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 0001/1124] 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 0002/1124] 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 0003/1124] 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 ed99f72403ef6aacba6ffe81ab14f65ee74a91ee Mon Sep 17 00:00:00 2001
From: Craig Bruce <cbruce@nine.com.au>
Date: Fri, 23 Mar 2018 14:15:59 +1100
Subject: [PATCH 0004/1124] Initial commit of cast types

---
 .../cast.framework.breaks.d.ts                |  110 +
 .../cast.framework.d.ts                       |  773 +++++++
 .../cast.framework.events.d.ts                |  421 ++++
 .../cast.framework.messages.d.ts              | 1777 +++++++++++++++++
 .../cast.framework.system.d.ts                |  177 ++
 .../cast.framework.ui.d.ts                    |  194 ++
 .../chromecast-caf-receiver-tests.ts          |   66 +
 types/chromecast-caf-receiver/index.d.ts      |   25 +
 types/chromecast-caf-receiver/tsconfig.json   |   22 +
 types/chromecast-caf-receiver/tslint.json     |    1 +
 10 files changed, 3566 insertions(+)
 create mode 100644 types/chromecast-caf-receiver/cast.framework.breaks.d.ts
 create mode 100644 types/chromecast-caf-receiver/cast.framework.d.ts
 create mode 100644 types/chromecast-caf-receiver/cast.framework.events.d.ts
 create mode 100644 types/chromecast-caf-receiver/cast.framework.messages.d.ts
 create mode 100644 types/chromecast-caf-receiver/cast.framework.system.d.ts
 create mode 100644 types/chromecast-caf-receiver/cast.framework.ui.d.ts
 create mode 100644 types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
 create mode 100644 types/chromecast-caf-receiver/index.d.ts
 create mode 100644 types/chromecast-caf-receiver/tsconfig.json
 create mode 100644 types/chromecast-caf-receiver/tslint.json

diff --git a/types/chromecast-caf-receiver/cast.framework.breaks.d.ts b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
new file mode 100644
index 0000000000..4fed094a12
--- /dev/null
+++ b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./index.d.ts" />
+/// <reference path="./cast.framework.d.ts" />
+/// <reference path="./cast.framework.events.d.ts" />
+/// <reference path="./cast.framework.messages.d.ts" />
+/// <reference path="./cast.framework.system.d.ts" />
+/// <reference path="./cast.framework.ui.d.ts" />
+
+import { Break, BreakClip } from './cast.framework.messages';
+
+export = cast.framework.breaks;
+
+declare namespace cast.framework.breaks {
+    export class BreakSeekData {
+        constructor(seekFrom: number, seekTo: number, breaks: Break[]);
+
+        /**
+         * List of breaks
+         */
+        breaks: Break[];
+
+        /**
+         * Current playback time
+         */
+        seekFrom: number;
+
+        /**
+         * The time to seek to
+         */
+        seekTo: number;
+    }
+
+    /** Provide context information for break clip load interceptor. */
+    export class BreakClipLoadInterceptorContext {
+        constructor(brk: Break);
+
+        /**
+         * The container break for the break clip
+         */
+        break: Break;
+    }
+
+    /** Interface to manage breaks */
+    export interface BreakManager {
+        /**
+         * Get current media break by id.
+         * @param {*} id
+         */
+        getBreakById(id: string): Break;
+
+        /**
+         * Get current media break clip by id
+         * @param {*} id
+         */
+        getBreakClipById(id: string): BreakClip;
+
+        /** Get current media break clips. */
+        getBreakClips(): BreakClip[];
+
+        /** Get current media breaks. */
+        getBreaks(): Break[];
+
+        /** Returns true if watched breaks should be played. */
+        getPlayWatchedBreak(): boolean;
+
+        /**
+         * Provide an interceptor to allow developer to insert more break clips or modify current break clip before a break is started.
+         * If interceptor is null it will reset the interceptor to default one.
+         * By default VAST fetching and parsing logic in default interceptor.
+         * So if customized interceptor is set by developer;
+         * the VAST logic will be overridden and developers should implement their own VAST fetching and parsing logic in the provided interceptor.
+         * @param {*} interceptor
+         */
+        setBreakClipLoadInterceptor(
+            interceptor: (
+                breakClip: BreakClip,
+                breakClipLoaderContext?: BreakClipLoadInterceptorContext
+            ) => void
+        ): void;
+
+        /**
+         * Provide an interceptor for developer to specify what breaks they want to play after seek.
+         * @param {*} seekInterceptor
+         */
+        setBreakSeekInterceptor(
+            seekInterceptor: (breakSeekData: BreakSeekData) => void
+        ): void;
+
+        /**
+         * Set a flag to control if the watched client stitching break should be played.
+         * @param {*} playWatchedBreak
+         */
+        setPlayWatchedBreak(playWatchedBreak: boolean): void;
+
+        /**
+         * Provide an interceptor to modify VAST tracking URL before it is being sent to server.
+         * The input of the interceptor is a string of the tracking URL.
+         * The interceptor can either return a modified string of URL or a Promise of modified string of URL.
+         * The interceptor can also return null if you want to send the tracking URL by your own code instead of by CAF.
+         * @param {*} interceptor
+         */
+        setVastTrackingInterceptor(
+            interceptor?: (trackingUrl: string) => void
+        ): void;
+    }
+}
diff --git a/types/chromecast-caf-receiver/cast.framework.d.ts b/types/chromecast-caf-receiver/cast.framework.d.ts
new file mode 100644
index 0000000000..a22e9a24b9
--- /dev/null
+++ b/types/chromecast-caf-receiver/cast.framework.d.ts
@@ -0,0 +1,773 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./index.d.ts" />
+/// <reference path="./cast.framework.breaks.d.ts" />
+/// <reference path="./cast.framework.events.d.ts" />
+/// <reference path="./cast.framework.messages.d.ts" />
+/// <reference path="./cast.framework.system.d.ts" />
+/// <reference path="./cast.framework.ui.d.ts" />
+
+import { EventType } from './cast.framework.events';
+import {
+    PlayerState,
+    PlayStringId,
+    ErrorType,
+    ErrorReason,
+    IdleReason,
+    MessageType,
+    Track,
+    TextTrackStyle,
+    QueueItem,
+    LoadRequestData,
+    QueueData,
+    Break,
+    LiveSeekableRange,
+    MediaInformation,
+    ErrorData,
+    RequestData,
+} from './cast.framework.messages';
+import { BreakManager } from './cast.framework.breaks';
+import { EventHandler, RequestHandler, BinaryHandler } from './cast';
+import {
+    ApplicationData,
+    Sender,
+    StandbyState,
+    SystemState,
+} from './cast.framework.system';
+
+export = cast.framework;
+
+declare namespace cast.framework {
+    export type LoggerLevel =
+        | 'DEBUG'
+        | 'VERBOSE'
+        | 'INFO'
+        | 'WARNING'
+        | 'ERROR'
+        | 'NONE';
+
+    export type ContentProtection =
+        | 'NONE'
+        | 'CLEARKEY'
+        | 'PLAYREADY'
+        | 'WIDEVINE';
+
+    /**
+     * Manages text tracks.
+     */
+    export class TextTracksManager {
+        constructor(params: any);
+
+        /**
+         * Adds text tracks to the list.
+         */
+        addTracks(tracks: Track[]): void;
+
+        /**
+         * Creates a text track.
+         */
+        createTrack(): Track;
+
+        /**
+         * Gets all active text ids.
+         */
+        getActiveIds(): number[];
+
+        /**
+         * Gets all active text tracks.
+         */
+        getActiveTracks(): Track[];
+
+        /**
+         * Returns the current text track style.
+         */
+        getTextTracksStyle(): TextTrackStyle;
+
+        /**
+         * Gets text track by id.
+         */
+        getTrackById(id: number): Track;
+
+        /**
+         * Returns all text tracks.
+         */
+        getTracks(): Track[];
+
+        /**
+         * Gets text tracks by language.
+         */
+        getTracksByLanguage(language: string): Track[];
+
+        /**
+         * Sets text tracks to be active by id.
+         */
+        setActiveByIds(newIds: number[]): void;
+
+        /**
+         * Sets text tracks to be active by language.
+         */
+        setActiveByLanguage(language: string): void;
+
+        /**
+         * Sets text track style.
+         */
+        setTextTrackStyle(style: TextTrackStyle): void;
+    }
+
+    /**
+     * QueueManager exposes several queue manipulation APIs to developers.
+     */
+    export class QueueManager {
+        constructor(params: any);
+
+        /**
+         * Returns the current queue item.
+         */
+        getCurrentItem(): QueueItem;
+
+        /**
+         * Returns the index of the current queue item.
+         */
+        getCurrentItemIndex(): number;
+
+        /**
+         * Returns the queue items.
+         */
+        getItems(): QueueItem[];
+
+        /**
+         * Inserts items into the queue.
+         */
+        insertItems(items: QueueItem[], insertBefore?: number): void;
+
+        /**
+         * Removes items from the queue.
+         */
+        removeItems(itemIds: number[]): void;
+
+        /**
+         * Sets whether to limit the number of queue items to be reported in Media Status (default is true).
+         */
+        setQueueStatusLimit(limitQueueItemsInStatus: boolean): void;
+
+        /**
+         * Updates existing queue items by matching itemId.
+         */
+        updateItems(items: QueueItem[]): void;
+    }
+
+    /**
+     * Base implementation of a queue.
+     */
+    export class QueueBase {
+        /**
+         * Fetches a window of items using the specified item id as reference; called by the receiver MediaManager when it needs more queue items; often as a request from senders. If only one of nextCount and prevCount is non-zero; fetchItems should only return items after or before the reference item; if both nextCount and prevCount are non-zero; a window of items including the reference item should be returned.
+         */
+        fetchItems(
+            itemId: number,
+            nextCount: number,
+            prevCount: number
+        ): QueueItem[] | Promise<QueueItem[]>;
+
+        /**
+         * Initializes the queue with the requestData. This is called when a new LOAD request comes in to the receiver. If this returns or resolves to null; our default queueing implementation will create a queue based on queueData.items or the single media in the load request data.
+         */
+        initialize(requestData: LoadRequestData): QueueData | Promise<QueueData>;
+
+        /**
+         * Returns next items after the reference item; often the end of the current queue; called by the receiver MediaManager.
+         */
+        nextItems(itemId?: number): QueueItem[] | Promise<QueueItem[]>;
+
+        /**
+         * Sets the current item with the itemId; called by the receiver MediaManager when it changes the current playing item.
+         */
+        onCurrentItemIdChanged(itemId: number): void;
+
+        /**
+         * A callback for informing the following items have been inserted into the receiver queue in this session. A cloud based implementation can optionally choose to update its queue based on the new information.
+         */
+        onItemsInserted(items: QueueItem[], insertBefore?: number): void;
+
+        /**
+         * A callback for informing the following items have been removed from the receiver queue in this session. A cloud based implementation can optionally choose to update its queue based on the new information.
+         */
+        onItemsRemoved(itemIds: number[]): void;
+
+        /**
+         * Returns previous items before the reference item; often at the beginning of the queue; called by the receiver MediaManager.
+         */
+        prevItems(itemId?: number): QueueItem[] | Promise<QueueItem[]>;
+
+        /**
+         * Shuffles the queue and returns new queue items. Returns null if the operation is not supported.
+         */
+        shuffle(): QueueItem[] | Promise<QueueItem[]>;
+    }
+
+    /**
+     * Controls and monitors media playback.
+     */
+    export class PlayerManager {
+        constructor(params: any);
+
+        /**
+         * Adds an event listener for player event.
+         */
+        addEventListener: (
+            eventType: EventType | EventType[],
+            eventListener: EventHandler
+        ) => void;
+
+        /**
+         * Sends a media status message to all senders (broadcast). Applications use this to send a custom state change.
+         */
+        broadcastStatus(
+            includeMedia?: boolean,
+            requestId?: number,
+            customData?: any,
+            includeQueueItems?: boolean
+        ): void;
+
+        /**
+         *
+         */
+        getAudioTracksManager(): AudioTracksManager;
+
+        /**
+         * Returns current time in sec in currently-playing break clip.
+         */
+        getBreakClipCurrentTimeSec(): number;
+
+        /**
+         * Returns duration in sec of currently-playing break clip.
+         */
+        getBreakClipDurationSec(): number;
+
+        /**
+         * Obtain the breaks (Ads) manager.
+         */
+        getBreakManager(): BreakManager;
+
+        /**
+         * Returns list of breaks.
+         */
+        getBreaks(): Break[];
+
+        /**
+         * Gets current time in sec of current media.
+         */
+        getCurrentTimeSec(): number;
+
+        /**
+         * Gets duration in sec of currently playing media.
+         */
+        getDurationSec(): number;
+
+        /**
+         * Returns live seekable range with start and end time in seconds. The values are media time based.
+         */
+        getLiveSeekableRange(): LiveSeekableRange;
+
+        /**
+         * Gets media information of current media.
+         */
+        getMediaInformation(): MediaInformation;
+
+        /**
+         * Returns playback configuration.
+         */
+        getPlaybackConfig(): PlaybackConfig;
+
+        /**
+         * Returns current playback rate.
+         */
+        getPlaybackRate(): number;
+
+        /**
+         * Gets player state.
+         */
+        getPlayerState(): PlayerState;
+
+        /**
+         * Get the preferred playback rate. (Can be used on shutdown event to save latest preferred playback rate to a persistent storage; so it can be used in next session in the cast options).
+         */
+        getPreferredPlaybackRate(): number;
+
+        /**
+         * Get the preferred text track language.
+         */
+        getPreferredTextLanguage(): string;
+
+        /**
+         * Obtain QueueManager API.
+         */
+        getQueueManager(): QueueManager;
+
+        /**
+         *
+         */
+        getTextTracksManager(): TextTracksManager;
+
+        /**
+         * Loads media.
+         */
+        load(loadRequest: LoadRequestData): Promise<void>;
+
+        /**
+         * Pauses currently playing media.
+         */
+        pause(): void;
+
+        /**
+         * Plays currently paused media.
+         */
+        play(): void;
+
+        /**
+         * Requests a text string to be played back locally on the receiver device.
+         */
+        playString(stringId: PlayStringId, args?: string[]): Promise<ErrorData>;
+
+        /**
+         * Request Google Assistant to refresh the credentials. Only works if the original credentials came from the assistant.
+         */
+        refreshCredentials(): Promise<void>;
+
+        /**
+         * Removes the event listener added for given player event. If event listener is not added; it will be ignored.
+         */
+        removeEventListener(
+            eventType: EventType | EventType[],
+            eventListener: EventHandler
+        ): void;
+
+        /**
+         * Seeks in current media.
+         */
+        seek(seekTime: number): void;
+
+        /**
+         * Sends an error to a specific sender
+         */
+        sendError(
+            senderId: string,
+            requestId: number,
+            type: ErrorType,
+            reason?: ErrorReason,
+            customData?: any
+        ): void;
+
+        /**
+         * Send local media request.
+         */
+        sendLocalMediaRequest(request: RequestData): void;
+
+        /**
+         * Sends a media status message to a specific sender.
+         */
+        sendStatus(
+            senderId: string,
+            requestId: number,
+            includeMedia?: boolean,
+            customData?: any,
+            includeQueueItems?: boolean
+        ): void;
+
+        /**
+         * Sets the IDLE reason. This allows applications that want to force the IDLE state to indicate the reason that made the player going to IDLE state (a custom error; for example). The idle reason will be sent in the next status message. NOTE: Most applications do not need to set this value; it is only needed if they want to make the player go to IDLE in special circumstances and the default idleReason does not reflect their intended behavior.
+         */
+        setIdleReason(idleReason: IdleReason): void;
+
+        /**
+         * Sets MediaElement to use. If Promise of MediaElement is set; media begins playback after Promise is resolved.
+         */
+        setMediaElement(mediaElement: HTMLMediaElement): void;
+
+        /**
+         * Sets media information.
+         */
+        setMediaInformation(
+            mediaInformation: MediaInformation,
+            opt_broadcast?: boolean
+        ): void;
+
+        /**
+         * Sets a handler to return or modify PlaybackConfig; for a specific load request. The handler paramaters are the load request data and default playback config for the receiver (provided in the context options). The handler should returns a modified playback config; or null to prevent the media from playing. The return value can be a promise to allow waiting for data from the server.
+         */
+        setMediaPlaybackInfoHandler(
+            handler: (
+                loadRequestData: LoadRequestData,
+                playbackConfig: PlaybackConfig
+            ) => void
+        ): void;
+
+        /**
+         * Sets a handler to return the media url for a load request. This handler can be used to avoid having the media content url published as part of the media status. By default the media contentId is used as the content url.
+         */
+        setMediaUrlResolver(
+            resolver: (loadRequestData: LoadRequestData) => void
+        ): void;
+
+        /**
+         * Provide an interceptor of incoming and outgoing messages. The interceptor can update the request data; and return updated data; a promise of updated data if need to get more data from the server; or null if the request should not be handled. Note that if load message interceptor is provided; and no interceptor is provided for preload - the load interceptor will be called for preload messages.
+         */
+        setMessageInterceptor(
+            type: MessageType,
+            interceptor: (requestData: RequestData) => Promise<any>
+        ): void;
+
+        /**
+         * Sets playback configuration on the PlayerManager.
+         */
+        setPlaybackConfig(playbackConfig: PlaybackConfig): void;
+
+        /**
+         * Set the preferred playback rate for follow up load or media items. The preferred playback rate will be updated automatically to the latest playback rate that was provided by a load request or explicit set of playback rate.
+         */
+        setPreferredPlaybackRate(preferredPlaybackRate: number): void;
+
+        /**
+         * Set the preferred text track language. The preferred text track language will be updated automatically to the latest enabled language by a load request or explicit change to text tracks. (Should be called only in idle state; and Will only apply to next loaded media).
+         */
+        setPreferredTextLanguage(preferredTextLanguage: string): void;
+
+        /**
+         * Stops currently playing media.
+         */
+        stop(): void;
+    }
+
+    /**
+     * Configuration to customize playback behavior.
+     */
+    export class PlaybackConfig {
+        /**
+         * Duration of buffered media in seconds to start buffering.
+         */
+        autoPauseDuration?: number;
+
+        /**
+         * Duration of buffered media in seconds to start/resume playback after auto-paused due to buffering.
+         */
+        autoResumeDuration?: number;
+
+        /**
+         * Minimum number of buffered segments to start/resume playback.
+         */
+        autoResumeNumberOfSegments?: number;
+
+        /**
+         * A function to customize request to get a caption segment.
+         */
+        captionsRequestHandler?: RequestHandler;
+
+        /**
+         * Initial bandwidth in bits in per second.
+         */
+        initialBandwidth?: number;
+
+        /**
+         * Custom license data.
+         */
+        licenseCustomData?: string;
+
+        /**
+         * Handler to process license data. The handler is passed the license data; and returns the modified license data.
+         */
+        licenseHandler?: BinaryHandler;
+
+        /**
+         * A function to customize request to get a license.
+         */
+        licenseRequestHandler?: RequestHandler;
+
+        /**
+         * Url for acquiring the license.
+         */
+        licenseUrl?: string;
+
+        /**
+         * Handler to process manifest data. The handler is passed the manifest; and returns the modified manifest.
+         */
+        manifestHandler?: (manifest: string) => string;
+
+        /**
+         * A function to customize request to get a manifest.
+         */
+        manifestRequestHandler?: RequestHandler;
+
+        /**
+         * Preferred protection system to use for decrypting content.
+         */
+        protectionSystem: ContentProtection;
+
+        /**
+         * Handler to process segment data. The handler is passed the segment data; and returns the modified segment data.
+         */
+        segmentHandler?: BinaryHandler;
+
+        /**
+         * A function to customize request information to get a media segment.
+         */
+        segmentRequestHandler?: RequestHandler;
+
+        /**
+         * Maximum number of times to retry a network request for a segment.
+         */
+        segmentRequestRetryLimit?: number;
+    }
+    /**
+     * HTTP(s) Request/Response information.
+     */
+    export class NetworkRequestInfo {
+        /**
+         * The content of the request. Can be used to modify license request body.
+         */
+        content: Uint8Array;
+
+        /**
+         * An object containing properties that you would like to send in the header.
+         */
+        headers: any;
+
+        /**
+         * The URL requested.
+         */
+        url: string;
+
+        /**
+         * Indicates whether CORS Access-Control requests should be made using credentials such as cookies or authorization headers.
+         */
+        withCredentials: boolean;
+    }
+    /** Cast receiver context options. All options are optionals. */
+    export class CastReceiverOptions {
+        /**
+         * Optional map of custom messages namespaces to initialize and their types.
+         * Custom messages namespaces need to be initiated before the application started;
+         * so it is best to provide the namespaces in the receiver options.
+         * (The default type of a message bus is JSON; if not provided here).
+         */
+        customNamespaces?: any;
+
+        /**
+         * Sender id used for local requests. Default value is 'local'.
+         */
+        localSenderId?: string;
+
+        /**
+         * Maximum time in seconds before closing an idle sender connection.
+         * Setting this value enables a heartbeat message to keep the connection alive.
+         * Used to detect unresponsive senders faster than typical TCP timeouts.
+         * The minimum value is 5 seconds; there is no upper bound enforced but practically it's minutes before platform TCP timeouts come into play.
+         * Default value is 10 seconds.
+         */
+        maxInactivity?: number;
+
+        /**
+         * Optional media element to play content with. Default behavior is to use the first found media element in the page.
+         */
+        mediaElement?: HTMLMediaElement;
+
+        /**
+         * Optional playback configuration.
+         */
+        playbackConfig?: PlaybackConfig;
+
+        /**
+         * If this is true; the watched client stitching break will also be played.
+         */
+        playWatchedBreak?: boolean;
+
+        /**
+         * Preferred value for player playback rate. It is used if playback rate value is not provided in the load request.
+         */
+        preferredPlaybackRate?: number;
+
+        /**
+         * Preferred text track language. It is used if no active track is provided in the load request.
+         */
+        preferredTextLanguage?: string;
+
+        /**
+         * Optional queue implementation.
+         */
+        queue?: QueueBase;
+
+        /**
+         * Text that represents the application status.
+         * It should meet internationalization rules as may be displayed by the sender application.
+         */
+        statusText?: string;
+
+        /**
+         * A bitmask of media commands supported by the application.
+         * LOAD; PLAY; STOP; GET_STATUS must always be supported.
+         * If this value is not provided; then PAUSE; SEEK; STREAM_VOLUME; STREAM_MUTE are assumed to be supported too.
+         */
+        supportedCommands?: number;
+
+        /**
+         * Indicate that MPL should be used for DASH content.
+         */
+        useLegacyDashSupport?: boolean;
+
+        /**
+         * An integer used as an internal version number.
+         * This number is used only to distinguish between receiver releases and higher numbers do not necessarily have to represent newer releases.
+         */
+        versionCode?: number;
+    }
+
+    /** Manages loading of underlying libraries and initializes underlying cast receiver SDK. */
+    export class CastReceiverContext {
+        /** Returns the CastReceiverContext singleton instance. */
+        static getInstance(): CastReceiverContext;
+
+        constructor(params: any);
+
+        /**
+         * Sets message listener on custom message channel.
+         */
+        addCustomMessageListener(namespace: string, listener: EventHandler): void;
+
+        /**
+         * Add listener to cast system events.
+         */
+        addEventListener(type: EventType, handler: EventHandler): void;
+
+        /**
+         * Checks if the given media params of video or audio streams are supported by the platform.
+         */
+        canDisplayType(
+            mimeType: string,
+            codecs?: string,
+            width?: number,
+            height?: number,
+            framerate?: number
+        ): boolean;
+
+        /**
+         * Provides application information once the system is ready; otherwise it will be null.
+         */
+        getApplicationData(): ApplicationData;
+
+        /**
+         * Provides device capabilities information once the system is ready; otherwise it will be null.
+         * If an empty object is returned; the device does not expose any capabilities information.
+         */
+        getDeviceCapabilities(): any;
+
+        /**
+         * Get Player instance that can control and monitor media playback.
+         */
+        getPlayerManager(): PlayerManager;
+
+        /**
+         * Get a sender by sender id
+         */
+        getSender(senderId: string): Sender;
+
+        /**
+         * Gets a list of currently-connected senders.
+         */
+        getSenders(): Sender[];
+
+        /**
+         * Reports if the cast application's HDMI input is in standby.
+         */
+        getStandbyState(): StandbyState;
+
+        /**
+         * Provides application information about the system state.
+         */
+        getSystemState(): SystemState;
+
+        /**
+         * Reports if the cast application is the HDMI active input.
+         */
+        getVisibilityState(): VisibilityState;
+
+        /**
+         * When the application calls start; the system will send the ready event to indicate
+         * that the application information is ready and the application can send messages as soon as there is one sender connected.
+         */
+        isSystemReady(): boolean;
+
+        /**
+         * Start loading player js. This can be used to start loading the players js code in early stage of starting the receiver before calling start.
+         * This function is a no-op if players were already loaded (start was called).
+         */
+        loadPlayerLibraries(useLegacyDashSupport?: boolean): void;
+
+        /**
+         * Remove a message listener on custom message channel.
+         */
+        removeCustomMessageListener(
+            namespace: string,
+            listener: EventHandler
+        ): void;
+
+        /**
+         * Remove listener to cast system events.
+         */
+        removeEventListener(type: EventType, handler: EventHandler): void;
+
+        /**
+         * Sends a message to a specific sender.
+         */
+        sendCustomMessage(namespace: string, senderId: string, message: any): void;
+
+        /**
+         * This function should be called in response to the feedbackstarted event if the application
+         * add debug state information to log in the feedback report.
+         * It takes in a parameter ‘message’ that is a string that represents the debug information that the application wants to log.
+         */
+        sendFeedbackMessage(feedbackMessage: string): void;
+
+        /**
+         * Sets the application state. The application should call this when its state changes.
+         * If undefined or set to an empty string; the value of the Application Name established during application
+         * registration is used for the application state by default.
+         */
+        setApplicationState(statusText: string): void;
+
+        /**
+         * Sets the receiver inactivity timeout.
+         * It is recommended to set the maximum inactivity value when calling Start and not changing it.
+         * This API is just provided for development/debugging purposes.
+         */
+        setInactivityTimeout(maxInactivity: number): void;
+
+        /**
+         * Sets the log verbosity level.
+         */
+        setLoggerLevel(level: LoggerLevel): void;
+
+        /**
+         * Initializes system manager and media manager; so that receiver app can receive requests from senders.
+         */
+        start(options?: CastReceiverOptions): CastReceiverContext;
+
+        /**
+         * Shutdown receiver application.
+         */
+        stop(): void;
+    }
+
+    /** Manages audio tracks. */
+    export class AudioTracksManager {
+        constructor(params: any);
+        getActiveId(): number;
+        getActiveTrack(): Track;
+        getTrackById(id: number): Track;
+        getTracks(): Track[];
+        getTracksByLanguage(language: string): Track[];
+        setActiveById(id: number): void;
+        setActiveByLanguage(language: string): void;
+    }
+}
diff --git a/types/chromecast-caf-receiver/cast.framework.events.d.ts b/types/chromecast-caf-receiver/cast.framework.events.d.ts
new file mode 100644
index 0000000000..c5e2e71771
--- /dev/null
+++ b/types/chromecast-caf-receiver/cast.framework.events.d.ts
@@ -0,0 +1,421 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./index.d.ts" />
+/// <reference path="./cast.framework.d.ts" />
+/// <reference path="./cast.framework.breaks.d.ts" />
+/// <reference path="./cast.framework.messages.d.ts" />
+/// <reference path="./cast.framework.system.d.ts" />
+/// <reference path="./cast.framework.ui.d.ts" />
+
+import {
+    RequestData,
+    MediaInformation,
+    Track,
+    MediaStatus,
+} from './cast.framework.messages';
+export = cast.framework.events;
+
+declare namespace cast.framework.events {
+    export type EventType =
+        | 'ALL'
+        | 'ABORT'
+        | 'CAN_PLAY'
+        | 'CAN_PLAY_THROUGH'
+        | 'DURATION_CHANGE'
+        | 'EMPTIED'
+        | 'ENDED'
+        | 'LOADED_DATA'
+        | 'LOADED_METADATA'
+        | 'LOAD_START'
+        | 'PAUSE'
+        | 'PLAY'
+        | 'PLAYING'
+        | 'PROGRESS'
+        | 'RATE_CHANGE'
+        | 'SEEKED'
+        | 'SEEKING'
+        | 'STALLED'
+        | 'TIME_UPDATE'
+        | 'SUSPEND'
+        | 'WAITING'
+        | 'BITRATE_CHANGED'
+        | 'BREAK_STARTED'
+        | 'BREAK_ENDED'
+        | 'BREAK_CLIP_LOADING'
+        | 'BREAK_CLIP_STARTED'
+        | 'BREAK_CLIP_ENDED'
+        | 'BUFFERING'
+        | 'CACHE_LOADED'
+        | 'CACHE_HIT'
+        | 'CACHE_INSERTED'
+        | 'CLIP_STARTED'
+        | 'CLIP_ENDED'
+        | 'EMSG'
+        | 'ERROR'
+        | 'ID3'
+        | 'MEDIA_STATUS'
+        | 'MEDIA_FINISHED'
+        | 'PLAYER_PRELOADING'
+        | 'PLAYER_PRELOADING_CANCELLED'
+        | 'PLAYER_LOAD_COMPLETE'
+        | 'PLAYER_LOADING'
+        | 'SEGMENT_DOWNLOADED'
+        | 'REQUEST_SEEK'
+        | 'REQUEST_LOAD'
+        | 'REQUEST_STOP'
+        | 'REQUEST_PAUSE'
+        | 'REQUEST_PLAY'
+        | 'REQUEST_PLAY_AGAIN'
+        | 'REQUEST_PLAYBACK_RATE_CHANGE'
+        | 'REQUEST_SKIP_AD'
+        | 'REQUEST_VOLUME_CHANGE'
+        | 'REQUEST_EDIT_TRACKS_INFO'
+        | 'REQUEST_EDIT_AUDIO_TRACKS'
+        | 'REQUEST_SET_CREDENTIALS'
+        | 'REQUEST_LOAD_BY_ENTITY'
+        | 'REQUEST_USER_ACTION'
+        | 'REQUEST_DISPLAY_STATUS'
+        | 'REQUEST_CUSTOM_COMMAND'
+        | 'REQUEST_FOCUS_STATE'
+        | 'REQUEST_QUEUE_LOAD'
+        | 'REQUEST_QUEUE_INSERT'
+        | 'REQUEST_QUEUE_UPDATE'
+        | 'REQUEST_QUEUE_REMOVE'
+        | 'REQUEST_QUEUE_REORDER'
+        | 'REQUEST_QUEUE_GET_ITEM_RANGE'
+        | 'REQUEST_QUEUE_GET_ITEMS'
+        | 'REQUEST_QUEUE_GET_ITEM_IDS'
+        | 'REQUEST_PRECACHE';
+
+    export type DetailedErrorCode =
+        | 'MEDIA_UNKNOWN'
+        | 'MEDIA_ABORTED'
+        | 'MEDIA_DECODE'
+        | 'MEDIA_NETWORK'
+        | 'MEDIA_SRC_NOT_SUPPORTED'
+        | 'SOURCE_BUFFER_FAILURE'
+        | 'MEDIAKEYS_UNKNOWN'
+        | 'MEDIAKEYS_NETWORK'
+        | 'MEDIAKEYS_UNSUPPORTED'
+        | 'MEDIAKEYS_WEBCRYPTO'
+        | 'NETWORK_UNKNOWN'
+        | 'SEGMENT_NETWORK'
+        | 'HLS_NETWORK_MASTER_PLAYLIST'
+        | 'HLS_NETWORK_PLAYLIST'
+        | 'HLS_NETWORK_NO_KEY_RESPONSE'
+        | 'HLS_NETWORK_KEY_LOAD'
+        | 'HLS_NETWORK_INVALID_SEGMENT'
+        | 'HLS_SEGMENT_PARSING'
+        | 'DASH_NETWORK'
+        | 'DASH_NO_INIT'
+        | 'SMOOTH_NETWORK'
+        | 'SMOOTH_NO_MEDIA_DATA'
+        | 'MANIFEST_UNKNOWN'
+        | 'HLS_MANIFEST_MASTER'
+        | 'HLS_MANIFEST_PLAYLIST'
+        | 'DASH_MANIFEST_UNKNOWN'
+        | 'DASH_MANIFEST_NO_PERIODS'
+        | 'DASH_MANIFEST_NO_MIMETYPE'
+        | 'DASH_INVALID_SEGMENT_INFO'
+        | 'SMOOTH_MANIFEST'
+        | 'SEGMENT_UNKNOWN'
+        | 'TEXT_UNKNOWN'
+        | 'APP'
+        | 'BREAK_CLIP_LOADING_ERROR'
+        | 'BREAK_SEEK_INTERCEPTOR_ERROR'
+        | 'IMAGE_ERROR'
+        | 'LOAD_INTERRUPTED'
+        | 'GENERIC';
+
+    export type EndedReason =
+        | 'END_OF_STREAM'
+        | 'ERROR'
+        | 'STOPPED'
+        | 'INTERRUPTED'
+        | 'SKIPPED'
+        | 'BREAK_SWITCH';
+
+    /**
+     * Event data for @see{@link EventType.SEGMENT_DOWNLOADED} event.
+     */
+    export class SegmentDownloadedEvent {
+        constructor(downloadTime?: number, size?: number);
+
+        /**
+         * The time it took to download the segment; in milliseconds.
+         */
+        downloadTime?: number;
+
+        /**
+         * The number of bytes in the segment.
+         */
+        size?: number;
+    }
+
+    /**
+     * Event data for all events that represent requests made to the receiver.
+     */
+    export class RequestEvent {
+        constructor(type: EventType, requestData?: RequestData, senderId?: string);
+
+        /**
+         * The data that was sent with the request.
+         */
+        requestData?: RequestData;
+
+        /**
+         * The sender id the request came from.
+         */
+        senderId?: string;
+    }
+
+    /**
+     * Event data for @see{@link EventType.MEDIA_STATUS} event.
+     */
+    export class MediaStatusEvent {
+        constructor(mediaStatus?: MediaStatus);
+
+        /**
+         * The media status that was sent.
+         */
+        mediaStatus?: MediaStatus;
+    }
+    /**
+     * Event data for pause events forwarded from the MediaElement.
+     */
+    export class MediaPauseEvent {
+        constructor(currentMediaTime?: number, ended?: boolean);
+
+        /**
+         * Indicate if the media ended (indicates the pause was fired due to stream reached the end).
+         */
+        ended?: boolean;
+    }
+    /**
+     * Event data for @see{@link EventType.MEDIA_FINISHED} event.
+     */
+    export class MediaFinishedEvent {
+        constructor(currentMediaTime?: number, endedReason?: EndedReason);
+
+        /**
+         * The time when the media finished (in seconds). For an item in a queue; this value represents the time in the currently playing queue item ( where 0 means the queue item has just started).
+         */
+        currentTime?: number;
+
+        /**
+         * The reason the media finished.
+         */
+        endedReason?: EndedReason;
+    }
+    /**
+     * Event data for all events forwarded from the MediaElement.
+     */
+    export class MediaElementEvent {
+        constructor(type: EventType, currentMediaTime?: number);
+
+        /**
+         * The time in the currently playing clip when the event was fired (in seconds). Undefined if playback has not started yet.
+         */
+        currentMediaTime?: number;
+    }
+    /**
+     * Event data for all events pertaining to processing a load / preload request. made to the player.
+     */
+    export class LoadEvent {
+        constructor(type: EventType, media?: MediaInformation);
+
+        /**
+         * Information about the media being loaded.
+         */
+        media: MediaInformation;
+    }
+    /**
+     * Event data for @see{@link EventType.INBAND_TRACK_ADDED} event.
+     */
+    export class InbandTrackAddedEvent {
+        constructor(track: Track);
+
+        /**
+         * Added track.
+         */
+        track: Track;
+    }
+
+    /** Event data for @see{@link EventType.ID3} event. */
+    export class Id3Event {
+        constructor(segmentData: Uint8Array);
+
+        /**
+         * The segment data.
+         */
+        segmentData: Uint8Array;
+    }
+    /**
+     * Event data superclass for all events dispatched by @see{@link PlayerManager}
+     */
+    export class Event {
+        constructor(type: EventType);
+
+        /**
+         * Type of the event.
+         */
+        type: EventType;
+    }
+    /**
+     * Event data for @see{@link EventType.EMSG} event.
+     */
+    export class EmsgEvent {
+        constructor(emsgData: any);
+
+        /**
+         * The time that the event ends (in presentation time). Undefined if using legacy Dash support.
+         */
+        endTime: any;
+
+        /**
+         * The duration of the event (in units of timescale). Undefined if using legacy Dash support.
+         */
+        eventDuration: any;
+
+        /**
+         * A field identifying this instance of the message. Undefined if using legacy Dash support.
+         */
+        id: any;
+
+        /**
+         * Body of the message. Undefined if using legacy Dash support.
+         */
+        messageData: any;
+
+        /**
+         * The offset that the event starts; relative to the start of the segment this is contained in (in units of timescale). Undefined if using legacy Dash support.
+         */
+        presentationTimeDelta: any;
+
+        /**
+         * Identifies the message scheme. Undefined if using legacy Dash support.
+         */
+        schemeIdUri: any;
+
+        /**
+         * The segment data. This is only defined if using legacy Dash support.
+         */
+        segmentData: any;
+
+        /**
+         * The time that the event starts (in presentation time). Undefined if using legacy Dash support.
+         */
+        startTime: any;
+
+        /**
+         * Provides the timescale; in ticks per second. Undefined if using legacy Dash support.
+         */
+        timescale: any;
+
+        /**
+         * Specifies the value for the event. Undefined if using legacy Dash support.
+         */
+        value: any;
+    }
+    /**
+     * Event data for @see{@link EventType.CLIP_ENDED} event.
+     */
+    export class ClipEndedEvent {
+        constructor(currentMediaTime: number, endedReason?: EndedReason);
+
+        /**
+         * The time in media (in seconds) when clip ended.
+         */
+        currentMediaTime: number;
+
+        /**
+         * The reason the clip ended.
+         */
+        endedReason?: EndedReason;
+    }
+
+    /**
+     * Event data for @see{@link EventType.CACHE_LOADED} event.
+     */
+    export class CacheLoadedEvent {
+        constructor(media?: MediaInformation);
+
+        /**
+         * Information about the media being cached.
+         */
+        media: MediaInformation;
+    }
+
+    export class CacheItemEvent {
+        constructor(type: EventType, url: string);
+
+        /**
+         * The URL of data fetched from cache
+         */
+        url: string;
+    }
+
+    export class BufferingEvent {
+        constructor(isBuffering: boolean);
+
+        /**
+         * True if the player is entering a buffering state.
+         */
+        isBuffering: boolean;
+    }
+
+    export class BreaksEvent {
+        constructor(
+            type: EventType,
+            currentMediaTime?: number,
+            index?: number,
+            total?: number,
+            whenSkippable?: number,
+            endedReason?: EndedReason,
+            breakClipId?: string
+        );
+
+        /**
+         * The break clip's id. Refer to BreakClip.id
+         */
+        breakClipId: string;
+
+        /**
+         * The time in the currently playing media when the break event occurred.
+         */
+        currentMediaTime: string;
+
+        /**
+         * The reason the break clip ended.
+         */
+        endedReason: EndedReason;
+
+        /**
+         * Index of break clip; which starts from 1.
+         */
+        index: number;
+
+        /**
+         * Total number of break clips.
+         */
+        total: number;
+
+        /**
+         * When to skip current break clip in sec; after break clip begins to play.
+         */
+        whenSkippable: number;
+    }
+
+    /**
+     * Event data for @see {@link EventType.BITRATE_CHANGED} event.
+     */
+    export class BitrateChangedEvent {
+        constructor(totalBitrate?: number);
+
+        /** The bitrate of the media (audio and video) in bits per second. */
+        totalBitrate: number;
+    }
+}
diff --git a/types/chromecast-caf-receiver/cast.framework.messages.d.ts b/types/chromecast-caf-receiver/cast.framework.messages.d.ts
new file mode 100644
index 0000000000..dc5c1ac07b
--- /dev/null
+++ b/types/chromecast-caf-receiver/cast.framework.messages.d.ts
@@ -0,0 +1,1777 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./index.d.ts" />
+/// <reference path="./cast.framework.d.ts" />
+/// <reference path="./cast.framework.breaks.d.ts" />
+/// <reference path="./cast.framework.events.d.ts" />
+/// <reference path="./cast.framework.system.d.ts" />
+/// <reference path="./cast.framework.ui.d.ts" />
+
+import { DetailedErrorCode } from './cast.framework.events';
+export = cast.framework.messages;
+
+declare namespace cast.framework.messages {
+    export type UserAction =
+        | 'LIKE'
+        | 'DISLIKE'
+        | 'FOLLOW'
+        | 'UNFOLLOW'
+        | 'FLAG'
+        | 'SKIP_AD';
+
+    export type UserActionContext =
+        | 'UNKNOWN_CONTEXT'
+        | 'ALBUM'
+        | 'ARTIST'
+        | 'PLAYLIST'
+        | 'EPISODE'
+        | 'SERIES'
+        | 'MOVIE'
+        | 'CHANNEL'
+        | 'TEAM'
+        | 'PLAYER'
+        | 'COACH';
+
+    export type TextTrackType =
+        | 'SUBTITLES'
+        | 'CAPTIONS'
+        | 'DESCRIPTIONS'
+        | 'CHAPTERS'
+        | 'METADATA';
+
+    export type TextTrackWindowType = 'NONE' | 'NORMAL' | 'ROUNDED_CORNERS';
+
+    export type TrackType = 'TEXT' | 'AUDIO' | 'VIDEO';
+
+    export type TextTrackFontGenericFamily =
+        | 'SANS_SERIF'
+        | 'MONOSPACED_SANS_SERIF'
+        | 'SERIF'
+        | 'MONOSPACED_SERIF'
+        | 'CASUAL'
+        | 'CURSIVE'
+        | 'SMALL_CAPITALS';
+
+    export type TextTrackFontStyle = 'NORMAL' | 'BOLD' | 'BOLD_ITALIC' | 'ITALIC';
+
+    export type TextTrackEdgeType =
+        | 'NONE'
+        | 'OUTLINE'
+        | 'DROP_SHADOW'
+        | 'RAISED'
+        | 'DEPRESSED';
+
+    export type Command =
+        | 'PAUSE'
+        | 'SEEK'
+        | 'STREAM_VOLUME'
+        | 'STREAM_MUTE'
+        | 'ALL_BASIC_MEDIA'
+        | 'QUEUE_NEXT'
+        | 'QUEUE_PREV'
+        | 'QUEUE_SHUFFLE'
+        | 'SKIP_AD';
+
+    export type SeekResumeState = 'PLAYBACK_START' | 'PLAYBACK_PAUSE';
+
+    export type StreamingProtocolType =
+        | 'UNKNOWN'
+        | 'MPEG_DASH'
+        | 'HLS'
+        | 'SMOOTH_STREAMING';
+
+    export type StreamType = 'BUFFERED' | 'LIVE' | 'NONE';
+
+    export type FocusState = 'IN_FOCUS' | 'NOT_IN_FOCUS';
+
+    export type ExtendedPlayerState = 'LOADING';
+
+    export type ErrorType =
+        | 'INVALID_PLAYER_STATE'
+        | 'LOAD_FAILED'
+        | 'LOAD_CANCELLED'
+        | 'INVALID_REQUEST'
+        | 'ERROR';
+
+    export type ErrorReason =
+        | 'INVALID_COMMAND'
+        | 'INVALID_PARAMS'
+        | 'INVALID_MEDIA_SESSION_ID'
+        | 'SKIP_LIMIT_REACHED'
+        | 'NOT_SUPPORTED'
+        | 'LANGUAGE_NOT_SUPPORTED'
+        | 'END_OF_QUEUE'
+        | 'APP_ERROR'
+        | 'AUTHENTICATION_EXPIRED'
+        | 'PREMIUM_ACCOUNT_REQUIRED'
+        | 'CONCURRENT_STREAM_LIMIT'
+        | 'PARENTAL_CONTROL_RESTRICTED'
+        | 'NOT_AVAILABLE_IN_REGION'
+        | 'CONTENT_ALREADY_PLAYING'
+        | 'INVALID_REQUEST'
+        | 'GENERIC_LOAD_ERROR';
+
+    export type RepeatMode =
+        | 'REPEAT_OFF'
+        | 'REPEAT_ALL'
+        | 'REPEAT_SINGLE'
+        | 'REPEAT_ALL_AND_SHUFFLE';
+
+    export type IdleReason = 'CANCELLED' | 'INTERRUPTED' | 'FINISHED' | 'ERROR';
+
+    export type HlsSegmentFormat = 'AAC' | 'AC3' | 'MP3' | 'TS' | 'TS_AAC';
+
+    export type HdrType = 'SDR' | 'HDR' | 'DV';
+
+    export type PlayStringId =
+        | 'FREE_TRIAL_ABOUT_TO_EXPIRE'
+        | 'SUBSCRIPTION_ABOUT_TO_EXPIRE'
+        | 'STREAM_HIJACKED';
+
+    export type GetStatusOptions = 'NO_METADATA' | 'NO_QUEUE_ITEMS';
+
+    export type MessageType =
+        | 'MEDIA_STATUS'
+        | 'CLOUD_STATUS'
+        | 'QUEUE_CHANGE'
+        | 'QUEUE_ITEMS'
+        | 'QUEUE_ITEM_IDS'
+        | 'GET_STATUS'
+        | 'LOAD'
+        | 'PAUSE'
+        | 'STOP'
+        | 'PLAY'
+        | 'SKIP_AD'
+        | 'PLAY_AGAIN'
+        | 'SEEK'
+        | 'SET_PLAYBACK_RATE'
+        | 'SET_VOLUME'
+        | 'EDIT_TRACKS_INFO'
+        | 'EDIT_AUDIO_TRACKS'
+        | 'PRECACHE'
+        | 'PRELOAD'
+        | 'QUEUE_LOAD'
+        | 'QUEUE_INSERT'
+        | 'QUEUE_UPDATE'
+        | 'QUEUE_REMOVE'
+        | 'QUEUE_REORDER'
+        | 'QUEUE_NEXT'
+        | 'QUEUE_PREV'
+        | 'QUEUE_GET_ITEM_RANGE'
+        | 'QUEUE_GET_ITEMS'
+        | 'QUEUE_GET_ITEM_IDS'
+        | 'QUEUE_SHUFFLE'
+        | 'SET_CREDENTIALS'
+        | 'LOAD_BY_ENTITY'
+        | 'USER_ACTION'
+        | 'DISPLAY_STATUS'
+        | 'FOCUS_STATE'
+        | 'CUSTOM_COMMAND';
+
+    export type PlayerState = 'IDLE' | 'PLAYING' | 'PAUSED' | 'BUFFERING';
+
+    export type QueueChangeType =
+        | 'INSERT'
+        | 'REMOVE'
+        | 'ITEMS_CHANGE'
+        | 'UPDATE'
+        | 'NO_CHANGE';
+
+    export type QueueType =
+        | 'ALBUM'
+        | 'PLAYLIST'
+        | 'AUDIOBOOK'
+        | 'RADIO_STATION'
+        | 'PODCAST_SERIES'
+        | 'TV_SERIES'
+        | 'VIDEO_PLAYLIST'
+        | 'LIVE_TV'
+        | 'MOVIE';
+
+    export type MetadataType =
+        | 'GENERIC'
+        | 'MOVIE'
+        | 'TV_SHOW'
+        | 'MUSIC_TRACK'
+        | 'PHOTO';
+
+    /**
+     * RefreshCredentials request data.
+     */
+    export interface RefreshCredentialsRequestData { }
+
+    /**
+     * Media event SET_VOLUME request data.
+     */
+    export interface VolumeRequestData extends RequestData {
+        /**
+         * The media stream volume
+         */
+        volume?: Volume;
+    }
+
+    /**
+     * Represents the volume of a media session stream.
+     */
+    export interface Volume {
+        /**
+         * Value from 0 to 1 that represents the current stream volume level.
+         */
+        level?: number;
+
+        /**
+         * Whether the stream is muted.
+         */
+        muted?: boolean;
+    }
+
+    /**
+     * Video information such as video resolution and High Dynamic Range (HDR).
+     */
+    export class VideoInformation {
+        constructor(width: number, height: number, hdrType: HdrType);
+
+        /**
+         *
+         */
+        width: number;
+
+        /**
+         *
+         */
+        height: number;
+
+        /**
+         *
+         */
+        hdrType: HdrType;
+    }
+
+    /**
+     * VAST ad request configuration.
+     */
+    export interface VastAdsRequest {
+        /**
+         * Specifies a VAST document to be used as the ads response instead of making a request via an ad tag url. This can be useful for debugging and other situations where a VAST response is already available.
+         */
+        adsResponse?: string;
+
+        /**
+         * URL for VAST file.
+         */
+        adTagUrl?: string;
+    }
+
+    /**
+     * UserAction request data.
+     */
+    export interface UserActionRequestData {
+        /**
+         * Optional request source. It contain the assistent query that initiate the request.
+         */
+        source?: string;
+
+        /**
+         * User action to be handled by the application.
+         */
+        userAction?: UserAction;
+
+        /**
+         * Optional context information for the user action.
+         */
+        userActionContext?: UserActionContext;
+    }
+
+    /**
+     * A TV episode media description.
+     */
+    export interface TvShowMediaMetadata {
+        /**
+         * TV episode number. A positive integer.
+         */
+        episode?: number;
+
+        /**
+         * @deprecated use episode instead
+         */
+        episodeNumber?: number;
+
+        /**
+         * @deprecated use episode instead
+         */
+        episodeTitle?: string;
+
+        /**
+         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         */
+        images?: Image[];
+
+        /**
+         * ISO 8601 date when the episode originally aired; e.g. 2014-02-10.
+         */
+        originalAirdate?: string;
+
+        /**
+         * @deprecated use originalAirdate instead.
+         */
+        releaseYear?: number;
+
+        /**
+         * TV episode season. A positive integer.
+         */
+        season?: number;
+
+        /**
+         * @deprecated use season instead.
+         */
+        seasonNumber?: number;
+
+        /**
+         * TV series title.
+         */
+        seriesTitle?: string;
+
+        /**
+         * TV episode title.
+         */
+        title?: string;
+    }
+    /**
+     * Describes track metadata information.
+     */
+    export class Track {
+        constructor(trackId: number, trackType: TrackType);
+
+        /**
+         * Custom data set by the receiver application.
+         */
+        customData?: string;
+
+        /**
+         * Language tag as per RFC 5646 (If subtype is “SUBTITLES” it is mandatory).
+         */
+        language?: string;
+
+        /**
+         * A descriptive; human readable name for the track. For example "Spanish".
+         */
+        name?: string;
+
+        /**
+         * For text tracks; the type of text track.
+         */
+        subtype?: string;
+
+        /**
+         * It can be the url of the track or any other identifier that allows the receiver to find the content (when the track is not inband or included in the manifest). For example it can be the url of a vtt file.
+         */
+        trackContentId?: string;
+
+        /**
+         * It represents the MIME type of the track content. For example if the track is a vtt file it will be ‘text/vtt’. This field is needed for out of band tracks; so it is usually provided if a trackContentId has also been provided. It is not mandatory if the receiver has a way to identify the content from the trackContentId; but recommended. The track content type; if provided; must be consistent with the track type.
+         */
+        trackContentType?: string;
+
+        /**
+         * Unique identifier of the track within the context of a MediaInformation object.
+         */
+        trackId?: number;
+
+        /**
+         * The type of track.
+         */
+        type: TrackType;
+    }
+    /**
+     * Describes style information for a text track.
+     */
+    export interface TextTrackStyle {
+        /**
+         * The background 32 bit RGBA color. The alpha channel should be used for transparent backgrounds.
+         */
+        backgroundColor?: string;
+
+        /**
+         * Custom data set by the receiver application.
+         */
+        customData?: any;
+
+        /**
+         * RGBA color for the edge; this value will be ignored if edgeType is NONE.
+         */
+        edgeColor?: string;
+
+        /**
+         *
+         */
+        edgeType?: TextTrackEdgeType;
+
+        /**
+         * If the font is not available in the receiver the fontGenericFamily will be used.
+         */
+        fontFamily?: string;
+
+        /**
+         * The text track generic family.
+         */
+        fontGenericFamily?: TextTrackFontGenericFamily;
+
+        /**
+         * The font scaling factor for the text track (the default is 1).
+         */
+        fontScale?: number;
+
+        /**
+         * The text track font style.
+         */
+        fontStyle?: TextTrackFontStyle;
+
+        /**
+         * The foreground 32 bit RGBA color.
+         */
+        foregroundColor?: string;
+
+        /**
+         * 32 bit RGBA color for the window. This value will be ignored if windowType is NONE.
+         */
+        windowColor?: string;
+
+        /**
+         * Rounded corner radius absolute value in pixels (px). This value will be ignored if windowType is not ROUNDED_CORNERS.
+         */
+        windowRoundedCornerRadius?: number;
+
+        /**
+         * The window concept is defined in CEA-608 and CEA-708. In WebVTT is called a region.
+         */
+        windowType?: TextTrackWindowType;
+    }
+
+    /**
+     * Media event playback rate request data.
+     */
+    export interface SetPlaybackRateRequestData extends RequestData {
+        /**
+         * New playback rate (>0).
+         */
+        playbackRate?: number;
+
+        /**
+         * New playback rate relative to current playback rate. New rate will be the result of multiplying the current rate with the value. For example a value of 1.1 will increase rate by 10%. (Only used if the playbackRate value is not provided).
+         */
+        relativePlaybackRate?: number;
+    }
+
+    /**
+     * SetCredentials request data.
+     */
+    export interface SetCredentialsRequestData {
+        /**
+         * Credentials to use by receiver.
+         */
+        credentials?: string;
+
+        /**
+         * If it is a response for refresh credentials; it will indicate the request id of the refresh credentials request.
+         */
+        forRequestId?: number;
+
+        /**
+         * Optional request source. It contain the assistent query that initiate the request.
+         */
+        source?: string;
+    }
+
+    /**
+     * Media event SEEK request data.
+     */
+    export interface SeekRequestData extends RequestData {
+        /**
+         * Seconds since beginning of content.
+         */
+        currentTime?: number;
+
+        /**
+         * Seconds relative to the current playback position. If this field is defined; the currentTime field will be ignored.
+         */
+        relativeTime?: number;
+
+        /**
+         * The playback state after a SEEK request.
+         */
+        resumeState?: SeekResumeState;
+    }
+
+    /**
+     * Provides seekable range in seconds.
+     */
+    export class SeekableRange {
+        constructor(start?: number, end?: number);
+
+        /**
+         * End of the seekable range in seconds.
+         */
+        end?: number;
+
+        /**
+         * Start of the seekable range in seconds.
+         */
+        start?: number;
+    }
+
+    /**
+     * Media event request data.
+     */
+    export class RequestData {
+        constructor(type: MessageType);
+
+        /**
+         * Application-specific data for this request. It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         */
+        customData?: any;
+
+        /**
+         * Id of the media session that the request applies to.
+         */
+        mediaSessionId?: number;
+
+        /**
+         * Id of the request; used to correlate request/response.
+         */
+        requestId: number;
+    }
+
+    /**
+     * Media event UPDATE queue request data.
+     */
+    export interface QueueUpdateRequestData {
+        /**
+         * ID of the current media Item after the deletion (if not provided; the currentItem value will be the same as before the deletion; if it does not exist because it has been deleted; the currentItem will point to the next logical item in the list).
+         */
+        currentItemId?: number;
+
+        /**
+         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         */
+        currentTime?: number;
+
+        /**
+         * List of queue items to be updated. No reordering will happen; the items will retain the existing order.
+         */
+        items?: QueueItem[];
+
+        /**
+         * Skip/Go back number of items with respect to the position of currentItem (it can be negative). If it is out of boundaries; the currentItem will be the next logical item in the queue wrapping around the boundaries. The new currentItem position will follow the rules of the queue repeat behavior.
+         */
+        jump?: number;
+
+        /**
+         * Behavior of the queue when all items have been played.
+         */
+        repeatMode?: RepeatMode;
+
+        /**
+         * Shuffle the queue items when the update is processed. After the queue items are shuffled; the item at the currentItem position will be loaded.
+         */
+        shuffle?: boolean;
+    }
+
+    /**
+     * Media event queue REORDER request data.
+     */
+    export class QueueReorderRequestData extends RequestData {
+        constructor(itemIds: number[]);
+
+        /**
+         * ID of the current media Item after the deletion (if not provided; the currentItem value will be the same as before the deletion; if it does not exist because it has been deleted; the currentItem will point to the next logical item in the list).
+         */
+        currentItemId?: number;
+
+        /**
+         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         */
+        currentTime?: number;
+
+        /**
+         * ID of the item that will be located immediately after the reordered list. If the ID is not found or it is not provided; the reordered list will be appended at the end of the existing list.
+         */
+        insertBefore?: number;
+
+        /**
+               * IDs of the items to be reordered; in the new order. Items not provided will keep their existing order. The provided list will be inserted at the position determined by insertBefore. For example:
+
+                  If insertBefore is not specified Existing queue: “A”;”D”;”G”;”H”;”B”;”E” itemIds: “D”;”H”;”B” New Order: “A”;”G”;”E”;“D”;”H”;”B”
+
+                  If insertBefore is “A” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “D”;”H”;”B”;“A”;”G”;”E”
+
+                  If insertBefore is “G” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “A”;“D”;”H”;”B”;”G”;”E”
+               */
+        itemIds: number[];
+    }
+
+    /**
+     * Media event queue REMOVE request data.
+     */
+    export class QueueRemoveRequestData extends RequestData {
+        constructor(itemIds: number[]);
+
+        /**
+         * ID of the current media Item after the deletion (if not provided; the currentItem value will be the same as before the deletion; if it does not exist because it has been deleted; the currentItem will point to the next logical item in the list).
+         */
+        currentItemId?: number;
+
+        /**
+         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         */
+        currentTime?: number;
+
+        /**
+         * IDs of queue items to be deleted.
+         */
+        itemIds?: number[];
+    }
+    /**
+     * Media event queue LOAD request data.
+     */
+    export interface QueueLoadRequestData extends RequestData {
+        constructor(items: QueueItem[]): QueueLoadRequestData;
+
+        /**
+         * Seconds (since the beginning of content) to start playback of the first item to be played. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user casts the item that was playing locally so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         */
+        currentTime?: number;
+
+        /**
+         * Behavior of the queue when all items have been played.
+         */
+        items: QueueItem[];
+
+        /**
+         * Id of the request; used to correlate request/response.
+         */
+        repeatMode?: RepeatMode;
+
+        /**
+         * The index of the item in the items array that must be the first currentItem (the item that will be played first). Note this is the index of the array (starts at 0) and not the itemId (as it is not known until the queue is created). If repeatMode is REPEAT_OFF playback will end when the last item in the array is played (elements before the startIndex will not be played). This may be useful for continuation scenarios where the user was already using the sender app and in the middle decides to cast. In this way the sender app does not need to map between the local and remote queue positions or saves one extra QUEUE_UPDATE request.
+         */
+        startIndex?: number;
+    }
+
+    /**
+     * Queue item information. Application developers may need to create a QueueItem to insert a queue element using InsertQueueItems. In this case they should not provide an itemId (as the actual itemId will be assigned when the item is inserted in the queue). This prevents ID collisions with items added from a sender app.
+     */
+    export class QueueItem {
+        constructor(opt_itemId?: number);
+
+        /**
+         * Array of Track trackIds that are active. If the array is not provided; the default tracks will be active.
+         */
+        activeTrackIds?: number[];
+
+        /**
+         * If the autoplay parameter is not specified or is true; the media player will begin playing the element in the queue when the item becomes the currentItem.
+         */
+        autoplay?: boolean;
+
+        /**
+         * The application can define any extra queue item information needed.
+         */
+        customData?: any;
+
+        /**
+         * Unique identifier of the item in the queue. The attribute is optional because for LOAD or INSERT should not be provided (as it will be assigned by the receiver when an item is first created/inserted).
+         */
+        itemId?: number;
+
+        /**
+         * Metadata (including contentId) of the playlist element.
+         */
+        media?: MediaInformation;
+
+        /**
+         * Playback duration of the item; if it is larger than the actual duration - startTime it will be ignored (default behavior). It can be negative; in such case the duration will be the actual asset duration minus the duration provided. It can be used for photo slideshows to control the duration the item should be presented or for live events to control the duration that the program should be played. It may be useful for autoplay scenarios to avoid displaying all the credits after an episode has ended.
+         */
+        playbackDuration?: number;
+
+        /**
+         * This parameter is a hint for the receiver to preload this media item before it is played. It allows for a smooth transition between items played from the queue. The time is expressed in seconds; relative to the beginning of this item playback (usually the end of the previous item playback). Only positive values are valid. For example; if the value is 10 seconds; this item will be preloaded 10 seconds before the previous item has finished. The receiver will try to honor this value but will not guarantee it; for example if the value is larger than the previous item duration the receiver may just preload this item shortly after the previous item has started playing (there will never be two items being preloaded in parallel). Also; if an item is inserted in the queue just after the currentItem and the time to preload is higher than the time left on the currentItem; the preload will just happen as soon as possible.
+         */
+        preloadTime?: number;
+
+        /**
+         * Seconds since beginning of content. If the content is live content; and startTime is not specified; the stream will start at the live position.
+         */
+        startTime?: number;
+    }
+
+    /**
+     * Media event queue INSERT request data.
+     */
+    export class QueueInsertRequestData extends RequestData {
+        constructor(items: QueueItem[]);
+
+        /**
+         * ID of the current media Item after the insertion (if not provided; the currentItem value will be the same as before the insertion).
+         */
+        currentItemId?: number;
+
+        /**
+         * Index (relative to the items array; starting with 0) of the new current media Item. For inserted items we use the index (similar to startIndex in QUEUE_LOAD) and not currentItemId; because the itemId is unknown until the items are inserted. If not provided; the currentItem value will be the same as before the insertion (unless currentItemId is provided). This param allows to make atomic the common use case of insert and play an item.
+         */
+        currentItemIndex?: number;
+
+        /**
+         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         */
+        currentTime?: number;
+
+        /**
+         * ID of the item that will be located immediately after the inserted list. If the ID is not found or it is not provided; the list will be appended at the end of the existing list.
+         */
+        insertBefore?: number;
+
+        /**
+         * List of queue items. The itemId field of the items should be empty. It is sorted (first element will be played first).
+         */
+        items: QueueItem[];
+    }
+
+    /**
+     * Represents a data message containing the full list of queue ids.
+     */
+    export interface QueueIds {
+        /**
+         * List of queue item ids.
+         */
+        itemIds?: number[];
+
+        /**
+         * The corresponding request id.
+         */
+        requestId?: number;
+
+        /**
+         *
+         */
+        type: MessageType;
+    }
+
+    /**
+     * Queue data as part of the LOAD request.
+     */
+    export class QueueData {
+        constructor(
+            id?: string,
+            name?: string,
+            description?: string,
+            repeatMode?: RepeatMode,
+            items?: QueueItem[],
+            startIndex?: number,
+            startTime?: number
+        );
+
+        /**
+         * Description of the queue.
+         */
+        description?: string;
+
+        /**
+         * Optional Queue entity id; provide Google Assistant deep link.
+         */
+        entity?: string;
+
+        /**
+         * Id of the queue.
+         */
+        id?: string;
+
+        /**
+         * Array of queue items. It is sorted (first element will be played first).
+         */
+        items?: QueueItem[];
+
+        /**
+         * Name of the queue.
+         */
+        name?: string;
+
+        /**
+         * Queue type; e.g. album; playlist; radio station; tv series; etc.
+         */
+        queueType?: QueueType;
+
+        /**
+         * Continuous playback behavior of the queue.
+         */
+        repeatMode?: RepeatMode;
+
+        /**
+         * The index of the item in the queue that should be used to start playback first.
+         */
+        startIndex?: number;
+
+        /**
+         * Seconds (since the beginning of content) to start playback of the first item.
+         */
+        startTime?: number;
+    }
+
+    /**
+     * Represents a queue change message; such as insert; remove; and update.
+     */
+    export interface QueueChange {
+        /**
+         * The actual queue change type.
+         */
+        changeType?: QueueChangeType;
+
+        /**
+         * The id to insert the list of itemIds before.
+         */
+        insertBefore?: number;
+
+        /**
+         * List of changed itemIds.
+         */
+        itemIds?: number[];
+
+        /**
+         * The corresponding request id.
+         */
+        requestId?: number;
+
+        /**
+         * The queue change sequence ID. Used to coordinate state sync between various senders and the receiver.
+         */
+        sequenceNumber?: number;
+
+        /**
+         *
+         */
+        type: MessageType;
+    }
+
+    /**
+     * Media event PRELOAD request data.
+     */
+    export class PreloadRequestData implements LoadRequestData {
+        /**
+         * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
+         */
+        activeTrackIds: number[];
+        /**
+         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified;the media player implementation may choose to begin playback immediately.
+         */
+        autoplay?: boolean;
+        /**
+         * Optional user credentials.
+         */
+        credentials?: string;
+        /**
+         * Optional credentials type. The type 'cloud' is a reserved type used by load requests that were originated by voice assistant commands.
+         */
+        credentialsType?: string;
+        /**
+         * Seconds since beginning of content. If the content is live content; and currentTime is not specified; the stream will start at the live position.
+         */
+        currentTime?: number;
+        /**
+         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified; the media player implementation may choose to begin playback immediately.
+         */
+        media: MediaInformation;
+        /**
+         * The media playback rate.
+         */
+        playbackRate?: number;
+        /**
+         * Queue data.
+         */
+        queueData: QueueData;
+        /**
+         * Application-specific data for this request. It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         */
+        customData?: any;
+        /**
+         * Id of the media session that the request applies to.
+         */
+        mediaSessionId?: number;
+        /**
+         * Id of the request; used to correlate request/response.
+         */
+        requestId: number;
+        constructor(itemId: number);
+
+        /**
+         * The ID of the queue item.
+         */
+        itemId: number;
+    }
+
+    /**
+     * Media event PRECACHE request data. (Some fields of the load request; like autoplay and queueData; are ignored).
+     */
+    export class PrecacheRequestData implements LoadRequestData {
+        /**
+         * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
+         */
+        activeTrackIds: number[];
+        /**
+         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified;the media player implementation may choose to begin playback immediately.
+         */
+        autoplay?: boolean;
+        /**
+         * Optional user credentials.
+         */
+        credentials?: string;
+        /**
+         * Optional credentials type. The type 'cloud' is a reserved type used by load requests that were originated by voice assistant commands.
+         */
+        credentialsType?: string;
+        /**
+         * Seconds since beginning of content. If the content is live content; and currentTime is not specified; the stream will start at the live position.
+         */
+        currentTime?: number;
+        /**
+         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified; the media player implementation may choose to begin playback immediately.
+         */
+        media: MediaInformation;
+        /**
+         * The media playback rate.
+         */
+        playbackRate?: number;
+        /**
+         * Queue data.
+         */
+        queueData: QueueData;
+        /**
+         * Application-specific data for this request. It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         */
+        customData?: any;
+        /**
+         * Id of the media session that the request applies to.
+         */
+        mediaSessionId?: number;
+        /**
+         * Id of the request; used to correlate request/response.
+         */
+        requestId: number;
+        constructor(data?: string);
+
+        /**
+         * Application precache data.
+         */
+        precacheData?: string;
+    }
+
+    /**
+     * PlayString request data.
+     */
+    export class PlayStringRequestData {
+        constructor(stringId: PlayStringId, opt_arguments?: string[]);
+
+        /**
+         * An optional array of string values to be filled into the text.
+         */
+        arguments?: string[];
+
+        /**
+         * An identifier for the text to be played back.
+         */
+        stringId: PlayStringId;
+    }
+
+    /**
+     * A photo media description.
+     */
+    export interface PhotoMediaMetadata {
+        /**
+         * Name of the photographer.
+         */
+        artist?: string;
+
+        /**
+         * ISO 8601 date and time the photo was taken; e.g. 2014-02-10T15:47:00Z.
+         */
+        creationDateTime?: string;
+
+        /**
+         * Photo height; in pixels.
+         */
+        height?: number;
+
+        /**
+         * Images associated with the content. Examples would include a photo thumbnail.
+         */
+        images: Image[];
+
+        /**
+         * Latitude.
+         */
+        latitude?: number;
+
+        /**
+         * Location where the photo was taken. For example; "Seattle; Washington; USA".
+         */
+        location?: string;
+
+        /**
+         * Longitude.
+         */
+        longitude?: number;
+
+        /**
+         * Photo title.
+         */
+        title?: string;
+
+        /**
+         * Photo width; in pixels.
+         */
+        width?: number;
+    }
+
+    /**
+     * A music track media description.
+     */
+    export interface MusicTrackMediaMetadata {
+        /**
+         * Album artist name.
+         */
+        albumArtist?: string;
+
+        /**
+         * Album name.
+         */
+        albumName?: string;
+
+        /**
+         * Track artist name.
+         */
+        artist?: string;
+
+        /**
+         * @deprecated: use @see{@link artist} instead
+         */
+        artistName: string;
+
+        /**
+         * Track composer name.
+         */
+        composer?: string;
+
+        /**
+         * Disc number. A positive integer.
+         */
+        discNumber?: number;
+
+        /**
+         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         */
+        images: Image[];
+
+        /**
+         * ISO 8601 date when the track was released; e.g. 2014-02-10.
+         */
+        releaseDate?: string;
+
+        /**
+         * @deprecated: Use @see{@link releaseDate} instead
+         */
+        releaseYear?: string;
+
+        /**
+         * Track name.
+         */
+        songName?: string;
+
+        /**
+         * Track title.
+         */
+        title?: string;
+
+        /**
+         * Track number in album. A positive integer.
+         */
+        trackNumber?: number;
+    }
+
+    /**
+     * A movie media description.
+     */
+    export interface MovieMediaMetadata {
+        /**
+         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         */
+        images: Image[];
+
+        /**
+         * ISO 8601 date when the movie was released; e.g. 2014-02-10.
+         */
+        releaseDate?: string;
+
+        /**
+         * @deprecated: use @see{@link releaseDate} instead
+         */
+        releaseYear?: number;
+
+        /**
+         * Movie studio.
+         */
+        studio?: string;
+
+        /**
+         * Movie subtitle.
+         */
+        subtitle?: string;
+
+        /**
+         * Movie title.
+         */
+        title?: string;
+    }
+    /**
+     * Represents the status of a media session.
+     */
+    export interface MediaStatus {
+        /**
+         * List of IDs corresponding to the active tracks.
+         */
+        activeTrackIds: number[];
+
+        /**
+         * Status of break; if receiver is playing break. This field will be defined only when receiver is playing break.
+         */
+        breakStatus: BreakStatus;
+
+        /**
+         * ID of this media item (the item that originated the status change).
+         */
+        currentItemId?: number;
+
+        /**
+         * The current playback position.
+         */
+        currentTime: number;
+
+        /**
+         * Application-specific media status.
+         */
+        customData?: any;
+
+        /**
+         * Extended media status information.
+         */
+        extendedStatus: ExtendedMediaStatus;
+
+        /**
+         * If the state is IDLE; the reason the player went to IDLE state.
+         */
+        idleReason: IdleReason;
+
+        /**
+         * List of media queue items.
+         */
+        items: QueueItem[];
+
+        /**
+         * Seekable range of a live or event stream. It uses relative media time in seconds. It will be undefined for VOD streams.
+         */
+        liveSeekableRange: LiveSeekableRange;
+
+        /**
+         * ID of the media Item currently loading. If there is no item being loaded; it will be undefined.
+         */
+        loadingItemId?: number;
+
+        /**
+         * The media information.
+         */
+        media: MediaInformation;
+
+        /**
+         * Unique id for the session.
+         */
+        mediaSessionId: number;
+
+        /**
+         * The playback rate.
+         */
+        playbackRate: number;
+
+        /**
+         * The playback state.
+         */
+        playerState: PlayerState;
+
+        /**
+         * ID of the next Item; only available if it has been preloaded. Media items can be preloaded and cached temporarily in memory; so when they are loaded later on; the process is faster (as the media does not have to be fetched from the network).
+         */
+        preloadedItemId?: number;
+
+        /**
+         * Queue data.
+         */
+        queueData: QueueData;
+
+        /**
+         * The behavior of the queue when all items have been played.
+         */
+        repeatMode: RepeatMode;
+
+        /**
+         * The commands supported by this player.
+         */
+        supportedMediaCommands: number;
+
+        /**
+         *
+         */
+        type: MessageType;
+
+        /**
+         * The video information.
+         */
+        videoInfo: VideoInformation;
+
+        /**
+         * The current stream volume.
+         */
+        volume: Volume;
+    }
+    /**
+     * Common media metadata used as part of MediaInformation
+     */
+    export class MediaMetadata {
+        constructor(type: MetadataType);
+
+        /**
+         * The type of metadata
+         */
+        metadataType: MetadataType;
+    }
+
+    /**
+     * Represents the media information.
+     */
+    export interface MediaInformation {
+        /**
+         * Partial list of break clips that includes current break clip that receiver is playing or ones that receiver will play shortly after; instead of sending whole list of clips. This is to avoid overflow of MediaStatus message.
+         */
+        breakClips: BreakClip[];
+
+        /**
+         * List of breaks.
+         */
+        breaks: Break[];
+
+        /**
+         * Typically the url of the media.
+         */
+        contentId: string;
+
+        /**
+         *  The content MIME type.
+         */
+        contentType: string;
+
+        /**
+         * Optional media url; to allow using contentId for real id. If contentUrl is provided; it will be used as media url; otherwise the contentId will be used as the media url.
+         */
+        contentUrl?: string;
+
+        /**
+         * Application-specific media information.
+         */
+        customData?: any;
+
+        /**
+         * The media duration.
+         */
+        duration?: number;
+
+        /**
+         * Optional Media entity; provide Google Assistant deep link.
+         */
+        entity?: string;
+
+        /**
+         * The format of the HLS media segment.
+         */
+        hlsSegmentFormat: HlsSegmentFormat;
+
+        /**
+         * The media metadata.
+         */
+        metadata: MediaMetadata;
+
+        /**
+         * The stream type.
+         */
+        streamType: StreamType;
+
+        /**
+         * The style of text track.
+         */
+        textTrackStyle: TextTrackStyle;
+
+        /**
+         * The media tracks.
+         */
+        tracks: Track[];
+    }
+
+    /**
+     * Media event LOAD request data.
+     */
+    export interface LoadRequestData extends RequestData {
+        /**
+         * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
+         */
+        activeTrackIds: number[];
+
+        /**
+         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified;the media player implementation may choose to begin playback immediately.
+         */
+        autoplay?: boolean;
+
+        /**
+         * Optional user credentials.
+         */
+        credentials?: string;
+
+        /**
+         * Optional credentials type. The type 'cloud' is a reserved type used by load requests that were originated by voice assistant commands.
+         */
+        credentialsType?: string;
+
+        /**
+         * Seconds since beginning of content. If the content is live content; and currentTime is not specified; the stream will start at the live position.
+         */
+        currentTime?: number;
+
+        /**
+         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified; the media player implementation may choose to begin playback immediately.
+         */
+        media: MediaInformation;
+
+        /**
+         * The media playback rate.
+         */
+        playbackRate?: number;
+
+        /**
+         * Queue data.
+         */
+        queueData: QueueData;
+    }
+
+    /**
+     * LoadByEntity request data.
+     */
+    export interface LoadByEntityRequestData {
+        /**
+         * Content entity information; typically represented by a stringified JSON object
+         */
+        entity: string;
+
+        /**
+         *  Shuffle the items to play.
+         */
+        shuffle?: boolean;
+
+        /**
+         * Optional request source. It contain the assistent query that initiate the request.
+         */
+        source?: string;
+    }
+
+    /**
+     * Provides live seekable range with start and end time in seconds and two more attributes.
+     */
+    export class LiveSeekableRange {
+        constructor(
+            start?: number,
+            end?: number,
+            isMovingWindow?: boolean,
+            isLiveDone?: boolean
+        );
+
+        /**
+         * A boolean value indicates whether a live stream is ended. If it is done; the end of live seekable range should stop updating.
+         */
+        isLiveDone?: boolean;
+
+        /**
+         * A boolean value indicates whether the live seekable range is a moving window. If false; it will be either a expanding range or a fixed range meaning live has ended.
+         */
+        isMovingWindow?: boolean;
+    }
+
+    /**
+     * Represents a data message containing item information for each requested ids.
+     */
+    export interface ItemsInfo {
+        /**
+         * List of changed itemIds.
+         */
+        items: QueueItem[];
+
+        /**
+         * The corresponding request id.
+         */
+        requestId?: number;
+
+        /**
+         *
+         */
+        type: MessageType;
+    }
+
+    /**
+     * An image that describes a receiver application or media item.
+     * This could be an application icon; cover art; or a thumbnail.
+     */
+    export class Image {
+        constructor(url: string);
+
+        /**
+         * The height of the image.
+         */
+        height?: number;
+
+        /**
+         * the URL to the image
+         */
+        url: string;
+
+        /**
+         * The width of the image
+         */
+        width?: number;
+    }
+    /** Media event GET_STATUS request data. */
+    export interface GetStatusRequestData extends RequestData {
+        /**
+         * The options of a GET_STATUS request.
+         */
+        options: GetStatusOptions;
+    }
+
+    /**
+     * Get items info request data.
+     */
+    export interface GetItemsInfoRequestData extends RequestData {
+        constructor(itemIds: number[]): GetItemsInfoRequestData;
+
+        /**
+         * List of item ids to be requested.
+         */
+        itemIds: number[];
+    }
+    /**
+     * A generic media description.
+     */
+    export interface GenericMediaMetadata {
+        /**
+         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         */
+        images: Image[];
+
+        /**
+         * ISO 8601 date and/or time when the content was released; e.g. 2014-02-10.
+         */
+        releaseDate?: string;
+
+        /**
+         *@deprecated - use @see{@link releaseDate} instead
+         */
+        releaseYear?: number;
+
+        /**
+         * Content subtitle.
+         */
+        subtitle?: string;
+
+        /**
+         * Content title.
+         */
+        title?: string;
+    }
+
+    /**
+     * Focus state change message.
+     */
+    export interface FocusStateRequestData {
+        /**
+         * The focus state of the app.
+         */
+        state: FocusState;
+    }
+
+    /** Fetch items request data. */
+    export class FetchItemsRequestData extends RequestData {
+        constructor(itemId: number, nextCount: number, prevCount: number);
+
+        /**
+         * ID of the reference media item for fetching more items.
+         */
+        itemId: number;
+
+        /**
+         * Number of items after the reference item to be fetched.
+         */
+        nextCount: number;
+
+        /**
+         * Number of items before the reference item to be fetched.
+         */
+        prevCount: number;
+    }
+
+    /**
+     * Extended media status information
+     */
+    export class ExtendedMediaStatus {
+        constructor(playerState: MediaInformation, opt_media?: MediaInformation);
+
+        /**
+         *
+         */
+        media: MediaInformation;
+
+        /**
+         *
+         */
+        playerState: ExtendedPlayerState;
+    }
+
+    /** Event data for @see{@link EventType.ERROR} event. */
+    export class ErrorEvent {
+        constructor(detailedErrorCode?: DetailedErrorCode, error?: any);
+        /**
+         * An error code representing the cause of the error.
+         */
+        detailedErrorCode?: DetailedErrorCode;
+
+        /**
+         * The error object.
+         * This could be an Error object (e.g.; if an Error was thrown in an event handler)
+         * or an object with error information (e.g.; if the receiver received an invalid command).
+         */
+        error?: any;
+    }
+
+    export class ErrorData {
+        constructor(type: ErrorType);
+
+        /**
+         * Application-specific data for this request.
+         * It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         */
+        customData?: any;
+
+        /**
+                Id of the request; used to correlate request/response.
+               */
+        requestId?: number;
+    }
+
+    /**  Media event EDIT_TRACKS_INFO request data. */
+    export interface EditTracksInfoRequestData extends RequestData {
+        /**
+         * Array of the Track trackIds that should be active.
+         * If it is not provided; the active tracks will not change.
+         * If the array is empty; no track will be active.
+         */
+        activeTrackIds?: number[];
+
+        /**
+         * Flag to enable or disable text tracks.
+         * If false it will disable all text tracks;
+         * if true it will enable the first text track; or the previous active text tracks.
+         * This flag is ignored if activeTrackIds or language is provided.
+         */
+        enableTextTracks?: boolean;
+
+        /**
+         * Indicates that the provided language was not explicit user request; but rather inferred from used language in voice query.
+         * It allows receiver apps to use user saved preference instead of spoken language.
+         */
+        isSuggestedLanguage?: boolean;
+
+        /**
+         * Language for the tracks that should be active. The language field will take precedence over activeTrackIds if both are specified.
+         */
+        language?: string;
+
+        /**
+         *
+         */
+        textTrackStyle?: TextTrackStyle;
+    }
+
+    /**
+     * Media event EDIT_AUDIO_TRACKS request data. If language is not provided; the default audio track for the media will be enabled.
+     */
+    export interface EditAudioTracksRequestData extends RequestData {
+        /**
+         * Indicates that the provided language was not explicit user request; but rather inferred from used language in voice query.
+         * It allows receiver apps to use user saved preference instead of spoken language.
+         */
+        isSuggestedLanguage?: boolean;
+
+        /**
+         *
+         */
+        language?: string;
+    }
+
+    /** DisplayStatus request data. */
+    export interface DisplayStatusRequestData {
+        /**
+         * Optional request source. It contain the assistent query that initiate the request.
+         */
+        source: string;
+    }
+
+    /** CustomCommand request data. */
+    export interface CustomCommandRequestData {
+        /**
+         * Custom Data; typically represented by a stringified JSON object.
+         */
+        data: string;
+
+        /**
+         * Optional request source. It contain the assistent query that initiate the request.
+         */
+        source: string;
+    }
+    /** Cloud media status. Media status that is only sent to the cloud sender. */
+    export class CloudMediaStatus {
+        constructor();
+    }
+
+    export class BreakStatus {
+        constructor(currentBreakTime: number, currentBreakClipTime: number);
+
+        /**
+         * Id of current break clip.
+         */
+        breakClipId: string;
+
+        /**
+         * Id of current break.
+         */
+        breakId: string;
+
+        /**
+         * Time in sec elapsed after current break clip starts.
+         */
+        currentBreakClipTime: number;
+
+        /**
+         * Time in sec elapsed after current break starts.
+         */
+        currentBreakTime: number;
+
+        /**
+         * The time in sec when this break clip becomes skippable.
+         * 5 means that end user can skip this break clip after 5 seconds.
+         * If this field is not defined; it means that current break clip is not skippable.
+         */
+        whenSkippable: number;
+    }
+
+    /**
+     * Represents break clip (e.g. a clip of ad during ad break)
+     */
+    export class BreakClip {
+        constructor(id: string);
+
+        /**
+         * Url of page that sender will display; when end user clicks link on sender UI; while receiver is playing this clip.
+         */
+        clickThroughUrl?: string;
+        /**
+         * Typically the url of the break media (playing on the receiver).
+         */
+        contentId?: string;
+        /**
+         * The content MIME type.
+         */
+        contentType?: string;
+        /**
+         * Optional break media url; to allow using contentId for real id.
+         * If contentUrl is provided; it will be used as media url; otherwise the contentId will be used as the media url.
+         */
+        contentUrl?: string;
+        /**
+         * Application-specific break clip data.
+         */
+        customData?: any;
+        /**
+         * Duration of break clip in sec.
+         */
+        duration?: number;
+        /**
+         * The format of the HLS media segment.
+         */
+        hlsSegmentFormat: HlsSegmentFormat;
+        /**
+         * Unique id of break clip.
+         */
+        id: string;
+        /**
+         * Url of content that sender will display while receiver is playing this clip.
+         */
+        posterUrl?: string;
+        /**
+         * Title of break clip. Sender might display this on its screen; if provided.
+         */
+        title?: string;
+        /**
+         * VAST ad request configuration. Used if contentId or contentUrl is not provided.
+         */
+        vastAdsRequest: VastAdsRequest;
+        /**
+         * The time in sec when this break clip becomes skippable.
+         * 5 means that end user can skip this break clip after 5 seconds.
+         * If this field is not defined; it means that current break clip is not skippable.
+         */
+        whenSkippable?: number;
+    }
+
+    /** Represents break (e.g. ad break) included in main video. */
+    export class Break {
+        constructor(id: string, breakClipIds: string[], position: number);
+        /**
+         * List of ids of break clip that this break includes.
+         */
+        breakClipIds: string[];
+        /**
+         * Duration of break in sec.
+         */
+        duration?: number;
+        /**
+         * Unique id of break.
+         */
+        id: string;
+        /**
+         * If true; indicates this is embedded break in main stream.
+         */
+        isEmbedded?: boolean;
+        /**
+         * Whether break is watched.
+         * Sender can change color of progress bar marker corresponding to this break once this field changes from false to true;
+         *  denoting that the end-user already watched this break.
+         */
+        isWatched: boolean;
+        /**
+         * Where the break is located inside main video. -1 represents the end of main video.
+         */
+        position: number;
+    }
+}
diff --git a/types/chromecast-caf-receiver/cast.framework.system.d.ts b/types/chromecast-caf-receiver/cast.framework.system.d.ts
new file mode 100644
index 0000000000..1f465761b0
--- /dev/null
+++ b/types/chromecast-caf-receiver/cast.framework.system.d.ts
@@ -0,0 +1,177 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./index.d.ts" />
+/// <reference path="./cast.framework.d.ts" />
+/// <reference path="./cast.framework.breaks.d.ts" />
+/// <reference path="./cast.framework.events.d.ts" />
+/// <reference path="./cast.framework.messages.d.ts" />
+/// <reference path="./cast.framework.ui.d.ts" />
+
+import { EventType } from './cast.framework.events';
+export = cast.framework.system;
+
+declare namespace cast.framework.system {
+  export type SystemState =
+    | 'NOT_STARTED'
+    | 'STARTING_IN_BACKGROUND'
+    | 'STARTING'
+    | 'READY'
+    | 'STOPPING_IN_BACKGROUND'
+    | 'STOPPING';
+
+  export type StandbyState = 'STANDBY' | 'NOT_STANDBY' | 'UNKNOWN';
+
+  export type DisconnectReason = 'REQUESTED_BY_SENDER' | 'ERROR' | 'UNKNOWN';
+
+  /**
+   * Event dispatched by @see{@link CastReceiverManager} when the visibility of the application changes (HDMI input change; TV is turned off).
+   */
+  export class VisibilityChangedEvent {
+    constructor(isVisible: boolean);
+
+    /**
+     * Whether the Cast device is the active input or not.
+     */
+    isVisible: boolean;
+  }
+
+  /**
+   * Represents the system volume data.
+   */
+  export interface SystemVolumeData {
+    /**
+     * The level (from 0.0 to 1.0) of the system volume.
+     */
+    level: number;
+
+    /**
+     * Whether the system volume is muted or not.
+     */
+    muted: boolean;
+  }
+  /**
+   * Event dispatched by @see{CastReceiverManager} when the system volume changes.
+   */
+  export class SystemVolumeChangedEvent extends Event {
+    constructor(volume: SystemVolumeData);
+
+    /**
+     *  The system volume data
+     */
+    data: SystemVolumeData;
+  }
+  /**
+   * Event dispatched by @see{@link CastReceiverManager} when the TV enters/leaves the standby state.
+   */
+  export class StandbyChangedEvent {
+    constructor(isStandby: boolean);
+
+    /**
+     *
+     */
+    isStandby: boolean;
+  }
+  /**
+   * Whether the TV is in standby or not.
+   */
+  export interface ShutdownEvent extends Event {}
+
+  /**
+   * Event dispatched by @see{@link CastReceiverManager} when a sender is disconnected.
+   */
+  export class SenderDisconnectedEvent extends Event {
+    constructor(senderId: string, userAgent: string);
+    /**
+     * The ID of the sender connected.
+     */
+    senderId: string;
+
+    /**
+     * The user agent of the sender.
+     */
+    userAgent: string;
+
+    /**
+     * The reason the sender was disconnected.
+     */
+    reason?: DisconnectReason;
+  }
+
+  /**
+   * Event dispatched by @see{@link CastReceiverManager} when a sender is connected.
+   */
+  export class SenderConnectedEvent extends Event {
+    constructor(senderId: string, userAgent: string);
+    /**
+     * The ID of the sender connected.
+     */
+    senderId: string;
+
+    /**
+     * The user agent of the sender.
+     */
+    userAgent: string;
+  }
+
+  /**
+   * Represents the data of a connected sender device.
+   */
+  export interface Sender {
+    /**
+     * The sender Id.
+     */
+    id: string;
+
+    /**
+     * Indicate the sender supports large messages (>64KB).
+     */
+    largeMessageSupported?: boolean;
+
+    /**
+     * The userAgent of the sender.
+     */
+    userAgent?: string;
+  }
+
+  /**
+   * Event dispatched by CastReceiverManager when the system is ready.
+   */
+  export class ReadyEvent {
+    constructor(applicationData: ApplicationData);
+
+    /**
+     * The application data
+     */
+    data: ApplicationData;
+  }
+
+  /**
+   * Event dispatched by @see{@link CastReceiverManager} when the system needs to update the restriction on maximum video resolution.
+   */
+  export class MaxVideoResolutionChangedEvent extends Event {
+    constructor(height: number);
+
+    /**
+     * Maximum video resolution requested by the system. The value of 0 means there is no restriction.
+     */
+    height: number;
+  }
+  /** Event dispatched by @see{@link CastReceiverManager} when the systems starts to create feedback report. */
+  export interface FeedbackStartedEvent extends Event {}
+  /** Event dispatched by @see{@link CastReceiverContext} which contains system information. */
+  export class Event {
+    constructor(type: EventType, data?: any);
+  }
+
+  /** Represents the data of the launched application. */
+  export interface ApplicationData {
+    id(): string;
+    launchingSenderId(): string;
+    name(): string;
+    namespaces(): string[];
+    sessionId(): number;
+  }
+}
diff --git a/types/chromecast-caf-receiver/cast.framework.ui.d.ts b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
new file mode 100644
index 0000000000..fbc61f56d0
--- /dev/null
+++ b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
@@ -0,0 +1,194 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./index.d.ts" />
+/// <reference path="./cast.framework.d.ts" />
+/// <reference path="./cast.framework.breaks.d.ts" />
+/// <reference path="./cast.framework.events.d.ts" />
+/// <reference path="./cast.framework.messages.d.ts" />
+/// <reference path="./cast.framework.system.d.ts" />
+
+import { PlayerDataEventType } from './cast.framework.ui';
+import { MediaMetadata } from './cast.framework.messages';
+
+export = cast.framework.ui;
+
+declare namespace cast.framework.ui {
+    export type ContentType = 'VIDEO' | 'AUDIO' | 'IMAGE';
+
+    export type State =
+        | 'LAUNCHING'
+        | 'IDLE'
+        | 'LOADING'
+        | 'BUFFERING'
+        | 'PAUSED'
+        | 'PLAYING';
+
+    export type PlayerDataEventType =
+        | 'ANY_CHANGE'
+        | 'STATE_CHANGED'
+        | 'IS_SEEKING_CHANGED'
+        | 'DURATION_CHANGED'
+        | 'CURRENT_TIME_CHANGED'
+        | 'METADATA_CHANGED'
+        | 'TITLE_CHANGED'
+        | 'SUBTITLE_CHANGED'
+        | 'THUMBNAIL_URL_CHANGED'
+        | 'NEXT_TITLE_CHANGED'
+        | 'NEXT_SUBTITLE_CHANGED'
+        | 'NEXT_THUMBNAIL_URL_CHANGED'
+        | 'PRELOADING_NEXT_CHANGED'
+        | 'CONTENT_TYPE_CHANGED'
+        | 'IS_LIVE_CHANGED'
+        | 'BREAK_PERCENTAGE_POSITIONS_CHANGED'
+        | 'IS_PLAYING_BREAK_CHANGED'
+        | 'IS_BREAK_SKIPPABLE_CHANGED'
+        | 'WHEN_SKIPPABLE_CHANGED'
+        | 'NUMBER_BREAK_CLIPS_CHANGED'
+        | 'CURRENT_BREAK_CLIP_NUMBER_CHANGED'
+        | 'DISPLAY_STATUS_CHANGED';
+
+    /**
+     * Player data changed event. Provides the changed field (type); and new value.
+     */
+    export class PlayerDataChangedEvent {
+        constructor(type: PlayerDataEventType, field: string, value: any);
+
+        /**
+         * The field name that was changed.
+         */
+        field: string;
+
+        /**
+         *
+         */
+        type: PlayerDataEventType;
+
+        /**
+         * The new field value.
+         */
+        value: any;
+    }
+    /**
+     * Player data binder. Bind a player data object to the player state. The player data will be updated to reflect correctly the current player state without firing any change event.
+     */
+    export class PlayerDataBinder {
+        constructor(playerData: PlayerData | any);
+
+        /**
+         * Add listener to player data changes.
+         */
+        // addEventListener: (type: PlayerDataEventType; listener: PlayerDataChangedEventHandler);
+
+        /**
+         * Remove listener to player data changes.
+         */
+        // removeEventListener: (type: PlayerDataEventType; listener: PlayerDataChangedEventHandler);
+    }
+    /**
+     * Player data. Provide the player media and break state.
+     */
+    export interface PlayerData {
+        /**
+         * Array of breaks positions in percentage.
+         */
+        breakPercentagePositions: number[];
+
+        /**
+         * Content Type.
+         */
+        contentType: ContentType;
+
+        /**
+         * The number of the current playing break clip in the break.
+         */
+        currentBreakClipNumber: number;
+
+        /**
+         * Media current position in seconds; or break current position if playing break.
+         */
+        currentTime: number;
+
+        /**
+         * Whether the player metadata (ie: title; currentTime) should be displayed. This will be true if at least one field in the metadata should be displayed. In some cases; displayStatus will be true; but parts of the metadata should be hidden (ie: the media title while media is seeking). In these cases; additional css can be applied to hide those elements. For cases where the media is audio-only; this will almost always be true. In cases where the media is video; this will be true when: (1) the video is loading; buffering; or seeking (2) a play request was made in the last five seconds while media is already playing; (3) there is a request made to show the status in the last five seconds; or (4) the media was paused in the last five seconds.
+         */
+        displayStatus: boolean;
+
+        /**
+         * Media duration in seconds; Or break duration if playing break.
+         */
+        duration: number;
+
+        /**
+         * Indicate break clip can be skipped.
+         */
+        isBreakSkippable: boolean;
+
+        /**
+         * Indicate if the content is a live stream.
+         */
+        isLive: boolean;
+
+        /**
+         * Indicate that the receiver is playing a break.
+         */
+        isPlayingBreak: boolean;
+
+        /**
+         * Indicate the player is seeking (can be either during playing or pausing).
+         */
+        isSeeking: boolean;
+
+        /**
+         * Media metadata.
+         */
+        metadata: MediaMetadata | any;
+
+        /**
+         * Next Item subtitle.
+         */
+        nextSubtitle: string;
+
+        /**
+         * Next Item thumbnail url.
+         */
+        nextThumbnailUrl: string;
+
+        /**
+         * Next Item title.
+         */
+        nextTitle: string;
+
+        /**
+         * Number of break clips in current break.
+         */
+        numberBreakClips: number;
+
+        /**
+         * Flag to show/hide next item metadata.
+         */
+        preloadingNext: boolean;
+
+        /**
+         * Current player state.
+         */
+        state: State;
+
+        /**
+         * Content thumbnail url.
+         */
+        thumbnailUrl: string;
+
+        /**
+         * Content title.
+         */
+        title: string;
+
+        /**
+         * Provide the time a break is skipable - relative to current playback time. Undefined if not skippable.
+         */
+        whenSkippable?: number;
+    }
+}
diff --git a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
new file mode 100644
index 0000000000..a4f59bd985
--- /dev/null
+++ b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
@@ -0,0 +1,66 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./index.d.ts" />
+/// <reference path="./cast.framework.d.ts" />
+/// <reference path="./cast.framework.breaks.d.ts" />
+/// <reference path="./cast.framework.events.d.ts" />
+/// <reference path="./cast.framework.messages.d.ts" />
+/// <reference path="./cast.framework.system.d.ts" />
+/// <reference path="./cast.framework.ui.d.ts" />
+
+import { TextTracksManager } from "cast.framework";
+import { StandbyChangedEvent } from "cast.framework.system";
+import { PlayerData, ContentType } from "cast.framework.ui";
+import { BreakManager } from "cast.framework.breaks";
+import { MediaStatusEvent } from "cast.framework.events";
+import { Track, Break, MediaStatus, QueueData } from "cast.framework.messages";
+
+const ct = ContentType.VIDEO;
+// framework tests
+const track = new Track(123, {});
+const ttm = new TextTracksManager({});
+ttm.addTracks(track);
+
+// $ExpectError
+ttm.addTracks("should fail");
+
+// system tests
+const sce = new StandbyChangedEvent(true);
+// $ExpectError
+const wrongSce = new StandbyChangedEvent("error");
+
+const result: boolean = sce.isStandby;
+// $ExpectError
+const failure: string = sce.isStandby;
+
+// ui tests
+const pd = new PlayerData();
+
+const cn: number = pd.currentBreakClipNumber;
+// $ExpectError
+const wrongCn: boolean = pd.currentBreakClipNumber;
+
+// breaks tests
+const bm: BreakManager = new BreakManager();
+const brk1: Break = bm.getBreakById("123");
+// $ExpectError
+const brk2: string = bm.getBreakById("123");
+// $ExpectError
+const brk3: Break = bm.getBreakById(123);
+// events tests
+
+const evt: MediaStatusEvent = new MediaStatusEvent();
+const ms: MediaStatus = evt.mediaStatus;
+// $ExpectError
+const ms: string = evt.mediaStatus;
+
+// messages tests
+const qd = new QueueData("id", "name", "description", "mode");
+// $ExpectError
+const wrongQd = new QueueData({});
+const name: string = qd.name;
+// $ExpectError
+const wrongName: number = qd.name;
diff --git a/types/chromecast-caf-receiver/index.d.ts b/types/chromecast-caf-receiver/index.d.ts
new file mode 100644
index 0000000000..5dc89456e6
--- /dev/null
+++ b/types/chromecast-caf-receiver/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for chromecast-caf-receiver 3.x
+// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
+// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="./cast.framework.d.ts" />
+/// <reference path="./cast.framework.breaks.d.ts" />
+/// <reference path="./cast.framework.events.d.ts" />
+/// <reference path="./cast.framework.messages.d.ts" />
+/// <reference path="./cast.framework.system.d.ts" />
+/// <reference path="./cast.framework.ui.d.ts" />
+
+import { PlayerDataChangedEvent } from './cast.framework.ui';
+import { NetworkRequestInfo } from './cast.framework';
+import { Event } from './cast.framework.events';
+
+export = cast;
+declare namespace cast {
+    export type EventHandler = (event: Event) => void;
+    export type PlayerDataChangedEventHandler = (
+        event: PlayerDataChangedEvent
+    ) => void;
+    export type RequestHandler = (request: NetworkRequestInfo) => void;
+    export type BinaryHandler = (data: Uint8Array) => Uint8Array;
+}
diff --git a/types/chromecast-caf-receiver/tsconfig.json b/types/chromecast-caf-receiver/tsconfig.json
new file mode 100644
index 0000000000..5c13aa8765
--- /dev/null
+++ b/types/chromecast-caf-receiver/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",
+        "chromecast-caf-receiver-tests.ts"
+    ]
+}
diff --git a/types/chromecast-caf-receiver/tslint.json b/types/chromecast-caf-receiver/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/chromecast-caf-receiver/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 05bfe66185666bf56b2b4421bd8f38648d703b6d Mon Sep 17 00:00:00 2001
From: akizimov <a.kizimov@mute-lab.com>
Date: Fri, 23 Mar 2018 17:10:38 +0300
Subject: [PATCH 0005/1124]  defines

---
 types/redux-testkit/index.d.ts             | 69 ++++++++++++++++++++++
 types/redux-testkit/redux-testkit-tests.ts | 69 ++++++++++++++++++++++
 types/redux-testkit/tsconfig.json          | 22 +++++++
 types/redux-testkit/tslint.json            |  1 +
 4 files changed, 161 insertions(+)
 create mode 100644 types/redux-testkit/index.d.ts
 create mode 100644 types/redux-testkit/redux-testkit-tests.ts
 create mode 100644 types/redux-testkit/tsconfig.json
 create mode 100644 types/redux-testkit/tslint.json

diff --git a/types/redux-testkit/index.d.ts b/types/redux-testkit/index.d.ts
new file mode 100644
index 0000000000..0e9dc4ff74
--- /dev/null
+++ b/types/redux-testkit/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for redux-testkit 1.0
+// Project: https://github.com/wix/redux-testkit#readme
+// Definitions by: Andrey Kizimov <https://github.com/Bookler96>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as Redux from 'redux';
+
+//-----------------------------------------------------------------------
+
+interface ReducerMainCommands {
+	expect(action: Redux.AnyAction): InternalReducerCommands;
+	execute(action: Redux.AnyAction): any;
+}
+
+interface InternalReducerCommands {
+	toReturnState(expected: Redux.AnyAction): any;
+	toStayTheSame(): any;
+	toChangeInState(expectedChanges: any): any;
+}
+
+interface ReducerAction extends ReducerMainCommands {
+	withState(state: any): ReducerMainCommands;
+}
+
+//-----------------------------------------------------------------------
+
+interface SelectorExpect {
+	toReturn(expected: any): any;
+}
+interface SelectorAction {
+	expect(state: any, ...arg: any[]): SelectorExpect;
+	execute(state: any, ...arg: any[]): any;
+}
+
+//-----------------------------------------------------------------------
+
+interface DispatchObject {
+	isFunction(): boolean,
+    isPlainObject(): boolean,
+    getType(): any,
+    getAction(): any,
+    getName(): any
+}
+
+interface ThunkMainCommands {
+	execute(...arg: any[]): DispatchObject[];
+}
+
+interface ThunkAction extends ThunkMainCommands {
+	withState(state: any): ThunkMainCommands;
+}
+
+//-----------------------------------------------------------------------
+
+interface FlushThunksMiddleware {
+	flush(): void;
+	reset(): void;
+}
+
+export class FlushThunks {
+	static createMiddleware(): FlushThunksMiddleware;
+}
+
+//-----------------------------------------------------------------------
+
+export function Reducer(action: Redux.Reducer<any>): ReducerAction;
+export function Selector(action: Redux.Reducer<any>): SelectorAction;
+export function Thunk(action: Redux.Reducer<any>): ThunkAction;
+
diff --git a/types/redux-testkit/redux-testkit-tests.ts b/types/redux-testkit/redux-testkit-tests.ts
new file mode 100644
index 0000000000..3e0fa7b1be
--- /dev/null
+++ b/types/redux-testkit/redux-testkit-tests.ts
@@ -0,0 +1,69 @@
+import {Reducer, Selector, FlushThunks, Thunk} from 'redux-testkit';
+import {Action, Dispatch} from 'redux';
+
+interface SimpleState {
+	currentState: string;
+	numbers: number[];
+}
+
+const TO_FINISH_STATE = 'TO_FINISH_STATE';
+const TO_INITIAL_STATE = 'TO_INITIAL_STATE';
+
+enum NumberType {
+	ODD = 'ODD',
+	EVEN = 'EVEN'
+}
+
+const simpleState: SimpleState = {
+	currentState: "initial",
+	numbers: [1, 2, 3, 4, 5, 6, 7, 8, 9]
+};
+
+const simpleAction = (state: SimpleState = simpleState, action: Action): SimpleState => {
+	if (action.type === TO_FINISH_STATE) {
+		return {...state, currentState: 'finish'};
+	}
+	else if (action.type === TO_INITIAL_STATE) {
+		return {...state, currentState: 'initial'};
+	}
+
+	return state;
+};
+
+const getNumbers = (state: SimpleState = simpleState, type: NumberType = NumberType.EVEN): number[] => {
+	return state.numbers.filter(element => {
+		const division = element % 2;
+
+		if (division === 0 && type === NumberType.EVEN) {
+			return element;
+		}
+		else if (division !== 0 && type === NumberType.ODD) {
+			return element;
+		}
+	});
+};
+
+const thunkAction1: Action = {
+	type: TO_FINISH_STATE
+};
+
+const thunkAction2: Action = {
+	type: TO_INITIAL_STATE
+};
+
+const thunk = () => {
+	return function (dispatch: Dispatch) {
+		dispatch({ thunkAction1 });
+		dispatch({ thunkAction2 });
+	};
+};
+
+Reducer(simpleAction).expect({ type: 'WRONG_TYPE' }).toStayTheSame();
+Reducer(simpleAction).withState(simpleState).expect({ type: TO_FINISH_STATE }).toChangeInState({ currentState: 'finish' });
+Reducer(simpleAction).expect({ type: TO_INITIAL_STATE }).toReturnState(simpleState);
+
+Selector(getNumbers).expect(simpleState, NumberType.EVEN).toReturn([2, 4, 6, 8]);
+
+const odd = Selector(getNumbers).execute(simpleState, NumberType.ODD);
+
+const dispatches = Thunk(thunk).execute();
diff --git a/types/redux-testkit/tsconfig.json b/types/redux-testkit/tsconfig.json
new file mode 100644
index 0000000000..be52e915a3
--- /dev/null
+++ b/types/redux-testkit/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",
+        "redux-testkit-tests.ts"
+    ]
+}
diff --git a/types/redux-testkit/tslint.json b/types/redux-testkit/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-testkit/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0006/1124] 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 0007/1124] 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 0008/1124] 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 076d8cafb4f6b8bf3928250d9a0a695dbee522c3 Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.e.parker@gmail.com>
Date: Thu, 19 Apr 2018 20:56:31 +0100
Subject: [PATCH 0009/1124] Glue - Fix to plugins

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

diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index 8e710d233a..d1bf010ffe 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -24,7 +24,7 @@ export interface Plugin {
 export interface Manifest {
   server: ServerOptions;
   register?: {
-    plugins: Plugin[]
+    plugins: string | Plugin[]
   };
 }
 

From fde76994561dd7151f8b002fd646690c176e85a3 Mon Sep 17 00:00:00 2001
From: Scott Jones <scottdj92@gmail.com>
Date: Thu, 19 Apr 2018 23:42:02 -0400
Subject: [PATCH 0010/1124] Fix up next/router types

* add name to index.ts
* update tests
---
 types/next/index.d.ts                 |  1 +
 types/next/router.d.ts                |  8 +++--
 types/next/test/next-router-tests.tsx | 46 +++++++++++++--------------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 036e9f58ce..e0ec456724 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/zeit/next.js
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>
+//                 Scott Jones <https://github.com/scottdj92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/next/router.d.ts b/types/next/router.d.ts
index 181208518f..a5cfb42c90 100644
--- a/types/next/router.d.ts
+++ b/types/next/router.d.ts
@@ -9,7 +9,7 @@ export interface EventChangeOptions {
 }
 
 export type RouterCallback = () => void;
-export interface SingletonRouter {
+export interface RouterProps {
     readyCallbacks: RouterCallback[];
     ready(cb: RouterCallback): void;
 
@@ -53,8 +53,12 @@ export interface SingletonRouter {
     onRouteChangeError?(error: any, url: string): void;
 }
 
+export interface SingletonRouter {
+    router: RouterProps;
+}
+
 export function withRouter<T extends {}>(
-    Component: React.ComponentType<T & { router: SingletonRouter }>,
+    Component: React.ComponentType<T & SingletonRouter>,
 ): React.ComponentType<T>;
 
 export const Singleton: SingletonRouter;
diff --git a/types/next/test/next-router-tests.tsx b/types/next/test/next-router-tests.tsx
index fe82d6f0b2..7957f5e8a2 100644
--- a/types/next/test/next-router-tests.tsx
+++ b/types/next/test/next-router-tests.tsx
@@ -2,10 +2,10 @@ import Router, * as r from "next/router";
 import * as React from "react";
 import * as qs from "querystring";
 
-Router.readyCallbacks.push(() => {
+Router.router.readyCallbacks.push(() => {
     console.log("I'll get called when the router initializes.");
 });
-Router.ready(() => {
+Router.router.ready(() => {
     console.log(
         "I'll get called immediately if the router initializes, or when it eventually does.",
     );
@@ -13,8 +13,8 @@ Router.ready(() => {
 
 // Access readonly properties of the router.
 
-Object.keys(Router.components).forEach(key => {
-    const c = Router.components[key];
+Object.keys(Router.router.components).forEach(key => {
+    const c = Router.router.components[key];
     c.err.isAnAny;
 
     return <c.Component />;
@@ -26,51 +26,51 @@ function split(routeLike: string) {
     });
 }
 
-if (Router.asPath) {
-    split(Router.asPath);
-    split(Router.asPath);
+if (Router.router.asPath) {
+    split(Router.router.asPath);
+    split(Router.router.asPath);
 }
 
-split(Router.pathname);
+split(Router.router.pathname);
 
-const query = `?${qs.stringify(Router.query)}`;
+const query = `?${qs.stringify(Router.router.query)}`;
 
 // Assign some callback methods.
-Router.onAppUpdated = (nextRoute: string) => console.log(nextRoute);
-Router.onRouteChangeStart = (url: string) =>
+Router.router.onAppUpdated = (nextRoute: string) => console.log(nextRoute);
+Router.router.onRouteChangeStart = (url: string) =>
     console.log("Route is starting to change.", url);
-Router.onBeforeHistoryChange = (as: string) =>
+Router.router.onBeforeHistoryChange = (as: string) =>
     console.log("History hasn't changed yet.", as);
-Router.onRouteChangeComplete = (url: string) =>
+Router.router.onRouteChangeComplete = (url: string) =>
     console.log("Route chaneg is complete.", url);
-Router.onRouteChangeError = (err: any, url: string) =>
+Router.router.onRouteChangeError = (err: any, url: string) =>
     console.log("Route is starting to change.", url, err);
 
 // Call methods on the router itself.
-Router.reload("/route").then(() => console.log("route was reloaded"));
-Router.back();
+Router.router.reload("/route").then(() => console.log("route was reloaded"));
+Router.router.back();
 
-Router.push("/route").then((success: boolean) =>
+Router.router.push("/route").then((success: boolean) =>
     console.log("route push success: ", success),
 );
-Router.push("/route", "/asRoute").then((success: boolean) =>
+Router.router.push("/route", "/asRoute").then((success: boolean) =>
     console.log("route push success: ", success),
 );
-Router.push("/route", "/asRoute", { shallow: false }).then((success: boolean) =>
+Router.router.push("/route", "/asRoute", { shallow: false }).then((success: boolean) =>
     console.log("route push success: ", success),
 );
 
-Router.replace("/route").then((success: boolean) =>
+Router.router.replace("/route").then((success: boolean) =>
     console.log("route replace success: ", success),
 );
-Router.replace("/route", "/asRoute").then((success: boolean) =>
+Router.router.replace("/route", "/asRoute").then((success: boolean) =>
     console.log("route replace success: ", success),
 );
-Router.replace("/route", "/asRoute", {
+Router.router.replace("/route", "/asRoute", {
     shallow: false,
 }).then((success: boolean) => console.log("route replace success: ", success));
 
-Router.prefetch("/route").then(Component => {
+Router.router.prefetch("/route").then(Component => {
     const element = <Component />;
 });
 

From f9810f1caa738e724cfdc07533c139486cbf5146 Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Fri, 20 Apr 2018 21:25:56 +0100
Subject: [PATCH 0011/1124] Plugins can now be string arrays rather that just
 strings

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

diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index d1bf010ffe..f347e69746 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -24,7 +24,7 @@ export interface Plugin {
 export interface Manifest {
   server: ServerOptions;
   register?: {
-    plugins: string | Plugin[]
+    plugins: string[] | Plugin[]
   };
 }
 

From 107dce1caeeab4524dbe53e049f692dbd858eb5a Mon Sep 17 00:00:00 2001
From: Scott Jones <scottdj92@gmail.com>
Date: Fri, 20 Apr 2018 19:19:50 -0400
Subject: [PATCH 0012/1124] Update SingletonRouter type to include ready and
 readyCallback funcs

---
 types/next/router.d.ts                | 5 ++---
 types/next/test/next-router-tests.tsx | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/types/next/router.d.ts b/types/next/router.d.ts
index a5cfb42c90..5a17bd2a53 100644
--- a/types/next/router.d.ts
+++ b/types/next/router.d.ts
@@ -10,9 +10,6 @@ export interface EventChangeOptions {
 
 export type RouterCallback = () => void;
 export interface RouterProps {
-    readyCallbacks: RouterCallback[];
-    ready(cb: RouterCallback): void;
-
     // router properties
     readonly components: {
         [key: string]: { Component: React.ComponentType<any>; err: any };
@@ -55,6 +52,8 @@ export interface RouterProps {
 
 export interface SingletonRouter {
     router: RouterProps;
+    readyCallbacks: RouterCallback[];
+    ready(cb: RouterCallback): void;
 }
 
 export function withRouter<T extends {}>(
diff --git a/types/next/test/next-router-tests.tsx b/types/next/test/next-router-tests.tsx
index 7957f5e8a2..822b9b8e6f 100644
--- a/types/next/test/next-router-tests.tsx
+++ b/types/next/test/next-router-tests.tsx
@@ -2,10 +2,10 @@ import Router, * as r from "next/router";
 import * as React from "react";
 import * as qs from "querystring";
 
-Router.router.readyCallbacks.push(() => {
+Router.readyCallbacks.push(() => {
     console.log("I'll get called when the router initializes.");
 });
-Router.router.ready(() => {
+Router.ready(() => {
     console.log(
         "I'll get called immediately if the router initializes, or when it eventually does.",
     );

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 0013/1124] 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 27e6fddf22d2ff6f3fa90f3ca8555e2c0b4a3884 Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Mon, 23 Apr 2018 12:29:43 -0600
Subject: [PATCH 0014/1124] Add definitions for axios-token-interceptor

---
 .../axios-token-interceptor-tests.ts          | 18 +++++++++++
 types/axios-token-interceptor/index.d.ts      | 31 +++++++++++++++++++
 types/axios-token-interceptor/package.json    |  6 ++++
 types/axios-token-interceptor/tsconfig.json   | 23 ++++++++++++++
 types/axios-token-interceptor/tslint.json     |  1 +
 5 files changed, 79 insertions(+)
 create mode 100644 types/axios-token-interceptor/axios-token-interceptor-tests.ts
 create mode 100644 types/axios-token-interceptor/index.d.ts
 create mode 100644 types/axios-token-interceptor/package.json
 create mode 100644 types/axios-token-interceptor/tsconfig.json
 create mode 100644 types/axios-token-interceptor/tslint.json

diff --git a/types/axios-token-interceptor/axios-token-interceptor-tests.ts b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
new file mode 100644
index 0000000000..58d67e02ad
--- /dev/null
+++ b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
@@ -0,0 +1,18 @@
+import tokenProvider, { tokenCache } from 'axios-token-interceptor';
+
+tokenProvider(); // $ExpectError
+
+const validOptions = {
+    getToken: () => Promise.resolve('qwerty'),
+};
+tokenProvider(validOptions); // $ExpectType TokenProvider
+
+tokenCache(); // $ExpectError
+
+const getToken = Promise.resolve('qwerty');
+const validCacheOptions = {
+    maxAge: 3600,
+};
+const cache = tokenCache(getToken, validCacheOptions); // $Expect TokenCache
+
+cache.reset(); // $ExpectType void
diff --git a/types/axios-token-interceptor/index.d.ts b/types/axios-token-interceptor/index.d.ts
new file mode 100644
index 0000000000..8b63c5cc67
--- /dev/null
+++ b/types/axios-token-interceptor/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for axios-token-interceptor 0.1
+// Project: https://github.com/sandrinodimattia/axios-token-interceptor#readme
+// Definitions by: Mike Dodge <https://github.com/innovation-team>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { AxiosRequestConfig } from 'axios';
+
+/*~ If this module has methods, declare them as functions like so.
+ */
+
+export default function tokenProvider(Options: InterceptorOptions): TokenProvider;
+export function tokenCache(getToken: Promise<string>, options: TokenCacheOptions): TokenCache;
+
+/*~ You can declare types that are available via importing the module */
+export interface InterceptorOptions {
+    token?: string;
+    getToken?: () => string | Promise<string>;
+    header?: string;
+    headerFormatter?: (token: string) => string;
+}
+
+export type TokenProvider = (config: AxiosRequestConfig) => Promise<AxiosRequestConfig>;
+
+export interface TokenCacheOptions {
+    getMaxAge?: () => number;
+    maxAge?: number;
+}
+
+export interface TokenCache {
+    reset(): void;
+}
diff --git a/types/axios-token-interceptor/package.json b/types/axios-token-interceptor/package.json
new file mode 100644
index 0000000000..bd5a40b16d
--- /dev/null
+++ b/types/axios-token-interceptor/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "axios": "^0.16.2"
+    }
+}
diff --git a/types/axios-token-interceptor/tsconfig.json b/types/axios-token-interceptor/tsconfig.json
new file mode 100644
index 0000000000..509608e7d6
--- /dev/null
+++ b/types/axios-token-interceptor/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",
+        "axios-token-interceptor-tests.ts"
+    ]
+}
diff --git a/types/axios-token-interceptor/tslint.json b/types/axios-token-interceptor/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/axios-token-interceptor/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3ec28e76de08d0cf5b50dd04390cc3f172db8cfb Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Mon, 23 Apr 2018 12:59:39 -0600
Subject: [PATCH 0015/1124] Use namespace to add tokenCache as prop of default
 export function

---
 .../axios-token-interceptor-tests.ts                 |  4 ++--
 types/axios-token-interceptor/index.d.ts             | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/types/axios-token-interceptor/axios-token-interceptor-tests.ts b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
index 58d67e02ad..63f40c611a 100644
--- a/types/axios-token-interceptor/axios-token-interceptor-tests.ts
+++ b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
@@ -1,4 +1,4 @@
-import tokenProvider, { tokenCache } from 'axios-token-interceptor';
+import tokenProvider from 'axios-token-interceptor';
 
 tokenProvider(); // $ExpectError
 
@@ -13,6 +13,6 @@ const getToken = Promise.resolve('qwerty');
 const validCacheOptions = {
     maxAge: 3600,
 };
-const cache = tokenCache(getToken, validCacheOptions); // $Expect TokenCache
+const cache = tokenProvider.tokenCache(getToken, validCacheOptions); // $Expect TokenCache
 
 cache.reset(); // $ExpectType void
diff --git a/types/axios-token-interceptor/index.d.ts b/types/axios-token-interceptor/index.d.ts
index 8b63c5cc67..c2bcd259d2 100644
--- a/types/axios-token-interceptor/index.d.ts
+++ b/types/axios-token-interceptor/index.d.ts
@@ -5,13 +5,15 @@
 
 import { AxiosRequestConfig } from 'axios';
 
-/*~ If this module has methods, declare them as functions like so.
- */
+// Module
+export function AxiosTokenProvider(Options: InterceptorOptions): TokenProvider;
+export namespace AxiosTokenProvider {
+	function tokenCache(getToken: Promise<string>, options: TokenCacheOptions): TokenCache;
+}
+export default AxiosTokenProvider;
 
-export default function tokenProvider(Options: InterceptorOptions): TokenProvider;
-export function tokenCache(getToken: Promise<string>, options: TokenCacheOptions): TokenCache;
+// Interfaces
 
-/*~ You can declare types that are available via importing the module */
 export interface InterceptorOptions {
     token?: string;
     getToken?: () => string | Promise<string>;

From 27f3db2d27e1a1e95784cffa1438b8557d4e7a17 Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Tue, 24 Apr 2018 12:10:34 -0600
Subject: [PATCH 0016/1124] Add definitions for okta-vue

---
 types/okta__okta-vue/index.d.ts              | 36 ++++++++++++++
 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, 117 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..75a3332c68
--- /dev/null
+++ b/types/okta__okta-vue/index.d.ts
@@ -0,0 +1,36 @@
+// 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';
+
+export interface OktaVueOptions {
+    issuer: string;
+    client_id: string;
+    redirect_uri: string;
+    scope: string;
+}
+export function OktaVuePlugin(vm: VueConstructor, options: OktaVueOptions): void;
+export namespace OktaVuePlugin {
+    function handleCallback(): 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 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 0017/1124] .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 0018/1124] 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 2e4d7a47cab30d7620498811dd0e7d266aaf7df7 Mon Sep 17 00:00:00 2001
From: "Jon.Hallander" <jon.hallander@polarisalpha.com>
Date: Wed, 2 May 2018 13:45:52 -0400
Subject: [PATCH 0019/1124] missing methods

Added missing methods to pki namespace.
---
 types/node-forge/index.d.ts          | 2 ++
 types/node-forge/node-forge-tests.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index 2784d95fa3..f177f36d5c 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -43,7 +43,9 @@ declare module "node-forge" {
             privateKey: Key;
         }
 
+		function pemToDer(pem: PEM): util.ByteStringBuffer;
         function privateKeyToPem(key: Key, maxline?: number): PEM;
+		function privateKeyInfoToPem(key: Key, maxline?: number): PEM;
         function publicKeyToPem(key: Key, maxline?: number): PEM;
         function publicKeyFromPem(pem: PEM): Key;
         function privateKeyFromPem(pem: PEM): Key;
diff --git a/types/node-forge/node-forge-tests.ts b/types/node-forge/node-forge-tests.ts
index 29b8267714..a5487ed027 100644
--- a/types/node-forge/node-forge-tests.ts
+++ b/types/node-forge/node-forge-tests.ts
@@ -8,6 +8,8 @@ let x: string = forge.ssh.privateKeyToOpenSSH(key);
 let pemKey: forge.pki.PEM = publicKeyPem;
 let publicKeyRsa = forge.pki.publicKeyFromPem(pemKey);
 let privateKeyRsa = forge.pki.privateKeyFromPem(privateKeyPem);
+let privateKeyRsa2 = forge.pki.privateKeyInfoToPem(privateKeyPem);
+let byteBufferString = forge.pki.pemToDer(privateKeyRsa);
 let cert = forge.pki.createCertificate();
 
 {

From ffa30195c0348582068cc673fe0d36c4b798bed2 Mon Sep 17 00:00:00 2001
From: "Jon.Hallander" <jon.hallander@polarisalpha.com>
Date: Wed, 2 May 2018 14:18:28 -0400
Subject: [PATCH 0020/1124] Updated node-forge release number

The node-forge I updated against is 0.7.5
---
 types/node-forge/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index f177f36d5c..dafed52047 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-forge 0.7.2
+// Type definitions for node-forge 0.7.5
 // Project: https://github.com/digitalbazaar/forge
 // Definitions by: Seth Westphal <https://github.com/westy92>
 //                 Kay Schecker <https://github.com/flynetworks>

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 0021/1124] 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 0022/1124] 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 32050c38149f3f323f34c7c1219d0abda7fc6aa2 Mon Sep 17 00:00:00 2001
From: akizimov <a.kizimov@mute-lab.com>
Date: Fri, 4 May 2018 15:43:28 +0300
Subject: [PATCH 0023/1124] redux-testkit defines

---
 types/redux-testkit/index.d.ts             | 96 ++++++++--------------
 types/redux-testkit/package.json           |  7 ++
 types/redux-testkit/redux-testkit-tests.ts | 35 ++++----
 types/redux-testkit/tsconfig.json          |  1 +
 4 files changed, 61 insertions(+), 78 deletions(-)
 create mode 100644 types/redux-testkit/package.json

diff --git a/types/redux-testkit/index.d.ts b/types/redux-testkit/index.d.ts
index 0e9dc4ff74..daf8c2af43 100644
--- a/types/redux-testkit/index.d.ts
+++ b/types/redux-testkit/index.d.ts
@@ -2,68 +2,44 @@
 // Project: https://github.com/wix/redux-testkit#readme
 // Definitions by: Andrey Kizimov <https://github.com/Bookler96>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import * as Redux from 'redux';
+import { ThunkAction } from 'redux-thunk';
 
-//-----------------------------------------------------------------------
+export function Reducer(action: Redux.Reducer<any>): {
+	withState(state: any): {
+		expect: (action: Redux.Action) => {
+			toReturnState(expected: any): any,
+			toStayTheSame(): any;
+			toChangeInState(expectedChanges: any): any;
+		},
+		execute(action: Redux.Action): any;
+	};
 
-interface ReducerMainCommands {
-	expect(action: Redux.AnyAction): InternalReducerCommands;
-	execute(action: Redux.AnyAction): any;
+	expect: (action: Redux.Action) => {
+		toReturnState(expected: any): any,
+		toStayTheSame(): any;
+		toChangeInState(expectedChanges: any): any;
+	};
+	execute(action: Redux.Action): any;
+};
+
+export function Selector(selector: (state: any, action: any) => any): {
+	expect(state: any, ...args: any[]): any;
+	execute(state: any, ...args: any[]): any;
+};
+
+export function Thunk(thunkFunc: ThunkAction<any, any, any>, extraArg?: any): {
+	execute(...args: any[]): any;
+	withState(state: any): {
+		execute(...args: any[]): any;
+	}
+};
+
+export namespace FlushThunks {
+	function createMiddleware(): {
+		flush(): any;
+		reset(): any;
+	};
 }
-
-interface InternalReducerCommands {
-	toReturnState(expected: Redux.AnyAction): any;
-	toStayTheSame(): any;
-	toChangeInState(expectedChanges: any): any;
-}
-
-interface ReducerAction extends ReducerMainCommands {
-	withState(state: any): ReducerMainCommands;
-}
-
-//-----------------------------------------------------------------------
-
-interface SelectorExpect {
-	toReturn(expected: any): any;
-}
-interface SelectorAction {
-	expect(state: any, ...arg: any[]): SelectorExpect;
-	execute(state: any, ...arg: any[]): any;
-}
-
-//-----------------------------------------------------------------------
-
-interface DispatchObject {
-	isFunction(): boolean,
-    isPlainObject(): boolean,
-    getType(): any,
-    getAction(): any,
-    getName(): any
-}
-
-interface ThunkMainCommands {
-	execute(...arg: any[]): DispatchObject[];
-}
-
-interface ThunkAction extends ThunkMainCommands {
-	withState(state: any): ThunkMainCommands;
-}
-
-//-----------------------------------------------------------------------
-
-interface FlushThunksMiddleware {
-	flush(): void;
-	reset(): void;
-}
-
-export class FlushThunks {
-	static createMiddleware(): FlushThunksMiddleware;
-}
-
-//-----------------------------------------------------------------------
-
-export function Reducer(action: Redux.Reducer<any>): ReducerAction;
-export function Selector(action: Redux.Reducer<any>): SelectorAction;
-export function Thunk(action: Redux.Reducer<any>): ThunkAction;
-
diff --git a/types/redux-testkit/package.json b/types/redux-testkit/package.json
new file mode 100644
index 0000000000..f682c6113f
--- /dev/null
+++ b/types/redux-testkit/package.json
@@ -0,0 +1,7 @@
+{
+	"private": true,
+	"dependencies": {
+		"redux": "^3.6.0",
+		"redux-thunk": "^2.2.0"
+	}
+}
diff --git a/types/redux-testkit/redux-testkit-tests.ts b/types/redux-testkit/redux-testkit-tests.ts
index 3e0fa7b1be..efbab291dc 100644
--- a/types/redux-testkit/redux-testkit-tests.ts
+++ b/types/redux-testkit/redux-testkit-tests.ts
@@ -1,5 +1,5 @@
-import {Reducer, Selector, FlushThunks, Thunk} from 'redux-testkit';
-import {Action, Dispatch} from 'redux';
+import { Reducer, Selector, FlushThunks, Thunk } from 'redux-testkit';
+import { Action, Dispatch } from 'redux';
 
 interface SimpleState {
 	currentState: string;
@@ -8,11 +8,8 @@ interface SimpleState {
 
 const TO_FINISH_STATE = 'TO_FINISH_STATE';
 const TO_INITIAL_STATE = 'TO_INITIAL_STATE';
-
-enum NumberType {
-	ODD = 'ODD',
-	EVEN = 'EVEN'
-}
+const ODD_NUMBERS = 'ODD_NUMBERS';
+const EVEN_NUMBERS = 'EVEN_NUMBERS';
 
 const simpleState: SimpleState = {
 	currentState: "initial",
@@ -23,21 +20,23 @@ const simpleAction = (state: SimpleState = simpleState, action: Action): SimpleS
 	if (action.type === TO_FINISH_STATE) {
 		return {...state, currentState: 'finish'};
 	}
-	else if (action.type === TO_INITIAL_STATE) {
+
+	if (action.type === TO_INITIAL_STATE) {
 		return {...state, currentState: 'initial'};
 	}
 
 	return state;
 };
 
-const getNumbers = (state: SimpleState = simpleState, type: NumberType = NumberType.EVEN): number[] => {
+const getNumbers = (state: SimpleState = simpleState, type: string): number[] => {
 	return state.numbers.filter(element => {
 		const division = element % 2;
 
-		if (division === 0 && type === NumberType.EVEN) {
+		if (division === 0 && type === ODD_NUMBERS) {
 			return element;
 		}
-		else if (division !== 0 && type === NumberType.ODD) {
+
+		if (division !== 0 && type === EVEN_NUMBERS) {
 			return element;
 		}
 	});
@@ -52,9 +51,9 @@ const thunkAction2: Action = {
 };
 
 const thunk = () => {
-	return function (dispatch: Dispatch) {
-		dispatch({ thunkAction1 });
-		dispatch({ thunkAction2 });
+	return (dispatch: Dispatch<Action>): void => {
+		dispatch(thunkAction1);
+		dispatch(thunkAction2);
 	};
 };
 
@@ -62,8 +61,8 @@ Reducer(simpleAction).expect({ type: 'WRONG_TYPE' }).toStayTheSame();
 Reducer(simpleAction).withState(simpleState).expect({ type: TO_FINISH_STATE }).toChangeInState({ currentState: 'finish' });
 Reducer(simpleAction).expect({ type: TO_INITIAL_STATE }).toReturnState(simpleState);
 
-Selector(getNumbers).expect(simpleState, NumberType.EVEN).toReturn([2, 4, 6, 8]);
+Selector(getNumbers).expect(simpleState, EVEN_NUMBERS).toReturn([2, 4, 6, 8]);
+Selector(getNumbers).execute(simpleState, ODD_NUMBERS);
 
-const odd = Selector(getNumbers).execute(simpleState, NumberType.ODD);
-
-const dispatches = Thunk(thunk).execute();
+Thunk(thunk).execute();
+Thunk(thunk).withState(simpleState).execute();
diff --git a/types/redux-testkit/tsconfig.json b/types/redux-testkit/tsconfig.json
index be52e915a3..82c91d335a 100644
--- a/types/redux-testkit/tsconfig.json
+++ b/types/redux-testkit/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From ecbd9b2da8a90b2791c90bae81e3588ee9e1b3de Mon Sep 17 00:00:00 2001
From: akizimov <a.kizimov@mute-lab.com>
Date: Fri, 4 May 2018 16:54:10 +0300
Subject: [PATCH 0024/1124] redux-testkit defines

---
 types/redux-testkit/index.d.ts             | 44 +++++++++++-----------
 types/redux-testkit/redux-testkit-tests.ts | 24 ++++++++++--
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/types/redux-testkit/index.d.ts b/types/redux-testkit/index.d.ts
index daf8c2af43..47aa006cd2 100644
--- a/types/redux-testkit/index.d.ts
+++ b/types/redux-testkit/index.d.ts
@@ -7,39 +7,37 @@
 import * as Redux from 'redux';
 import { ThunkAction } from 'redux-thunk';
 
-export function Reducer(action: Redux.Reducer<any>): {
-	withState(state: any): {
-		expect: (action: Redux.Action) => {
-			toReturnState(expected: any): any,
-			toStayTheSame(): any;
-			toChangeInState(expectedChanges: any): any;
-		},
-		execute(action: Redux.Action): any;
-	};
-
+export interface ReducerTestkit {
 	expect: (action: Redux.Action) => {
-		toReturnState(expected: any): any,
-		toStayTheSame(): any;
-		toChangeInState(expectedChanges: any): any;
+		toReturnState(expected: any): void,
+		toStayTheSame(): void;
+		toChangeInState(expectedChanges: any): void;
 	};
-	execute(action: Redux.Action): any;
+	execute(action: Redux.Action): any; // state
+}
+
+export interface ThunkTestkit {
+	execute(...args: any[]): any;
+}
+
+export function Reducer(action: Redux.Reducer<any>): ReducerTestkit & {
+	withState(state: any): ReducerTestkit;
 };
 
 export function Selector(selector: (state: any, action: any) => any): {
-	expect(state: any, ...args: any[]): any;
+	expect(state: any, ...args: any[]): {
+		toReturn(expected: any): void;
+	};
 	execute(state: any, ...args: any[]): any;
 };
 
-export function Thunk(thunkFunc: ThunkAction<any, any, any>, extraArg?: any): {
-	execute(...args: any[]): any;
-	withState(state: any): {
-		execute(...args: any[]): any;
-	}
+export function Thunk(thunkFunc: ThunkAction<any, any, any>, extraArg?: any): ThunkTestkit & {
+	withState(state: any): ThunkTestkit;
 };
 
 export namespace FlushThunks {
-	function createMiddleware(): {
-		flush(): any;
-		reset(): any;
+	function createMiddleware(): Redux.Middleware & {
+		flush(): void;
+		reset(): void;
 	};
 }
diff --git a/types/redux-testkit/redux-testkit-tests.ts b/types/redux-testkit/redux-testkit-tests.ts
index efbab291dc..2fdbf14856 100644
--- a/types/redux-testkit/redux-testkit-tests.ts
+++ b/types/redux-testkit/redux-testkit-tests.ts
@@ -1,5 +1,6 @@
 import { Reducer, Selector, FlushThunks, Thunk } from 'redux-testkit';
-import { Action, Dispatch } from 'redux';
+import { Action, Dispatch, createStore, applyMiddleware } from 'redux';
+import thunk from 'redux-thunk';
 
 interface SimpleState {
 	currentState: string;
@@ -42,6 +43,14 @@ const getNumbers = (state: SimpleState = simpleState, type: string): number[] =>
 	});
 };
 
+const reducer = (state = { count: 0 }, action: Action): any => {
+	if (action.type === 'count') {
+		state.count++;
+	}
+
+	return state;
+};
+
 const thunkAction1: Action = {
 	type: TO_FINISH_STATE
 };
@@ -50,7 +59,7 @@ const thunkAction2: Action = {
 	type: TO_INITIAL_STATE
 };
 
-const thunk = () => {
+const thunkAction = () => {
 	return (dispatch: Dispatch<Action>): void => {
 		dispatch(thunkAction1);
 		dispatch(thunkAction2);
@@ -64,5 +73,12 @@ Reducer(simpleAction).expect({ type: TO_INITIAL_STATE }).toReturnState(simpleSta
 Selector(getNumbers).expect(simpleState, EVEN_NUMBERS).toReturn([2, 4, 6, 8]);
 Selector(getNumbers).execute(simpleState, ODD_NUMBERS);
 
-Thunk(thunk).execute();
-Thunk(thunk).withState(simpleState).execute();
+Thunk(thunkAction).execute();
+Thunk(thunkAction).withState(simpleState).execute();
+
+const flushThunks = FlushThunks.createMiddleware();
+
+const store = createStore(reducer, applyMiddleware(flushThunks, thunk));
+
+flushThunks.flush();
+flushThunks.reset();

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 0025/1124] 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 486a5dc69f3fa7da3f750b0b54a729565e86b9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikita=20Volodin=20=5B=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D0=B8=D0=BD=5D?=
 <volodin.n@gmail.com>
Date: Sat, 5 May 2018 23:15:03 -0400
Subject: [PATCH 0026/1124] feat(types/freshy): types for new module freshy

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

diff --git a/types/freshy/freshy-tests.ts b/types/freshy/freshy-tests.ts
new file mode 100644
index 0000000000..1134489d77
--- /dev/null
+++ b/types/freshy/freshy-tests.ts
@@ -0,0 +1,27 @@
+import { unload, reload, freshy } from 'freshy';
+import minimist = require('minimist');
+
+declare function require(x: string): any;
+
+unload('minimist'); // $ExpectType boolean
+
+const reloaded = reload('minimist'); // $ExpectType any
+// $ExpectType boolean
+minimist === reloaded; // false
+
+const freshlyLoaded = freshy('minimist'); // $ExpectType any
+// $ExpectType boolean
+minimist === freshlyLoaded; // false
+
+let alsofresh: any;
+// $ExpectType any
+const fresh = freshy('minimist', (fresh) => {
+    alsofresh = require('minimist');
+
+    // $ExpectType boolean
+    fresh === alsofresh; // true
+});
+// $ExpectType boolean
+minimist === fresh; // false
+// $ExpectType boolean
+fresh === alsofresh; // true
diff --git a/types/freshy/index.d.ts b/types/freshy/index.d.ts
new file mode 100644
index 0000000000..93b424143a
--- /dev/null
+++ b/types/freshy/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for freshy 1.0
+// Project: https://github.com/krakenjs/freshy#readme
+// Definitions by: Nikita Volodin <https://github.com/qlonik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function unload(module: string): boolean;
+export function reload(module: string): any;
+export function freshy(module: string, cb?: (module: any) => any): any;
diff --git a/types/freshy/tsconfig.json b/types/freshy/tsconfig.json
new file mode 100644
index 0000000000..7cc3f4d9f4
--- /dev/null
+++ b/types/freshy/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",
+        "freshy-tests.ts"
+    ]
+}
diff --git a/types/freshy/tslint.json b/types/freshy/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/freshy/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4df7adcb42dbf01d7c3b49db3471092ff7dae21d Mon Sep 17 00:00:00 2001
From: David Andre Evans Farinha <davidfarinha@hotmail.co.uk>
Date: Mon, 7 May 2018 17:51:22 +0300
Subject: [PATCH 0027/1124] Creating type definitions for
 "react-native-keychain" (#25419)

* Creating type definitions for "react-native-keychain"

* Updating index.d.ts to include Promise<string> on getGenericPassword()

* Fixing all tslint and dts-lint errors and issues.

* Removing duplicate "Definitions by"

* Updating index.d.ts, improving tests.

-Updating index.d.ts to include type definitions for canImplyAuthentication and getSupportedBiometryType.
-Updating index.d.ts to fix type definitions for setInternetCredentials and resetGenericPassword.
-Adding full type test coverage to all exposed methods on react-native-keychain.

* Updating type definitions for setGenericPassword, getGenericPassword.

-Updating index.d.ts to update type definitions for setGenericPassword, getGenericPassword.
-Updating type definition tests to reflect new type definition updates.

* Updating type definitions for setGenericPassword

-Updating index.d.ts to include correct setGenericPassword parameter types.
---
 types/react-native-keychain/index.d.ts        | 87 +++++++++++++++++++
 .../react-native-keychain-tests.ts            | 39 +++++++++
 types/react-native-keychain/tsconfig.json     | 23 +++++
 types/react-native-keychain/tslint.json       |  1 +
 4 files changed, 150 insertions(+)
 create mode 100644 types/react-native-keychain/index.d.ts
 create mode 100644 types/react-native-keychain/react-native-keychain-tests.ts
 create mode 100644 types/react-native-keychain/tsconfig.json
 create mode 100644 types/react-native-keychain/tslint.json

diff --git a/types/react-native-keychain/index.d.ts b/types/react-native-keychain/index.d.ts
new file mode 100644
index 0000000000..e6fcde8bd6
--- /dev/null
+++ b/types/react-native-keychain/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for react-native-keychain 3.0
+// Project: https://github.com/oblador/react-native-keychain
+// Definitions by: David Evans Farinha <https://github.com/DavidFarinha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export interface UserCredentials {
+    username: string;
+    password: string;
+}
+
+export interface SharedWebCredentials {
+    server: string;
+    username: string;
+    password: string;
+}
+
+export interface Options {
+    accessControl?: SecAccessControl;
+    accessGroup?: string;
+    accessible?: SecAccessible;
+    authenticationPrompt?: string;
+    authenticationType?: LAPolicy;
+    service?: string;
+}
+
+export type SecAccessible =
+    'AccessibleWhenUnlocked'
+    | 'AccessibleAfterFirstUnlock'
+    | 'AccessibleAlways'
+    | 'AccessibleWhenPasscodeSetThisDeviceOnly'
+    | 'AccessibleWhenUnlockedThisDeviceOnly'
+    | 'AccessibleAfterFirstUnlockThisDeviceOnly'
+    | 'AccessibleAlwaysThisDeviceOnly';
+
+export type SecAccessControl =
+    'UserPresence'
+    | 'BiometryAny'
+    | 'BiometryCurrentSet'
+    | 'DevicePasscode'
+    | 'ApplicationPassword'
+    | 'BiometryAnyOrDevicePasscode'
+    | 'BiometryCurrentSetOrDevicePasscode';
+
+export type LAPolicy = 'Authentication' | 'AuthenticationWithBiometrics';
+
+export function canImplyAuthentication(options?: Options): Promise<boolean>;
+
+export function getSupportedBiometryType(): Promise<string | null>;
+
+export function setInternetCredentials(
+    server: string,
+    username: string,
+    password: string,
+    options?: Options
+): Promise<boolean>;
+
+export function getInternetCredentials(
+    server: string
+): Promise<UserCredentials>;
+
+export function resetInternetCredentials(
+    server: string
+): Promise<boolean>;
+
+export function setGenericPassword(
+    username: string,
+    password: string,
+    serviceOrOptions?: string | Options
+): Promise<boolean>;
+
+export function getGenericPassword(
+    serviceOrOptions?: string | Options
+): Promise<boolean | {service: string, username: string, password: string}>;
+
+export function resetGenericPassword(
+    serviceOrOptions?: string | Options
+): Promise<boolean>;
+
+export function requestSharedWebCredentials(
+): Promise<SharedWebCredentials>;
+
+export function setSharedWebCredentials(
+    server: string,
+    username: string,
+    password: string
+): Promise<boolean>;
diff --git a/types/react-native-keychain/react-native-keychain-tests.ts b/types/react-native-keychain/react-native-keychain-tests.ts
new file mode 100644
index 0000000000..55f643e26f
--- /dev/null
+++ b/types/react-native-keychain/react-native-keychain-tests.ts
@@ -0,0 +1,39 @@
+import * as Keychain from 'react-native-keychain';
+
+async () => {
+  const username = 'username';
+  const password = 'password';
+
+  const service: string | undefined = "test.service";
+  const server = "test.server";
+
+  const serviceOrOptions: string | Keychain.Options | undefined = {};
+  const options: Keychain.Options = {};
+
+  const keychainServicePassword: boolean | {
+    service: string;
+    username: string;
+    password: string;
+  } = await Keychain.getGenericPassword(service);
+  const keychainPassword: boolean | {
+    service: string;
+    username: string;
+    password: string;
+  } = await Keychain.getGenericPassword();
+
+  const keychainServerPassword: Keychain.UserCredentials = await Keychain.getInternetCredentials(server);
+
+  const keychainSharedWebPassword: Keychain.SharedWebCredentials = await Keychain.requestSharedWebCredentials();
+
+  const keychainResetGenericPassword: boolean = await Keychain.resetGenericPassword(serviceOrOptions);
+
+  const keychainSetGenericPassword: boolean = await Keychain.setGenericPassword(username, password, options);
+
+  const keychainSetServerPassword: boolean = await Keychain.setInternetCredentials(server, username, password, serviceOrOptions);
+
+  const keychainSetSharedWebPassword: boolean = await Keychain.setSharedWebCredentials(server, username, password);
+
+  const canImplyAuthentication: boolean = await Keychain.canImplyAuthentication(serviceOrOptions);
+
+  const supportedBiometryType: string | null = await Keychain.getSupportedBiometryType();
+};
diff --git a/types/react-native-keychain/tsconfig.json b/types/react-native-keychain/tsconfig.json
new file mode 100644
index 0000000000..54fbdf074a
--- /dev/null
+++ b/types/react-native-keychain/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-keychain-tests.ts"
+    ]
+}
diff --git a/types/react-native-keychain/tslint.json b/types/react-native-keychain/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-keychain/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1bf7dc073317d8b4c66becaae90d52bd0ad9097d Mon Sep 17 00:00:00 2001
From: NateScarlet <NateScarlet@Gmail.com>
Date: Mon, 7 May 2018 22:56:26 +0800
Subject: [PATCH 0028/1124] [notifyjs] Fix `notifyjs is not a module` (#25333)

* Fix types of 'notifyjs'

* Replace `export default` with `export =`
---
 types/notifyjs/index.d.ts        | 164 +++++++++++++++----------------
 types/notifyjs/notifyjs-tests.ts |  32 +++---
 types/notifyjs/tsconfig.json     |   3 +-
 3 files changed, 97 insertions(+), 102 deletions(-)

diff --git a/types/notifyjs/index.d.ts b/types/notifyjs/index.d.ts
index d01ae91a92..0b32e0bdbe 100644
--- a/types/notifyjs/index.d.ts
+++ b/types/notifyjs/index.d.ts
@@ -1,118 +1,112 @@
-// Type definitions for notifyjs 1.2.8
+// Type definitions for notifyjs 3.0.0
 // Project: https://github.com/alexgibson/notify.js
 // Definitions by: soundTricker <https://github.com/soundTricker>
+//                 NateScarlet <https://github.com/NateScarlet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var Notify: {
-    new (title : string , options? : notifyjs.INotifyOption): notifyjs.INotify;
+declare class Notify {
+    constructor(title: string, options?: INotifyOption);
 
     /**
      * Check is permission is needed for the user to receive notifications.
      * @return true : needs permission, false : does not need
      */
-    needsPermission : boolean;
+    static needsPermission: boolean;
 
     /**
      * Asks the user for permission to display notifications
      * @param onPermissionGrantedCallback A callback for permission is granted.
      * @param onPermissionDeniedCallback  A callback for permission is denied.
      */
-    requestPermission(onPermissionGrantedCallback?: ()=> any, onPermissionDeniedCallback? : ()=> any) : void;
+    static requestPermission(onPermissionGrantedCallback?: () => any, onPermissionDeniedCallback?: () => any): void;
 
     /**
      * return true if the browser supports HTML5 Notification
      * @param true : the browser supports HTML5 Notification, false ; the browser does not supports HTML5 Notification.
      */
-    isSupported(): boolean;
+    static isSupported(): boolean;
 
     /**
      * shows the user's current permission level (granted, denied or default), returns null if notifications are not supported.
      * @return 'granted' : permission has been given, 'denied' : permission has been denied, 'default' : permission has not yet been set, null : notifications are not supported
      */
-    permissionLevel: string;
-}
-
-declare namespace notifyjs {
+    static permissionLevel: string;
 
     /**
-     * Interface for Web Notifications API Wrapper.
+     * Show the notification.
      */
-     interface INotify {
-        /**
-         * Show the notification.
-         */
-        show() : void;
-
-        /**
-         * Remove all event listener.
-         */
-        destroy() : void;
-
-        /**
-         * Close the notification.
-         */
-        close() : void;
-        onShowNotification(e : Event) : void;
-        onCloseNotification() : void;
-        onClickNotification() : void;
-        onErrorNotification() : void;
-        handleEvent(e : Event) : void;
-    }
+    show(): void;
 
     /**
-     * Interface for the Notify's optional parameter.
+     * Remove all event listener.
      */
-    interface INotifyOption {
+    destroy(): void;
 
-        /**
-         * notification message body
-         */
-        body? : string;
-
-        /**
-         * path for icon to display in notification
-         */
-        icon? : string;
-
-        /**
-         * unique identifier to stop duplicate notifications
-         */
-        tag? : string;
-
-         /**
-         * number of seconds to close the notification automatically
-         */
-        timeout? : number;
-
-        /**
-         * callback when notification is shown
-         */
-        notifyShow? (e : Event): any;
-        /**
-         * callback when notification is closed
-         */
-        notifyClose? : Function;
-        /**
-         * callback when notification is clicked
-         */
-        notifyClick? : Function;
-        /**
-         * callback when notification throws an error
-         */
-        notifyError? : Function;
-        /**
-         *  callback when user has granted permission
-         */
-        permissionGranted? : Function;
-        /**
-         * callback when user has denied permission
-         */
-        permissionDenied?: Function;
-
-        /**
-         * whether we expect for user interaction or not
-         * in case value is true the timeout for closing the notification won't be set
-         */
-        requireInteraction?: boolean;
-    }
+    /**
+     * Close the notification.
+     */
+    close(): void;
+    onShowNotification(e: Event): void;
+    onCloseNotification(): void;
+    onClickNotification(): void;
+    onErrorNotification(): void;
+    handleEvent(e: Event): void;
 }
+
+/**
+ * Interface for the Notify's optional parameter.
+ */
+interface INotifyOption {
+
+    /**
+     * notification message body
+     */
+    body?: string;
+
+    /**
+     * path for icon to display in notification
+     */
+    icon?: string;
+
+    /**
+     * unique identifier to stop duplicate notifications
+     */
+    tag?: string;
+
+    /**
+    * number of seconds to close the notification automatically
+    */
+    timeout?: number;
+
+    /**
+     * callback when notification is shown
+     */
+    notifyShow?(e: Event): any;
+    /**
+     * callback when notification is closed
+     */
+    notifyClose?: Function;
+    /**
+     * callback when notification is clicked
+     */
+    notifyClick?: Function;
+    /**
+     * callback when notification throws an error
+     */
+    notifyError?: Function;
+    /**
+     *  callback when user has granted permission
+     */
+    permissionGranted?: Function;
+    /**
+     * callback when user has denied permission
+     */
+    permissionDenied?: Function;
+
+    /**
+     * whether we expect for user interaction or not
+     * in case value is true the timeout for closing the notification won't be set
+     */
+    requireInteraction?: boolean;
+}
+export = Notify
\ No newline at end of file
diff --git a/types/notifyjs/notifyjs-tests.ts b/types/notifyjs/notifyjs-tests.ts
index 4eb6890d77..bdac4d2c05 100644
--- a/types/notifyjs/notifyjs-tests.ts
+++ b/types/notifyjs/notifyjs-tests.ts
@@ -1,27 +1,27 @@
-
+import Notify from 'notifyjs';
 
 function test_Notify_constructor() {
     //Min
     var n = new Notify("hoge")
     n.show();
-    
+
     //With option
-    n = new Notify("hoge", {body : "fuga"});
+    n = new Notify("hoge", { body: "fuga" });
     n.show();
-    
+
     //With Full option
     n = new Notify("hoge", {
-        body : "fuga",
-        icon : "./logo.png",
-        tag  : "user",
+        body: "fuga",
+        icon: "./logo.png",
+        tag: "user",
         timeout: 2,
-        notifyShow : (e:Event)=> console.log("notifyShow", e),
-        notifyClose : ()=> console.log("notifyClose"),
-        notifyClick : ()=> console.log("notifyClick"),
-        notifyError : ()=> console.log("notifyError"),
-        permissionGranted : ()=> console.log("permissionGranted"),
-        permissionDenied : ()=> console.log("permissionDenied"),
-        requireInteraction:true
+        notifyShow: (e: Event) => console.log("notifyShow", e),
+        notifyClose: () => console.log("notifyClose"),
+        notifyClick: () => console.log("notifyClick"),
+        notifyError: () => console.log("notifyError"),
+        permissionGranted: () => console.log("permissionGranted"),
+        permissionDenied: () => console.log("permissionDenied"),
+        requireInteraction: true
     });
     n.show();
 
@@ -30,8 +30,8 @@ function test_Notify_constructor() {
 function test_Notify_static_methods() {
     Notify.needsPermission;
     Notify.requestPermission();
-    Notify.requestPermission(()=> console.log("onPermissionGrantedCallback"));
-    Notify.requestPermission(()=> console.log("onPermissionGrantedCallback"), ()=> console.log("onPermissionDeniedCallback"));
+    Notify.requestPermission(() => console.log("onPermissionGrantedCallback"));
+    Notify.requestPermission(() => console.log("onPermissionGrantedCallback"), () => console.log("onPermissionDeniedCallback"));
     Notify.isSupported();
     Notify.permissionLevel;
 }
diff --git a/types/notifyjs/tsconfig.json b/types/notifyjs/tsconfig.json
index 0652ac5cfc..c3df5229ab 100644
--- a/types/notifyjs/tsconfig.json
+++ b/types/notifyjs/tsconfig.json
@@ -15,7 +15,8 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "allowSyntheticDefaultImports": true
     },
     "files": [
         "index.d.ts",

From fcf00ba166b16a98b86617e0734f7107c9e2c42a Mon Sep 17 00:00:00 2001
From: Evghenii Vasilovici <38034585+vasev01@users.noreply.github.com>
Date: Mon, 7 May 2018 17:56:16 +0200
Subject: [PATCH 0029/1124] Add ODBCResult method definitions: fetchAllSync,
 moreResultsSync, closeSync (#25578)

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

diff --git a/types/ibm_db/index.d.ts b/types/ibm_db/index.d.ts
index 662a16ffb3..de54b9ca26 100644
--- a/types/ibm_db/index.d.ts
+++ b/types/ibm_db/index.d.ts
@@ -187,6 +187,9 @@ export class ODBCStatement {
 
 export class ODBCResult {
     fetchMode: number;
+    fetchAllSync(): any[];
+    moreResultsSync(): any[];
+    closeSync(): void;
 } // Class ODBCResult
 
 export function getElapsedTime(): string;

From 552460da3a00238230d569d046e83457cad9be6b Mon Sep 17 00:00:00 2001
From: Nikita Volodin <volodin.n@gmail.com>
Date: Mon, 7 May 2018 12:00:09 -0400
Subject: [PATCH 0030/1124] feat(types/proper-lockfile): add new types (#25571)

---
 types/proper-lockfile/index.d.ts              | 32 +++++++++++++
 .../proper-lockfile/proper-lockfile-tests.ts  | 45 +++++++++++++++++++
 types/proper-lockfile/tsconfig.json           | 24 ++++++++++
 types/proper-lockfile/tslint.json             |  1 +
 4 files changed, 102 insertions(+)
 create mode 100644 types/proper-lockfile/index.d.ts
 create mode 100644 types/proper-lockfile/proper-lockfile-tests.ts
 create mode 100644 types/proper-lockfile/tsconfig.json
 create mode 100644 types/proper-lockfile/tslint.json

diff --git a/types/proper-lockfile/index.d.ts b/types/proper-lockfile/index.d.ts
new file mode 100644
index 0000000000..885e63808b
--- /dev/null
+++ b/types/proper-lockfile/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for proper-lockfile 3.0
+// Project: https://github.com/moxystudio/node-proper-lockfile
+// Definitions by: Nikita Volodin <https://github.com/qlonik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface LockOptions {
+    stale?: number; // default: 10000
+    update?: number; // default: stale/2
+    retries?: number; // default: 0
+    realpath?: boolean; // default: true
+    fs?: any; // default: graceful-fs
+    onCompromised?: (err: Error) => any; // default: (err) => throw err
+}
+
+export interface UnlockOptions {
+    realpath?: boolean; // default: true
+    fs?: any; // default: graceful-fs
+}
+
+export interface CheckOptions {
+    stale?: number; // default: 10000
+    realpath?: boolean; // default: true
+    fs?: any; // default: graceful-fs
+}
+
+export function lock(file: string, options?: LockOptions): Promise<() => Promise<void>>;
+export function unlock(file: string, options?: UnlockOptions): Promise<void>;
+export function check(file: string, options?: CheckOptions): Promise<boolean>;
+
+export function lockSync(file: string, options?: LockOptions): () => void;
+export function unlockSync(file: string, options?: UnlockOptions): void;
+export function checkSync(file: string, options?: CheckOptions): boolean;
diff --git a/types/proper-lockfile/proper-lockfile-tests.ts b/types/proper-lockfile/proper-lockfile-tests.ts
new file mode 100644
index 0000000000..7555fd5116
--- /dev/null
+++ b/types/proper-lockfile/proper-lockfile-tests.ts
@@ -0,0 +1,45 @@
+import {
+    check,
+    checkSync,
+    lock,
+    lockSync,
+    unlock,
+    unlockSync
+} from 'proper-lockfile';
+
+(async () => {
+    const release = await lock('some/file'); // $ExpectType () => Promise<void>
+    await release(); // $ExpectType void
+
+    await lock('some/file'); // $ExpectType () => Promise<void>
+    await unlock('some/file'); // $ExpectType void
+
+    await check('some/file'); // $ExpectType boolean
+})();
+
+lock('some/file')
+    .then((release) => {
+        // Do something while the file is locked
+
+        // Call the provided release function when you're done,
+        // which will also return a promise
+        return release();
+    });
+
+lock('some/file')
+    .then(() => {
+        // Do something while the file is locked
+
+        // Later..
+        return unlock('some/file');
+    });
+
+check('some/file')
+    .then((isLocked) => {
+        // isLocked will be true if 'some/file' is locked, false otherwise
+    });
+
+const release = lockSync('some/file'); // $ExpectType () => void
+release(); // $ExpectType void
+unlockSync('some/file'); // $ExpectType void
+checkSync('some/file'); // $ExpectType boolean
diff --git a/types/proper-lockfile/tsconfig.json b/types/proper-lockfile/tsconfig.json
new file mode 100644
index 0000000000..d8e7d42310
--- /dev/null
+++ b/types/proper-lockfile/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "proper-lockfile-tests.ts"
+    ]
+}
diff --git a/types/proper-lockfile/tslint.json b/types/proper-lockfile/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/proper-lockfile/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From aca0178bccf1683472ace79a2d05ff2ad7a059a3 Mon Sep 17 00:00:00 2001
From: Nikita Volodin <volodin.n@gmail.com>
Date: Mon, 7 May 2018 12:03:26 -0400
Subject: [PATCH 0031/1124] feat(types/cloneable-readable): add new types
 (#25570)

---
 .../cloneable-readable-tests.ts               | 11 +++++++++
 types/cloneable-readable/index.d.ts           | 17 ++++++++++++++
 types/cloneable-readable/tsconfig.json        | 23 +++++++++++++++++++
 types/cloneable-readable/tslint.json          |  1 +
 4 files changed, 52 insertions(+)
 create mode 100644 types/cloneable-readable/cloneable-readable-tests.ts
 create mode 100644 types/cloneable-readable/index.d.ts
 create mode 100644 types/cloneable-readable/tsconfig.json
 create mode 100644 types/cloneable-readable/tslint.json

diff --git a/types/cloneable-readable/cloneable-readable-tests.ts b/types/cloneable-readable/cloneable-readable-tests.ts
new file mode 100644
index 0000000000..d6cf68f33d
--- /dev/null
+++ b/types/cloneable-readable/cloneable-readable-tests.ts
@@ -0,0 +1,11 @@
+import { PassThrough } from 'stream';
+import cloneable = require('cloneable-readable');
+
+const ps = new PassThrough(); // $ExpectType PassThrough
+const cl = cloneable(ps); // $ExpectType Cloneable<PassThrough>
+
+process.stdin.pipe(cl.clone()).pipe(process.stderr);
+process.stdin.pipe(cl).pipe(process.stdout);
+
+cloneable.isCloneable(ps); // $ExpectType boolean
+cloneable.isCloneable(cl); // $ExpectType boolean
diff --git a/types/cloneable-readable/index.d.ts b/types/cloneable-readable/index.d.ts
new file mode 100644
index 0000000000..49f7c89ffd
--- /dev/null
+++ b/types/cloneable-readable/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for cloneable-readable 1.1
+// Project: https://github.com/mcollina/cloneable-readable#readme
+// Definitions by: Nikita Volodin <https://github.com/qlonik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node"/>
+
+import { Readable } from 'stream';
+
+type Cloneable<T> = T & { clone(): Cloneable<T> };
+interface CloneableFn {
+    <T extends Readable>(x: T): Cloneable<T>;
+    isCloneable(x: Readable): boolean;
+}
+declare const cloneable: CloneableFn;
+export = cloneable;
diff --git a/types/cloneable-readable/tsconfig.json b/types/cloneable-readable/tsconfig.json
new file mode 100644
index 0000000000..86b9886f7d
--- /dev/null
+++ b/types/cloneable-readable/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",
+        "cloneable-readable-tests.ts"
+    ]
+}
diff --git a/types/cloneable-readable/tslint.json b/types/cloneable-readable/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cloneable-readable/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e453232df55c64d8efb6fa8fc68527b570918b12 Mon Sep 17 00:00:00 2001
From: FishOrBear <cay776@gmail.com>
Date: Tue, 8 May 2018 00:03:45 +0800
Subject: [PATCH 0032/1124] [three.js] class CatmullRomCurve3 (#25569)

* add 'Texture' attribute: 'center','rotation'

* add 'ShapeBufferGeometry'

* Geometry: Move computeLineDistance() to Line

* return this

* update CatmullRomCurve3

* fix type
---
 types/three/three-core.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index f32f975fb1..dd7bd22adf 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6820,7 +6820,7 @@ export namespace CurveUtils {
 }
 
 export class CatmullRomCurve3 extends Curve<Vector3> {
-    constructor(points?: Vector3[]);
+    constructor(points?: Vector3[], closed?: boolean, curveType?: string, tension?: number);
 
     points: Vector3[];
 

From 7ff376ea8e1f30f6ed142f797e8638ce44b4f045 Mon Sep 17 00:00:00 2001
From: Tim Stirrat <tstirrat@google.com>
Date: Tue, 8 May 2018 02:05:07 +1000
Subject: [PATCH 0033/1124] Add new types for yahoo/react-stickynode 1.4
 (#25565)

---
 types/react-stickynode/index.d.ts             | 79 +++++++++++++++++++
 .../react-stickynode-tests.tsx                | 34 ++++++++
 types/react-stickynode/tsconfig.json          | 24 ++++++
 types/react-stickynode/tslint.json            |  1 +
 4 files changed, 138 insertions(+)
 create mode 100644 types/react-stickynode/index.d.ts
 create mode 100644 types/react-stickynode/react-stickynode-tests.tsx
 create mode 100644 types/react-stickynode/tsconfig.json
 create mode 100644 types/react-stickynode/tslint.json

diff --git a/types/react-stickynode/index.d.ts b/types/react-stickynode/index.d.ts
new file mode 100644
index 0000000000..884b0390d9
--- /dev/null
+++ b/types/react-stickynode/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for react-stickynode 1.4
+// Project: https://github.com/yahoo/react-stickynode
+// Definitions by: Tim Stirrat <https://github.com/tstirrat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+export = Sticky;
+
+/** A performant and comprehensive React sticky component. */
+declare class Sticky extends React.Component<Sticky.Props> {
+    static defaultProps: Sticky.Props;
+    static STATUS_ORIGINAL: Sticky.StatusCode.STATUS_ORIGINAL;
+    static STATUS_RELEASED: Sticky.StatusCode.STATUS_RELEASED;
+    static STATUS_FIXED: Sticky.StatusCode.STATUS_FIXED;
+}
+
+declare namespace Sticky {
+    enum StatusCode {
+        /** The default status, located at the original position. */
+        STATUS_ORIGINAL = 0,
+
+        /**
+         * The released status, located at somewhere on document, but not
+         * default one.
+         */
+        STATUS_RELEASED = 1,
+        STATUS_FIXED = 2
+    }
+
+    interface Status {
+        status: StatusCode;
+    }
+
+    interface Props {
+        /** The switch to enable or disable Sticky (true by default ). */
+        enabled?: boolean;
+
+        /**
+         * The offset from the top of window where the top of the element will
+         * be when sticky state is triggered(0 by default ).If it is a selector
+         * to a target(via `querySelector()`), the offset will be the height of
+         * the target.
+         */
+        top?: number | string;
+
+        /**
+         * The offset from the top of document which release state will be
+         * triggered when the bottom of the element reaches at.If it is a
+         * selector to a target(via `querySelector()`), the offset will be the
+         * bottom of the target.
+         */
+        bottomBoundary?: number | string;
+
+        /** z - index of the sticky */
+        innerZ?: number | string;
+
+        /** Enable the use of CSS3 transforms (true by default ). */
+        enableTransforms?: boolean;
+
+        /**
+         * Class name to be applied to the element when the sticky state is
+         * active (active by default ).
+         */
+        activeClass?: string;
+
+        /**
+         * Class name to be applied to the element when the sticky state is
+         * released (released by default ).
+         */
+        releasedClass?: string;
+
+        /** Callback for when the sticky state changes.See below. */
+        onStateChange?: (status: Status) => void;
+
+        shouldFreeze?: () => boolean;
+    }
+}
diff --git a/types/react-stickynode/react-stickynode-tests.tsx b/types/react-stickynode/react-stickynode-tests.tsx
new file mode 100644
index 0000000000..5db49f63f0
--- /dev/null
+++ b/types/react-stickynode/react-stickynode-tests.tsx
@@ -0,0 +1,34 @@
+import * as Sticky from "react-stickynode";
+import * as React from "react";
+
+const StickyAllOptions: JSX.Element = (
+    <Sticky
+        enabled={true}
+        top={10}
+        bottomBoundary={120}
+        innerZ={1000}
+        enableTransforms={true}
+        activeClass="active"
+        releasedClass="released"
+        onStateChange={s => s.status === Sticky.StatusCode.STATUS_ORIGINAL}
+        shouldFreeze={() => false}
+    >
+        <div />
+    </Sticky>
+);
+
+const StickyOptionalStringOptions: JSX.Element = (
+    <Sticky
+        top="#elem"
+        bottomBoundary="#bottom"
+        innerZ="1234"
+    >
+        <div />
+    </Sticky>
+);
+
+const StickyNoOptions: JSX.Element = (
+    <Sticky>
+        <div />
+    </Sticky>
+);
diff --git a/types/react-stickynode/tsconfig.json b/types/react-stickynode/tsconfig.json
new file mode 100644
index 0000000000..0d36cc6d18
--- /dev/null
+++ b/types/react-stickynode/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-stickynode-tests.tsx"
+    ]
+}
diff --git a/types/react-stickynode/tslint.json b/types/react-stickynode/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-stickynode/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 75e4923f82f8cef015322d87a7b4e549c0780438 Mon Sep 17 00:00:00 2001
From: Vasily Nesterov <vasily.s.nesterov@gmail.com>
Date: Mon, 7 May 2018 21:07:37 +0500
Subject: [PATCH 0034/1124] [react-google-places-suggest] Create type
 definitions (#25557)

---
 types/react-google-places-suggest/index.d.ts  | 34 ++++++++++++++
 .../react-google-places-suggest-tests.tsx     | 46 +++++++++++++++++++
 .../react-google-places-suggest/tsconfig.json | 25 ++++++++++
 types/react-google-places-suggest/tslint.json |  1 +
 4 files changed, 106 insertions(+)
 create mode 100644 types/react-google-places-suggest/index.d.ts
 create mode 100644 types/react-google-places-suggest/react-google-places-suggest-tests.tsx
 create mode 100644 types/react-google-places-suggest/tsconfig.json
 create mode 100644 types/react-google-places-suggest/tslint.json

diff --git a/types/react-google-places-suggest/index.d.ts b/types/react-google-places-suggest/index.d.ts
new file mode 100644
index 0000000000..d11139a911
--- /dev/null
+++ b/types/react-google-places-suggest/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for react-google-places-suggest 3.4
+// Project: https://xuopled.github.io/react-google-places-suggest
+// Definitions by: Vasily Nesterov <https://github.com/vasilysn>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="googlemaps" />
+import { Component, ReactNode } from "react";
+
+export default ReactGooglePlacesSuggest;
+
+declare class ReactGooglePlacesSuggest extends Component<
+    ReactGooglePlacesSuggest.Props
+    > { }
+
+declare namespace ReactGooglePlacesSuggest {
+    type Prediction = google.maps.places.AutocompletePrediction;
+    type GeocodedPrediction = google.maps.GeocoderResult;
+
+    interface Props {
+        autocompletionRequest: google.maps.places.AutocompletionRequest;
+        children?: ReactNode;
+        customRender?: (prediction?: Prediction) => JSX.Element | string;
+        customContainerRender?: (
+            predictions: ReadonlyArray<Prediction>
+        ) => JSX.Element | string;
+        googleMaps: typeof google.maps;
+        onSelectSuggest?: (
+            geocodedPrediction: GeocodedPrediction,
+            originalPrediction: Prediction
+        ) => any;
+        textNoResults?: string | null;
+    }
+}
diff --git a/types/react-google-places-suggest/react-google-places-suggest-tests.tsx b/types/react-google-places-suggest/react-google-places-suggest-tests.tsx
new file mode 100644
index 0000000000..b5e19f2115
--- /dev/null
+++ b/types/react-google-places-suggest/react-google-places-suggest-tests.tsx
@@ -0,0 +1,46 @@
+import * as React from "react";
+import ReactGooglePlacesSuggest from "react-google-places-suggest";
+
+const defaultProps: ReactGooglePlacesSuggest.Props = {
+    googleMaps: google.maps,
+    autocompletionRequest: { input: "" }
+};
+
+const ReactGooglePlacesSuggestWithChildrenTest: React.SFC = () => (
+    <ReactGooglePlacesSuggest {...defaultProps}>
+        <div />
+    </ReactGooglePlacesSuggest>
+);
+
+const ReactGooglePlacesSuggestWithTextNoResultsPropTest: React.SFC = () => (
+    <ReactGooglePlacesSuggest {...defaultProps} textNoResults="No results..." />
+);
+
+const ReactGooglePlacesSuggestWithCustomRenderPropTest: React.SFC = () => (
+    <ReactGooglePlacesSuggest
+        {...defaultProps}
+        customRender={(prediction?: ReactGooglePlacesSuggest.Prediction) => {
+            return "123";
+        }}
+    />
+);
+
+const ReactGooglePlacesSuggestWithOnSelectSuggestPropTest: React.SFC = () => (
+    <ReactGooglePlacesSuggest
+        {...defaultProps}
+        onSelectSuggest={(geocodedPrediction, originalPrediction) => {
+            return "123";
+        }}
+    />
+);
+
+const ReactGooglePlacesSuggestWithCustomContainerRenderPropTest: React.SFC = () => (
+    <ReactGooglePlacesSuggest
+        {...defaultProps}
+        customContainerRender={(
+            predictions: ReadonlyArray<ReactGooglePlacesSuggest.Prediction>
+        ) => {
+            return "123";
+        }}
+    />
+);
diff --git a/types/react-google-places-suggest/tsconfig.json b/types/react-google-places-suggest/tsconfig.json
new file mode 100644
index 0000000000..7553fd3c8a
--- /dev/null
+++ b/types/react-google-places-suggest/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-google-places-suggest-tests.tsx"
+    ]
+}
diff --git a/types/react-google-places-suggest/tslint.json b/types/react-google-places-suggest/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-google-places-suggest/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From db0789397a1fe70e7651606c0678387fb4550c02 Mon Sep 17 00:00:00 2001
From: Tim Kendrick <timkendrick@gmail.com>
Date: Mon, 7 May 2018 17:07:56 +0100
Subject: [PATCH 0035/1124] [babel-types] Allow sparse ArrayExpression nodes
 (#25556)

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

diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index b1de338923..8c892a3ca0 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -46,7 +46,7 @@ export interface Node {
 
 export interface ArrayExpression extends Node {
     type: "ArrayExpression";
-    elements: Array<Expression | SpreadElement>;
+    elements: Array<null | Expression | SpreadElement>;
 }
 
 export interface AssignmentExpression extends Node {
@@ -1306,7 +1306,7 @@ export type TSEntityName = Identifier | TSQualifiedName;
 export type TSTypeElement = TSCallSignatureDeclaration | TSConstructSignatureDeclaration | TSIndexSignature
     | TSMethodSignature | TSPropertySignature;
 
-export function arrayExpression(elements?: Array<Expression | SpreadElement>): ArrayExpression;
+export function arrayExpression(elements?: Array<null | Expression | SpreadElement>): ArrayExpression;
 export function assignmentExpression(operator?: string, left?: LVal, right?: Expression): AssignmentExpression;
 export function binaryExpression(
     operator?: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=",

From 3edecaf23a1872525053d5ea01e1360736066097 Mon Sep 17 00:00:00 2001
From: Nikita Volodin <volodin.n@gmail.com>
Date: Mon, 7 May 2018 12:08:43 -0400
Subject: [PATCH 0036/1124] feat(types/shelljs-exec-proxy): types for new
 module (#25555)

---
 types/shelljs-exec-proxy/index.d.ts           | 17 ++++++++++++++
 .../shelljs-exec-proxy-tests.ts               |  9 ++++++++
 types/shelljs-exec-proxy/tsconfig.json        | 23 +++++++++++++++++++
 types/shelljs-exec-proxy/tslint.json          |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 types/shelljs-exec-proxy/index.d.ts
 create mode 100644 types/shelljs-exec-proxy/shelljs-exec-proxy-tests.ts
 create mode 100644 types/shelljs-exec-proxy/tsconfig.json
 create mode 100644 types/shelljs-exec-proxy/tslint.json

diff --git a/types/shelljs-exec-proxy/index.d.ts b/types/shelljs-exec-proxy/index.d.ts
new file mode 100644
index 0000000000..a12c12f19f
--- /dev/null
+++ b/types/shelljs-exec-proxy/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for shelljs-exec-proxy 0.1
+// Project: https://github.com/nfischer/shelljs-exec-proxy#readme
+// Definitions by: Nikita Volodin <https://github.com/qlonik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as shelljs from 'shelljs';
+
+interface Exec {
+    (...command: string[]): shelljs.ExecOutputReturnValue;
+    [k: string]: Exec;
+}
+
+type ShelljsExecProxy = { [k: string]: Exec } & typeof shelljs;
+
+declare const shelljsExecProxy: ShelljsExecProxy;
+export = shelljsExecProxy;
diff --git a/types/shelljs-exec-proxy/shelljs-exec-proxy-tests.ts b/types/shelljs-exec-proxy/shelljs-exec-proxy-tests.ts
new file mode 100644
index 0000000000..71b7038a44
--- /dev/null
+++ b/types/shelljs-exec-proxy/shelljs-exec-proxy-tests.ts
@@ -0,0 +1,9 @@
+import * as shell from 'shelljs-exec-proxy';
+
+shell.git.status(); // $ExpectType ExecOutputReturnValue
+shell.git.add('.'); // $ExpectType ExecOutputReturnValue
+shell.git.commit('-am', 'Fixed issue #1'); // $ExpectType ExecOutputReturnValue
+shell.git.push('origin', 'master'); // $ExpectType ExecOutputReturnValue
+
+shell.cd('string'); // $ExpectType void
+shell.cd(123); // $ExpectError
diff --git a/types/shelljs-exec-proxy/tsconfig.json b/types/shelljs-exec-proxy/tsconfig.json
new file mode 100644
index 0000000000..eb56eddf72
--- /dev/null
+++ b/types/shelljs-exec-proxy/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",
+        "shelljs-exec-proxy-tests.ts"
+    ]
+}
diff --git a/types/shelljs-exec-proxy/tslint.json b/types/shelljs-exec-proxy/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/shelljs-exec-proxy/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 44cb792e09cf49ce733e7e4f84218e27147ea694 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 7 May 2018 09:10:08 -0700
Subject: [PATCH 0037/1124] Remove unnecessary

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

diff --git a/types/freshy/freshy-tests.ts b/types/freshy/freshy-tests.ts
index 1134489d77..406791d0eb 100644
--- a/types/freshy/freshy-tests.ts
+++ b/types/freshy/freshy-tests.ts
@@ -6,22 +6,16 @@ declare function require(x: string): any;
 unload('minimist'); // $ExpectType boolean
 
 const reloaded = reload('minimist'); // $ExpectType any
-// $ExpectType boolean
 minimist === reloaded; // false
 
 const freshlyLoaded = freshy('minimist'); // $ExpectType any
-// $ExpectType boolean
 minimist === freshlyLoaded; // false
 
 let alsofresh: any;
 // $ExpectType any
 const fresh = freshy('minimist', (fresh) => {
     alsofresh = require('minimist');
-
-    // $ExpectType boolean
     fresh === alsofresh; // true
 });
-// $ExpectType boolean
 minimist === fresh; // false
-// $ExpectType boolean
 fresh === alsofresh; // true

From cf0c469c1b64171b14f8402c719c035f6f101773 Mon Sep 17 00:00:00 2001
From: Seamus Leahy <seamus@moronicbajebus.com>
Date: Mon, 7 May 2018 09:15:16 -0700
Subject: [PATCH 0038/1124] Add missing parameter to gm's `define` method
 (#25567)

* Add  missing value parameter to define method

* Increase version number
---
 types/gm/gm-tests.ts | 3 ++-
 types/gm/index.d.ts  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/gm/gm-tests.ts b/types/gm/gm-tests.ts
index 9f59854467..b2efd9505a 100644
--- a/types/gm/gm-tests.ts
+++ b/types/gm/gm-tests.ts
@@ -62,6 +62,7 @@ declare const font: string;
 declare const quality: number;
 declare const align: string;
 declare const depth: number;
+declare const defineValue: string;
 let readStream: stream.PassThrough;
 
 gm(src)
@@ -104,7 +105,7 @@ gm(src)
 	.crop(width, height, x, y, usePercent)
 	.cycle(factor)
 	.deconstruct()
-	.define()
+	.define(defineValue)
 	.delay(time)
 	.density(width, height)
 	.despeckle()
diff --git a/types/gm/index.d.ts b/types/gm/index.d.ts
index 0670f0ae0f..5e8853efce 100644
--- a/types/gm/index.d.ts
+++ b/types/gm/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for gm 1.17
+// Type definitions for gm 1.18
 // Project: https://github.com/aheckmann/gm
 // Definitions by: Joel Spadin <https://github.com/ChaosinaCan>, Maarten van Vliet <https://github.com/maartenvanvliet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -123,7 +123,7 @@ declare namespace m {
         crop(width: number, height: number, x?: number, y?: number, percent?: boolean): State;
         cycle(amount: number): State;
         deconstruct(): State;
-        define(): State;
+        define(value: string): State;
         delay(milliseconds: number): State;
         density(width: number, height: number): State;
         despeckle(): State;

From a834f70fde604d7be4a2a58e6c5e5ab3fd323048 Mon Sep 17 00:00:00 2001
From: Klaus Meinhardt <klaus.meinhardt1@gmail.com>
Date: Mon, 7 May 2018 18:15:36 +0200
Subject: [PATCH 0039/1124] resolve: use ReadonlyArray for options (#25544)

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

diff --git a/types/resolve/index.d.ts b/types/resolve/index.d.ts
index af32bf4097..a3fb1f4f46 100644
--- a/types/resolve/index.d.ts
+++ b/types/resolve/index.d.ts
@@ -73,15 +73,15 @@ declare namespace resolve {
     /** package.json data applicable to the module being loaded */
     package?: any;
     /** array of file extensions to search in order (defaults to ['.js']) */
-    extensions?: string | string[];
+    extensions?: string | ReadonlyArray<string>;
     /** transform the parsed package.json contents before looking at the "main" field */
     packageFilter?: (pkg: any, pkgfile: string) => any;
     /** transform a path within a package */
     pathFilter?: (pkg: any, path: string, relativePath: string) => string;
     /** require.paths array to use if nothing is found on the normal node_modules recursive walk (probably don't use this) */
-    paths?: string | string[];
+    paths?: string | ReadonlyArray<string>;
     /** directory (or directories) in which to recursively look for modules. (default to 'node_modules') */
-    moduleDirectory?: string | string[]
+    moduleDirectory?: string | ReadonlyArray<string>
     /**
      * if true, doesn't resolve `basedir` to real path before resolving.
      * This is the way Node resolves dependencies when executed with the --preserve-symlinks flag.

From b14a53f47516e6aefc09e450d3c4e5b3c090ca9a Mon Sep 17 00:00:00 2001
From: Cedric van Putten <byCedric@users.noreply.github.com>
Date: Mon, 7 May 2018 18:16:24 +0200
Subject: [PATCH 0040/1124] [expo]: Add missing Updates module (#25549)

Expo has created the Updates module since SDK 26 to modify the update mechanism.

see https://docs.expo.io/versions/latest/sdk/updates
---
 types/expo/expo-tests.tsx | 36 +++++++++++++++-
 types/expo/index.d.ts     | 88 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index 36eb5fc22c..fd0d7ad973 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -36,7 +36,8 @@ import {
     SQLite,
     Calendar,
     MailComposer,
-    Location
+    Location,
+    Updates
 } from 'expo';
 
 const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
@@ -744,3 +745,36 @@ async () => {
 
     result.status === 'saved';
 };
+
+async () => {
+    const updateEventListener: Updates.UpdateEventListener = ({ type, manifest, message }) => {
+        switch (type) {
+            case Updates.EventType.DOWNLOAD_STARTED:
+            case Updates.EventType.DOWNLOAD_PROGRESS:
+            case Updates.EventType.DOWNLOAD_FINISHED:
+            case Updates.EventType.NO_UPDATE_AVAILABLE:
+            case Updates.EventType.ERROR:
+                return true;
+        }
+    };
+
+    Updates.reload();
+
+    Updates.reloadFromCache();
+
+    Updates.addListener(updateEventListener);
+
+    const updateCheckResult = await Updates.checkForUpdateAsync();
+
+    if (updateCheckResult.isAvailable) {
+        console.log(updateCheckResult.manifest);
+    }
+
+    Updates.fetchUpdateAsync(updateEventListener);
+
+    const bundleFetchResult = await Updates.fetchUpdateAsync();
+
+    if (bundleFetchResult.isNew) {
+        console.log(bundleFetchResult.manifest);
+    }
+};
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index d10ffea9d4..f51d2d13b6 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2764,3 +2764,91 @@ export namespace MailComposer {
     ): Promise<{ status: 'sent' | 'saved' | 'cancelled' }>;
 }
 // #endregion
+
+export namespace Updates {
+    namespace EventType {
+        /** A new update is available and has started downloading. */
+        type DownloadStart = 'downloadStart';
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        type DownloadProgress = 'downloadProgress';
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        type DownloadFinished = 'downloadFinished';
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        type NoUpdateAvailable = 'noUpdateAvailable';
+        /** An error occurred trying to fetch the latest update. */
+        type Error = 'error';
+
+        /** A new update is available and has started downloading. */
+        const DOWNLOAD_STARTED: DownloadStart;
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        const DOWNLOAD_PROGRESS: DownloadProgress;
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        const DOWNLOAD_FINISHED: DownloadFinished;
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        const NO_UPDATE_AVAILABLE: NoUpdateAvailable;
+        /** An error occurred trying to fetch the latest update. */
+        const ERROR: Error;
+    }
+
+    interface UpdateCheck {
+        /** True if an update is available, false if you're already running the most up-to-date JS bundle. */
+        isAvailable: boolean;
+        /** If `isAvailable` is true, the manifest of the available update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+    }
+
+    interface UpdateBundle {
+        /** True if the fetched bundle is new (i.e. a different version that the what's currently running). */
+        isNew: boolean;
+        /** Manifest of the fetched update. */
+        manifest: Constants.Manifest;
+    }
+
+    /** An object that is passed into each event listener when a new version is available. */
+    interface UpdateEvent {
+        /** Type of the event */
+        type: EventType.DownloadStart
+            | EventType.DownloadProgress
+            | EventType.DownloadFinished
+            | EventType.NoUpdateAvailable
+            | EventType.Error;
+        /** If `type === Expo.Updates.EventType.DOWNLOAD_FINISHED`, the manifest of the newly downloaded update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+        /** If `type === Expo.Updates.EventType.ERROR`, the error message. Undefined otherwise. */
+        message?: string;
+    }
+
+    type UpdateEventListener = (event: UpdateEvent) => any;
+
+    /**
+     * Invokes a callback when updates-related events occur,
+     * either on the initial app load or as a result of a call to `Expo.Updates.fetchUpdateAsync`.
+     */
+    function addListener(listener: UpdateEventListener): EventSubscription;
+
+    /**
+     * Check if a new published version of your project is available.
+     * Does not actually download the update.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function checkForUpdateAsync(): Promise<UpdateCheck>;
+
+    /**
+     * Downloads the most recent published version of your experience to the device's local cache.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function fetchUpdateAsync(listener?: UpdateEventListener): Promise<UpdateBundle>;
+
+    /**
+     * Immediately reloads the current experience.
+     * This will use your app.json updates configuration to fetch and load the newest available JS supported by the device's Expo environment.
+     * This is useful for triggering an update of your experience if you have published a new version.
+     */
+    function reload(): void;
+
+    /**
+     * Immediately reloads the current experience using the most recent cached version.
+     * This is useful for triggering an update of your experience if you have published and already downloaded a new version.
+     */
+    function reloadFromCache(): void;
+}

From e8849415f2ecd13d8006ee147aa033d2d87228ab Mon Sep 17 00:00:00 2001
From: JounQin <admin@1stg.me>
Date: Tue, 8 May 2018 00:18:22 +0800
Subject: [PATCH 0041/1124] feat: add declarations for
 sw-precache-webpack-plugin (#25541)

* feat: add declarations for sw-precache-webpack-plugin

* override type of sw-precache option `importScripts`
---
 types/sw-precache-webpack-plugin/index.d.ts   | 38 +++++++++++++++++++
 .../sw-precache-webpack-plugin-tests.ts       | 36 ++++++++++++++++++
 .../sw-precache-webpack-plugin/tsconfig.json  | 23 +++++++++++
 types/sw-precache-webpack-plugin/tslint.json  |  1 +
 4 files changed, 98 insertions(+)
 create mode 100644 types/sw-precache-webpack-plugin/index.d.ts
 create mode 100644 types/sw-precache-webpack-plugin/sw-precache-webpack-plugin-tests.ts
 create mode 100644 types/sw-precache-webpack-plugin/tsconfig.json
 create mode 100644 types/sw-precache-webpack-plugin/tslint.json

diff --git a/types/sw-precache-webpack-plugin/index.d.ts b/types/sw-precache-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..3378e55f08
--- /dev/null
+++ b/types/sw-precache-webpack-plugin/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for sw-precache-webpack-plugin 0.11
+// Project: https://github.com/goldhand/sw-precache-webpack-plugin#readme
+// Definitions by: JounQin <https://github.com/JounQin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Options as SwPrecacheOptions } from 'sw-precache';
+import { Plugin } from 'webpack';
+
+// workaround to override parent types
+interface _Options extends SwPrecacheOptions {
+    importScripts?: any;
+}
+
+declare namespace SWPrecacheWebpackPlugin {
+    interface Options extends _Options {
+        filename?: string;
+        filepath?: string;
+        staticFileGlobsIgnorePatterns?: RegExp[];
+        mergeStaticsConfig?: boolean;
+        minify?: boolean;
+
+        // override sw-precache options
+        importScripts?: Array<
+            | string
+            | {
+                  chunkName?: string;
+                  filename?: string;
+              }
+        >;
+    }
+}
+
+declare class SWPrecacheWebpackPlugin extends Plugin {
+    constructor(options?: SWPrecacheWebpackPlugin.Options);
+}
+
+export = SWPrecacheWebpackPlugin;
diff --git a/types/sw-precache-webpack-plugin/sw-precache-webpack-plugin-tests.ts b/types/sw-precache-webpack-plugin/sw-precache-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..5cc7fd7c38
--- /dev/null
+++ b/types/sw-precache-webpack-plugin/sw-precache-webpack-plugin-tests.ts
@@ -0,0 +1,36 @@
+import { Configuration } from 'webpack';
+import * as SwPrecacheWebpackPlugin from 'sw-precache-webpack-plugin';
+
+let config: Configuration = {
+    plugins: [new SwPrecacheWebpackPlugin()]
+};
+
+config = {
+    plugins: [
+        new SwPrecacheWebpackPlugin({
+            filename: ''
+        })
+    ]
+};
+
+config = {
+    plugins: [
+        new SwPrecacheWebpackPlugin({
+            cacheId: ''
+        })
+    ]
+};
+
+config = {
+    plugins: [
+        new SwPrecacheWebpackPlugin({
+            importScripts: [
+                {
+                    chunkName: ''
+                }
+            ]
+        })
+    ]
+};
+
+export default config;
diff --git a/types/sw-precache-webpack-plugin/tsconfig.json b/types/sw-precache-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..f26bc80766
--- /dev/null
+++ b/types/sw-precache-webpack-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sw-precache-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/sw-precache-webpack-plugin/tslint.json b/types/sw-precache-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sw-precache-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 021d2ad2722135133eebf066af2079186d115fdb Mon Sep 17 00:00:00 2001
From: denisname <denisname@users.noreply.github.com>
Date: Mon, 7 May 2018 18:19:12 +0200
Subject: [PATCH 0042/1124] d3-polygon strict null check (#25538)

* d3-polygon strict null check

* Update tests
---
 types/d3-polygon/d3-polygon-tests.ts | 4 ++--
 types/d3-polygon/index.d.ts          | 8 ++++----
 types/d3-polygon/tsconfig.json       | 2 +-
 types/d3-polygon/tslint.json         | 6 +-----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/types/d3-polygon/d3-polygon-tests.ts b/types/d3-polygon/d3-polygon-tests.ts
index 28e1e464e1..c4aac0b900 100644
--- a/types/d3-polygon/d3-polygon-tests.ts
+++ b/types/d3-polygon/d3-polygon-tests.ts
@@ -17,7 +17,7 @@ let containsFlag: boolean;
 let point: [number, number] = [15, 15];
 const polygon: Array<[number, number]> = [[10, 10], [20, 20], [10, 30]];
 const pointArray: Array<[number, number]> = [[10, 10], [20, 20], [10, 30], [15, 15]];
-let hull: Array<[number, number]>;
+let hullOrNothing: Array<[number, number]> | null;
 
 // -----------------------------------------------------------------------------
 // Tests
@@ -27,7 +27,7 @@ num = d3Polygon.polygonArea(polygon);
 
 point = d3Polygon.polygonCentroid(polygon);
 
-hull = d3Polygon.polygonHull(pointArray);
+hullOrNothing = d3Polygon.polygonHull(pointArray);
 
 containsFlag = d3Polygon.polygonContains(polygon, point);
 
diff --git a/types/d3-polygon/index.d.ts b/types/d3-polygon/index.d.ts
index 64e1d2c9b9..b9f8711335 100644
--- a/types/d3-polygon/index.d.ts
+++ b/types/d3-polygon/index.d.ts
@@ -3,11 +3,11 @@
 // 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.1
+// Last module patch version validated against: 1.0.3
 
 /**
- * Returns the signed area of the specified polygon. If the vertices of the polygon are in counterclockwise order (
- * assuming a coordinate system where the origin ⟨0,0⟩ is in the top-left corner), the returned area is positive;
+ * Returns the signed area of the specified polygon. If the vertices of the polygon are in counterclockwise order
+ * (assuming a coordinate system where the origin <0,0> is in the top-left corner), the returned area is positive;
  * otherwise it is negative, or zero.
  *
  * @param polygon Array of coordinates <x0, y0>, <x1, y1> and so on.
@@ -34,7 +34,7 @@ export function polygonHull(points: Array<[number, number]>): Array<[number, num
  * Returns true if and only if the specified point is inside the specified polygon.
  *
  * @param polygon Array of coordinates <x0, y0>, <x1, y1> and so on.
- * @param point Coordinates of point <x, y>
+ * @param point Coordinates of point <x, y>.
  */
 export function polygonContains(polygon: Array<[number, number]>, point: [number, number]): boolean;
 
diff --git a/types/d3-polygon/tsconfig.json b/types/d3-polygon/tsconfig.json
index 79bd8a43b8..1444a903df 100644
--- a/types/d3-polygon/tsconfig.json
+++ b/types/d3-polygon/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/d3-polygon/tslint.json b/types/d3-polygon/tslint.json
index 604d5950cf..f93cf8562a 100644
--- a/types/d3-polygon/tslint.json
+++ b/types/d3-polygon/tslint.json
@@ -1,7 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "unified-signatures": false,
-        "callable-types": false
-    }
+    "extends": "dtslint/dt.json"
 }

From d7e112022acdfcd2e741a35e8dc02cc6f68a7c37 Mon Sep 17 00:00:00 2001
From: NN <nn1436401@gmail.com>
Date: Mon, 7 May 2018 19:20:26 +0300
Subject: [PATCH 0043/1124] Add json3 typing. (#25543)

---
 types/json3/index.d.ts     |  7 +++++++
 types/json3/json3-tests.ts |  5 +++++
 types/json3/tsconfig.json  | 24 ++++++++++++++++++++++++
 types/json3/tslint.json    |  3 +++
 4 files changed, 39 insertions(+)
 create mode 100644 types/json3/index.d.ts
 create mode 100644 types/json3/json3-tests.ts
 create mode 100644 types/json3/tsconfig.json
 create mode 100644 types/json3/tslint.json

diff --git a/types/json3/index.d.ts b/types/json3/index.d.ts
new file mode 100644
index 0000000000..768a76cf14
--- /dev/null
+++ b/types/json3/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for json3 3.3
+// Project: https://bestiejs.github.io/json3/
+// Definitions by: NN <https://github.com/NN--->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var json3: JSON;
+export = json3;
diff --git a/types/json3/json3-tests.ts b/types/json3/json3-tests.ts
new file mode 100644
index 0000000000..464f266509
--- /dev/null
+++ b/types/json3/json3-tests.ts
@@ -0,0 +1,5 @@
+import * as JSON3 from "json3";
+
+const obj = JSON3.parse('{ "a" : { "b" : [1, 2] } }');
+const str = JSON3.stringify(obj, null, "\t");
+console.log(str);
diff --git a/types/json3/tsconfig.json b/types/json3/tsconfig.json
new file mode 100644
index 0000000000..4aa2789a30
--- /dev/null
+++ b/types/json3/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",
+        "json3-tests.ts"
+    ]
+}
diff --git a/types/json3/tslint.json b/types/json3/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/json3/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From e051442fa035b55268a540a912a26260153cbefa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20Fria=C3=A7a?= <afriacaxd@gmail.com>
Date: Mon, 7 May 2018 12:20:53 -0400
Subject: [PATCH 0044/1124] Types for jquery-next-id (#25552)

---
 types/jquery-next-id/index.d.ts              | 22 +++++++++++++++++
 types/jquery-next-id/jquery-next-id-tests.ts |  6 +++++
 types/jquery-next-id/tsconfig.json           | 25 ++++++++++++++++++++
 types/jquery-next-id/tslint.json             |  1 +
 4 files changed, 54 insertions(+)
 create mode 100644 types/jquery-next-id/index.d.ts
 create mode 100644 types/jquery-next-id/jquery-next-id-tests.ts
 create mode 100644 types/jquery-next-id/tsconfig.json
 create mode 100644 types/jquery-next-id/tslint.json

diff --git a/types/jquery-next-id/index.d.ts b/types/jquery-next-id/index.d.ts
new file mode 100644
index 0000000000..bdb573dfa1
--- /dev/null
+++ b/types/jquery-next-id/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for jquery-next-id 1.0
+// Project: https://github.com/makeup-jquery/jquery-next-id
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface JQueryNextId {
+    (prefix?: string): JQuery;
+
+    defaults: {
+        prefix: string;
+        separator: string;
+    };
+}
+
+declare global {
+    interface JQuery {
+        nextId: JQueryNextId;
+    }
+}
diff --git a/types/jquery-next-id/jquery-next-id-tests.ts b/types/jquery-next-id/jquery-next-id-tests.ts
new file mode 100644
index 0000000000..663dfbabe3
--- /dev/null
+++ b/types/jquery-next-id/jquery-next-id-tests.ts
@@ -0,0 +1,6 @@
+$('div').nextId('my-prefix');
+
+$.fn.nextId.defaults = {
+  prefix: 'id',
+  separator: '-'
+};
diff --git a/types/jquery-next-id/tsconfig.json b/types/jquery-next-id/tsconfig.json
new file mode 100644
index 0000000000..a8bd98da54
--- /dev/null
+++ b/types/jquery-next-id/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-next-id-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-next-id/tslint.json b/types/jquery-next-id/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-next-id/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From b05072819b5554d707ecf1f9b992ccb366028a15 Mon Sep 17 00:00:00 2001
From: AylaJK <26681805+AylaJK@users.noreply.github.com>
Date: Mon, 7 May 2018 10:21:42 -0600
Subject: [PATCH 0045/1124] Add passport-remember-me-extended (#25551)

---
 .../passport-remember-me-extended/index.d.ts  | 37 ++++++++
 .../passport-remember-me-extended-tests.ts    | 85 +++++++++++++++++++
 .../tsconfig.json                             | 23 +++++
 .../passport-remember-me-extended/tslint.json |  1 +
 4 files changed, 146 insertions(+)
 create mode 100644 types/passport-remember-me-extended/index.d.ts
 create mode 100644 types/passport-remember-me-extended/passport-remember-me-extended-tests.ts
 create mode 100644 types/passport-remember-me-extended/tsconfig.json
 create mode 100644 types/passport-remember-me-extended/tslint.json

diff --git a/types/passport-remember-me-extended/index.d.ts b/types/passport-remember-me-extended/index.d.ts
new file mode 100644
index 0000000000..044647fe0b
--- /dev/null
+++ b/types/passport-remember-me-extended/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for passport-remember-me-extended 0.0
+// Project: https://github.com/dereklakin/passport-remember-me
+// Definitions by: AylaJK <https://github.com/AylaJK>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import passport = require('passport');
+import express = require('express');
+
+export interface StrategyOption {
+    key?: string;
+    cookie?: express.CookieOptions;
+}
+
+export interface StrategyOptionWithRequest extends StrategyOption {
+    passReqToCallback: true;
+}
+
+export type VerifyFunction =
+    (token: any, done: (err: any, user?: any, info?: any) => void) => void;
+
+export type VerifyFunctionWithRequest =
+    (req: express.Request, token: any, done: (err: any, user?: any, info?: any) => void) => void;
+
+export type IssueFunction =
+    (user: any, done: (err: any, token?: any) => void) => void;
+
+export type IssueFunctionWithRequest =
+    (req: express.Request, user: any, done: (err: any, token?: any) => void) => void;
+
+export class Strategy extends passport.Strategy {
+    constructor(verify: VerifyFunction, issue: IssueFunction);
+    constructor(options: StrategyOptionWithRequest, verify: VerifyFunctionWithRequest, issue: IssueFunctionWithRequest);
+    constructor(options: StrategyOption, verify: VerifyFunction, issue: IssueFunction);
+
+    authenticate(req: express.Request, options?: passport.AuthenticateOptions): void;
+}
diff --git a/types/passport-remember-me-extended/passport-remember-me-extended-tests.ts b/types/passport-remember-me-extended/passport-remember-me-extended-tests.ts
new file mode 100644
index 0000000000..2b5e1adee5
--- /dev/null
+++ b/types/passport-remember-me-extended/passport-remember-me-extended-tests.ts
@@ -0,0 +1,85 @@
+/**
+ * Create by AylaJK on 05/05/2018
+ */
+import express = require('express');
+import passport = require('passport');
+import rememberme = require('passport-remember-me-extended');
+
+// just some test model
+const Token = {
+    consume(token: any, callback: (err: any, user?: any) => void): void {
+        callback(null, { id: '1234', username: 'james' });
+    },
+    save(token: any, user: any, callback: (err: any) => void): void {
+        callback(null);
+    }
+};
+
+passport.use(new rememberme.Strategy(
+    (token: any, done: (err: any, user?: any) => void) => {
+        Token.consume(token, (err, user) => {
+            if (err) done(err);
+            else if (!user) done(null, false);
+            else done(null, user);
+        });
+    },
+    (user: any, done: (err: any, token?: any) => void) => {
+        const token = { id: 'token' };
+        Token.save(token, { userId: user.id }, (err) => {
+            if (err) done(err);
+            else done(null, token);
+        });
+    }
+));
+
+passport.use(new rememberme.Strategy({
+        key: 'remember-me',
+        cookie: {
+            path: '/',
+            httpOnly: true,
+            maxAge: 604800000,
+        },
+    },
+    (token: any, done: (err: any, user?: any) => void) => {
+        Token.consume(token, (err, user) => {
+            if (err) done(err);
+            else if (!user) done(null, false);
+            else done(null, user);
+        });
+    },
+    (user: any, done: (err: any, token?: any) => void) => {
+        const token = { id: 'token' };
+        Token.save(token, { userId: user.id }, (err) => {
+            if (err) done(err);
+            else done(null, token);
+        });
+    }
+));
+
+passport.use(new rememberme.Strategy({
+        key: 'remember-me',
+        cookie: {
+            path: '/',
+            httpOnly: true,
+            maxAge: 604800000,
+        },
+        passReqToCallback: true,
+    },
+    (req: express.Request, token: any, done: (err: any, user?: any) => void) => {
+        Token.consume(token, (err, user) => {
+            if (err) done(err);
+            else if (!user) done(null, false);
+            else done(null, user);
+        });
+    },
+    (req: express.Request, user: any, done: (err: any, token?: any) => void) => {
+        const token = { id: 'token' };
+        Token.save(token, { userId: user.id }, (err) => {
+            if (err) done(err);
+            else done(null, token);
+        });
+    }
+));
+
+const app = express();
+app.use(passport.authenticate('remember-me'));
diff --git a/types/passport-remember-me-extended/tsconfig.json b/types/passport-remember-me-extended/tsconfig.json
new file mode 100644
index 0000000000..7062f9acbc
--- /dev/null
+++ b/types/passport-remember-me-extended/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",
+        "passport-remember-me-extended-tests.ts"
+    ]
+}
diff --git a/types/passport-remember-me-extended/tslint.json b/types/passport-remember-me-extended/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/passport-remember-me-extended/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9617a7fb65db42b68639132e765b776ed4686ac8 Mon Sep 17 00:00:00 2001
From: Ilfat Galiev <zBritva@users.noreply.github.com>
Date: Mon, 7 May 2018 19:56:14 +0300
Subject: [PATCH 0046/1124] Add type definitions for Power BI Custom Visuals
 API (powerbi-visuals-tools) (#25021)

* Added Power BI Custom Visuals API types

* Added UT

* Fix header of index.d.ts

* Code review

Update header
Remove empty VisualPermissions enumeration
Enable some rules
Added disable-next-line for no-unnecessary-generics

* Remove empty interfaces
---
 types/powerbi-visuals-tools/index.d.ts        | 1346 +++++++++++++++++
 .../powerbi-visuals-tools-tests.ts            |  110 ++
 types/powerbi-visuals-tools/tsconfig.json     |   24 +
 types/powerbi-visuals-tools/tslint.json       |    9 +
 4 files changed, 1489 insertions(+)
 create mode 100644 types/powerbi-visuals-tools/index.d.ts
 create mode 100644 types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts
 create mode 100644 types/powerbi-visuals-tools/tsconfig.json
 create mode 100644 types/powerbi-visuals-tools/tslint.json

diff --git a/types/powerbi-visuals-tools/index.d.ts b/types/powerbi-visuals-tools/index.d.ts
new file mode 100644
index 0000000000..0b7fcf2192
--- /dev/null
+++ b/types/powerbi-visuals-tools/index.d.ts
@@ -0,0 +1,1346 @@
+// Type definitions for Powerbi-visuals-tools 1.11
+// Project: https://github.com/Microsoft/PowerBI-visuals-tools
+// Definitions by:  Ilfat Galiev <https://github.com/zBritva>
+//                  Microsoft <https://github.com/Microsoft>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace powerbi {
+    enum VisualDataRoleKind {
+        /** Indicates that the role should be bound to something that evaluates to a grouping of values. */
+        Grouping = 0,
+        /** Indicates that the role should be bound to something that evaluates to a single value in a scope. */
+        Measure = 1,
+        /** Indicates that the role can be bound to either Grouping or Measure. */
+        GroupingOrMeasure = 2,
+    }
+    enum VisualDataChangeOperationKind {
+        Create = 0,
+        Append = 1,
+    }
+    enum VisualUpdateType {
+        Data = 2,
+        Resize = 4,
+        ViewMode = 8,
+        Style = 16,
+        ResizeEnd = 32,
+        All = 62,
+    }
+
+    const enum CartesianRoleKind {
+        X = 0,
+        Y = 1,
+    }
+    const enum ViewMode {
+        View = 0,
+        Edit = 1,
+        InFocusEdit = 2,
+    }
+    const enum EditMode {
+        /** Default editing mode for the visual. */
+        Default = 0,
+        /** Indicates the user has asked the visual to display advanced editing controls. */
+        Advanced = 1,
+    }
+    const enum AdvancedEditModeSupport {
+        /** The visual doesn't support Advanced Edit mode. Do not display the 'Edit' button on this visual. */
+        NotSupported = 0,
+        /** The visual supports Advanced Edit mode, but doesn't require any further changes aside from setting EditMode=Advanced. */
+        SupportedNoAction = 1,
+        /** The visual supports Advanced Edit mode, and requires that the host pops out the visual when entering Advanced EditMode. */
+        SupportedInFocus = 2,
+    }
+    const enum ResizeMode {
+        Resizing = 1,
+        Resized = 2,
+    }
+    const enum JoinPredicateBehavior {
+        /** Prevent items in this role from acting as join predicates. */
+        None = 0,
+    }
+    const enum PromiseResultType {
+        Success = 0,
+        Failure = 1,
+    }
+    /**
+     * Defines actions to be taken by the visual in response to a selection.
+     *
+     * An undefined/null VisualInteractivityAction should be treated as Selection,
+     * as that is the default action.
+     */
+    const enum VisualInteractivityAction {
+        /** Normal selection behavior which should call onSelect */
+        Selection = 0,
+        /** No additional action or feedback from the visual is needed */
+        None = 1,
+    }
+    /**
+     * Defines various events Visuals can notify the host on.
+     */
+    const enum VisualEventType {
+        /** Should be used at the beginning of a visual's rendering operation. */
+        RenderStarted = 0,
+        /** Should be used at the end of a visual's rendering operation. */
+        RenderCompleted = 1,
+        /** Should be used by visuals to trace information in PBI telemetry. */
+        Trace = 2,
+        /** Should be used by visuals to trace errors in PBI telemetry. */
+        Error = 3,
+    }
+    const enum FilterAction {
+        /** Merging filter into existing filters. */
+        merge = 0,
+        /** removing existing filter. */
+        remove = 1,
+    }
+}
+
+declare namespace powerbi.visuals.plugins {
+    /** This IVisualPlugin interface is only used by the CLI tools when compiling */
+
+    interface IVisualPlugin {
+        /** The name of the plugin.  Must match the property name in powerbi.visuals. */
+        name: string;
+
+        /** Function to call to create the visual. */
+        create: (options?: extensibility.VisualConstructorOptions) => extensibility.IVisual;
+
+        /** The class of the plugin.  At the moment it is only used to have a way to indicate the class name that a custom visual has. */
+        class: string;
+
+        /** Check if a visual is custom */
+        custom: boolean;
+
+        /** The version of the api that this plugin should be run against */
+        apiVersion: string;
+
+        /** Human readable plugin name displayed to users */
+        displayName: string;
+    }
+}
+
+declare namespace jsCommon {
+    interface IStringResourceProvider {
+        get(id: string): string;
+        getOptional(id: string): string;
+    }
+}
+
+declare namespace powerbi {
+    /**
+     * An interface to promise/deferred,
+     * which abstracts away the underlying mechanism (e.g., Angular, jQuery, etc.).
+     */
+
+    interface IPromiseFactory {
+        /**
+         * Creates a Deferred object which represents a task which will finish in the future.
+         */
+        // tslint:disable-next-line
+        defer<T>(): IDeferred<T>;
+
+        /**
+         * Creates a Deferred object which represents a task which will finish in the future.
+         */
+        // tslint:disable-next-line
+        defer<TSuccess, TError>(): IDeferred2<TSuccess, TError>;
+
+        /**
+         * Creates a promise that is resolved as rejected with the specified reason.
+         * This api should be used to forward rejection in a chain of promises.
+         * If you are dealing with the last promise in a promise chain, you don't need to worry about it.
+         * When comparing deferreds/promises to the familiar behavior of try/catch/throw,
+         * think of reject as the throw keyword in JavaScript.
+         * This also means that if you "catch" an error via a promise error callback and you want
+         * to forward the error to the promise derived from the current promise,
+         * you have to "rethrow" the error by returning a rejection constructed via reject.
+         *
+         * @param reason Constant, message, exception or an object representing the rejection reason.
+         */
+        reject<TError>(reason?: TError): IPromise2<any, TError>;
+
+        /**
+         * Creates a promise that is resolved with the specified value.
+         * This api should be used to forward rejection in a chain of promises.
+         * If you are dealing with the last promise in a promise chain, you don't need to worry about it.
+         *
+         * @param value Object representing the promise result.
+         */
+        resolve<TSuccess>(value?: TSuccess): IPromise2<TSuccess, any>;
+
+        /**
+         * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
+         * Rejects immediately if any of the promises fail
+         */
+        all(promises: Array<IPromise2<any, any>>): IPromise<any[]>;
+
+        /**
+         * Combines multiple promises into a single promise that is resolved when all of the input promises are resolved.
+         * Does not resolve until all promises finish (success or failure).
+         */
+        // tslint:disable-next-line
+        allSettled<T>(promises: Array<IPromise2<any, any>>): IPromise<Array<IPromiseResult<T>>>;
+
+        /**
+         * Wraps an object that might be a value or a then-able promise into a promise.
+         * This is useful when you are dealing with an object that might or might not be a promise
+         */
+        when<T>(value: T | IPromise<T>): IPromise<T>;
+    }
+
+    /**
+     * Represents an operation, to be completed (resolve/rejected) in the future.
+     */
+    interface IPromise<T> extends IPromise2<T, T> {// eslint-disable-line interface-name
+    }
+
+    /**
+     * Represents an operation, to be completed (resolve/rejected) in the future.
+     * Success and failure types can be set independently.
+     */
+    interface IPromise2<TSuccess, TError> {
+        /**
+         * Regardless of when the promise was or will be resolved or rejected,
+         * then calls one of the success or error callbacks asynchronously as soon as the result is available.
+         * The callbacks are called with a single argument: the result or rejection reason.
+         * Additionally, the notify callback may be called zero or more times to provide a progress indication,
+         * before the promise is resolved or rejected.
+         * This method returns a new promise which is resolved or rejected via
+         * the return value of the successCallback, errorCallback.
+         */
+        then<TSuccessResult, TErrorResult>(
+            successCallback: (promiseValue: TSuccess) => TSuccessResult | IPromise2<TSuccessResult, TErrorResult>,
+            errorCallback?: (reason: TError) => TErrorResult):
+        IPromise2<TSuccessResult, TErrorResult>;
+
+        /**
+         * Shorthand for promise.then(null, errorCallback).
+         */
+        catch<TErrorResult>(onRejected: (reason: any) => IPromise2<TSuccess, TErrorResult>): IPromise2<TSuccess, TErrorResult>;
+
+        /**
+         * Shorthand for promise.then(null, errorCallback).
+         */
+        catch<TErrorResult>(onRejected: (reason: any) => TErrorResult): IPromise2<TSuccess, TErrorResult>;
+
+        /**
+         * Allows you to observe either the fulfillment or rejection of a promise,
+         * but to do so without modifying the final value.
+         * This is useful to release resources or do some clean-up that needs to be done
+         * whether the promise was rejected or resolved.
+         * See the full specification for more information.
+         * Because finally is a reserved word in JavaScript and reserved keywords
+         * are not supported as property names by ES3, you'll need to invoke
+         * the method like promise['finally'](callback) to make your code IE8 and Android 2.x compatible.
+         */
+        // tslint:disable-next-line
+        finally<T, U>(finallyCallback: () => any): IPromise2<T, U>;
+    }
+
+    interface IDeferred<T> extends IDeferred2<T, T> {
+    }
+
+    interface IDeferred2<TSuccess, TError> {
+        resolve(value: TSuccess): void;
+        reject(reason?: TError): void;
+        promise: IPromise2<TSuccess, TError>;
+    }
+
+    interface RejectablePromise2<T, E> extends IPromise2<T, E> {
+        reject(reason?: E): void;
+        resolved(): boolean;
+        rejected(): boolean;
+        pending(): boolean;
+    }
+
+    interface RejectablePromise<T> extends RejectablePromise2<T, T> {
+    }
+
+    interface IResultCallback<T> {
+        // tslint:disable-next-line
+        (result: T, done: boolean): void;
+    }
+
+    interface IPromiseResult<T> {
+        type: PromiseResultType;
+        value: T;
+    }
+}
+
+declare namespace powerbi.visuals {
+    import Selector = data.Selector;
+	import SelectorsByColumn = data.SelectorsByColumn;
+
+    interface ISelectionIdBuilder {
+        withCategory(categoryColumn: DataViewCategoryColumn, index: number): this;
+        withSeries(seriesColumn: DataViewValueColumns, valueColumn: DataViewValueColumn | DataViewValueColumnGroup): this;
+        withMeasure(measureId: string): this;
+        createSelectionId(): ISelectionId;
+    }
+
+    interface ISelectionId {
+        equals(other: ISelectionId): boolean;
+        includes(other: ISelectionId, ignoreHighlight?: boolean): boolean;
+        getKey(): string;
+        getSelector(): Selector;
+        getSelectorsByColumn(): SelectorsByColumn;
+        hasIdentity(): boolean;
+    }
+}
+
+declare namespace powerbi {
+    const enum SortDirection {
+        Ascending = 1,
+        Descending = 2,
+    }
+}
+
+declare namespace powerbi {
+    /** Represents views of a data set. */
+    interface DataView {
+        metadata: DataViewMetadata;
+        categorical?: DataViewCategorical;
+        single?: DataViewSingle;
+        tree?: DataViewTree;
+        table?: DataViewTable;
+        matrix?: DataViewMatrix;
+        scriptResult?: DataViewScriptResultData;
+    }
+
+    interface DataViewMetadata {
+        columns: DataViewMetadataColumn[];
+
+        /** The metadata repetition objects. */
+        objects?: DataViewObjects;
+
+        /** When defined, describes whether the DataView contains just a segment of the complete data set. */
+        segment?: {};
+
+        /** Describes the data reduction applied to this data set when limits are exceeded. */
+        dataReduction?: DataViewReductionMetadata;
+    }
+
+    interface DataViewMetadataColumn {
+        /** The user-facing display name of the column. */
+        displayName: string;
+
+        /** The query name the source column in the query. */
+        queryName?: string;
+
+        /** The format string of the column. */
+        format?: string; // TODO: Deprecate this, and populate format string through objects instead.
+
+        /** Data type information for the column. */
+        type?: ValueTypeDescriptor;
+
+        /** Indicates that this column is a measure (aggregate) value. */
+        isMeasure?: boolean;
+
+        /** The position of the column in the select statement. */
+        index?: number;
+
+        /** The properties that this column provides to the visualization. */
+        roles?: { [name: string]: boolean };
+
+        /** The metadata repetition objects. */
+        objects?: DataViewObjects;
+
+        /** The name of the containing group. */
+        groupName?: PrimitiveValue;
+
+        /** The sort direction of this column. */
+        sort?: SortDirection;
+
+        /** The order sorts are applied. Lower values are applied first. Undefined indicates no sort was done on this column. */
+        sortOrder?: number;
+
+        /** The KPI metadata to use to convert a numeric status value into its visual representation. */
+        kpi?: DataViewKpiColumnMetadata;
+
+        /** Indicates that aggregates should not be computed across groups with different values of this column. */
+        discourageAggregationAcrossGroups?: boolean;
+
+        /** The aggregates computed for this column, if any. */
+        aggregates?: DataViewColumnAggregates;
+
+        /** The SQExpr this column represents. */
+        expr?: data.ISQExpr;
+
+        /**
+         * The set of expressions that define the identity for instances of this grouping field.
+         * This must be a subset of the items in the DataViewScopeIdentity in the grouped items result.
+         * This property is undefined for measure fields, as well as for grouping fields in DSR generated prior to the CY16SU08 or SU09 timeframe.
+         */
+        identityExprs?: data.ISQExpr[];
+
+        parameter?: {};
+    }
+
+    interface DataViewReductionMetadata {
+        categorical?: DataViewCategoricalReductionMetadata;
+    }
+
+    interface DataViewCategoricalReductionMetadata {
+        categories?: DataViewReductionAlgorithmMetadata;
+        values?: DataViewReductionAlgorithmMetadata;
+        metadata?: DataViewReductionAlgorithmMetadata;
+    }
+
+    interface DataViewReductionAlgorithmMetadata {
+        binnedLineSample?: {};
+    }
+
+    interface DataViewColumnAggregates {
+        subtotal?: PrimitiveValue;
+        max?: PrimitiveValue;
+        min?: PrimitiveValue;
+        average?: PrimitiveValue;
+        median?: PrimitiveValue;
+        count?: number;
+        percentiles?: DataViewColumnPercentileAggregate[];
+
+        /** Represents a single value evaluation, similar to a total. */
+        single?: PrimitiveValue;
+
+        /** Client-computed maximum value for a column. */
+        maxLocal?: PrimitiveValue;
+
+        /** Client-computed maximum value for a column. */
+        minLocal?: PrimitiveValue;
+    }
+
+    interface DataViewColumnPercentileAggregate {
+        exclusive?: boolean;
+        k: number;
+        value: PrimitiveValue;
+    }
+
+    interface DataViewCategorical {
+        categories?: DataViewCategoryColumn[];
+        values?: DataViewValueColumns;
+    }
+
+    interface DataViewCategoricalColumn {
+        source: DataViewMetadataColumn;
+
+        /** The data repetition objects. */
+        objects?: DataViewObjects[];
+    }
+
+    interface DataViewValueColumns extends Array<DataViewValueColumn> {
+        /** Returns an array that groups the columns in this group together. */
+        grouped(): DataViewValueColumnGroup[];
+
+        /** The set of expressions that define the identity for instances of the value group.  This must match items in the DataViewScopeIdentity in the grouped items result. */
+        identityFields?: data.ISQExpr[];
+
+        source?: DataViewMetadataColumn;
+    }
+
+    interface DataViewValueColumnGroup {
+        values: DataViewValueColumn[];
+        identity?: DataViewScopeIdentity;
+
+        /** The data repetition objects. */
+        objects?: DataViewObjects;
+
+        name?: PrimitiveValue;
+    }
+
+    interface DataViewValueColumn extends DataViewCategoricalColumn {
+        values: PrimitiveValue[];
+        highlights?: PrimitiveValue[];
+        identity?: DataViewScopeIdentity;
+    }
+
+    interface DataViewCategoryColumn extends DataViewCategoricalColumn {
+        values: PrimitiveValue[];
+        identity?: DataViewScopeIdentity[];
+
+        /** The set of expressions that define the identity for instances of the category.  This must match items in the DataViewScopeIdentity in the identity. */
+        identityFields?: data.ISQExpr[];
+    }
+
+    interface DataViewSingle {
+        value: PrimitiveValue;
+    }
+
+    interface DataViewTree {
+        root: DataViewTreeNode;
+    }
+
+    interface DataViewTreeNode {
+        name?: PrimitiveValue;
+
+        /**
+         * When used under the context of DataView.tree, this value is one of the elements in the values property.
+         *
+         * When used under the context of DataView.matrix, this property is the value of the particular
+         * group instance represented by this node (e.g. In a grouping on Year, a node can have value == 2016).
+         *
+         * DEPRECATED for usage under the context of DataView.matrix: This property is deprecated for objects
+         * that conform to the DataViewMatrixNode interface (which extends DataViewTreeNode).
+         * New visuals code should consume the new property levelValues on DataViewMatrixNode instead.
+         * If this node represents a composite group node in matrix, this property will be undefined.
+         */
+        value?: PrimitiveValue;
+
+        /**
+         * This property contains all the values in this node.
+         * The key of each of the key-value-pair in this dictionary is the position of the column in the
+         * select statement to which the value belongs.
+         */
+        values?: { [id: number]: DataViewTreeNodeValue };
+
+        children?: DataViewTreeNode[];
+        identity?: DataViewScopeIdentity;
+
+        /** The data repetition objects. */
+        objects?: DataViewObjects;
+
+        /** The set of expressions that define the identity for the child nodes.  This must match items in the DataViewScopeIdentity of those nodes. */
+        childIdentityFields?: data.ISQExpr[];
+    }
+
+    interface DataViewTreeNodeValue {
+        value?: PrimitiveValue;
+    }
+
+    interface DataViewTreeNodeMeasureValue extends DataViewTreeNodeValue, DataViewColumnAggregates {
+        highlight?: PrimitiveValue;
+    }
+
+    interface DataViewTreeNodeGroupValue extends DataViewTreeNodeValue {
+        count?: PrimitiveValue;
+    }
+
+    interface DataViewTable {
+        columns: DataViewMetadataColumn[];
+
+        identity?: DataViewScopeIdentity[];
+
+        /** The set of expressions that define the identity for rows of the table.  This must match items in the DataViewScopeIdentity in the identity. */
+        identityFields?: data.ISQExpr[];
+
+        rows?: DataViewTableRow[];
+
+        totals?: PrimitiveValue[];
+    }
+
+    interface DataViewTableRow extends Array<PrimitiveValue> {
+        /** The data repetition objects. */
+        objects?: DataViewObjects[];
+    }
+
+    interface DataViewMatrix {
+        rows: DataViewHierarchy;
+        columns: DataViewHierarchy;
+
+        /**
+         * The metadata columns of the measure values.
+         * In visual DataView, this array is sorted in projection order.
+         */
+        valueSources: DataViewMetadataColumn[];
+    }
+
+    interface DataViewMatrixNode extends DataViewTreeNode {
+        /** Indicates the level this node is on. Zero indicates the outermost children (root node level is undefined). */
+        level?: number;
+
+        children?: DataViewMatrixNode[];
+
+        /* If this DataViewMatrixNode represents the  inner-most dimension of row groups (i.e. a leaf node), then this property will contain the values at the
+        * matrix intersection under the group. The valueSourceIndex property will contain the position of the column in the select statement to which the
+        * value belongs.
+        *
+        * When this DataViewMatrixNode is used under the context of DataView.matrix.columns, this property is not used.
+        */
+        values?: { [id: number]: DataViewMatrixNodeValue };
+
+        /**
+         * Indicates the source metadata index on the node's level. Its value is 0 if omitted.
+         *
+         * DEPRECATED: This property is deprecated and exists for backward-compatibility only.
+         * New visuals code should consume the new property levelSourceIndex on DataViewMatrixGroupValue instead.
+         */
+        levelSourceIndex?: number;
+
+        /**
+         * The values of the particular group instance represented by this node.
+         * This array property would contain more than one element in a composite group
+         * (e.g. Year == 2016 and Month == 'January').
+         */
+        levelValues?: DataViewMatrixGroupValue[];
+
+        /** Indicates whether or not the node is a subtotal node. Its value is false if omitted. */
+        isSubtotal?: boolean;
+    }
+
+    /**
+     * Represents a value at a particular level of a matrix's rows or columns hierarchy.
+     * In the hierarchy level node is an instance of a composite group, this object will
+     * be one of multiple values
+     */
+    interface DataViewMatrixGroupValue extends DataViewTreeNodeValue {
+        /**
+         * Indicates the index of the corresponding column for this group level value
+         * (held by DataViewHierarchyLevel.sources).
+         *
+         * @example
+         * // For example, to get the source column metadata of each level value at a particular row hierarchy node:
+         * let matrixRowsHierarchy: DataViewHierarchy = dataView.matrix.rows;
+         * let targetRowsHierarchyNode = <DataViewMatrixNode>matrixRowsHierarchy.root.children[0];
+         * // Use the DataViewMatrixNode.level property to get the corresponding DataViewHierarchyLevel...
+         * let targetRowsHierarchyLevel: DataViewHierarchyLevel = matrixRows.levels[targetRowsHierarchyNode.level];
+         * for (let levelValue in rowsRootNode.levelValues) {
+         *   // columnMetadata is the source column for the particular levelValue.value in this loop iteration
+         *   let columnMetadata: DataViewMetadataColumn =
+         *     targetRowsHierarchyLevel.sources[levelValue.levelSourceIndex];
+         * }
+         */
+        levelSourceIndex: number;
+    }
+
+    /** Represents a value at the matrix intersection, used in the values property on DataViewMatrixNode (inherited from DataViewTreeNode). */
+    interface DataViewMatrixNodeValue extends DataViewTreeNodeValue {
+        highlight?: PrimitiveValue;
+
+        /** The data repetition objects. */
+        objects?: DataViewObjects;
+
+        /** Indicates the index of the corresponding measure (held by DataViewMatrix.valueSources). Its value is 0 if omitted. */
+        valueSourceIndex?: number;
+    }
+
+    interface DataViewHierarchy {
+        root: DataViewMatrixNode;
+        levels: DataViewHierarchyLevel[];
+    }
+
+    interface DataViewHierarchyLevel {
+        /**
+         * The metadata columns of this hierarchy level.
+         * In visual DataView, this array is sorted in projection order.
+         */
+        sources: DataViewMetadataColumn[];
+    }
+
+    interface DataViewKpiColumnMetadata {
+        graphic: string;
+
+        // When false, five state KPIs are in: { -2, -1, 0, 1, 2 }.
+        // When true, five state KPIs are in: { -1, -0.5, 0, 0.5, 1 }.
+        normalizedFiveStateKpiRange?: boolean;
+    }
+
+    interface DataViewScriptResultData {
+        payloadBase64: string;
+    }
+
+    interface ValueRange<T> {
+        min?: T;
+        max?: T;
+    }
+
+    /** Defines the acceptable values of a number. */
+    type NumberRange = ValueRange<number>;
+
+    /** Defines the PrimitiveValue range. */
+    type PrimitiveValueRange = ValueRange<PrimitiveValue>;
+}
+
+declare namespace powerbi {
+    /** Represents evaluated, named, custom objects in a DataView. */
+    interface DataViewObjects {
+        [name: string]: DataViewObject;
+    }
+
+    /** Represents an object (name-value pairs) in a DataView. */
+    interface DataViewObject {
+        /** Map of property name to property value. */
+        [propertyName: string]: DataViewPropertyValue | DataViewObjectMap;
+
+        /** Instances of this object. When there are multiple instances with the same object name they will appear here. */
+        // $instances?: DataViewObjectMap; - moved to indexed property as optional type
+    }
+
+    interface DataViewObjectWithId {
+        id: string;
+        object: DataViewObject;
+    }
+
+    interface DataViewObjectPropertyIdentifier {
+        objectName: string;
+        propertyName: string;
+    }
+
+    interface DataViewObjectMap {
+        [id: string]: DataViewObject;
+    }
+
+    type DataViewPropertyValue = PrimitiveValue | StructuralObjectValue;
+}
+
+declare namespace powerbi.data {
+    /** Defines a match against all instances of given roles. */
+    interface DataViewRoleWildcard {
+        kind: DataRepetitionKind.RoleWildcard;
+        roles: string[];
+        key: string;
+    }
+}
+
+declare namespace powerbi {
+    /** Encapsulates the identity of a data scope in a DataView. */
+    interface DataViewScopeIdentity {
+        kind: DataRepetitionKind.ScopeIdentity;
+
+        /** Predicate expression that identifies the scope. */
+        expr: data.ISQExpr;
+
+        /** Key string that identifies the DataViewScopeIdentity to a string, which can be used for equality comparison. */
+        key: string;
+    }
+}
+
+declare namespace powerbi.data {
+    /** Defines a match against all instances of a given DataView scope. Does not match Subtotals. */
+    interface DataViewScopeWildcard {
+        kind: DataRepetitionKind.ScopeWildcard;
+        exprs: ISQExpr[];
+        key: string;
+    }
+}
+
+declare namespace powerbi.data {
+    import IStringResourceProvider = jsCommon.IStringResourceProvider;
+
+    type DisplayNameGetter = ((resourceProvider: IStringResourceProvider) => string) | string;
+}
+
+declare namespace powerbi.data {
+    /** Defines a selector for content, including data-, metadata, and user-defined repetition. */
+    interface Selector {
+        /** Data-bound repetition selection. */
+        data?: DataRepetitionSelector[];
+
+        /** Metadata-bound repetition selection.  Refers to a DataViewMetadataColumn queryName. */
+        metadata?: string;
+
+        /** User-defined repetition selection. */
+        id?: string;
+    }
+
+    type DataRepetitionSelector =
+        DataViewScopeIdentity |
+        DataViewScopeWildcard |
+        DataViewRoleWildcard |
+        DataViewScopeTotal;
+
+	interface SelectorsByColumn {
+        key?: string;
+    }
+}
+
+declare namespace powerbi.data {
+    // intentionally blank interfaces since this is not part of the public API
+
+    interface ISemanticFilter {
+        whereItems?: {};
+    }
+
+    interface ISQExpr {
+        left?: ISQExpr;
+        right?: ISQExpr;
+        args?: ISQExpr;
+    }
+
+    interface ISQConstantExpr extends ISQExpr {
+        kind?: number;
+    }
+}
+
+declare namespace powerbi {
+    /** Kind of the Data Repetition Selector */
+    const enum DataRepetitionKind {
+        RoleWildcard = 0,
+        ScopeIdentity = 1,
+        ScopeTotal = 2,
+        ScopeWildcard = 3,
+    }
+}
+
+declare namespace powerbi.data {
+    /** Defines a match against any Total within a given DataView scope. */
+    interface DataViewScopeTotal {
+        kind: DataRepetitionKind.ScopeTotal;
+
+        /* The exprs defining the scope that this Total has been evaluated for
+         * It's an array to support expressing Total across a composite group
+         * Example: If this represents Total sales of USA across States, the Exprs wil refer to "States"
+        */
+        exprs: ISQExpr[];
+
+        key: string;
+    }
+}
+
+declare namespace powerbi {
+    interface DefaultValueDefinition {
+        value: data.ISQConstantExpr;
+        identityFieldsValues?: data.ISQConstantExpr[];
+    }
+
+    interface DefaultValueTypeDescriptor {
+        defaultValue: boolean;
+    }
+}
+
+declare namespace powerbi {
+    import DisplayNameGetter = data.DisplayNameGetter;
+
+    type EnumMemberValue = string | number;
+
+    interface IEnumMember {
+        value: EnumMemberValue;
+        displayName: DisplayNameGetter;
+    }
+
+    /** Defines a custom enumeration data type, and its values. */
+    interface IEnumType {
+        /** Gets the members of the enumeration, limited to the validMembers, if appropriate. */
+        members(validMembers?: EnumMemberValue[]): IEnumMember[];
+    }
+}
+
+declare namespace powerbi {
+    interface Fill {
+        solid?: {
+            color?: string;
+        };
+        gradient?: {
+            startColor?: string;
+            endColor?: string;
+        };
+        pattern?: {
+            patternKind?: string;
+            color?: string;
+        };
+    }
+
+    interface FillTypeDescriptor {
+        solid?: {
+            color?: FillSolidColorTypeDescriptor;
+        };
+        gradient?: {
+            startColor?: boolean;
+            endColor?: boolean;
+        };
+        pattern?: {
+            patternKind?: boolean;
+            color?: boolean;
+        };
+    }
+
+    type FillSolidColorTypeDescriptor = boolean | FillSolidColorAdvancedTypeDescriptor;
+
+    interface FillSolidColorAdvancedTypeDescriptor {
+        /** Indicates whether the color value may be nullable, and a 'no fill' option is appropriate. */
+        nullable: boolean;
+    }
+}
+
+declare namespace powerbi {
+    interface FillRule extends FillRuleGeneric<string, number, string> {
+    }
+
+    interface FillRuleGeneric<TColor, TValue, TStrategy> {
+        linearGradient2?: LinearGradient2Generic<TColor, TValue, TStrategy>;
+        linearGradient3?: LinearGradient3Generic<TColor, TValue, TStrategy>;
+
+        // stepped2?
+        // ...
+    }
+
+    interface LinearGradient2Generic<TColor, TValue, TStrategy> {
+        max: RuleColorStopGeneric<TColor, TValue>;
+        min: RuleColorStopGeneric<TColor, TValue>;
+        nullColoringStrategy?: NullColoringStrategyGeneric<TStrategy, TColor>;
+    }
+    interface LinearGradient3Generic<TColor, TValue, TStrategy> {
+        max: RuleColorStopGeneric<TColor, TValue>;
+        mid: RuleColorStopGeneric<TColor, TValue>;
+        min: RuleColorStopGeneric<TColor, TValue>;
+        nullColoringStrategy?: NullColoringStrategyGeneric<TStrategy, TColor>;
+    }
+
+    interface RuleColorStopGeneric<TColor, TValue> {
+        color: TColor;
+        value?: TValue;
+    }
+
+    interface NullColoringStrategyGeneric<TStrategy, TColor> {
+        strategy: TStrategy;
+        /**
+         * Only used if strategy is specificColor
+         */
+        color?: TColor;
+    }
+}
+
+declare namespace powerbi {
+    interface FilterTypeDescriptor {
+        selfFilter?: boolean;
+    }
+}
+
+declare namespace powerbi {
+    type GeoJson = GeoJsonDefinitionGeneric<string>;
+
+    interface GeoJsonDefinitionGeneric<T> {
+        type: T;
+        name: T;
+        content: T;
+    }
+}
+
+declare namespace powerbi {
+    type ImageValue = ImageDefinitionGeneric<string>;
+
+    interface ImageDefinitionGeneric<T> {
+        name: T;
+        url: T;
+        scaling?: T;
+    }
+}
+
+declare namespace powerbi {
+    import ISQExpr = data.ISQExpr;
+
+    type Paragraphs = Paragraph[];
+
+    interface Paragraph {
+        horizontalTextAlignment?: string;
+        textRuns: TextRun[];
+    }
+
+    interface TextRunStyle {
+        fontFamily?: string;
+        fontSize?: string;
+        fontStyle?: string;
+        fontWeight?: string;
+        color?: string;
+        textDecoration?: string;
+    }
+
+    interface TextRun {
+        textStyle?: TextRunStyle;
+        url?: string;
+        value: string;
+        valueExpr?: ISQExpr;
+    }
+}
+
+declare namespace powerbi {
+    import SemanticFilter = data.ISemanticFilter;
+
+    /** Defines instances of structural types. */
+    type StructuralObjectValue =
+        Fill |
+        FillRule |
+        SemanticFilter |
+        DefaultValueDefinition |
+        ImageValue |
+        Paragraphs |
+        GeoJson |
+        DataBars;
+
+    /** Describes a structural type in the client type system. Leaf properties should use ValueType. */
+    interface StructuralTypeDescriptor {
+        fill?: FillTypeDescriptor;
+        fillRule?: {};
+        filter?: FilterTypeDescriptor;
+        expression?: DefaultValueTypeDescriptor;
+        image?: {};
+        paragraphs?: {};
+        geoJson?: {};
+        queryTransform?: {};
+        dataBars?: {};
+    }
+}
+
+declare namespace powerbi {
+    /** Describes a data value type in the client type system. Can be used to get a concrete ValueType instance. */
+    interface ValueTypeDescriptor {
+        // Simplified primitive types
+        readonly text?: boolean;
+        readonly numeric?: boolean;
+        readonly integer?: boolean;
+        readonly bool?: boolean;
+        readonly dateTime?: boolean;
+        readonly duration?: boolean;
+        readonly binary?: boolean;
+        readonly none?: boolean; // TODO: 5005022 remove none type when we introduce property categories.
+
+        // Extended types
+        readonly temporal?: TemporalTypeDescriptor;
+        readonly geography?: GeographyTypeDescriptor;
+        readonly misc?: MiscellaneousTypeDescriptor;
+        readonly formatting?: FormattingTypeDescriptor;
+        /*readonly*/ enumeration?: IEnumType;
+        readonly scripting?: ScriptTypeDescriptor;
+        readonly operations?: OperationalTypeDescriptor;
+
+        // variant types
+        readonly variant?: ValueTypeDescriptor[];
+    }
+
+    interface ScriptTypeDescriptor {
+        readonly source?: boolean;
+    }
+
+    interface TemporalTypeDescriptor {
+        readonly year?: boolean;
+        readonly quarter?: boolean;
+        readonly month?: boolean;
+        readonly day?: boolean;
+        readonly paddedDateTableDate?: boolean;
+    }
+
+    interface GeographyTypeDescriptor {
+        readonly address?: boolean;
+        readonly city?: boolean;
+        readonly continent?: boolean;
+        readonly country?: boolean;
+        readonly county?: boolean;
+        readonly region?: boolean;
+        readonly postalCode?: boolean;
+        readonly stateOrProvince?: boolean;
+        readonly place?: boolean;
+        readonly latitude?: boolean;
+        readonly longitude?: boolean;
+    }
+
+    interface MiscellaneousTypeDescriptor {
+        readonly image?: boolean;
+        readonly imageUrl?: boolean;
+        readonly webUrl?: boolean;
+        readonly barcode?: boolean;
+    }
+
+    interface FormattingTypeDescriptor {
+        readonly color?: boolean;
+        readonly formatString?: boolean;
+        readonly alignment?: boolean;
+        readonly labelDisplayUnits?: boolean;
+        readonly fontSize?: boolean;
+        readonly fontFamily?: boolean;
+        readonly labelDensity?: boolean;
+        readonly bubbleSize?: boolean;
+        readonly altText?: boolean;
+    }
+
+    interface OperationalTypeDescriptor {
+        readonly searchEnabled?: boolean;
+    }
+
+    /** Describes instances of value type objects. */
+    type PrimitiveValue = string | number | boolean | Date;
+}
+
+declare namespace powerbi {
+    interface DataBars {
+        minValue?: number;
+        maxValue?: number;
+        positiveColor: Fill;
+        negativeColor: Fill;
+        axisColor: Fill;
+        reverseDirection: boolean;
+        hideText: boolean;
+    }
+}
+
+declare namespace powerbi {
+    interface IViewport {
+        height: number;
+        width: number;
+    }
+
+    interface ScaledViewport extends IViewport {
+        scale: number;
+    }
+}
+
+declare namespace powerbi {
+    import Selector = data.Selector;
+
+    interface VisualObjectInstance {
+        /** The name of the object (as defined in VisualCapabilities). */
+        objectName: string;
+
+        /** A display name for the object instance. */
+        displayName?: string;
+
+        /** The set of property values for this object.  Some of these properties may be defaults provided by the IVisual. */
+        properties: {
+            [propertyName: string]: DataViewPropertyValue;
+        };
+
+        /** The selector that identifies this object. */
+        selector: Selector;
+
+        /** (Optional) Defines the constrained set of valid values for a property. */
+        validValues?: {
+            [propertyName: string]: string[] | ValidationOptions;
+        };
+
+        /** (Optional) VisualObjectInstanceEnumeration category index. */
+        containerIdx?: number;
+
+        /** (Optional) Set the required type for particular properties that support variant types. */
+        propertyTypes?: {
+            [propertyName: string]: ValueTypeDescriptor;
+        };
+    }
+
+    type VisualObjectInstanceEnumeration = VisualObjectInstance[] | VisualObjectInstanceEnumerationObject;
+
+    interface ValidationOptions {
+        numberRange?: NumberRange;
+    }
+
+    interface VisualObjectInstanceEnumerationObject {
+        /** The visual object instances. */
+        instances: VisualObjectInstance[];
+
+        /** Defines a set of containers for related object instances. */
+        containers?: VisualObjectInstanceContainer[];
+    }
+
+    interface VisualObjectInstanceContainer {
+        displayName: data.DisplayNameGetter;
+    }
+
+    interface VisualObjectInstancesToPersist {
+        /** Instances which should be merged with existing instances. */
+        merge?: VisualObjectInstance[];
+
+        /** Instances which should replace existing instances. */
+        replace?: VisualObjectInstance[];
+
+        /** Instances which should be deleted from the existing instances. */
+        remove?: VisualObjectInstance[];
+
+        /** Instances which should be deleted from the existing objects. */
+        removeObject?: VisualObjectInstance[];
+    }
+
+    interface EnumerateVisualObjectInstancesOptions {
+        objectName: string;
+    }
+}
+
+declare namespace powerbi {
+    import Selector = data.Selector;
+
+    interface VisualObjectRepetition {
+        /** The selector that identifies the objects. */
+        selector: Selector;
+
+        /** Used to group differernt repetitions into containers. That will be used as the container displayName in the PropertyPane */
+        containerName?: string;
+
+        /** The set of repetition descriptors for this object. */
+        objects: {
+            [objectName: string]: DataViewRepetitionObjectDescriptor;
+        };
+    }
+
+    interface DataViewRepetitionObjectDescriptor {
+        /** Properties used for formatting (e.g., Conditional Formatting). */
+        formattingProperties?: string[];
+    }
+}
+
+declare namespace powerbi.extensibility {
+    interface IVisualPluginOptions {
+        transform?: IVisualDataViewTransform;
+    }
+
+    interface IVisualConstructor {
+        __transform__?: IVisualDataViewTransform;
+    }
+
+    interface IVisualDataViewTransform {
+        // tslint:disable-next-line
+        <T>(dataview: DataView[]): T;
+    }
+
+    // These are the base interfaces. These should remain empty
+    // All visual versions should extend these for type compatability
+
+    interface IVisual {
+        /** Notifies the visual that it is being destroyed, and to do any cleanup necessary (such as unsubscribing event handlers). */
+        destroy?(): void;
+    }
+
+    interface IVisualHost {
+        instanceId: string;
+    }
+
+    interface VisualUpdateOptions {
+        type: VisualUpdateType;
+    }
+
+    interface VisualConstructorOptions {
+        /** The loaded module, if any, defined by the IVisualPlugin.module. */
+        module?: any;
+    }
+}
+
+declare namespace powerbi {
+    interface IColorInfo extends IStyleInfo {
+        value: string;
+    }
+
+    interface IStyleInfo {
+        className?: string;
+    }
+}
+
+declare namespace powerbi.extensibility {
+    interface ISelectionManager {
+        select(selectionId: visuals.ISelectionId | visuals.ISelectionId[], multiSelect?: boolean): IPromise<visuals.ISelectionId[]>;
+        hasSelection(): boolean;
+        clear(): IPromise<{}>;
+        getSelectionIds(): visuals.ISelectionId[];
+        applySelectionFilter(): void;
+        registerOnSelectCallback(callback: (ids: visuals.ISelectionId[]) => void): void;
+    }
+}
+
+declare namespace powerbi.extensibility {
+    interface ISelectionIdBuilder {
+        withCategory(categoryColumn: DataViewCategoryColumn, index: number): this;
+        withSeries(seriesColumn: DataViewValueColumns, valueColumn: DataViewValueColumn | DataViewValueColumnGroup): this;
+        withMeasure(measureId: string): this;
+        createSelectionId(): visuals.ISelectionId;
+    }
+}
+
+declare namespace powerbi.extensibility {
+    interface IColorPalette {
+        getColor(key: string): IColorInfo;
+    }
+}
+
+declare namespace powerbi.extensibility {
+    interface VisualTooltipDataItem {
+        displayName: string;
+        value: string;
+        color?: string;
+        header?: string;
+        opacity?: string;
+    }
+
+    interface TooltipMoveOptions {
+        coordinates: number[];
+        isTouchEvent: boolean;
+        dataItems?: VisualTooltipDataItem[];
+        identities: visuals.ISelectionId[];
+    }
+
+    interface TooltipShowOptions extends TooltipMoveOptions {
+        dataItems: VisualTooltipDataItem[];
+    }
+
+    interface TooltipHideOptions {
+        isTouchEvent: boolean;
+        immediately: boolean;
+    }
+
+    interface ITooltipService {
+        enabled(): boolean;
+        show(options: TooltipShowOptions): void;
+        move(options: TooltipMoveOptions): void;
+        hide(options: TooltipHideOptions): void;
+    }
+}
+
+declare namespace powerbi.extensibility {
+    interface ITelemetryService {
+        readonly instanceId: string;
+        trace(type: VisualEventType, payload?: string): void;
+    }
+}
+
+declare namespace powerbi.extensibility {
+    function VisualPlugin(options: IVisualPluginOptions): ClassDecorator;
+}
+
+declare namespace powerbi.extensibility {
+    interface ILocalizationManager {
+        getDisplayName(key: string): string;
+    }
+}
+
+declare namespace powerbi.extensibility {
+    interface IAuthenticationService {
+        getAADToken(visualId?: string): IPromise<string>;
+    }
+}
+
+declare namespace powerbi {
+    interface IFilter {
+        conditions?: any;
+    }
+}
+
+/**
+ * Change Log Version 1.11.0
+ * Added `selectionManager.registerOnSelectCallback()` method for Report Bookmarks support
+ */
+
+declare namespace powerbi.extensibility.visual {
+    /**
+     * Represents a visualization displayed within an application (PowerBI dashboards, ad-hoc reporting, etc.).
+     * This interface does not make assumptions about the underlying JS/HTML constructs the visual uses to render itself.
+     */
+    interface IVisual extends extensibility.IVisual {
+        /** Notifies the IVisual of an update (data, viewmode, size change). */
+        // tslint:disable-next-line
+        update<T>(options: VisualUpdateOptions, viewModel?: T): void;
+
+        /** Gets the set of objects that the visual is currently displaying. */
+        enumerateObjectInstances?(options: EnumerateVisualObjectInstancesOptions): VisualObjectInstanceEnumeration;
+    }
+
+    interface IVisualHost extends extensibility.IVisualHost {
+        createSelectionIdBuilder: () => visuals.ISelectionIdBuilder;
+        createSelectionManager: () => ISelectionManager;
+        colorPalette: IColorPalette;
+        persistProperties: (changes: VisualObjectInstancesToPersist) => void;
+        applyJsonFilter: (filter: IFilter, objectName: string, propertyName: string, action: FilterAction) => void;
+        tooltipService: ITooltipService;
+        telemetry: ITelemetryService;
+        authenticationService: IAuthenticationService;
+        locale: string;
+        allowInteractions: boolean;
+        launchUrl: (url: string) => void;
+        refreshHostData: () => void;
+        createLocalizationManager: () => ILocalizationManager;
+    }
+
+    interface VisualUpdateOptions extends extensibility.VisualUpdateOptions {
+        viewport: IViewport;
+        dataViews: DataView[];
+        viewMode?: ViewMode;
+        editMode?: EditMode;
+    }
+
+    interface VisualConstructorOptions extends extensibility.VisualConstructorOptions {
+        element: HTMLElement;
+        host: IVisualHost;
+    }
+}
+
+export default powerbi;
diff --git a/types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts b/types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts
new file mode 100644
index 0000000000..d6bce0acea
--- /dev/null
+++ b/types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts
@@ -0,0 +1,110 @@
+import powerbi from './index';
+
+import IVisualPlugin = powerbi.visuals.plugins.IVisualPlugin;
+import IVisual = powerbi.extensibility.visual.IVisual;
+
+const visualPlugin: IVisualPlugin = {
+    name: 'string',
+    create: (options?: powerbi.extensibility.VisualConstructorOptions) => {
+        const value: IVisual = {
+            update: (options: powerbi.extensibility.VisualUpdateOptions) => {}
+        };
+        return value;
+    },
+    class: 'string',
+    custom: true,
+    apiVersion: "1.11.0",
+    displayName: "string"
+};
+
+import ISelectionIdBuilder = powerbi.visuals.ISelectionIdBuilder;
+import ISelectionId = powerbi.visuals.ISelectionId;
+
+const selectionBuilder: ISelectionIdBuilder = {
+    withCategory: (categoryColumn: powerbi.DataViewCategoryColumn, index: number): ISelectionIdBuilder => {
+        return selectionBuilder;
+    },
+    withSeries: (ser: powerbi.DataViewValueColumns, val: powerbi.DataViewValueColumn | powerbi.DataViewValueColumnGroup): ISelectionIdBuilder => {
+        return selectionBuilder;
+    },
+    withMeasure: (measure: string): ISelectionIdBuilder => {
+        return selectionBuilder;
+    },
+    createSelectionId: (): ISelectionId => {
+        const selection: ISelectionId = {
+            equals: (sel: ISelectionId) => false,
+            includes: (sel: ISelectionId, ignoreHL: boolean) => false,
+            getKey: () => "string",
+            getSelector: () => {
+                const selector: powerbi.data.Selector = {
+                };
+                return selector;
+            },
+            getSelectorsByColumn: () => {
+                const selector: powerbi.data.SelectorsByColumn = {
+                };
+                return selector;
+            },
+            hasIdentity: () => false
+        };
+        return selection;
+    }
+};
+
+import DataView = powerbi.DataView;
+import DataViewMetadata = powerbi.DataViewMetadata;
+import DataViewCategorical = powerbi.DataViewCategorical;
+import DataViewSingle = powerbi.DataViewSingle;
+import DataViewTree = powerbi.DataViewTree;
+import DataViewTable = powerbi.DataViewTable;
+import DataViewMatrix = powerbi.DataViewMatrix;
+import DataViewScriptResultData = powerbi.DataViewScriptResultData;
+
+const dataView: DataView = {
+    metadata: {
+        columns: [
+        ],
+        objects: undefined,
+        dataReduction: undefined,
+        segment: {
+        }
+    },
+    categorical: {
+        categories: [
+            {
+                identity: [
+                    {
+                        expr: {},
+                        key: "string",
+                        kind: powerbi.DataRepetitionKind.ScopeIdentity
+                    }
+                ],
+                identityFields: [],
+                objects: undefined,
+                source: {
+                    displayName: "string",
+                    format: "string",
+                    groupName: "string",
+                    objects: undefined,
+                    aggregates: {
+                        average: true
+                    },
+                    isMeasure: false,
+                    queryName: "string",
+                    sort: powerbi.SortDirection.Ascending || powerbi.SortDirection.Descending,
+                    index: 0,
+                    type: {
+                        text: true
+                    },
+                    sortOrder: 0,
+                    kpi: {
+                        graphic: "string",
+                        normalizedFiveStateKpiRange: false
+                    }
+                },
+                values: []
+            }
+        ],
+        values: undefined
+    }
+};
diff --git a/types/powerbi-visuals-tools/tsconfig.json b/types/powerbi-visuals-tools/tsconfig.json
new file mode 100644
index 0000000000..6b8b1f5507
--- /dev/null
+++ b/types/powerbi-visuals-tools/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",
+        "powerbi-visuals-tools-tests.ts"
+    ]
+}
diff --git a/types/powerbi-visuals-tools/tslint.json b/types/powerbi-visuals-tools/tslint.json
new file mode 100644
index 0000000000..aea589947e
--- /dev/null
+++ b/types/powerbi-visuals-tools/tslint.json
@@ -0,0 +1,9 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-relative-import-in-test": false,
+        "interface-name": false,
+        "no-mergeable-namespace": false,
+        "no-const-enum": false
+    }
+}

From 4d232442faeb650ceff7557e0d709f188bd7f27b Mon Sep 17 00:00:00 2001
From: Tony Trinh <tony19@gmail.com>
Date: Mon, 7 May 2018 12:37:42 -0500
Subject: [PATCH 0047/1124] feat: Add declarations for andyhu/transliteration
 (#25542)

* feat(andyhu/transliteration): Add types

* Remove unnecessary module declaration

* Set tsc strictFunctionTypes to true
---
 types/transliteration/index.d.ts              | 68 +++++++++++++++++++
 .../transliteration/transliteration-tests.ts  | 40 +++++++++++
 types/transliteration/tsconfig.json           | 23 +++++++
 types/transliteration/tslint.json             |  1 +
 4 files changed, 132 insertions(+)
 create mode 100644 types/transliteration/index.d.ts
 create mode 100644 types/transliteration/transliteration-tests.ts
 create mode 100644 types/transliteration/tsconfig.json
 create mode 100644 types/transliteration/tslint.json

diff --git a/types/transliteration/index.d.ts b/types/transliteration/index.d.ts
new file mode 100644
index 0000000000..6e74e8d1aa
--- /dev/null
+++ b/types/transliteration/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for transliteration 1.6
+// Project: https://github.com/andyhu/transliteration#readme
+// Definitions by: Anthony Trinh <https://github.com/tony19>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function transliterate(str: string, options?: transliterate.Options): string;
+
+export namespace transliterate {
+    /**
+     * Bind options globally so any following calls will be using
+     * optionsObj by default. If optionsObj argument is omitted,
+     * it will return current default option object.
+     */
+    function config(optionsObj?: Options): Options;
+
+    interface Options {
+        /**
+         * Unicode characters that are not in the database will be replaced with `unknown`
+         * default: "[?]"
+         */
+        unknown?: string;
+
+        /**
+         * Custom replacement of the strings before transliteration
+         */
+        replace?: string[][] |  {[source: string]: string};
+
+        /**
+         * Strings in the ignore list will be bypassed from transliteration
+         */
+        ignore?: string[];
+    }
+}
+
+export function slugify(str: string, options?: slugify.Options): string;
+
+export namespace slugify {
+    /**
+     * Bind options globally so any following calls will be using
+     * optionsObj by default. If optionsObj argument is omitted,
+     * it will return current default option object.
+     */
+    function config(optionsObj?: Options): Options;
+
+    interface Options {
+        /**
+         * Whether to force slugs to be lowercased
+         * default: true
+         */
+        lowercase?: boolean;
+
+        /**
+         * Separator of the slug
+         * default: "-"
+         */
+        separator?: string;
+
+        /**
+         * Custom replacement of the strings before transliteration
+         */
+        replace?: string[][] |  {[source: string]: string};
+
+        /**
+         * Strings in the ignore list will be bypassed from transliteration
+         */
+        ignore?: string[];
+    }
+}
diff --git a/types/transliteration/transliteration-tests.ts b/types/transliteration/transliteration-tests.ts
new file mode 100644
index 0000000000..fd9bef63c1
--- /dev/null
+++ b/types/transliteration/transliteration-tests.ts
@@ -0,0 +1,40 @@
+import { transliterate as tr, slugify } from 'transliteration';
+
+tr('你好，世界'); // Ni Hao , Shi Jie
+tr('Γεια σας, τον κόσμο'); // Geia sas, ton kosmo
+tr('안녕하세요, 세계'); // annyeonghaseyo, segye
+tr('你好，世界', { replace: {你: 'You'}, ignore: ['好'] }); // You 好, Shi Jie
+tr('你好，世界', { replace: [['你', 'You']], ignore: ['好'] }); // You 好, Shi Jie (option in array form)
+// or use configurations
+tr.config({ replace: [['你', 'You']], ignore: ['好'] });
+tr('你好，世界'); // You 好, Shi Jie
+// get configurations
+const opt1 = tr.config();
+opt1.ignore = ['foo', 'bar', 'baz'];
+opt1.ignore = undefined;
+opt1.replace = [['a', 'foo'], ['b', 'bar']];
+opt1.replace = {a: 'foo', b: 'bar', c: 'baz'};
+opt1.replace = undefined;
+opt1.unknown = '***?***';
+opt1.unknown = undefined;
+
+slugify('你好，世界'); // ni-hao-shi-jie
+slugify('你好，世界', { lowercase: false, separator: '_' }); // Ni_Hao_Shi_Jie
+slugify('你好，世界', { replace: {你好: 'Hello', 世界: 'world'}, separator: '_' }); // hello_world
+slugify('你好，世界', { replace: [['你好', 'Hello'], ['世界', 'world']], separator: '_' }); // hello_world (option in array form)
+slugify('你好，世界', { ignore: ['你好'] }); // 你好shi-jie
+// or use configurations
+slugify.config({ lowercase: false, separator: '_' });
+slugify('你好，世界'); // Ni_Hao_Shi_Jie
+// get configurations
+const opt2 = slugify.config();
+opt2.ignore = ['foo', 'bar', 'baz'];
+opt2.ignore = undefined;
+opt2.replace = [['a', 'foo'], ['b', 'bar']];
+opt2.replace = {a: 'foo', b: 'bar', c: 'baz'};
+opt2.replace = undefined;
+opt2.lowercase = false;
+opt2.lowercase = true;
+opt2.lowercase = undefined;
+opt2.separator = ';';
+opt2.separator = undefined;
diff --git a/types/transliteration/tsconfig.json b/types/transliteration/tsconfig.json
new file mode 100644
index 0000000000..152b73f04a
--- /dev/null
+++ b/types/transliteration/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",
+        "transliteration-tests.ts"
+    ]
+}
diff --git a/types/transliteration/tslint.json b/types/transliteration/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/transliteration/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4d1a953ea93061865064a37bc0c6ff55304f2c5e Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Mon, 7 May 2018 10:42:21 -0700
Subject: [PATCH 0048/1124] fix: add `defined` method on `is` npm module
 (#25467)

---
 types/is/index.d.ts  | 15 +++++++++++++++
 types/is/is-tests.ts |  6 ++++++
 2 files changed, 21 insertions(+)

diff --git a/types/is/index.d.ts b/types/is/index.d.ts
index 3b70472d65..37b485e0a0 100644
--- a/types/is/index.d.ts
+++ b/types/is/index.d.ts
@@ -87,6 +87,11 @@ interface IsStatic {
      */
     undefined(value: any): boolean;
 
+    /**
+     * Checks if the given value type is defined.
+     */
+    defined(value: any): boolean;
+
     /**
      * Checks if the given value types are same type.
      */
@@ -748,6 +753,16 @@ interface IsStaticApi {
      */
     undefined(value: any[]): boolean;
 
+    /**
+     * Checks if the given value type is defined.
+     */
+    defined(...value: any[]): boolean;
+
+    /**
+     * Checks if the given value type is defined.
+     */
+    defined(value: any[]): boolean;
+
     //#endregion
 
     //#region Presence checks
diff --git a/types/is/is-tests.ts b/types/is/is-tests.ts
index 0084de8990..77a88a81b3 100644
--- a/types/is/is-tests.ts
+++ b/types/is/is-tests.ts
@@ -104,6 +104,12 @@ is.all.undefined(undefined, 1);
 is.any.undefined(undefined, 2);
 is.all.undefined([{}, undefined]);
 
+is.defined(undefined);
+is.not.defined(null);
+is.all.defined(undefined, 1);
+is.any.defined(undefined, 2);
+is.all.defined([{}, undefined]);
+
 is.sameType(42, 7);
 is.sameType(42, '7');
 is.not.sameType(42, 7);

From b6c615262484d6db3cf7a491670d6f26270aa0fb Mon Sep 17 00:00:00 2001
From: Hanai <ihanai1991@gmail.com>
Date: Tue, 8 May 2018 01:43:12 +0800
Subject: [PATCH 0049/1124] [react-faux-dom] Omit ReactFauxDomProps (#25371)

* [react-faux-dom] Omit ReactFauxDomProps

* [react-faux-dom] update tslint rules

strict-export-declare-modifiers: false

* [react-faux-dom] replace Omit<T, K>

replace Omit<T, K> with Pick<T, Exclude<keyof T, K>>
---
 types/react-faux-dom/index.d.ts  | 5 +++--
 types/react-faux-dom/tslint.json | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/react-faux-dom/index.d.ts b/types/react-faux-dom/index.d.ts
index 5b56953198..5c68b4ad39 100644
--- a/types/react-faux-dom/index.d.ts
+++ b/types/react-faux-dom/index.d.ts
@@ -3,8 +3,9 @@
 // Definitions by: Ali Taheri Moghaddar <https://github.com/alitaheri>
 //                 Cleve Littlefield <https://github.com/cleverguy25>
 //                 Michał Kostrzyński <https://github.com/deviousm>
+//                 Hanai <https://github.com/hanai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
@@ -34,4 +35,4 @@ export interface ReactFauxDomProps {
     isAnimatingFauxDOM(): boolean;
 }
 
-export function withFauxDOM<P>(WrappedComponent: any): React.ClassicComponentClass<P & ReactFauxDomProps>;
+export function withFauxDOM<P>(WrappedComponent: React.ComponentClass<P>): React.ComponentClass<Pick<P, Exclude<keyof P, keyof ReactFauxDomProps>>>;
diff --git a/types/react-faux-dom/tslint.json b/types/react-faux-dom/tslint.json
index 71ee04c4e1..49e27f2a45 100644
--- a/types/react-faux-dom/tslint.json
+++ b/types/react-faux-dom/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-unnecessary-generics": false
+        "no-unnecessary-generics": false,
+        "strict-export-declare-modifiers": false
     }
 }

From 7eb0083532b5169c0f6682373f0dfa004eb1500e Mon Sep 17 00:00:00 2001
From: "James C. Davis" <james@cos.io>
Date: Mon, 7 May 2018 13:45:41 -0400
Subject: [PATCH 0050/1124] [ember-data] - improve relationship options
 (#25282)

* Add allowNull to AttrOptions

* Move relationship options to interfaces and tighten up inverse
---
 types/ember-data/index.d.ts    | 35 +++++++++++++++-------------------
 types/ember-data/test/model.ts |  1 +
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index a5918f9375..b891bbe1d1 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -52,25 +52,27 @@ declare module 'ember-data' {
          * Convert an array of errors in JSON-API format into an object.
          */
         function errorsArrayToHash(errors: any[]): {};
+
+        interface RelationshipOptions<Model> {
+            async?: boolean;
+            inverse?: RelationshipsFor<Model> | null;
+            polymorphic?: boolean;
+        }
+
+        interface Sync { async: false; }
+        interface Async { async?: true; }
+
         /**
          * `DS.belongsTo` is used to define One-To-One and One-To-Many
          * relationships on a [DS.Model](/api/data/classes/DS.Model.html).
          */
         function belongsTo<K extends keyof ModelRegistry>(
             modelName: K,
-            options: {
-                async: false;
-                inverse?: string | null;
-                polymorphic?: boolean;
-            }
+            options: RelationshipOptions<ModelRegistry[K]> & Sync
         ): Ember.ComputedProperty<ModelRegistry[K]>;
         function belongsTo<K extends keyof ModelRegistry>(
             modelName: K,
-            options?: {
-                async?: true;
-                inverse?: string | null;
-                polymorphic?: boolean;
-            }
+            options?: RelationshipOptions<ModelRegistry[K]> & Async
         ): Ember.ComputedProperty<ModelRegistry[K] & PromiseObject<ModelRegistry[K]>, ModelRegistry[K]>;
         /**
          * `DS.hasMany` is used to define One-To-Many and Many-To-Many
@@ -78,19 +80,11 @@ declare module 'ember-data' {
          */
         function hasMany<K extends keyof ModelRegistry>(
             type: K,
-            options: {
-                async: false;
-                inverse?: string | null;
-                polymorphic?: boolean;
-            }
+            options: RelationshipOptions<ModelRegistry[K]> & Sync
         ): Ember.ComputedProperty<ManyArray<ModelRegistry[K]>>;
         function hasMany<K extends keyof ModelRegistry>(
             type: K,
-            options?: {
-                async?: true;
-                inverse?: string | null;
-                polymorphic?: boolean;
-            }
+            options?: RelationshipOptions<ModelRegistry[K]> & Async
         ): Ember.ComputedProperty<PromiseManyArray<ModelRegistry[K]>, Ember.Array<ModelRegistry[K]>>;
         /**
          * This method normalizes a modelName into the format Ember Data uses
@@ -101,6 +95,7 @@ declare module 'ember-data' {
 
         interface AttrOptions<T = any> {
             defaultValue?: T | (() => T);
+            allowNull?: boolean; // TODO: restrict to boolean transform (TS 2.8)
         }
 
         /**
diff --git a/types/ember-data/test/model.ts b/types/ember-data/test/model.ts
index 63bda2588e..2085daf90a 100644
--- a/types/ember-data/test/model.ts
+++ b/types/ember-data/test/model.ts
@@ -17,6 +17,7 @@ const User = DS.Model.extend({
     username: DS.attr('string'),
     email: DS.attr('string'),
     verified: DS.attr('boolean', { defaultValue: false }),
+    canBeNull: DS.attr('boolean', { allowNull: true }),
     createdAt: DS.attr('date', {
         defaultValue() { return new Date(); }
     })

From 1b13c48ce19f1a7029f968a489adfa39379b2f0f Mon Sep 17 00:00:00 2001
From: Kevin Richter <me@kevinrichter.nl>
Date: Mon, 7 May 2018 19:46:19 +0200
Subject: [PATCH 0051/1124] [Leaflet Draw] Add missing events, functions &
 namespaces (#25252)

* [Leaflet Draw] Add missing events, functions & namespaces

* [Leaflet Draw] Resolve lint issues

* Update DrawOption parameters

* Fix namespace

* [Leaflet Draw] Fix lint errors

* Add back extend on MapOptions
---
 types/leaflet-draw/index.d.ts | 360 +++++++++++++++++++++++++++++++---
 1 file changed, 333 insertions(+), 27 deletions(-)

diff --git a/types/leaflet-draw/index.d.ts b/types/leaflet-draw/index.d.ts
index 62025a7c46..b431cf04ba 100644
--- a/types/leaflet-draw/index.d.ts
+++ b/types/leaflet-draw/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Matt Guest <https://github.com/matt-guest>
 //                 Ryan Blace <https://github.com/reblace>
 //                 Yun Shi <https://github.com/YunS-Stacy>
+//                 Kevin Richter <https://github.com/beschoenen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -13,6 +14,63 @@ declare module 'leaflet' {
 		drawControl?: boolean;
 	}
 
+	interface ToolbarAction {
+		title: string;
+		text: string;
+		callback: () => void;
+		context: object;
+	}
+
+	interface ToolbarModeHandler {
+		enabled: boolean;
+		handler: Handler;
+		title: string;
+	}
+
+	interface ToolbarOptions {
+		polyline?: DrawOptions.PolylineOptions;
+		polygon?: DrawOptions.PolygonOptions;
+		rectangle?: DrawOptions.RectangleOptions;
+		circle?: DrawOptions.CircleOptions;
+		marker?: DrawOptions.MarkerOptions;
+		circlemarker?: DrawOptions.CircleOptions;
+	}
+
+	interface PrecisionOptions {
+		km?: number;
+		ha?: number;
+		m?: number;
+		mi?: number;
+		ac?: number;
+		yd?: number;
+		ft?: number;
+		nm?: number;
+	}
+
+	class Toolbar extends Class {
+		constructor(options?: ToolbarOptions);
+
+		addToolbar(map: Map): HTMLElement | void;
+
+		removeToolbar(): void;
+	}
+
+	class DrawToolbar extends Toolbar {
+		getModeHandlers(map: Map): ToolbarModeHandler[];
+
+		getActions(handler: Draw.Feature): ToolbarAction[];
+
+		setOptions(options: Control.DrawConstructorOptions): void;
+	}
+
+	class EditToolbar extends Toolbar {
+		getModeHandlers(map: Map): ToolbarModeHandler[];
+
+		getActions(handler: Draw.Feature): ToolbarAction[];
+
+		setOptions(options: Control.DrawConstructorOptions): void;
+	}
+
 	namespace Control {
 		interface DrawConstructorOptions {
 			/**
@@ -30,9 +88,9 @@ declare module 'leaflet' {
 			draw?: DrawOptions;
 
 			/**
-			 * 	The options used to configure the edit toolbar.
+			 * The options used to configure the edit toolbar.
 			 *
-			 *  Default value: false
+			 * Default value: false
 			 */
 			edit?: EditOptions;
 		}
@@ -41,42 +99,42 @@ declare module 'leaflet' {
 			/**
 			 * Polyline draw handler options. Set to false to disable handler.
 			 *
-			 *  Default value: {}
+			 * Default value: {}
 			 */
 			polyline?: DrawOptions.PolylineOptions | false;
 
 			/**
 			 * Polygon draw handler options. Set to false to disable handler.
 			 *
-			 *  Default value: {}
+			 * Default value: {}
 			 */
 			polygon?: DrawOptions.PolygonOptions | false;
 
 			/**
 			 * Rectangle draw handler options. Set to false to disable handler.
 			 *
-			 *  Default value: {}
+			 * Default value: {}
 			 */
 			rectangle?: DrawOptions.RectangleOptions | false;
 
 			/**
 			 * Circle draw handler options. Set to false to disable handler.
 			 *
-			 *  Default value: {}
+			 * Default value: {}
 			 */
 			circle?: DrawOptions.CircleOptions | false;
 
 			/**
 			 * Circle marker draw handler options. Set to false to disable handler.
 			 *
-			 *  Default value: {}
+			 * Default value: {}
 			 */
 			circlemarker?: DrawOptions.CircleMarkerOptions | false;
 
 			/**
 			 * Marker draw handler options. Set to false to disable handler.
 			 *
-			 *  Default value: {}
+			 * Default value: {}
 			 */
 			marker?: DrawOptions.MarkerOptions | false;
 		}
@@ -115,6 +173,15 @@ declare module 'leaflet' {
 	}
 
 	namespace DrawOptions {
+		interface SimpleShapeOptions {
+			/**
+			 * Determines if the draw tool remains enabled after drawing a shape.
+			 *
+			 * Default value: false
+			 */
+			repeatMode?: boolean;
+		}
+
 		interface PolylineOptions {
 			/**
 			 * Determines if line segments can cross.
@@ -123,12 +190,23 @@ declare module 'leaflet' {
 			 */
 			allowIntersection?: boolean;
 
+			/**
+			 * Determines if the draw tool remains enabled after drawing a shape.
+			 *
+			 * Default value: false
+			 */
+			repeatMode?: boolean;
+
 			/**
 			 * Configuration options for the error that displays if an intersection is detected.
 			 *
 			 * Default value: See code
 			 */
-			drawError?: any;
+			drawError?: DrawErrorOptions;
+
+			icon?: Icon | DivIcon;
+
+			touchIcon?: Icon | DivIcon;
 
 			/**
 			 * Distance in pixels between each guide dash.
@@ -137,12 +215,19 @@ declare module 'leaflet' {
 			 */
 			guidelineDistance?: number;
 
+			/**
+			 * The maximum length of the guide line
+			 *
+			 * Default value: 4000
+			 */
+			maxGuideLineLength?: number;
+
 			/**
 			 * The options used when drawing the polyline/polygon on the map.
 			 *
 			 * Default value: See code
 			 */
-			shapeOptions?: L.PolylineOptions;
+			shapeOptions?: PathOptions;
 
 			/**
 			 * Determines which measurement system (metric or imperial) is used.
@@ -152,18 +237,46 @@ declare module 'leaflet' {
 			metric?: boolean;
 
 			/**
-			 * 	This should be a high number to ensure that you can draw over all other layers on the map.
+			 * When not metric, to use feet instead of yards for display.
+			 *
+			 * Default value: true
+			 */
+			feet?: boolean;
+
+			/**
+			 * When not metric, not feet use nautic mile for display
+			 *
+			 * Default value: false
+			 */
+			nautic?: boolean;
+
+			/**
+			 * Whether to display distance in the tooltip
+			 *
+			 * Default value: true
+			 */
+			showLength?: boolean;
+
+			/**
+			 * This should be a high number to ensure that you can draw over all other layers on the map.
 			 *
 			 * Default value: 2000
 			 */
 			zIndexOffset?: number;
 
 			/**
-			 * Determines if the draw tool remains enabled after drawing a shape.
+			 * To change distance calculation
 			 *
-			 * Default value: false
+			 * Default value: 1
 			 */
-			repeatMode?: boolean;
+			factor?: number;
+
+			/**
+			 * Once this number of points are placed, finish shape
+			 *
+			 * Default value: 0
+			 */
+			maxPoints?: number;
 		}
 
 		interface PolygonOptions extends PolylineOptions {
@@ -174,9 +287,16 @@ declare module 'leaflet' {
 			 * Default value: false
 			 */
 			showArea?: boolean;
+
+			/**
+			 * Defines the precision for each type of unit (e.g. {km: 2, ft: 0}
+			 *
+			 * Default value: {}
+			 */
+			precision?: PrecisionOptions;
 		}
 
-		interface RectangleOptions {
+		interface RectangleOptions extends SimpleShapeOptions {
 			/**
 			 * The options used when drawing the rectangle on the map.
 			 *
@@ -185,14 +305,14 @@ declare module 'leaflet' {
 			shapeOptions?: PathOptions;
 
 			/**
-			 * Determines if the draw tool remains enabled after drawing a shape.
+			 * Whether to use the metric measurement system or imperial
 			 *
-			 * Default value: false
+			 * Default value: true
 			 */
-			repeatMode?: boolean;
+			metric?: boolean;
 		}
 
-		interface CircleOptions {
+		interface CircleOptions extends SimpleShapeOptions {
 			/**
 			 * The options used when drawing the circle on the map.
 			 *
@@ -201,11 +321,32 @@ declare module 'leaflet' {
 			shapeOptions?: PathOptions;
 
 			/**
-			 * Determines if the draw tool remains enabled after drawing a shape.
+			 * Whether to show the radius in the tooltip
+			 *
+			 * Default value: true
+			 */
+			showRadius?: boolean;
+
+			/**
+			 * Whether to use the metric measurement system or imperial
+			 *
+			 * Default value: true
+			 */
+			metric?: boolean;
+
+			/**
+			 * When not metric, use feet instead of yards for display
+			 *
+			 * Default value: true
+			 */
+			feet?: boolean;
+
+			/**
+			 * When not metric, not feet use nautic mile for display
 			 *
 			 * Default value: false
 			 */
-			repeatMode?: boolean;
+			nautic?: boolean;
 		}
 
 		interface CircleMarkerOptions {
@@ -308,6 +449,11 @@ declare module 'leaflet' {
 
 		interface DeleteHandlerOptions {
 		}
+
+		interface DrawErrorOptions {
+			color?: string;
+			timeout?: number;
+		}
 	}
 
 	namespace Draw {
@@ -325,6 +471,9 @@ declare module 'leaflet' {
 			const EDITSTOP: string;
 			const DELETESTART: string;
 			const DELETESTOP: string;
+			const TOOLBAROPENED: string;
+			const TOOLBARCLOSED: string;
+			const TOOLBARCONTEXT: string;
 		}
 
 		class Feature extends Handler {
@@ -338,7 +487,9 @@ declare module 'leaflet' {
 			): void;
 		}
 
-		class SimpleShape extends Feature { }
+		class SimpleShape extends Feature {
+		}
+
 		class Marker extends Feature {
 			constructor(
 				map: Map,
@@ -346,14 +497,14 @@ declare module 'leaflet' {
 			)
 		}
 
-		class CircleMarker extends Feature {
+		class CircleMarker extends Marker {
 			constructor(
 				map: Map,
 				options?: DrawOptions.MarkerOptions
 			)
 		}
 
-		class Circle extends Feature {
+		class Circle extends SimpleShape {
 			constructor(
 				map: Map,
 				options?: DrawOptions.CircleOptions
@@ -365,21 +516,41 @@ declare module 'leaflet' {
 				map: Map,
 				options?: DrawOptions.PolylineOptions
 			)
+
+			deleteLastVertex(): void;
+
+			addVertex(latlng: LatLng): void;
+
+			completeShape(): void;
 		}
 
-		class Rectangle extends Feature {
+		class Rectangle extends SimpleShape {
 			constructor(
 				map: Map,
 				options?: DrawOptions.RectangleOptions
 			)
 		}
 
-		class Polygon extends Feature {
+		class Polygon extends Polyline {
 			constructor(
 				map: Map,
 				options?: DrawOptions.PolygonOptions
 			)
 		}
+
+		class Tooltip extends Class {
+			constructor(map: Map);
+
+			dispose(): void;
+
+			updateContent(labelText?: { text: string, subtext?: string }): Tooltip;
+
+			updatePosition(latlng: LatLng): Tooltip;
+
+			showAsError(): Tooltip;
+
+			removeError(): Tooltip;
+		}
 	}
 
 	namespace DrawEvents {
@@ -426,6 +597,13 @@ declare module 'leaflet' {
 			layerType: string;
 		}
 
+		interface DrawVertex extends Event {
+			/**
+			 * List of all layers just being added from the map.
+			 */
+			layers: LayerGroup;
+		}
+
 		interface EditStart extends Event {
 			/**
 			 * The type of edit this is. One of: edit
@@ -433,6 +611,29 @@ declare module 'leaflet' {
 			handler: string;
 		}
 
+		interface EditMove extends Event {
+			/**
+			 * Layer that was just moved.
+			 */
+			layer: Layer;
+		}
+
+		interface EditResize extends Event {
+			/**
+			 * Layer that was just resized.
+			 */
+			layer: Layer;
+		}
+
+		interface EditVertex extends Event {
+			/**
+			 * List of all layers just being edited from the map.
+			 */
+			layers: LayerGroup;
+
+			poly: Polyline | Polygon;
+		}
+
 		interface EditStop extends Event {
 			/**
 			 * The type of edit this is. One of: edit
@@ -453,6 +654,15 @@ declare module 'leaflet' {
 			 */
 			handler: string;
 		}
+
+		interface ToolbarOpened extends Event {
+		}
+
+		interface ToolbarClosed extends Event {
+		}
+
+		interface MarkerContext extends Event {
+		}
 	}
 
 	namespace GeometryUtil {
@@ -461,9 +671,105 @@ declare module 'leaflet' {
 		 */
 		function geodesicArea(coordinates: LatLngLiteral[]): number;
 
+		/**
+		 * Returns n in specified number format (if defined) and precision
+		 */
+		function formattedNumber(n: string, precision: number): string;
+
 		/**
 		 * Returns a readable area string in yards or metric
 		 */
-		function readableArea(area: number, isMetric: boolean): string;
+		function readableArea(area: number, isMetric?: boolean, precision?: PrecisionOptions): string;
+
+		/**
+		 * Converts metric distance to distance string.
+		 * The value will be rounded as defined by the precision option object.
+		 */
+		function readableDistance(distance: number, isMetric?: boolean, isFeet?: boolean, isNauticalMile?: boolean, precision?: PrecisionOptions): string;
+
+		/**
+		 * Returns true if the Leaflet version is 0.7.x, false otherwise.
+		 */
+		function isVersion07x(): boolean;
+	}
+
+	namespace LatLngUtil {
+		/**
+		 * Clone the latLng point or points or nested points and return an array with those points
+		 */
+		function cloneLatLngs(latlngs: LatLng[]): LatLng[][];
+
+		/**
+		 * Clone the latLng and return a new LatLng object.
+		 */
+		function cloneLatLng(latlng: LatLng): LatLng;
+	}
+
+	namespace EditToolbar {
+		class Edit extends Toolbar {
+			constructor(map: Map, options?: ToolbarOptions);
+
+			revertLayers(): void;
+
+			save(): void;
+		}
+
+		class Delete extends Toolbar {
+			constructor(map: Map, options?: ToolbarOptions);
+
+			revertLayers(): void;
+
+			save(): void;
+
+			removeAllLayers(): void;
+		}
+	}
+
+	namespace EditOptions {
+		interface EditPolyVerticesEditOptions {
+			icon?: Icon | DivIcon;
+			touchIcon?: Icon | DivIcon;
+			drawError?: DrawOptions.DrawErrorOptions;
+		}
+
+		interface EditSimpleShapeOptions {
+			moveIcon?: Icon | DivIcon;
+			resizeIcon?: Icon | DivIcon;
+			touchMoveIcon?: Icon | DivIcon;
+			touchResizeIcon?: Icon | DivIcon;
+		}
+	}
+
+	namespace Edit {
+		class Circle extends CircleMarker {
+		}
+
+		class CircleMarker extends SimpleShape {
+		}
+
+		class Marker extends Handler {
+			constructor(marker: Marker, options?: object);
+		}
+
+		class Poly extends Handler {
+			constructor(poly: Draw.Polyline);
+
+			updateMarkers(): void;
+		}
+
+		class PolyVerticesEdit extends Handler {
+			constructor(poly: Poly, latlngs: LatLngExpression[], options?: EditOptions.EditPolyVerticesEditOptions);
+
+			updateMarkers(): void;
+		}
+
+		class Rectangle extends SimpleShape {
+		}
+
+		class SimpleShape extends Handler {
+			constructor(shape: SimpleShape, options?: EditOptions.EditSimpleShapeOptions);
+
+			updateMarkers(): void;
+		}
 	}
 }

From d2efe5aac4d73a68ff2e6d1d8ec0516e05906c09 Mon Sep 17 00:00:00 2001
From: Ken Elkabany <ken@elkabany.com>
Date: Mon, 7 May 2018 10:49:34 -0700
Subject: [PATCH 0052/1124] chart.js: Add options for time cartesian axis.
 (#25462)

- ChartPoint.t, scale distribution, and ticks source.
---
 types/chart.js/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 621152162a..e6db82bc5a 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -10,6 +10,7 @@
 //                 Guillaume Rodriguez <https://github.com/guillaume-ro-fr>
 //                 Sergey Rubanov <https://github.com/chicoxyzzy>
 //                 Simon Archer <https://github.com/archy-bold>
+//                 Ken Elkabany <https://github.com/braincore>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -168,6 +169,7 @@ declare namespace Chart {
         x?: number | string | Date;
         y?: number | string | Date;
         r?: number;
+        t?: number | string | Date;
     }
 
     interface ChartConfiguration {
@@ -422,6 +424,7 @@ declare namespace Chart {
         padding?: number;
         reverse?: boolean;
         showLabelBackdrop?: boolean;
+        source?: 'auto' | 'data' | 'labels';
     }
 
     interface AngleLineOptions {
@@ -529,6 +532,7 @@ declare namespace Chart {
     interface ChartXAxe extends CommonAxe {
         categoryPercentage?: number;
         barPercentage?: number;
+        distribution?: 'linear' | 'series';
         time?: TimeScale;
     }
 

From 17233b80bd69c1316118b855ea4da32cad066895 Mon Sep 17 00:00:00 2001
From: Airex <airex.s@gmail.com>
Date: Mon, 7 May 2018 20:50:18 +0300
Subject: [PATCH 0053/1124] Add support of subgroupStack on DataGroup (#25480)

* Add support of subgroupStack on DataGroup

* Update index.d.ts

* Update index.d.ts

Added new SubGroupStackOptions dynamic structure and updated type of DataGroup.subgroupStack to SubGroupStackOptions | boolean

* Update index.d.ts

codestyling

* Update index.d.ts

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

diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index 44ab171de4..ed1c235061 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -88,6 +88,10 @@ export interface PointItem extends DataItem {
   y: number;
 }
 
+export interface SubGroupStackOptions {
+  [name: string]: boolean;
+}
+
 export interface DataGroup {
   className?: string;
   content: string;
@@ -97,6 +101,7 @@ export interface DataGroup {
   subgroupOrder?: string | (() => void);
   title?: string;
   nestedGroups?: number[];
+  subgroupStack?: SubGroupStackOptions | boolean;
 }
 
 export interface DataGroupOptions {

From 0af74afc17376663884b8f657e99409ab07f2a11 Mon Sep 17 00:00:00 2001
From: Saurabh Dutta <saurabh73@users.noreply.github.com>
Date: Mon, 7 May 2018 23:21:09 +0530
Subject: [PATCH 0054/1124] [auth0] Add additional Authenticator class
 definitions and Managers. (#25405)

* Use Indexer in App_Metadata and User_Metadata

* Add Additional Authenticator Classes
---
 types/auth0/index.d.ts | 132 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 130 insertions(+), 2 deletions(-)

diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index 516e2cc368..aa82e908e5 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -33,8 +33,13 @@ export interface RetryOptions {
   maxRetries?: number;
 }
 
-export interface UserMetadata { }
-export interface AppMetadata { }
+export interface UserMetadata {
+  [propName: string]: string
+}
+
+export interface AppMetadata {
+  [propName: string]: any
+}
 
 export interface UserData {
   email?: string;
@@ -513,9 +518,72 @@ export interface EmailVerificationTicketOptions {
   result_url: string;
 }
 
+export interface BaseClientOptions {
+  baseUrl: string;
+  clientId?: string;
+}
+
+export interface OAuthClientOptions extends BaseClientOptions {
+  clientSecret?: string;
+}
+
+export interface DatabaseClientOptions extends BaseClientOptions {
+}
+
+export interface PasswordLessClientOptions extends BaseClientOptions {
+}
+
+export interface TokenManagerOptions extends BaseClientOptions {
+  headers?: any;
+}
+export interface UsersOptions extends BaseClientOptions {
+  headers?: any;
+}
+
+export interface SignInOptions extends VerifyOptions {
+  connection?: string;
+}
+
+export interface SocialSignInOptions {
+  access_token: string;
+  connection: string;
+}
+
+export interface SignInToken {
+  access_token: string;
+  id_token?: string;
+  token_type?: string;
+  expiry: number;
+}
+
+export interface RequestSMSCodeOptions extends RequestSMSOptions {
+  client_id: string;
+}
+
+export type SendType = 'link' | 'code';
+export interface RequestEmailCodeOrLinkOptions {
+  email: string;
+  send: SendType
+}
+
+export interface ImpersonateSettingOptions {
+  impersonator_id: string;
+  protocol: string;
+  token: string;
+  clientId?: string;
+}
+
 
 
 export class AuthenticationClient {
+
+  // Members
+  database?: DatabaseAuthenticator;
+  oauth?: OAuthAuthenticator;
+  passwordless?: PasswordlessAuthenticator;
+  tokens?: TokenManager;
+  users?: UsersManager;
+
   constructor(options: AuthenticationClientOptions);
   getClientInfo(): ClientInfo;
 
@@ -755,3 +823,63 @@ export class ManagementClient {
   updateResourceServer(params: ObjectWithId, data: ResourceServer): Promise<ResourceServer>;
   updateResourceServer(params: ObjectWithId, data: ResourceServer, cb?: (err: Error, data: ResourceServer) => void): void;
 }
+
+
+export class DatabaseAuthenticator {
+  constructor(options: DatabaseClientOptions, oauth: OAuthAuthenticator);
+
+  changePassword(data: ResetPasswordOptions): Promise<any>;
+  changePassword(data: ResetPasswordOptions, cb: (err: Error, message: string) => void): void;
+
+  requestChangePasswordEmail(data: ResetPasswordEmailOptions): Promise<any>;
+  requestChangePasswordEmail(data: ResetPasswordEmailOptions, cb: (err: Error, message: string) => void): void;
+
+  signIn(data: SignInOptions): Promise<SignInToken>;
+  signIn(data: SignInOptions, cb: (err: Error, data: SignInToken) => void): void;
+
+  signUp(data: CreateUserData): Promise<User>;
+  signIn(data: CreateUserData, cb: (err: Error, data: User) => void): void;
+
+}
+
+export class OAuthAuthenticator {
+  constructor(options: OAuthClientOptions);
+
+  passwordGrant(options: PasswordGrantOptions): Promise<SignInToken>;
+  passwordGrant(options: PasswordGrantOptions, cb: (err: Error, response: SignInToken) => void): void;
+
+  signIn(data: SignInOptions): Promise<SignInToken>;
+  signIn(data: SignInOptions, cb: (err: Error, data: SignInToken) => void): void;
+
+
+  socialSignIn(data: SocialSignInOptions): Promise<SignInToken>;
+  socialSignIn(data: SocialSignInOptions, cb: (err: Error, data: SignInToken) => void): void;
+}
+
+export class PasswordlessAuthenticator {
+  constructor(options: PasswordLessClientOptions, oauth: OAuthAuthenticator);
+
+  signIn(data: SignInOptions): Promise<SignInToken>;
+  signIn(data: SignInOptions, cb: (err: Error, data: SignInToken) => void): void;
+
+  sendEmail(data: RequestEmailCodeOrLinkOptions): Promise<any>;
+  sendEmail(data: RequestEmailCodeOrLinkOptions, cb: (err: Error, message: string) => void): void;
+
+  sendSMS(data: RequestSMSCodeOptions): Promise<any>;
+  sendSMS(data: RequestSMSCodeOptions, cb: (err: Error, message: string) => void): void;
+}
+
+export class TokenManager {
+  constructor(options: TokenManagerOptions);
+
+}
+
+export class UsersManager {
+  constructor(options: UsersOptions);
+
+  getInfo(accessToken: string): Promise<User>;
+  getInfo(accessToken: string, cb: (err: Error, user: User) => void): void;
+
+  impersonate(userId: string, settings: ImpersonateSettingOptions): Promise<any>;
+  impersonate(userId: string, settings: ImpersonateSettingOptions, cb: (err: Error, data: any) => void): void;
+}
\ No newline at end of file

From 92251a67c8ffa8420028a2dd2926528c38c7ce92 Mon Sep 17 00:00:00 2001
From: Joseph Kohlmann <kohlmannj@gmail.com>
Date: Mon, 7 May 2018 13:52:12 -0400
Subject: [PATCH 0055/1124] Add type definitions for promise-map-limit package
 (#25550)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add type definitions for map-promise-limit library

* map-promise-limit → promise-map-limit

A typo…sigh. The GitHub repository link to promise-map-limit was previously correct, however.

* Remove additional TSLint rule

Thanks @plantain-00!
---
 .github/CODEOWNERS                            |  1 +
 types/promise-map-limit/index.d.ts            | 17 ++++++++++++
 .../promise-map-limit-tests.ts                | 26 +++++++++++++++++++
 types/promise-map-limit/tsconfig.json         | 23 ++++++++++++++++
 types/promise-map-limit/tslint.json           |  3 +++
 5 files changed, 70 insertions(+)
 create mode 100644 types/promise-map-limit/index.d.ts
 create mode 100644 types/promise-map-limit/promise-map-limit-tests.ts
 create mode 100644 types/promise-map-limit/tsconfig.json
 create mode 100644 types/promise-map-limit/tslint.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7f3c8671de..3938bc24d1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3009,6 +3009,7 @@
 /types/proj4leaflet/                            @BendingBender
 /types/project-oxford/                          @scsouthw
 /types/promise-dag/                             @OSjoerdWie
+/types/promise-map-limit/                       @kohlmannj
 /types/promise-pg/                              @coldacid
 /types/promise-polyfill/                        @skysteve
 /types/promise-pool/                            @vilic
diff --git a/types/promise-map-limit/index.d.ts b/types/promise-map-limit/index.d.ts
new file mode 100644
index 0000000000..17e859aec0
--- /dev/null
+++ b/types/promise-map-limit/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for promise-map-limit 1.0
+// Project: https://github.com/dbrockman/promise-map-limit
+// Definitions by: Joseph Kohlmann <https://github.com/kohlmannj>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export = promiseMapLimit;
+
+declare function promiseMapLimit<T, R>(
+iterable: Iterable<T>,
+concurrency: number,
+iteratee: promiseMapLimit.IIteratee<T, R>
+): Promise<R[]>;
+
+declare namespace promiseMapLimit {
+    type IIteratee<T, R> = (value: T) => Promise<R> | R;
+}
diff --git a/types/promise-map-limit/promise-map-limit-tests.ts b/types/promise-map-limit/promise-map-limit-tests.ts
new file mode 100644
index 0000000000..8d615e57c7
--- /dev/null
+++ b/types/promise-map-limit/promise-map-limit-tests.ts
@@ -0,0 +1,26 @@
+import mapPromiseLimit = require('promise-map-limit');
+
+const promisedStrings = mapPromiseLimit(['foo', 'bar'], 2, s => s);
+promisedStrings; // $ExpectType Promise<string[]>
+
+const promisedBooleans = mapPromiseLimit([true, false], 2, b => b);
+promisedBooleans; // $ExpectType Promise<boolean[]>
+
+const promiseOfPromisedNumbers = mapPromiseLimit(
+    [{ foo: 1 }, { foo: 2 }],
+    2,
+    value => Promise.resolve(value.foo),
+);
+promiseOfPromisedNumbers; // $ExpectType Promise<number[]>
+
+const promiseNumber = (value: Record<string, number>): Promise<number> =>
+    new Promise((resolve, reject) => { resolve(value.foo); });
+
+(async () => {
+    const asyncNumbers = await mapPromiseLimit(
+        [{ foo: 1 }, { foo: 2 }],
+        2,
+        async value => promiseNumber(value),
+    );
+    asyncNumbers; // $ExpectType number[]
+})();
diff --git a/types/promise-map-limit/tsconfig.json b/types/promise-map-limit/tsconfig.json
new file mode 100644
index 0000000000..a4b0825f25
--- /dev/null
+++ b/types/promise-map-limit/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-map-limit-tests.ts"
+    ]
+}
diff --git a/types/promise-map-limit/tslint.json b/types/promise-map-limit/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/promise-map-limit/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 74d3e6b86ddb5f9042793de718516e9fd4e04580 Mon Sep 17 00:00:00 2001
From: Steffen K <FastDeath@users.noreply.github.com>
Date: Mon, 7 May 2018 19:58:35 +0200
Subject: [PATCH 0056/1124] [mongoose] Fix: The `mongoose.pluralize(..)`
 function now gets/sets the function to pluralize collection names (#25458)

* Update: function signature mongoose.pluralize(..)

* Update: mongoose version number to 5.0.14
---
 types/mongoose/index.d.ts        | 10 +++++++---
 types/mongoose/mongoose-tests.ts |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 362f549e67..481b37c0a3 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mongoose 5.0.12
+// Type definitions for Mongoose 5.0.14
 // Project: http://mongoosejs.com/
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 sindrenm <https://github.com/sindrenm>
@@ -47,8 +47,12 @@ declare module "mongoose" {
   import stream = require('stream');
   import mongoose = require('mongoose');
 
-  /** Pluralises the given name */
-  export function pluralize(str: string): string;
+  /**
+   * Gets and optionally overwrites the function used to pluralize collection names
+   * @param fn function to use for pluralization of collection names
+   * @returns the current function used to pluralize collection names (defaults to the `mongoose-legacy-pluralize` module's function)
+   */
+  export function pluralize(fn?: (str: string) => string): (str: string) => string;
 
   /*
    * Some mongoose classes have the same name as the native JS classes
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 95f50a6e6f..aaedb577d3 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -170,7 +170,8 @@ mongooseError.stack;
 mongoose.Error.messages.hasOwnProperty('');
 mongoose.Error.Messages.hasOwnProperty('');
 
-const plural: string = mongoose.pluralize('foo');
+const pluralize = mongoose.pluralize();
+const plural: string = pluralize('foo');
 
 /*
  * section querycursor.js

From a355d32369dc8fc93eb6047dba01a03e0118d0e7 Mon Sep 17 00:00:00 2001
From: Max <m.balaganskiy@gmail.com>
Date: Tue, 8 May 2018 04:00:18 +1000
Subject: [PATCH 0057/1124] materialize-css: Add missing declarations and tests
 (#25492)

* Restructure files and add missing declarations

* Add JQuery declarations

* Restructure tests

* Add carousel tests

* Add more tests and missing JQuery declarations

* Add waves declaration and a test

* Add static init methods and tests

* allow jquery and cash object to be passed to init

* Remove redundant reference

* Clean up

* Clean up

* Clean up and add tests

* Clean up and add tests
---
 types/materialize-css/autocomplete.d.ts       |  88 ++
 types/materialize-css/carousel.d.ts           | 117 ++
 types/materialize-css/character-counter.d.ts  |  25 +
 types/materialize-css/chips.d.ts              | 124 +++
 types/materialize-css/collapsible.d.ts        |  83 ++
 types/materialize-css/common.d.ts             |  51 +
 types/materialize-css/datepicker.d.ts         | 201 ++++
 types/materialize-css/dropdown.d.ts           | 145 +++
 types/materialize-css/fab.d.ts                |  60 ++
 types/materialize-css/formselect.d.ts         |  70 ++
 types/materialize-css/index.d.ts              | 996 +-----------------
 types/materialize-css/inputfields.d.ts        |   7 +
 types/materialize-css/materialbox.d.ts        |  98 ++
 types/materialize-css/modal.d.ts              | 116 ++
 types/materialize-css/parallax.d.ts           |  33 +
 types/materialize-css/pushpin.d.ts            |  56 +
 types/materialize-css/range.d.ts              |  25 +
 types/materialize-css/scrollspy.d.ts          |  51 +
 types/materialize-css/sidenav.d.ts            |  99 ++
 types/materialize-css/slider.d.ts             |  86 ++
 types/materialize-css/tabs.d.ts               |  70 ++
 types/materialize-css/taptarget.d.ts          |  54 +
 .../materialize-css/test/autocomplete.test.ts |  55 +
 types/materialize-css/test/carousel.test.ts   |  53 +
 .../test/character-counter.test.ts            |  20 +
 types/materialize-css/test/chips.test.ts      |  40 +
 .../materialize-css/test/collapsible.test.ts  |  49 +
 types/materialize-css/test/common.test.ts     |  13 +
 types/materialize-css/test/datepicker.test.ts |  42 +
 types/materialize-css/test/dropdown.test.ts   |  46 +
 types/materialize-css/test/fab.test.ts        |  32 +
 types/materialize-css/test/formselect.test.ts |  42 +
 .../materialize-css/test/inputfields.test.ts  |   7 +
 .../materialize-css/test/materialbox.test.ts  |  49 +
 .../test/materialize-css-global.test.ts       |  36 -
 .../test/materialize-css-jquery.test.ts       |  61 --
 .../test/materialize-css-module.test.ts       | 277 -----
 types/materialize-css/test/modal.test.ts      |  38 +
 types/materialize-css/test/parallax.test.ts   |  24 +
 types/materialize-css/test/pushpin.test.ts    |  34 +
 types/materialize-css/test/range.test.ts      |  22 +
 types/materialize-css/test/scrollspy.test.ts  |  32 +
 types/materialize-css/test/sidenav.test.ts    |  39 +
 types/materialize-css/test/slider.test.ts     |  43 +
 types/materialize-css/test/tabs.test.ts       |  38 +
 types/materialize-css/test/taptarget.test.ts  |  38 +
 types/materialize-css/test/timepicker.test.ts |  65 ++
 types/materialize-css/test/toast.test.ts      |  17 +
 types/materialize-css/test/tooltip.test.ts    |  33 +
 types/materialize-css/test/waves.test.ts      |   4 +
 types/materialize-css/timepicker.d.ts         | 136 +++
 types/materialize-css/toast.d.ts              |  76 ++
 types/materialize-css/tooltip.d.ts            |  95 ++
 types/materialize-css/tsconfig.json           |  30 +-
 types/materialize-css/waves.d.ts              |   9 +
 55 files changed, 2905 insertions(+), 1345 deletions(-)
 create mode 100644 types/materialize-css/autocomplete.d.ts
 create mode 100644 types/materialize-css/carousel.d.ts
 create mode 100644 types/materialize-css/character-counter.d.ts
 create mode 100644 types/materialize-css/chips.d.ts
 create mode 100644 types/materialize-css/collapsible.d.ts
 create mode 100644 types/materialize-css/common.d.ts
 create mode 100644 types/materialize-css/datepicker.d.ts
 create mode 100644 types/materialize-css/dropdown.d.ts
 create mode 100644 types/materialize-css/fab.d.ts
 create mode 100644 types/materialize-css/formselect.d.ts
 create mode 100644 types/materialize-css/inputfields.d.ts
 create mode 100644 types/materialize-css/materialbox.d.ts
 create mode 100644 types/materialize-css/modal.d.ts
 create mode 100644 types/materialize-css/parallax.d.ts
 create mode 100644 types/materialize-css/pushpin.d.ts
 create mode 100644 types/materialize-css/range.d.ts
 create mode 100644 types/materialize-css/scrollspy.d.ts
 create mode 100644 types/materialize-css/sidenav.d.ts
 create mode 100644 types/materialize-css/slider.d.ts
 create mode 100644 types/materialize-css/tabs.d.ts
 create mode 100644 types/materialize-css/taptarget.d.ts
 create mode 100644 types/materialize-css/test/autocomplete.test.ts
 create mode 100644 types/materialize-css/test/carousel.test.ts
 create mode 100644 types/materialize-css/test/character-counter.test.ts
 create mode 100644 types/materialize-css/test/chips.test.ts
 create mode 100644 types/materialize-css/test/collapsible.test.ts
 create mode 100644 types/materialize-css/test/common.test.ts
 create mode 100644 types/materialize-css/test/datepicker.test.ts
 create mode 100644 types/materialize-css/test/dropdown.test.ts
 create mode 100644 types/materialize-css/test/fab.test.ts
 create mode 100644 types/materialize-css/test/formselect.test.ts
 create mode 100644 types/materialize-css/test/inputfields.test.ts
 create mode 100644 types/materialize-css/test/materialbox.test.ts
 delete mode 100644 types/materialize-css/test/materialize-css-global.test.ts
 delete mode 100644 types/materialize-css/test/materialize-css-jquery.test.ts
 delete mode 100644 types/materialize-css/test/materialize-css-module.test.ts
 create mode 100644 types/materialize-css/test/modal.test.ts
 create mode 100644 types/materialize-css/test/parallax.test.ts
 create mode 100644 types/materialize-css/test/pushpin.test.ts
 create mode 100644 types/materialize-css/test/range.test.ts
 create mode 100644 types/materialize-css/test/scrollspy.test.ts
 create mode 100644 types/materialize-css/test/sidenav.test.ts
 create mode 100644 types/materialize-css/test/slider.test.ts
 create mode 100644 types/materialize-css/test/tabs.test.ts
 create mode 100644 types/materialize-css/test/taptarget.test.ts
 create mode 100644 types/materialize-css/test/timepicker.test.ts
 create mode 100644 types/materialize-css/test/toast.test.ts
 create mode 100644 types/materialize-css/test/tooltip.test.ts
 create mode 100644 types/materialize-css/test/waves.test.ts
 create mode 100644 types/materialize-css/timepicker.d.ts
 create mode 100644 types/materialize-css/toast.d.ts
 create mode 100644 types/materialize-css/tooltip.d.ts
 create mode 100644 types/materialize-css/waves.d.ts

diff --git a/types/materialize-css/autocomplete.d.ts b/types/materialize-css/autocomplete.d.ts
new file mode 100644
index 0000000000..83eae14bfb
--- /dev/null
+++ b/types/materialize-css/autocomplete.d.ts
@@ -0,0 +1,88 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Autocomplete extends Component<AutocompleteOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Autocomplete;
+
+        /**
+         * Init autocomplete
+         */
+        static init(els: Element, options?: Partial<AutocompleteOptions>): Autocomplete;
+
+        /**
+         * Init autocompletes
+         */
+        static init(els: MElements, options?: Partial<AutocompleteOptions>): Autocomplete[];
+
+        /**
+         * Select a specific autocomplete options.
+         * @param el Element of the autocomplete option.
+         */
+        selectOption(el: Element): void;
+
+        /**
+         * Update autocomplete options data.
+         * @param data Autocomplete options data object.
+         */
+        updateData(data: AutocompleteData): void;
+
+        /**
+         * If the autocomplete is open.
+         */
+        isOpen: boolean;
+
+        /**
+         * Number of matching autocomplete options.
+         */
+        count: number;
+
+        /**
+         * Index of the current selected option.
+         */
+        activeIndex: number;
+    }
+
+    interface AutocompleteData {
+        [key: string]: string | null;
+    }
+
+    interface AutocompleteOptions {
+        /**
+         * Data object defining autocomplete options with optional icon strings.
+         */
+        data: AutocompleteData;
+
+        /**
+         * Limit of results the autocomplete shows.
+         * @default infinity
+         */
+        limit: number;
+
+        /**
+         * Callback for when autocompleted.
+         */
+        onAutocomplete: (this: Autocomplete, text: string) => void;
+
+        /**
+         * Minimum number of characters before autocomplete starts.
+         * @default 1
+         */
+        minLength: number;
+
+        /**
+         * Sort function that defines the order of the list of autocomplete options.
+         */
+        sortFunction: (a: string, b: string, inputText: string) => number;
+    }
+}
+
+interface JQuery {
+    // Pick<T,K> to check methods exist.
+    autocomplete(method: keyof Pick<M.Autocomplete, "destroy">): JQuery;
+    autocomplete(method: keyof Pick<M.Autocomplete, "selectOption">, el: Element): JQuery;
+    autocomplete(method: keyof Pick<M.Autocomplete, "updateData">, data: M.AutocompleteData): JQuery;
+    autocomplete(options?: Partial<M.AutocompleteOptions>): JQuery;
+}
diff --git a/types/materialize-css/carousel.d.ts b/types/materialize-css/carousel.d.ts
new file mode 100644
index 0000000000..fd660694d1
--- /dev/null
+++ b/types/materialize-css/carousel.d.ts
@@ -0,0 +1,117 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Carousel extends Component<CarouselOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Carousel;
+
+        /**
+         * Init carousel
+         */
+        static init(els: Element, options?: Partial<CarouselOptions>): Carousel;
+
+        /**
+         * Init carousels
+         */
+        static init(els: MElements, options?: Partial<CarouselOptions>): Carousel[];
+
+        /**
+         * If the carousel is being clicked or tapped
+         */
+        pressed: boolean;
+
+        /**
+         * If the carousel is currently being dragged
+         */
+        dragged: number;
+
+        /**
+         * The index of the center carousel item
+         */
+        center: number;
+
+        /**
+         * Move carousel to next slide or go forward a given amount of slides
+         * @param n How many times the carousel slides
+         */
+        next(n?: number): void;
+
+        /**
+         * Move carousel to previous slide or go back a given amount of slides
+         * @param n How many times the carousel slides
+         */
+        prev(n?: number): void;
+
+        /**
+         * Move carousel to nth slide
+         * @param n Index of slide
+         */
+        set(n?: number): void;
+    }
+
+    interface CarouselOptions {
+        /**
+         * Transition duration in milliseconds
+         * @default 200
+         */
+        duration: number;
+
+        /**
+         * Perspective zoom. If 0, all items are the same size
+         * @default -100
+         */
+        dist: number;
+
+        /**
+         * Set the spacing of the center item
+         * @default 0
+         */
+        shift: number;
+
+        /**
+         * Set the padding between non center items
+         * @default 0
+         */
+        padding: number;
+
+        /**
+         * Set the number of visible items
+         * @default 5
+         */
+        numVisible: number;
+
+        /**
+         * Make the carousel a full width slider like the second example
+         * @default false
+         */
+        fullWidth: boolean;
+
+        /**
+         * Set to true to show indicators
+         * @default false
+         */
+        indicators: boolean;
+
+        /**
+         * Don't wrap around and cycle through items
+         * @default false
+         */
+        noWrap: boolean;
+
+        /**
+         * Callback for when a new slide is cycled to
+         * @default null
+         */
+        onCycleTo: (this: Carousel, current: Element, dragged: boolean) => void;
+    }
+}
+
+interface JQuery {
+    carousel(method: keyof Pick<M.Carousel, "destroy">): JQuery;
+    carousel(method: keyof Pick<M.Carousel, "next">, n?: number): JQuery;
+    carousel(method: keyof Pick<M.Carousel, "prev">, n?: number): JQuery;
+    carousel(method: keyof Pick<M.Carousel, "set">, n?: number): JQuery;
+    carousel(options?: Partial<M.CarouselOptions>): JQuery;
+}
diff --git a/types/materialize-css/character-counter.d.ts b/types/materialize-css/character-counter.d.ts
new file mode 100644
index 0000000000..4d34ac170e
--- /dev/null
+++ b/types/materialize-css/character-counter.d.ts
@@ -0,0 +1,25 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class CharacterCounter extends Component<undefined> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): CharacterCounter;
+
+        /**
+         * Init CharacterCounter
+         */
+        static init(els: Element, options?: Partial<undefined>): CharacterCounter;
+
+        /**
+         * Init CharacterCounters
+         */
+        static init(els: MElements, options?: Partial<undefined>): CharacterCounter[];
+    }
+}
+
+interface JQuery {
+    characterCounter(method: keyof Pick<M.CharacterCounter, "destroy">): JQuery;
+    characterCounter(): JQuery;
+}
diff --git a/types/materialize-css/chips.d.ts b/types/materialize-css/chips.d.ts
new file mode 100644
index 0000000000..d912d4ff7e
--- /dev/null
+++ b/types/materialize-css/chips.d.ts
@@ -0,0 +1,124 @@
+/// <reference path="./common.d.ts" />
+/// <reference path="./autocomplete.d.ts" />
+
+declare namespace M {
+    class Chips extends Component<ChipsOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Chips;
+
+        /**
+         * Init Chips
+         */
+        static init(els: Element, options?: Partial<ChipsOptions>): Chips;
+
+        /**
+         * Init Chipses
+         */
+        static init(els: MElements, options?: Partial<ChipsOptions>): Chips[];
+
+        /**
+         * Array of the current chips data
+         */
+        chipsData: ChipData[];
+
+        /**
+         * If the chips has autocomplete enabled
+         */
+        hasAutocomplete: boolean;
+
+        /**
+         * Autocomplete instance, if any
+         */
+        autocomplete: Autocomplete;
+
+        /**
+         * Add chip to input
+         * @param data Chip data object
+         */
+        addChip(chip: ChipData): void;
+
+        /**
+         * Delete nth chip
+         * @param n  Index of chip
+         */
+        deleteChip(n?: number): void;
+
+        /**
+         * Select nth chip
+         * @param n Index of chip
+         */
+        selectChip(n: number): void;
+    }
+
+    interface ChipData {
+        /**
+         * Chip tag
+         */
+        tag: string;
+
+        /**
+         * Chip image
+         */
+        img?: string;
+    }
+
+    interface ChipsOptions {
+        /**
+         * Set the chip data
+         * @default []
+         */
+        data: ChipData[];
+
+        /**
+         * Set first placeholder when there are no tags
+         * @default ''
+         */
+        placeholder: string;
+
+        /**
+         * Set second placeholder when adding additional tags
+         * @default ''
+         */
+        secondaryPlaceholder: string;
+
+        /**
+         * Set autocomplete options
+         * @default {}
+         */
+        autocompleteOptions: Partial<AutocompleteOptions>;
+
+        /**
+         * Set chips limit
+         * @default Infinity
+         */
+        limit: number;
+
+        /**
+         * Callback for chip add
+         * @default null
+         */
+        onChipAdd: (this: Chips, element: Element, chip: Element) => void;
+
+        /**
+         * Callback for chip select
+         * @default null
+         */
+        onChipSelect: (this: Chips, element: Element, chip: Element) => void;
+
+        /**
+         * Callback for chip delete
+         * @default null
+         */
+        onChipDelete: (this: Chips, element: Element, chip: Element) => void;
+    }
+}
+
+interface JQuery {
+    chips(method: keyof Pick<M.Chips, "destroy">): JQuery;
+    chips(method: keyof Pick<M.Chips, "addChip">, chip: M.ChipData): JQuery;
+    chips(method: keyof Pick<M.Chips, "deleteChip">, n?: number): JQuery;
+    chips(method: keyof Pick<M.Chips, "selectChip">, n: number): JQuery;
+    chips(options?: Partial<M.ChipsOptions>): JQuery;
+}
diff --git a/types/materialize-css/collapsible.d.ts b/types/materialize-css/collapsible.d.ts
new file mode 100644
index 0000000000..649a59e9bb
--- /dev/null
+++ b/types/materialize-css/collapsible.d.ts
@@ -0,0 +1,83 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Collapsible extends Component<CollapsibleOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Collapsible;
+
+        /**
+         * Init Collapsible
+         */
+        static init(els: Element, options?: Partial<CollapsibleOptions>): Collapsible;
+
+        /**
+         * Init Collapsibles
+         */
+        static init(els: MElements, options?: Partial<CollapsibleOptions>): Collapsible[];
+
+        /**
+         * Open collapsible section
+         * @param n Nth section to open
+         */
+        open(n: number): void;
+
+        /**
+         * Close collapsible section
+         * @param n Nth section to close
+         */
+        close(n: number): void;
+    }
+
+    interface CollapsibleOptions {
+        /**
+         * If accordion versus collapsible
+         * @default true
+         */
+        accordion: boolean;
+
+        /**
+         * Transition in duration in milliseconds.
+         * @default 300
+         */
+        inDuration: number;
+
+        /**
+         * Transition out duration in milliseconds.
+         * @default 300
+         */
+        outDuration: number;
+
+        /**
+         * Callback function called before modal is opened
+         * @default null
+         */
+        onOpenStart: (this: Collapsible, el: Element) => void;
+
+        /**
+         * Callback function called after modal is opened
+         * @default null
+         */
+        onOpenEnd: (this: Collapsible, el: Element) => void;
+
+        /**
+         * Callback function called before modal is closed
+         * @default null
+         */
+        onCloseStart: (this: Collapsible, el: Element) => void;
+
+        /**
+         * Callback function called after modal is closed
+         * @default null
+         */
+        onCloseEnd: (this: Collapsible, el: Element) => void;
+    }
+}
+
+interface JQuery {
+    collapsible(method: keyof Pick<M.Collapsible, "destroy">): JQuery;
+    collapsible(method: keyof Pick<M.Collapsible, "open">, n: number): JQuery;
+    collapsible(method: keyof Pick<M.Collapsible, "close">, n: number): JQuery;
+    collapsible(options?: Partial<M.CollapsibleOptions>): JQuery;
+}
diff --git a/types/materialize-css/common.d.ts b/types/materialize-css/common.d.ts
new file mode 100644
index 0000000000..605e9389be
--- /dev/null
+++ b/types/materialize-css/common.d.ts
@@ -0,0 +1,51 @@
+/// <reference types="jquery"/>
+/// <reference types="cash"/>
+
+type MElements = NodeListOf<Element> | JQuery | Cash;
+
+declare namespace M {
+    abstract class Component<TOptions> extends ComponentBase<TOptions> {
+        /**
+         * Construct component instance and set everything up
+         */
+        constructor(elem: Element, options?: Partial<TOptions>);
+
+        /**
+         * Destroy plugin instance and teardown
+         */
+        destroy(): void;
+    }
+
+    abstract class ComponentBase<TOptions> {
+        constructor(options?: Partial<TOptions>);
+
+        /**
+         * The DOM element the plugin was initialized with
+         */
+        el: Element;
+
+        /**
+         * The options the instance was initialized with
+         */
+        options: TOptions;
+    }
+
+    interface Openable {
+        isOpen: boolean;
+        open(): void;
+        close(): void;
+    }
+
+    interface InternationalizationOptions {
+        cancel: string;
+        clear: string;
+        done: string;
+        previousMonth: string;
+        nextMonth: string;
+        months: string[];
+        monthsShort: string;
+        weekdays: string[];
+        weekdaysShort: string[];
+        weekdaysAbbrev: string[];
+    }
+}
diff --git a/types/materialize-css/datepicker.d.ts b/types/materialize-css/datepicker.d.ts
new file mode 100644
index 0000000000..3940027173
--- /dev/null
+++ b/types/materialize-css/datepicker.d.ts
@@ -0,0 +1,201 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Datepicker extends Component<DatepickerOptions> implements Openable {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Datepicker;
+
+        /**
+         * Init Datepicker
+         */
+        static init(els: Element, options?: Partial<DatepickerOptions>): Datepicker;
+
+        /**
+         * Init Datepickers
+         */
+        static init(els: MElements, options?: Partial<DatepickerOptions>): Datepicker[];
+
+        /**
+         * If the picker is open.
+         */
+        isOpen: boolean;
+
+        /**
+         * The selected Date.
+         */
+        date: Date;
+
+        /**
+         * DONE button instance (undocumented!).
+         */
+        doneBtn: HTMLButtonElement;
+
+        /**
+         * CLEAR button instance (undocumented!).
+         */
+        clearBtn: HTMLButtonElement;
+
+        /**
+         * Open datepicker
+         */
+        open(): void;
+
+        /**
+         * Close datepicker
+         */
+        close(): void;
+
+        /**
+         * Gets a string representation of the selected date
+         */
+        toString(): string;
+
+        /**
+         * Set a date on the datepicker
+         * @param date Date to set on the datepicker.
+         * @param preventOnSelect Undocumented as of 5 March 2018
+         */
+        setDate(date?: Date | string, preventOnSelect?: boolean): void;
+
+        /**
+         * Change date view to a specific date on the datepicker
+         * @param date Date to show on the datepicker.
+         */
+        gotoDate(date: Date): void;
+
+        setInputValue(): void;
+    }
+
+    interface DatepickerOptions {
+        /**
+         * Automatically close picker when date is selected
+         * @default false
+         */
+        autoClose: boolean;
+
+        /**
+         * The date output format for the input field value.
+         * @default 'mmm dd, yyyy'
+         */
+        format: string;
+
+        /**
+         * Used to create date object from current input string.
+         */
+        parse: (value: string, format: string) => Date;
+
+        /**
+         * The initial date to view when first opened.
+         */
+        defaultDate: Date;
+
+        /**
+         * Make the `defaultDate` the initial selected value
+         * @default false
+         */
+        setDefaultDate: boolean;
+
+        /**
+         * Prevent selection of any date on the weekend.
+         * @default false
+         */
+        disableWeekends: boolean;
+
+        /**
+         * Custom function to disable certain days.
+         */
+        disableDayFn: (day: Date) => boolean;
+
+        /**
+         * First day of week (0: Sunday, 1: Monday etc).
+         * @default 0
+         */
+        firstDay: number;
+
+        /**
+         * The earliest date that can be selected.
+         */
+        minDate: Date;
+
+        /**
+         * The latest date that can be selected.
+         */
+        maxDate: Date;
+
+        /**
+         * Number of years either side, or array of upper/lower range.
+         * @default 10
+         */
+        yearRange: number | number[];
+
+        /**
+         * Changes Datepicker to RTL.
+         * @default false
+         */
+        isRTL: boolean;
+
+        /**
+         * Show month after year in Datepicker title.
+         * @default false
+         */
+        showMonthAfterYear: boolean;
+
+        /**
+         * Render days of the calendar grid that fall in the next or previous month.
+         * @default false
+         */
+        showDaysInNextAndPreviousMonths: boolean;
+
+        /**
+         * Specify a DOM element to render the calendar in, by default it will be placed before the input
+         * @default null
+         */
+        container: Element;
+
+        /**
+         * Show the clear button in the datepicker
+         * @default false
+         */
+        showClearBtn: boolean;
+
+        /**
+         * Internationalization options
+         */
+        i18n: Partial<InternationalizationOptions>;
+
+        /**
+         * An array of string returned by `Date.toDateString()`, indicating there are events in the specified days.
+         * @default []
+         */
+        events: string[];
+
+        /**
+         * Callback function when date is selected, first parameter is the newly selected date.
+         */
+        onSelect: (this: Datepicker, selectedDate: Date) => void;
+
+        /**
+         * Callback function when Datepicker is opened
+         */
+        onOpen: (this: Datepicker) => void;
+
+        /**
+         * Callback function when Datepicker is closed
+         */
+        onClose: (this: Datepicker) => void;
+
+        /**
+         * Callback function when Datepicker HTML is refreshed
+         */
+        onDraw: (this: Datepicker) => void;
+    }
+}
+
+interface JQuery {
+    datepicker(method: keyof Pick<M.Datepicker, "open" | "close" | "destroy">): JQuery;
+    datepicker(method: keyof Pick<M.Datepicker, "setDate">, date?: Date): JQuery;
+    datepicker(method: keyof Pick<M.Datepicker, "gotoDate">, date: Date): JQuery;
+    datepicker(options?: Partial<M.DatepickerOptions>): JQuery;
+}
diff --git a/types/materialize-css/dropdown.d.ts b/types/materialize-css/dropdown.d.ts
new file mode 100644
index 0000000000..fb9b7d90c1
--- /dev/null
+++ b/types/materialize-css/dropdown.d.ts
@@ -0,0 +1,145 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Dropdown extends Component<DropdownOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Dropdown;
+
+        /**
+         * Init Dropdown
+         */
+        static init(els: Element, options?: Partial<DropdownOptions>): Dropdown;
+
+        /**
+         * Init Dropdowns
+         */
+        static init(els: MElements, options?: Partial<DropdownOptions>): Dropdown[];
+
+        /**
+         * ID of the dropdown element
+         */
+        id: string;
+
+        /**
+         * The DOM element of the dropdown
+         */
+        dropdownEl: Element;
+
+        /**
+         * If the dropdown is open
+         */
+        isOpen: boolean;
+
+        /**
+         * If the dropdown content is scrollable
+         */
+        isScrollable: boolean;
+
+        /**
+         * The index of the item focused
+         */
+        focusedIndex: number;
+
+        /**
+         * Open dropdown
+         */
+        open(): void;
+
+        /**
+         * Close dropdown
+         */
+        close(): void;
+
+        /**
+         * While dropdown is open, you can recalculate its dimensions if its contents have changed
+         */
+        recalculateDimensions(): void;
+    }
+
+    interface DropdownOptions {
+        /**
+         * Defines the edge the menu is aligned to
+         * @default 'left'
+         */
+        alignment: 'left' | 'right';
+
+        /**
+         * If true, automatically focus dropdown el for keyboard
+         * @default true
+         */
+        autoTrigger: boolean;
+
+        /**
+         * If true, constrainWidth to the size of the dropdown activator
+         * @default true
+         */
+        constrainWidth: boolean;
+
+        /**
+         * Provide an element that will be the bounding container of the dropdown
+         * @default null
+         */
+        container: Element;
+
+        /**
+         * If false, the dropdown will show below the trigger
+         * @default true
+         */
+        coverTrigger: boolean;
+
+        /**
+         * If true, close dropdown on item click
+         * @default true
+         */
+        closeOnClick: boolean;
+
+        /**
+         * If true, the dropdown will open on hover
+         * @default false
+         */
+        hover: boolean;
+
+        /**
+         * The duration of the transition enter in milliseconds
+         * @default 150
+         */
+        inDuration: number;
+
+        /**
+         * The duration of the transition out in milliseconds
+         * @default 250
+         */
+        outDuration: number;
+
+        /**
+         * Function called when dropdown starts entering
+         * @default null
+         */
+        onOpenStart: (this: Dropdown, el: Element) => void;
+
+        /**
+         * Function called when dropdown finishes entering
+         * @default null
+         */
+        onOpenEnd: (this: Dropdown, el: Element) => void;
+
+        /**
+         * Function called when dropdown starts exiting
+         * @default null
+         */
+        onCloseStart: (this: Dropdown, el: Element) => void;
+
+        /**
+         * Function called when dropdown finishes exiting
+         * @default null
+         */
+        onCloseEnd: (this: Dropdown, el: Element) => void;
+    }
+}
+
+interface JQuery {
+    dropdown(method: keyof Pick<M.Dropdown, "recalculateDimensions" | "open" | "close" | "destroy">): JQuery;
+    dropdown(options?: Partial<M.DropdownOptions>): JQuery;
+}
diff --git a/types/materialize-css/fab.d.ts b/types/materialize-css/fab.d.ts
new file mode 100644
index 0000000000..74a7c89bfb
--- /dev/null
+++ b/types/materialize-css/fab.d.ts
@@ -0,0 +1,60 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class FloatingActionButton extends Component<FloatingActionButtonOptions> implements Openable {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): FloatingActionButton;
+
+        /**
+         * Init FloatingActionButton
+         */
+        static init(els: Element, options?: Partial<FloatingActionButtonOptions>): FloatingActionButton;
+
+        /**
+         * Init FloatingActionButtons
+         */
+        static init(els: MElements, options?: Partial<FloatingActionButtonOptions>): FloatingActionButton[];
+
+        /**
+         * Open FAB
+         */
+        open(): void;
+
+        /**
+         * Close FAB
+         */
+        close(): void;
+
+        /**
+         * Describes open/close state of FAB.
+         */
+        isOpen: boolean;
+    }
+
+    interface FloatingActionButtonOptions {
+        /**
+         * Direction FAB menu opens
+         * @default "top"
+         */
+        direction: "top" | "right" | "buttom" | "left";
+
+        /**
+         * true: FAB menu appears on hover, false: FAB menu appears on click
+         * @default true
+         */
+        hoverEnabled: boolean;
+
+        /**
+         * Enable transit the FAB into a toolbar on click
+         * @default false
+         */
+        toolbarEnabled: boolean;
+    }
+}
+
+interface JQuery {
+    floatingActionButton(method: keyof Pick<M.FloatingActionButton, "open" | "close" | "destroy">): JQuery;
+    floatingActionButton(options?: Partial<M.FloatingActionButtonOptions>): JQuery;
+}
diff --git a/types/materialize-css/formselect.d.ts b/types/materialize-css/formselect.d.ts
new file mode 100644
index 0000000000..de901d7fbf
--- /dev/null
+++ b/types/materialize-css/formselect.d.ts
@@ -0,0 +1,70 @@
+/// <reference path="./common.d.ts" />
+/// <reference path="./dropdown.d.ts" />
+
+declare namespace M {
+    class FormSelect extends Component<FormSelectOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): FormSelect;
+
+        /**
+         * Init FormSelect
+         */
+        static init(els: Element, options?: Partial<FormSelectOptions>): FormSelect;
+
+        /**
+         * Init FormSelects
+         */
+        static init(els: MElements, options?: Partial<FormSelectOptions>): FormSelect[];
+
+        /**
+         * If this is a multiple select
+         */
+        isMultiple: boolean;
+
+        /**
+         * The select wrapper element
+         */
+        wrapper: Element;
+
+        /**
+         * Dropdown UL element
+         */
+        dropdownOptions: HTMLUListElement;
+
+        /**
+         * Text input that shows current selected option
+         */
+        input: HTMLInputElement;
+
+        /**
+         * Instance of the dropdown plugin for this select
+         */
+        dropdown: Dropdown;
+
+        /**
+         * Get selected values in an array
+         */
+        getSelectedValues(): string[];
+    }
+
+    interface FormSelectOptions {
+        /**
+         * Classes to be added to the select wrapper element
+         * @default ''
+         */
+        classes: string;
+
+        /**
+         * Pass options object to select dropdown initialization
+         * @default {}
+         */
+        dropdownOptions: Partial<DropdownOptions>;
+    }
+}
+
+interface JQuery {
+    formSelect(method: keyof Pick<M.FormSelect, "getSelectedValues" | "destroy">): JQuery;
+    formSelect(options?: Partial<M.FormSelectOptions>): JQuery;
+}
diff --git a/types/materialize-css/index.d.ts b/types/materialize-css/index.d.ts
index 0a383f1c65..f8502cafb4 100644
--- a/types/materialize-css/index.d.ts
+++ b/types/materialize-css/index.d.ts
@@ -1,975 +1,37 @@
 // Type definitions for materialize-css 1.0
 // Project: http://materializecss.com/
-// Definitions by:  胡玮文 <https://github.com/huww98>, Maxim Balaganskiy <https://github.com/MaximBalaganskiy>
+// Definitions by:  胡玮文 <https://github.com/huww98>
+//                  Maxim Balaganskiy <https://github.com/MaximBalaganskiy>
+//                  David Moniz <https://github.com/MonizDave>
+//                  Daniel Hoenes <https://github.com/broccoliarchy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 /// <reference types="jquery" />
+/// <reference path="./autocomplete.d.ts" />
+/// <reference path="./carousel.d.ts" />
+/// <reference path="./character-counter.d.ts" />
+/// <reference path="./chips.d.ts" />
+/// <reference path="./collapsible.d.ts" />
+/// <reference path="./common.d.ts" />
+/// <reference path="./datepicker.d.ts" />
+/// <reference path="./dropdown.d.ts" />
+/// <reference path="./fab.d.ts" />
+/// <reference path="./formselect.d.ts" />
+/// <reference path="./inputfields.d.ts" />
+/// <reference path="./materialbox.d.ts" />
+/// <reference path="./modal.d.ts" />
+/// <reference path="./parallax.d.ts" />
+/// <reference path="./pushpin.d.ts" />
+/// <reference path="./range.d.ts" />
+/// <reference path="./scrollspy.d.ts" />
+/// <reference path="./sidenav.d.ts" />
+/// <reference path="./slider.d.ts" />
+/// <reference path="./tabs.d.ts" />
+/// <reference path="./taptarget.d.ts" />
+/// <reference path="./timepicker.d.ts" />
+/// <reference path="./toast.d.ts" />
+/// <reference path="./tooltip.d.ts" />
+/// <reference path="./waves.d.ts" />
 
 export = M;
-
-declare global {
-    namespace M {
-        class Autocomplete extends Component<AutocompleteOptions> {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): Autocomplete;
-
-            /**
-             * Select a specific autocomplete options.
-             * @param el Element of the autocomplete option.
-             */
-            selectOption(el: Element): void;
-
-            /**
-             * Update autocomplete options data.
-             * @param data Autocomplete options data object.
-             */
-            updateData(data: AutocompleteData): void;
-
-            /**
-             * If the autocomplete is open.
-             */
-            isOpen: boolean;
-
-            /**
-             * Number of matching autocomplete options.
-             */
-            count: number;
-
-            /**
-             * Index of the current selected option.
-             */
-            activeIndex: number;
-        }
-
-        interface AutocompleteData {
-            [key: string]: string | null;
-        }
-
-        interface AutocompleteOptions {
-            /**
-             * Data object defining autocomplete options with optional icon strings.
-             */
-            data: AutocompleteData;
-
-            /**
-             * Limit of results the autocomplete shows.
-             * @default infinity
-             */
-            limit: number;
-
-            /**
-             * Callback for when autocompleted.
-             */
-            onAutocomplete: (this: Autocomplete, text: string) => void;
-
-            /**
-             * Minimum number of characters before autocomplete starts.
-             * @default 1
-             */
-            minLength: number;
-
-            /**
-             * Sort function that defines the order of the list of autocomplete options.
-             */
-            sortFunction: (a: string, b: string, inputText: string) => number;
-        }
-
-        class DatePicker extends Component<DatePickerOptions> implements Openable {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): DatePicker;
-
-            /**
-             * If the picker is open.
-             */
-            isOpen: boolean;
-
-            /**
-             * The selected Date.
-             */
-            date: Date;
-
-            /**
-             * Open datepicker
-             */
-            open(): void;
-
-            /**
-             * Close datepicker
-             */
-            close(): void;
-
-            /**
-             * Gets a string representation of the selected date
-             */
-            toString(): string;
-
-            /**
-             * Set a date on the datepicker
-             * @param date Date to set on the datepicker.
-             */
-            setDate(date?: Date): void;
-
-            /**
-             * Change date view to a specific date on the datepicker
-             * @param date Date to show on the datepicker.
-             */
-            gotoDate(date: Date): void;
-        }
-
-        interface DatePickerOptions {
-            /**
-             * The date output format for the input field value.
-             * @default 'mmm dd, yyyy'
-             */
-            format: string;
-
-            /**
-             * Used to create date object from current input string.
-             */
-            parse: (value: string, format: string) => Date;
-
-            /**
-             * The initial date to view when first opened.
-             */
-            defaultDate: Date;
-
-            /**
-             * Make the `defaultDate` the initial selected value
-             * @default false
-             */
-            setDefaultDate: boolean;
-
-            /**
-             * Prevent selection of any date on the weekend.
-             * @default false
-             */
-            disableWeekends: boolean;
-
-            /**
-             * Custom function to disable certain days.
-             */
-            disableDayFn: (day: Date) => boolean;
-
-            /**
-             * First day of week (0: Sunday, 1: Monday etc).
-             * @default 0
-             */
-            firstDay: number;
-
-            /**
-             * The earliest date that can be selected.
-             */
-            minDate: Date;
-
-            /**
-             * The latest date that can be selected.
-             */
-            maxDate: Date;
-
-            /**
-             * Number of years either side, or array of upper/lower range.
-             * @default 10
-             */
-            yearRange: number | number[];
-
-            /**
-             * Changes Datepicker to RTL.
-             * @default false
-             */
-            isRTL: boolean;
-
-            /**
-             * Show month after year in Datepicker title.
-             * @default false
-             */
-            showMonthAfterYear: boolean;
-
-            /**
-             * Render days of the calendar grid that fall in the next or previous month.
-             * @default false
-             */
-            showDaysInNextAndPreviousMonths: boolean;
-
-            /**
-             * Specify a selector for a DOM element to render the calendar in, by default it will be placed before the input.
-             */
-            container: string;
-
-            /**
-             * An array of string returned by `Date.toDateString()`, indicating there are events in the specified days.
-             * @default []
-             */
-            events: string[];
-
-            /**
-             * Callback function when date is selected, first parameter is the newly selected date.
-             */
-            onSelect: (this: DatePicker, selectedDate: Date) => void;
-
-            /**
-             * Callback function when Datepicker is opened
-             */
-            onOpen: (this: DatePicker) => void;
-
-            /**
-             * Callback function when Datepicker is closed
-             */
-            onClose: (this: DatePicker) => void;
-
-            /**
-             * Callback function when Datepicker HTML is refreshed
-             */
-            onDraw: (this: DatePicker) => void;
-        }
-
-        interface DropdownOptions {
-			/**
-			 * Defines the edge the menu is aligned to
-			 * @default 'left'
-			 */
-            alignment: string;
-
-			/**
-			 * If true, automatically focus dropdown el for keyboard
-			 * @default true
-			 */
-            autoTrigger: boolean;
-
-			/**
-			 * If true, constrainWidth to the size of the dropdown activator
-			 * @default true
-			 */
-            constrainWidth: boolean;
-
-			/**
-			 * Provide an element that will be the bounding container of the dropdown
-			 * @default null
-			 */
-            container: Element;
-
-			/**
-			 * If false, the dropdown will show below the trigger
-			 * @default true
-			 */
-            coverTrigger: boolean;	// If false, the dropdown will show below the trigger.
-
-			/**
-			 * If true, close dropdown on item click
-			 * @default true
-			 */
-            closeOnClick: boolean;
-
-			/**
-			 * If true, the dropdown will open on hover
-			 * @default false
-			 */
-            hover: boolean;
-
-			/**
-			 * The duration of the transition enter in milliseconds
-			 * @default 150
-			 */
-            inDuration: number;
-
-			/**
-			 * The duration of the transition out in milliseconds
-			 * @default 250
-			 */
-            outDuration: number;
-
-			/**
-			 * Function called when dropdown starts entering
-			 * @default null
-			 */
-            onOpenStart: (this: Dropdown, el: Element) => void;
-
-			/**
-			 * Function called when dropdown finishes entering
-			 * @default null
-			 */
-            onOpenEnd: (this: Dropdown, el: Element) => void;
-
-			/**
-			 * Function called when dropdown starts exiting
-			 * @default null
-			 */
-            onCloseStart: (this: Dropdown, el: Element) => void;
-
-			/**
-			 * Function called when dropdown finishes exiting
-			 * @default null
-			 */
-            onCloseEnd: (this: Dropdown, el: Element) => void;
-        }
-
-        class Dropdown extends Component<DropdownOptions> {
-			/**
-			 * ID of the dropdown element
-			 */
-            id: string;
-
-			/**
-			 * The DOM element of the dropdown
-			 */
-            dropdownEl: Element;
-
-			/**
-			 * If the dropdown is open
-			 */
-            isOpen: boolean;
-
-			/**
-			 * If the dropdown content is scrollable
-			 */
-            isScrollable: boolean;
-
-			/**
-			 * The index of the item focused
-			 */
-            focusedIndex: number;
-
-			/**
-			 * Open dropdown
-			 */
-            open(): void;
-
-			/**
-			 * Close dropdown
-			 */
-            close(): void;
-
-			/**
-			 * While dropdown is open, you can recalculate its dimensions if its contents have changed
-			 */
-            recalculateDimensions(): void;
-        }
-
-        class FloatingActionButton extends Component<FloatingActionButtonOptions> implements Openable {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): FloatingActionButton;
-
-            /**
-             * Open FAB
-             */
-            open(): void;
-
-            /**
-             * Close FAB
-             */
-            close(): void;
-
-            /**
-             * Describes open/close state of FAB.
-             */
-            isOpen: boolean;
-        }
-
-        interface FloatingActionButtonOptions {
-            /**
-             * Direction FAB menu opens
-             * @default "top"
-             */
-            direction: "top" | "right" | "buttom" | "left";
-
-            /**
-             * true: FAB menu appears on hover, false: FAB menu appears on click
-             * @default true
-             */
-            hoverEnabled: boolean;
-
-            /**
-             * Enable transit the FAB into a toolbar on click
-             * @default false
-             */
-            toolbarEnabled: boolean;
-        }
-
-        interface FormSelectOptions {
-            /**
-             * Classes to be added to the select wrapper element
-             * @default ''
-             */
-            classes: string;
-
-            /**
-             * Pass options object to select dropdown initialization
-             * @default {}
-             */
-            dropdownOptions: Partial<DropdownOptions>;
-        }
-
-        class FormSelect extends Component<FormSelectOptions> {
-            /**
-             * If this is a multiple select
-             */
-            isMultiple: boolean;
-
-            /**
-             * The select wrapper element
-             */
-            wrapper: Element;
-
-            /**
-             * Dropdown UL element
-             */
-            dropdownOptions: HTMLUListElement;
-
-            /**
-             * Text input that shows current selected option
-             */
-            input: HTMLInputElement;
-
-            /**
-             * Instance of the dropdown plugin for this select
-             */
-            dropdown: Dropdown;
-
-            /**
-             * Get selected values in an array
-             */
-            getSelectedValues(): string[];
-        }
-
-        class Sidenav extends Component<SidenavOptions> implements Openable {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): Sidenav;
-
-            /**
-             * Opens Sidenav
-             */
-            open(): void;
-
-            /**
-             * Closes Sidenav
-             */
-            close(): void;
-
-            /**
-             * Describes open/close state of Sidenav
-             */
-            isOpen: boolean;
-
-            /**
-             * Describes if sidenav is fixed
-             */
-            isFixed: boolean;
-
-            /**
-             * Describes if Sidenav is being dragged
-             */
-            isDragged: boolean;
-        }
-
-        /**
-         * Options for the Sidenav
-         */
-        interface SidenavOptions {
-            /**
-             * Side of screen on which Sidenav appears
-             * @default 'left'
-             */
-            edge: 'left' | 'right';
-
-            /**
-             * Allow swipe gestures to open/close Sidenav
-             * @default true
-             */
-            draggable: boolean;
-
-            /**
-             * Length in ms of enter transition
-             * @default 250
-             */
-            inDuration: number;
-
-            /**
-             * Length in ms of exit transition
-             * @default 200
-             */
-            outDuration: number;
-
-            /**
-             * Function called when sidenav starts entering
-             */
-            onOpenStart: (this: Sidenav, elem: Element) => void;
-
-            /**
-             * Function called when sidenav finishes entering
-             */
-            onOpenEnd: (this: Sidenav, elem: Element) => void;
-
-            /**
-             * Function called when sidenav starts exiting
-             */
-            onCloseStart: (this: Sidenav, elem: Element) => void;
-
-            /**
-             * Function called when sidenav finishes exiting
-             */
-            onCloseEnd: (this: Sidenav, elem: Element) => void;
-        }
-
-        class Tabs extends Component<TabsOptions> {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): Tabs;
-
-            /**
-             * Show tab content that corresponds to the tab with the id
-             * @param tabId The id of the tab that you want to switch to
-             */
-            select(tabId: string): void;
-
-            /**
-             * The index of tab that is currently shown
-             */
-            index: number;
-        }
-
-        /**
-         * Options for the Tabs
-         */
-        interface TabsOptions {
-            /**
-             * Transition duration in milliseconds.
-             * @default 300
-             */
-            duration: number;
-
-            /**
-             * Callback for when a new tab content is shown
-             */
-            onShow: (this: Tabs, newContent: Element) => void;
-
-            /**
-             * Set to true to enable swipeable tabs. This also uses the responsiveThreshold option
-             * @default false
-             */
-            swipeable: boolean;
-
-            /**
-             * The maximum width of the screen, in pixels, where the swipeable functionality initializes.
-             * @default infinity
-             */
-            responsiveThreshold: number;
-        }
-
-        class TimePicker extends Component<TimePickerOptions> {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): TimePicker;
-
-            /**
-             * If the picker is open.
-             */
-            isOpen: boolean;
-
-            /**
-             * The selected time.
-             */
-            time: string;
-
-            /**
-             * Open timepicker
-             */
-            open(): void;
-
-            /**
-             * Close timepicker
-             */
-            close(): void;
-
-            /**
-             * Show hours or minutes view on timepicker
-             * @param view The name of the view you want to switch to, 'hours' or 'minutes'.
-             */
-            showView(view: "hours" | "minutes"): void;
-        }
-
-        interface TimePickerOptions {
-            /**
-             * Duration of the transition from/to the hours/minutes view.
-             * @default 350
-             */
-            duration: number;
-
-            /**
-             * Specify a selector for a DOM element to render the calendar in, by default it will be placed before the input.
-             */
-            container: string;
-
-            /**
-             * Default time to set on the timepicker 'now' or '13:14'
-             * @default 'now';
-             */
-            defaultTime: string;
-
-            /**
-             * Millisecond offset from the defaultTime.
-             * @default 0
-             */
-            fromnow: number;
-
-            /**
-             * Done button text.
-             * @default 'Ok'
-             */
-            doneText: string;
-
-            /**
-             * Clear button text.
-             * @default 'Clear'
-             */
-            clearText: string;
-
-            /**
-             * Cancel button text.
-             * @default 'Cancel'
-             */
-            cancelText: string;
-
-            /**
-             * Automatically close picker when minute is selected.
-             * @default false;
-             */
-            autoClose: boolean;
-
-            /**
-             * Use 12 hour AM/PM clock instead of 24 hour clock.
-             * @default true
-             */
-            twelveHour: boolean;
-
-            /**
-             * Vibrate device when dragging clock hand.
-             * @default true
-             */
-            vibrate: boolean;
-        }
-
-        class Modal extends Component<ModalOptions> implements Openable {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): Modal;
-
-            /**
-             * Open modal
-             */
-            open(): void;
-
-            /**
-             * Close modal
-             */
-            close(): void;
-
-            /**
-             * If the modal is open.
-             */
-            isOpen: boolean;
-
-            /**
-             * ID of the modal element
-             */
-            id: string;
-        }
-
-        /**
-         * Options for the Modal
-         */
-        interface ModalOptions {
-            /**
-             * Opacity of the modal overlay.
-             * @default 0.5
-             */
-            opacity: number;
-
-            /**
-             * Transition in duration in milliseconds.
-             * @default 250
-             */
-            inDuration: number;
-
-            /**
-             * Transition out duration in milliseconds.
-             * @default 250
-             */
-            outDuration: number;
-
-            /**
-             * Callback function called when modal is finished entering.
-             */
-            ready: (this: Modal, elem: Element, openingTrigger: Element) => void;
-
-            /**
-             * Callback function called when modal is finished exiting.
-             */
-            complete: (this: Modal, elem: Element) => void;
-
-            /**
-             * Allow modal to be dismissed by keyboard or overlay click.
-             * @default true
-             */
-            dismissible: boolean;
-
-            /**
-             * Starting top offset
-             * @default '4%'
-             */
-            startingTop: string;
-
-            /**
-             * Ending top offset
-             * @default '10%'
-             */
-            endingTop: string;
-        }
-
-        class Toast extends ComponentBase<ToastOptions> {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): Toast;
-
-            /**
-             * Describes the current pan state of the Toast.
-             */
-            panning: boolean;
-
-            /**
-             * The remaining amount of time in ms that the toast will stay before dismissal.
-             */
-            timeRemaining: number;
-
-            /**
-             * remove a specific toast
-             */
-            dismiss(): void;
-
-            /**
-             * dismiss all toasts
-             */
-            static dismissAll(): void;
-        }
-
-        interface ToastOptions {
-            /**
-             * The HTML content of the Toast.
-             */
-            html: string;
-
-            /**
-             * Length in ms the Toast stays before dismissal.
-             * @default 4000
-             */
-            displayLength: number;
-
-            /**
-             * Transition in duration in milliseconds.
-             * @default 300
-             */
-            inDuration: number;
-
-            /**
-             * Transition out duration in milliseconds.
-             * @default 375
-             */
-            outDuration: number;
-
-            /**
-             * Classes to be added to the toast element.
-             */
-            classes: string;
-
-            /**
-             * Callback function called when toast is dismissed.
-             */
-            completeCallback: () => void;
-
-            /**
-             * The percentage of the toast's width it takes for a drag to dismiss a Toast.
-             * @default 0.8
-             */
-            activationPercent: number;
-        }
-
-        /**
-         * Create a toast
-         */
-        function toast(options: Partial<ToastOptions>): Toast;
-
-        class Tooltip extends Component<TooltipOptions> implements Openable {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): Tooltip;
-
-            /**
-             * Show tooltip.
-             */
-            open(): void;
-
-            /**
-             * Hide tooltip.
-             */
-            close(): void;
-
-            /**
-             * If tooltip is open.
-             */
-            isOpen: boolean;
-
-            /**
-             * If tooltip is hovered.
-             */
-            isHovered: boolean;
-        }
-
-        interface TooltipOptions {
-            /**
-             * Delay time before tooltip disappears.
-             * @default 0
-             */
-            exitDelay: number;
-
-            /**
-             * Delay time before tooltip appears.
-             * @default 200
-             */
-            enterDelay: number;
-
-            /**
-             * Can take regular text or HTML strings.
-             * @default null
-             */
-            html: string | null;
-
-            /**
-             * Set distance tooltip appears away from its activator excluding transitionMovement.
-             * @default 5
-             */
-            margin: number;
-
-            /**
-             * Enter transition duration.
-             * @default 300
-             */
-            inDuration: number;
-
-            /**
-             * Exit transition duration.
-             * @default 250
-             */
-            outDuration: number;
-
-            /**
-             * Set the direction of the tooltip.
-             * @default 'bottom'
-             */
-            position: 'top' | 'right' | 'bottom' | 'left';
-
-            /**
-             * Amount in px that the tooltip moves during its transition.
-             * @default 10
-             */
-            transitionMovement: number;
-        }
-
-        function updateTextFields(): void;
-
-        class CharacterCounter extends Component<undefined> {
-            /**
-             * Get Instance
-             */
-            static getInstance(elem: Element): CharacterCounter;
-        }
-
-        abstract class Component<TOptions> extends ComponentBase<TOptions> {
-            /**
-             * Construct component instance and set everything up
-             */
-            constructor(elem: Element, options?: Partial<TOptions>);
-
-            /**
-             * Destroy plugin instance and teardown
-             */
-            destroy(): void;
-        }
-
-        abstract class ComponentBase<TOptions> {
-            constructor(options?: Partial<TOptions>);
-
-            /**
-             * The DOM element the plugin was initialized with
-             */
-            el: Element;
-
-            /**
-             * The options the instance was initialized with
-             */
-            options: TOptions;
-        }
-
-        interface Openable {
-            isOpen: boolean;
-            open(): void;
-            close(): void;
-        }
-    }
-
-    interface JQuery {
-        // Pick<T,K> to check methods exist.
-        autocomplete(method: keyof Pick<M.Autocomplete, "destroy">): JQuery;
-        autocomplete(method: keyof Pick<M.Autocomplete, "selectOption">, el: Element): JQuery;
-        autocomplete(method: keyof Pick<M.Autocomplete, "updateData">, data: M.AutocompleteData): JQuery;
-        autocomplete(options?: Partial<M.AutocompleteOptions>): JQuery;
-
-        datepicker(method: keyof Pick<M.DatePicker, "open" | "close" | "destroy">): JQuery;
-        datepicker(method: keyof Pick<M.DatePicker, "setDate">, date?: Date): JQuery;
-        datepicker(method: keyof Pick<M.DatePicker, "gotoDate">, date: Date): JQuery;
-        datepicker(options?: Partial<M.DatePickerOptions>): JQuery;
-
-        dropdown(method: keyof Pick<M.Dropdown, "recalculateDimensions" | "open" | "close" | "destroy">): JQuery;
-        dropdown(options?: Partial<M.DropdownOptions>): JQuery;
-
-        floatingActionButton(method: keyof Pick<M.FloatingActionButton, "open" | "close" | "destroy">): JQuery;
-        floatingActionButton(options?: Partial<M.FloatingActionButtonOptions>): JQuery;
-
-        formSelect(method: keyof Pick<M.FormSelect, "getSelectedValues" | "destroy">): JQuery;
-        formSelect(options?: Partial<M.FormSelectOptions>): JQuery;
-
-        sidenav(method: keyof Pick<M.Sidenav, "open" | "close" | "destroy">): JQuery;
-        sidenav(options?: Partial<M.SidenavOptions>): JQuery;
-
-        tabs(method: keyof Pick<M.Tabs, "destroy">): JQuery;
-        tabs(method: keyof Pick<M.Tabs, "select">, tabId: string): JQuery;
-        tabs(options?: Partial<M.TabsOptions>): JQuery;
-
-        timepicker(method: keyof Pick<M.TimePicker, "open" | "close" | "destroy">): JQuery;
-        timepicker(method: keyof Pick<M.TimePicker, "showView">, view: "hours" | "minutes"): JQuery;
-        timepicker(options?: Partial<M.TimePickerOptions>): JQuery;
-
-        // Toast can not be invoked using jQuery.
-
-        tooltip(method: keyof Pick<M.Tooltip, "open" | "close" | "destroy">): JQuery;
-        tooltip(options?: Partial<M.TooltipOptions>): JQuery;
-
-        modal(method: keyof Pick<M.Modal, "open" | "close" | "destroy">): JQuery;
-        modal(options?: Partial<M.ModalOptions>): JQuery;
-
-        // tslint:disable-next-line unified-signatures
-        characterCounter(method: keyof Pick<M.CharacterCounter, "destroy">): JQuery;
-        characterCounter(): JQuery;
-    }
-}
diff --git a/types/materialize-css/inputfields.d.ts b/types/materialize-css/inputfields.d.ts
new file mode 100644
index 0000000000..23c5ca9489
--- /dev/null
+++ b/types/materialize-css/inputfields.d.ts
@@ -0,0 +1,7 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    function updateTextFields(): void;
+
+    function textareaAutoResize(textarea: Element | JQuery | Cash): void;
+}
diff --git a/types/materialize-css/materialbox.d.ts b/types/materialize-css/materialbox.d.ts
new file mode 100644
index 0000000000..225afd67e6
--- /dev/null
+++ b/types/materialize-css/materialbox.d.ts
@@ -0,0 +1,98 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Materialbox extends Component<MaterialboxOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Materialbox;
+
+        /**
+         * Init Materialbox
+         */
+        static init(els: Element, options?: Partial<MaterialboxOptions>): Materialbox;
+
+        /**
+         * Init Materialboxes
+         */
+        static init(els: MElements, options?: Partial<MaterialboxOptions>): Materialbox[];
+
+        /**
+         * If the materialbox overlay is showing
+         */
+        overlayActive: boolean;
+
+        /**
+         * If the materialbox is no longer being animated
+         */
+        doneAnimating: boolean;
+
+        /**
+         * Caption if specified
+         */
+        caption: string;
+
+        /**
+         * Original width of image
+         */
+        originalWidth: number;
+
+        /**
+         * Original height of image
+         */
+        originalHeight: number;
+
+        /**
+         * Open materialbox
+         */
+        open(): void;
+
+        /**
+         * Close materialbox
+         */
+        close(): void;
+    }
+
+    interface MaterialboxOptions {
+        /**
+         * Transition in duration in milliseconds
+         * @default 275
+         */
+        inDuration: number;
+
+        /**
+         * Transition out duration in milliseconds
+         * @default 200
+         */
+        outDuration: number;
+
+        /**
+         * Callback function called before materialbox is opened
+         * @default null
+         */
+        onOpenStart: (this: Materialbox, el: Element) => void;
+
+        /**
+         * Callback function called after materialbox is opened
+         * @default null
+         */
+        onOpenEnd: (this: Materialbox, el: Element) => void;
+
+        /**
+         * Callback function called before materialbox is closed
+         * @default null
+         */
+        onCloseStart: (this: Materialbox, el: Element) => void;
+
+        /**
+         * Callback function called after materialbox is closed
+         * @default null
+         */
+        onCloseEnd: (this: Materialbox, el: Element) => void;
+    }
+}
+
+interface JQuery {
+    materialbox(method: keyof Pick<M.Materialbox, "destroy" | "open" | "close">): JQuery;
+    materialbox(options?: Partial<M.MaterialboxOptions>): JQuery;
+}
diff --git a/types/materialize-css/modal.d.ts b/types/materialize-css/modal.d.ts
new file mode 100644
index 0000000000..d23a4f9c33
--- /dev/null
+++ b/types/materialize-css/modal.d.ts
@@ -0,0 +1,116 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Modal extends Component<ModalOptions> implements Openable {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Modal;
+
+        /**
+         * Init Modal
+         */
+        static init(els: Element, options?: Partial<ModalOptions>): Modal;
+
+        /**
+         * Init Modals
+         */
+        static init(els: MElements, options?: Partial<ModalOptions>): Modal[];
+
+        /**
+         * Open modal
+         */
+        open(): void;
+
+        /**
+         * Close modal
+         */
+        close(): void;
+
+        /**
+         * If the modal is open.
+         */
+        isOpen: boolean;
+
+        /**
+         * ID of the modal element
+         */
+        id: string;
+    }
+
+    /**
+     * Options for the Modal
+     */
+    interface ModalOptions {
+        /**
+         * Opacity of the modal overlay.
+         * @default 0.5
+         */
+        opacity: number;
+
+        /**
+         * Transition in duration in milliseconds.
+         * @default 250
+         */
+        inDuration: number;
+
+        /**
+         * Transition out duration in milliseconds.
+         * @default 250
+         */
+        outDuration: number;
+
+        /**
+         * Prevent page from scrolling while modal is open
+         * @default true
+         */
+        preventScrolling: boolean;
+
+        /**
+         * Callback function called before modal is opened
+         * @default null
+         */
+        onOpenStart: (this: Modal, el: Element) => void;
+
+        /**
+         * Callback function called after modal is opened
+         * @default null
+         */
+        onOpenEnd: (this: Modal, el: Element) => void;
+
+        /**
+         * Callback function called before modal is closed
+         * @default null
+         */
+        onCloseStart: (this: Modal, el: Element) => void;
+
+        /**
+         * Callback function called after modal is closed
+         * @default null
+         */
+        onCloseEnd: (this: Modal, el: Element) => void;
+
+        /**
+         * Allow modal to be dismissed by keyboard or overlay click.
+         * @default true
+         */
+        dismissible: boolean;
+
+        /**
+         * Starting top offset
+         * @default '4%'
+         */
+        startingTop: string;
+
+        /**
+         * Ending top offset
+         * @default '10%'
+         */
+        endingTop: string;
+    }
+}
+
+interface JQuery {
+    modal(method: keyof Pick<M.Modal, "open" | "close" | "destroy">): JQuery;
+    modal(options?: Partial<M.ModalOptions>): JQuery;
+}
diff --git a/types/materialize-css/parallax.d.ts b/types/materialize-css/parallax.d.ts
new file mode 100644
index 0000000000..17d2de56b9
--- /dev/null
+++ b/types/materialize-css/parallax.d.ts
@@ -0,0 +1,33 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Parallax extends Component<ParallaxOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Parallax;
+
+        /**
+         * Init Parallax
+         */
+        static init(els: Element, options?: Partial<ParallaxOptions>): Parallax;
+
+        /**
+         * Init Parallaxs
+         */
+        static init(els: MElements, options?: Partial<ParallaxOptions>): Parallax[];
+    }
+
+    interface ParallaxOptions {
+        /**
+         * The minimum width of the screen, in pixels, where the parallax functionality starts working
+         * @default 0
+         */
+        responsiveThreshold: number;
+    }
+}
+
+interface JQuery {
+    parallax(options?: Partial<M.ParallaxOptions>): JQuery;
+    parallax(method: keyof Pick<M.Parallax, "destroy">): JQuery;
+}
diff --git a/types/materialize-css/pushpin.d.ts b/types/materialize-css/pushpin.d.ts
new file mode 100644
index 0000000000..cab559e713
--- /dev/null
+++ b/types/materialize-css/pushpin.d.ts
@@ -0,0 +1,56 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Pushpin extends Component<PushpinOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Pushpin;
+
+        /**
+         * Init Pushpin
+         */
+        static init(els: Element, options?: Partial<PushpinOptions>): Pushpin;
+
+        /**
+         * Init Pushpins
+         */
+        static init(els: MElements, options?: Partial<PushpinOptions>): Pushpin[];
+
+        /**
+         * Original offsetTop of element
+         */
+        originalOffset: number;
+    }
+
+    interface PushpinOptions {
+        /**
+         * The distance in pixels from the top of the page where the element becomes fixed
+         * @default 0
+         */
+        top: number;
+
+        /**
+         * The distance in pixels from the top of the page where the elements stops being fixed
+         * @default Infinity
+         */
+        bottom: number;
+
+        /**
+         * The offset from the top the element will be fixed at
+         * @default 0
+         */
+        offset: number;
+
+        /**
+         * Callback function called when pushpin position changes. You are provided with a position string
+         * @default null
+         */
+        onPositionChange: (this: Pushpin, position: "pinned" | "pin-top" | "pin-bottom") => void;
+    }
+}
+
+interface JQuery {
+    pushpin(options?: Partial<M.PushpinOptions>): JQuery;
+    pushpin(method: keyof Pick<M.Pushpin, "destroy">): JQuery;
+}
diff --git a/types/materialize-css/range.d.ts b/types/materialize-css/range.d.ts
new file mode 100644
index 0000000000..dac7a7edf2
--- /dev/null
+++ b/types/materialize-css/range.d.ts
@@ -0,0 +1,25 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Range extends Component<undefined> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Range;
+
+        /**
+         * Init Range
+         */
+        static init(els: Element, options?: Partial<undefined>): Range;
+
+        /**
+         * Init Ranges
+         */
+        static init(els: MElements, options?: Partial<undefined>): Range[];
+    }
+}
+
+interface JQuery {
+    range(): JQuery;
+    range(method: keyof Pick<M.Range, "destroy">): JQuery;
+}
diff --git a/types/materialize-css/scrollspy.d.ts b/types/materialize-css/scrollspy.d.ts
new file mode 100644
index 0000000000..3f5f2bd21b
--- /dev/null
+++ b/types/materialize-css/scrollspy.d.ts
@@ -0,0 +1,51 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class ScrollSpy extends Component<ScrollSpyOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): ScrollSpy;
+
+        /**
+         * Init ScrollSpy
+         */
+        static init(els: Element, options?: Partial<ScrollSpyOptions>): ScrollSpy;
+
+        /**
+         * Init ScrollSpies
+         */
+        static init(els: MElements, options?: Partial<ScrollSpyOptions>): ScrollSpy[];
+    }
+
+    interface ScrollSpyOptions {
+        /**
+         * Throttle of scroll handler
+         * @default 100
+         */
+        throttle: number;
+
+        /**
+         * Offset for centering element when scrolled to
+         * @default 200
+         */
+        scrollOffset: number;
+
+        /**
+         * Class applied to active elements
+         * @default 'active'
+         */
+        activeClass: string;
+
+        /**
+         * Used to find active element
+         * @default id => 'a[href="#' + id + '"]'
+         */
+        getActiveElement: (id: string) => string;
+    }
+}
+
+interface JQuery {
+    scrollSpy(options?: Partial<M.ScrollSpyOptions>): JQuery;
+    scrollSpy(method: keyof Pick<M.ScrollSpy, "destroy">): JQuery;
+}
diff --git a/types/materialize-css/sidenav.d.ts b/types/materialize-css/sidenav.d.ts
new file mode 100644
index 0000000000..3843393d88
--- /dev/null
+++ b/types/materialize-css/sidenav.d.ts
@@ -0,0 +1,99 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Sidenav extends Component<SidenavOptions> implements Openable {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Sidenav;
+
+        /**
+         * Init Sidenav
+         */
+        static init(els: Element, options?: Partial<SidenavOptions>): Sidenav;
+
+        /**
+         * Init Sidenavs
+         */
+        static init(els: MElements, options?: Partial<SidenavOptions>): Sidenav[];
+
+        /**
+         * Opens Sidenav
+         */
+        open(): void;
+
+        /**
+         * Closes Sidenav
+         */
+        close(): void;
+
+        /**
+         * Describes open/close state of Sidenav
+         */
+        isOpen: boolean;
+
+        /**
+         * Describes if sidenav is fixed
+         */
+        isFixed: boolean;
+
+        /**
+         * Describes if Sidenav is being dragged
+         */
+        isDragged: boolean;
+    }
+
+    /**
+     * Options for the Sidenav
+     */
+    interface SidenavOptions {
+        /**
+         * Side of screen on which Sidenav appears
+         * @default 'left'
+         */
+        edge: 'left' | 'right';
+
+        /**
+         * Allow swipe gestures to open/close Sidenav
+         * @default true
+         */
+        draggable: boolean;
+
+        /**
+         * Length in ms of enter transition
+         * @default 250
+         */
+        inDuration: number;
+
+        /**
+         * Length in ms of exit transition
+         * @default 200
+         */
+        outDuration: number;
+
+        /**
+         * Function called when sidenav starts entering
+         */
+        onOpenStart: (this: Sidenav, elem: Element) => void;
+
+        /**
+         * Function called when sidenav finishes entering
+         */
+        onOpenEnd: (this: Sidenav, elem: Element) => void;
+
+        /**
+         * Function called when sidenav starts exiting
+         */
+        onCloseStart: (this: Sidenav, elem: Element) => void;
+
+        /**
+         * Function called when sidenav finishes exiting
+         */
+        onCloseEnd: (this: Sidenav, elem: Element) => void;
+    }
+}
+
+interface JQuery {
+    sidenav(method: keyof Pick<M.Sidenav, "open" | "close" | "destroy">): JQuery;
+    sidenav(options?: Partial<M.SidenavOptions>): JQuery;
+}
diff --git a/types/materialize-css/slider.d.ts b/types/materialize-css/slider.d.ts
new file mode 100644
index 0000000000..4ab110ba58
--- /dev/null
+++ b/types/materialize-css/slider.d.ts
@@ -0,0 +1,86 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Slider extends Component<SliderOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Slider;
+
+        /**
+         * Init Slider
+         */
+        static init(els: Element, options?: Partial<SliderOptions>): Slider;
+
+        /**
+         * Init Sliders
+         */
+        static init(els: MElements, options?: Partial<SliderOptions>): Slider[];
+
+        /**
+         * ID of the dropdown element
+         */
+        el: Element;
+
+        /**
+         * ID of the dropdown element
+         */
+        options: SliderOptions;
+
+        /**
+         * Index of current slide
+         */
+        activeIndex: number;
+
+        /**
+         * Pause slider autoslide
+         */
+        pause(): void;
+
+        /**
+         * Start slider autoslide
+         */
+        start(): void;
+
+        /**
+         * Move to next slider
+         */
+        next(): void;
+
+        /**
+         * Move to prev slider
+         */
+        prev(): void;
+    }
+
+    interface SliderOptions {
+        /**
+         * Set to false to hide slide indicators
+         * @default true
+         */
+        indicators: boolean;
+
+        /**
+         * Set height of slider
+         * @default 400
+         */
+        height: number;
+
+        /**
+         * Set the duration of the transition animation in ms
+         * @default 500
+         */
+        duration: number;
+
+        /**
+         * Set the duration between transitions in ms
+         * @default 6000
+         */
+        interval: number;
+    }
+}
+
+interface JQuery {
+    slider(method: keyof Pick<M.Slider, "pause" | "start" | "next" | "prev" | "destroy">): JQuery;
+    slider(options?: Partial<M.SliderOptions>): JQuery;
+}
diff --git a/types/materialize-css/tabs.d.ts b/types/materialize-css/tabs.d.ts
new file mode 100644
index 0000000000..b8cb2d5fec
--- /dev/null
+++ b/types/materialize-css/tabs.d.ts
@@ -0,0 +1,70 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Tabs extends Component<TabsOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Tabs;
+
+        /**
+         * Init Tabs
+         */
+        static init(els: Element, options?: Partial<TabsOptions>): Tabs;
+
+        /**
+         * Init Tabses
+         */
+        static init(els: MElements, options?: Partial<TabsOptions>): Tabs[];
+
+        /**
+         * Show tab content that corresponds to the tab with the id
+         * @param tabId The id of the tab that you want to switch to
+         */
+        select(tabId: string): void;
+
+        /**
+         * The index of tab that is currently shown
+         */
+        index: number;
+
+        /**
+         * Recalculate tab indicator position. This is useful when the indicator position is not correct
+         */
+        updateTabIndicator(): void;
+    }
+
+    /**
+     * Options for the Tabs
+     */
+    interface TabsOptions {
+        /**
+         * Transition duration in milliseconds.
+         * @default 300
+         */
+        duration: number;
+
+        /**
+         * Callback for when a new tab content is shown
+         */
+        onShow: (this: Tabs, newContent: Element) => void;
+
+        /**
+         * Set to true to enable swipeable tabs. This also uses the responsiveThreshold option
+         * @default false
+         */
+        swipeable: boolean;
+
+        /**
+         * The maximum width of the screen, in pixels, where the swipeable functionality initializes.
+         * @default infinity
+         */
+        responsiveThreshold: number;
+    }
+}
+
+interface JQuery {
+    tabs(method: keyof Pick<M.Tabs, "destroy">): JQuery;
+    tabs(method: keyof Pick<M.Tabs, "select">, tabId: string): JQuery;
+    tabs(options?: Partial<M.TabsOptions>): JQuery;
+}
diff --git a/types/materialize-css/taptarget.d.ts b/types/materialize-css/taptarget.d.ts
new file mode 100644
index 0000000000..eeea843592
--- /dev/null
+++ b/types/materialize-css/taptarget.d.ts
@@ -0,0 +1,54 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class TapTarget extends Component<TapTargetOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): TapTarget;
+
+        /**
+         * Init TapTarget
+         */
+        static init(els: Element, options?: Partial<TapTargetOptions>): TapTarget;
+
+        /**
+         * Init TapTargets
+         */
+        static init(els: MElements, options?: Partial<TapTargetOptions>): TapTarget[];
+
+        /**
+         * If the tap target is open
+         */
+        isOpen: boolean;
+
+        /**
+         * Open Tap Target
+         */
+        open(): void;
+
+        /**
+         * Close Tap Target
+         */
+        close(): void;
+    }
+
+    interface TapTargetOptions {
+        /**
+         * Callback function called when Tap Target is opened
+         * @default null
+         */
+        onOpen: (this: TapTarget, origin: Element) => void;
+
+        /**
+         * Callback function called when Tap Target is closed
+         * @default null
+         */
+        onClose: (this: TapTarget, origin: Element) => void;
+    }
+}
+
+interface JQuery {
+    tapTarget(method: keyof Pick<M.TapTarget, "open" | "close" | "destroy">): JQuery;
+    tapTarget(options?: Partial<M.TapTargetOptions>): JQuery;
+}
diff --git a/types/materialize-css/test/autocomplete.test.ts b/types/materialize-css/test/autocomplete.test.ts
new file mode 100644
index 0000000000..dece4118bd
--- /dev/null
+++ b/types/materialize-css/test/autocomplete.test.ts
@@ -0,0 +1,55 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Autocomplete
+const _autocomplete = new M.Autocomplete(elem);
+// $ExpectType Autocomplete
+const el = M.Autocomplete.init(elem);
+// $ExpectType Autocomplete[]
+const els = M.Autocomplete.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Autocomplete
+new materialize.Autocomplete(elem);
+// $ExpectType Autocomplete
+const autocomplete = new materialize.Autocomplete(elem, {
+    data: {
+        Apple: null,
+        Google: "https://placehold.it/250x250"
+    },
+    minLength: 3,
+    limit: 3,
+    onAutocomplete(text) {
+        // $ExpectType Autocomplete
+        this;
+        // $ExpectType string
+        text;
+    },
+    sortFunction(a, b, input) {
+        // $ExpectType string
+        a;
+        // $ExpectType string
+        b;
+        // $ExpectType string
+        input;
+        return 0;
+    }
+});
+// $ExpectType void
+autocomplete.updateData({ Microsoft: null });
+// $ExpectType void
+autocomplete.destroy();
+// $ExpectType AutocompleteOptions
+autocomplete.options;
+// $ExpectType Element
+autocomplete.el;
+// $ExpectType boolean
+autocomplete.isOpen;
+
+$(".whatever").autocomplete({
+    data: {
+        Apple: null,
+        Google: "https://placehold.it/250x250"
+    }
+});
+$(".whatever").autocomplete("updateData", { Microsoft: null });
diff --git a/types/materialize-css/test/carousel.test.ts b/types/materialize-css/test/carousel.test.ts
new file mode 100644
index 0000000000..e6658e8862
--- /dev/null
+++ b/types/materialize-css/test/carousel.test.ts
@@ -0,0 +1,53 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Carousel
+const _carousel = new M.Carousel(elem);
+// $ExpectType Carousel
+const el = M.Carousel.init(elem);
+// $ExpectType Carousel[]
+const els = M.Carousel.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Carousel
+const carousel = new materialize.Carousel(elem, {
+    dist: 1,
+    duration: 1,
+    fullWidth: true,
+    indicators: true,
+    noWrap: true,
+    numVisible: 10,
+    onCycleTo(current, dragged) {
+        // $ExpectType Element
+        current;
+        // $ExpectType boolean
+        dragged;
+    },
+    padding: 1,
+    shift: 1
+});
+
+// $ExpectType number
+carousel.center;
+// $ExpectType number
+carousel.dragged;
+// $ExpectType Element
+carousel.el;
+// $ExpectType CarouselOptions
+carousel.options;
+// $ExpectType boolean
+carousel.pressed;
+// $ExpectType void
+carousel.destroy();
+// $ExpectType void
+carousel.next(1);
+// $ExpectType void
+carousel.prev(1);
+// $ExpectType void
+carousel.set(2);
+
+$(".whatever").carousel();
+$(".whatever").carousel("destroy");
+$(".whatever").carousel("next", 1);
+$(".whatever").carousel("prev", 1);
+$(".whatever").carousel("set", 1);
diff --git a/types/materialize-css/test/character-counter.test.ts b/types/materialize-css/test/character-counter.test.ts
new file mode 100644
index 0000000000..e928510662
--- /dev/null
+++ b/types/materialize-css/test/character-counter.test.ts
@@ -0,0 +1,20 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType CharacterCounter
+const _characterCounter = new M.CharacterCounter(elem);
+// $ExpectType CharacterCounter
+const el = M.CharacterCounter.init(elem);
+// $ExpectType CharacterCounter[]
+const els = M.CharacterCounter.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType CharacterCounter
+const characterCounter = new materialize.CharacterCounter(elem);
+// $ExpectType void
+characterCounter.destroy();
+// $ExpectType Element
+characterCounter.el;
+
+$(".whatever").characterCounter();
+$(".whatever").characterCounter("destroy");
diff --git a/types/materialize-css/test/chips.test.ts b/types/materialize-css/test/chips.test.ts
new file mode 100644
index 0000000000..de68820070
--- /dev/null
+++ b/types/materialize-css/test/chips.test.ts
@@ -0,0 +1,40 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Chips
+const _chips = new M.Chips(elem);
+// $ExpectType Chips
+const el = M.Chips.init(elem);
+// $ExpectType Chips[]
+const els = M.Chips.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Chips
+const chips = new materialize.Chips(elem, {
+    data: [{ tag: "tag" }],
+    onChipAdd() { },
+    onChipDelete() { },
+    onChipSelect() { }
+});
+
+// $ExpectType void
+chips.addChip({ tag: "tag" });
+// $ExpectType void
+chips.deleteChip(1);
+// $ExpectType void
+chips.destroy();
+// $ExpectType void
+chips.selectChip(1);
+// $ExpectType Autocomplete
+chips.autocomplete;
+// $ExpectType ChipData[]
+chips.chipsData;
+// $ExpectType Element
+chips.el;
+// $ExpectType boolean
+chips.hasAutocomplete;
+// $ExpectType ChipsOptions
+chips.options;
+
+$(".whatever").chips({ data: [{ tag: "tag" }] });
+$(".whatever").chips("destroy");
diff --git a/types/materialize-css/test/collapsible.test.ts b/types/materialize-css/test/collapsible.test.ts
new file mode 100644
index 0000000000..927cd16cb7
--- /dev/null
+++ b/types/materialize-css/test/collapsible.test.ts
@@ -0,0 +1,49 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Collapsible
+const _collapsible = new M.Collapsible(elem);
+// $ExpectType Collapsible
+const el = M.Collapsible.init(elem);
+// $ExpectType Collapsible[]
+const els = M.Collapsible.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Collapsible
+const collapsible = new materialize.Collapsible(elem, {
+    accordion: true,
+    inDuration: 1,
+    outDuration: 1,
+    onCloseEnd(el) {
+        // $ExpectType Element
+        el;
+    },
+    onCloseStart(el) {
+        // $ExpectType Element
+        el;
+    },
+    onOpenEnd(el) {
+        // $ExpectType Element
+        el;
+    },
+    onOpenStart(el) {
+        // $ExpectType Element
+        el;
+    }
+});
+
+// $ExpectType void
+collapsible.close(1);
+// $ExpectType void
+collapsible.destroy();
+// $ExpectType void
+collapsible.open(1);
+// $ExpectType Element
+collapsible.el;
+// $ExpectType CollapsibleOptions
+collapsible.options;
+
+$(".whatever").collapsible();
+$(".whatever").collapsible("destroy");
+$(".whatever").collapsible("open", 1);
+$(".whatever").collapsible("close", 1);
diff --git a/types/materialize-css/test/common.test.ts b/types/materialize-css/test/common.test.ts
new file mode 100644
index 0000000000..a46cd7fe28
--- /dev/null
+++ b/types/materialize-css/test/common.test.ts
@@ -0,0 +1,13 @@
+import * as M from "materialize-css";
+import * as jQuery from "jquery";
+
+// Test Component Initialization
+
+// $ExpectType Autocomplete
+M.Autocomplete.init(document.querySelector('.whatever')!);
+// $ExpectType Autocomplete[]
+M.Autocomplete.init(document.querySelectorAll('.whatever'));
+// $ExpectType Autocomplete[]
+M.Autocomplete.init(jQuery('.whatever'));
+// $ExpectType Autocomplete[]
+M.Autocomplete.init(cash('.whatever'));
diff --git a/types/materialize-css/test/datepicker.test.ts b/types/materialize-css/test/datepicker.test.ts
new file mode 100644
index 0000000000..bd5279243e
--- /dev/null
+++ b/types/materialize-css/test/datepicker.test.ts
@@ -0,0 +1,42 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Datepicker
+const _datePicker = new M.Datepicker(elem);
+// $ExpectType Datepicker
+const el = M.Datepicker.init(elem);
+// $ExpectType Datepicker[]
+const els = M.Datepicker.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Datepicker
+new materialize.Datepicker(elem);
+// $ExpectType Datepicker
+const datePicker = new materialize.Datepicker(elem, {
+    defaultDate: new Date(),
+    onSelect(date) {
+        // $ExpectType Datepicker
+        this;
+        // $ExpectType Date
+        date;
+    }
+});
+// $ExpectType void
+datePicker.open();
+// $ExpectType void
+datePicker.setDate(new Date());
+// $ExpectType void
+datePicker.destroy();
+// $ExpectType DatepickerOptions
+datePicker.options;
+// $ExpectType Element
+datePicker.el;
+// $ExpectType boolean
+datePicker.isOpen;
+
+$(".whatever").datepicker();
+$(".whatever").datepicker({ defaultDate: new Date() });
+$(".whatever").datepicker("open");
+$(".whatever").datepicker("destroy");
+$(".whatever").datepicker("setDate", new Date());
+$(".whatever").datepicker("gotoDate", new Date());
diff --git a/types/materialize-css/test/dropdown.test.ts b/types/materialize-css/test/dropdown.test.ts
new file mode 100644
index 0000000000..a10eef6fc1
--- /dev/null
+++ b/types/materialize-css/test/dropdown.test.ts
@@ -0,0 +1,46 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Dropdown
+const _dropdown = new M.Dropdown(elem);
+// $ExpectType Dropdown
+const el = M.Dropdown.init(elem);
+// $ExpectType Dropdown[]
+const els = M.Dropdown.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Dropdown
+new materialize.Dropdown(elem);
+// $ExpectType Dropdown
+const dropdown = new materialize.Dropdown(elem, {
+    alignment: "left"
+});
+// $ExpectType void
+dropdown.open();
+// $ExpectType void
+dropdown.close();
+// $ExpectType void
+dropdown.destroy();
+// $ExpectType void
+dropdown.recalculateDimensions();
+// $ExpectType Element
+dropdown.dropdownEl;
+// $ExpectType Element
+dropdown.el;
+// $ExpectType number
+dropdown.focusedIndex;
+// $ExpectType string
+dropdown.id;
+// $ExpectType boolean
+dropdown.isOpen;
+// $ExpectType boolean
+dropdown.isScrollable;
+// $ExpectType DropdownOptions
+dropdown.options;
+
+$(".whatever").dropdown();
+$(".whatever").dropdown({ alignment: "left" });
+$(".whatever").dropdown("open");
+$(".whatever").dropdown("close");
+$(".whatever").dropdown("destroy");
+$(".whatever").dropdown("recalculateDimensions");
diff --git a/types/materialize-css/test/fab.test.ts b/types/materialize-css/test/fab.test.ts
new file mode 100644
index 0000000000..988adbf4bb
--- /dev/null
+++ b/types/materialize-css/test/fab.test.ts
@@ -0,0 +1,32 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType FloatingActionButton
+const _fab = new M.FloatingActionButton(elem);
+// $ExpectType FloatingActionButton
+const el = M.FloatingActionButton.init(elem);
+// $ExpectType FloatingActionButton[]
+const els = M.FloatingActionButton.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType FloatingActionButton
+new materialize.FloatingActionButton(elem);
+// $ExpectType FloatingActionButton
+const fab = new materialize.FloatingActionButton(elem, {
+    direction: 'left'
+});
+// $ExpectType void
+fab.open();
+// $ExpectType void
+fab.destroy();
+// $ExpectType FloatingActionButtonOptions
+fab.options;
+// $ExpectType Element
+fab.el;
+// $ExpectType boolean
+fab.isOpen;
+
+$(".whatever").floatingActionButton();
+$(".whatever").floatingActionButton({ direction: "left" });
+$(".whatever").floatingActionButton("open");
+$(".whatever").floatingActionButton("destroy");
diff --git a/types/materialize-css/test/formselect.test.ts b/types/materialize-css/test/formselect.test.ts
new file mode 100644
index 0000000000..1a5192de41
--- /dev/null
+++ b/types/materialize-css/test/formselect.test.ts
@@ -0,0 +1,42 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType FormSelect
+const _formselect = new M.FormSelect(elem);
+// $ExpectType FormSelect
+const el = M.FormSelect.init(elem);
+// $ExpectType FormSelect[]
+const els = M.FormSelect.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType FormSelect
+new materialize.FormSelect(elem);
+// $ExpectType FormSelect
+const formSelect = new materialize.FormSelect(elem, {
+    classes: "whatever",
+    dropdownOptions: {
+        alignment: "left"
+    }
+});
+// $ExpectType string[]
+formSelect.getSelectedValues();
+// $ExpectType void
+formSelect.destroy();
+// $ExpectType FormSelectOptions
+formSelect.options;
+// $ExpectType Element
+formSelect.el;
+// $ExpectType Dropdown
+formSelect.dropdown;
+// $ExpectType HTMLUListElement
+formSelect.dropdownOptions;
+// $ExpectType HTMLInputElement
+formSelect.input;
+// $ExpectType boolean
+formSelect.isMultiple;
+// $ExpectType Element
+formSelect.wrapper;
+
+$(".whatever").formSelect();
+$(".whatever").formSelect({ classes: "whatever" });
+$(".whatever").formSelect("destroy");
diff --git a/types/materialize-css/test/inputfields.test.ts b/types/materialize-css/test/inputfields.test.ts
new file mode 100644
index 0000000000..ecde571537
--- /dev/null
+++ b/types/materialize-css/test/inputfields.test.ts
@@ -0,0 +1,7 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+M.textareaAutoResize(elem);
+M.textareaAutoResize($(elem));
+M.textareaAutoResize(cash(elem));
diff --git a/types/materialize-css/test/materialbox.test.ts b/types/materialize-css/test/materialbox.test.ts
new file mode 100644
index 0000000000..277edb7305
--- /dev/null
+++ b/types/materialize-css/test/materialbox.test.ts
@@ -0,0 +1,49 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Materialbox
+const _materialbox = new M.Materialbox(elem);
+// $ExpectType Materialbox
+const el = M.Materialbox.init(elem);
+// $ExpectType Materialbox[]
+const els = M.Materialbox.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Materialbox
+const materialbox = new materialize.Materialbox(elem, {
+    inDuration: 1,
+    outDuration: 1,
+    onCloseEnd(el) {
+        // $ExpectType Element
+        el;
+    },
+    onCloseStart(el) {
+        // $ExpectType Element
+        el;
+    },
+    onOpenEnd(el) {
+        // $ExpectType Element
+        el;
+    },
+    onOpenStart(el) {
+        // $ExpectType Element
+        el;
+    }
+});
+
+// $ExpectType void
+materialbox.close();
+// $ExpectType void
+materialbox.destroy();
+// $ExpectType void
+materialbox.open();
+// $ExpectType Element
+materialbox.el;
+// $ExpectType MaterialboxOptions
+materialbox.options;
+
+$(".whatever").materialbox();
+$(".whatever").materialbox({ inDuration: 2 });
+$(".whatever").materialbox("open");
+$(".whatever").materialbox("destroy");
+$(".whatever").materialbox("close");
diff --git a/types/materialize-css/test/materialize-css-global.test.ts b/types/materialize-css/test/materialize-css-global.test.ts
deleted file mode 100644
index 79ed142be4..0000000000
--- a/types/materialize-css/test/materialize-css-global.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-const elem = document.querySelector('.whatever')!;
-// $ExpectType Sidenav
-const sidenav = new M.Sidenav(elem);
-
-// $ExpectType Tabs
-const tabs = new M.Tabs(elem);
-
-// $ExpectType Modal
-const modal = new M.Modal(elem);
-
-// $ExpectType Autocomplete
-const autocomplete = new M.Autocomplete(elem);
-
-// $ExpectType CharacterCounter
-const characterCounter = new M.CharacterCounter(elem);
-
-// $ExpectType Tooltip
-const tooltips = new M.Tooltip(elem);
-
-// $ExpectType FloatingActionButton
-const fab = new M.FloatingActionButton(elem);
-
-// $ExpectType Toast
-const toast = M.toast({ html: 'I am a toast!' });
-
-// $ExpectType DatePicker
-const datePicker = new M.DatePicker(elem);
-
-// $ExpectType TimePicker
-const timePicker = new M.TimePicker(elem);
-
-// $ExpectType Dropdown
-const dropdown = new M.Dropdown(elem);
-
-// $ExpectType FormSelect
-const formSelect = new M.FormSelect(elem);
diff --git a/types/materialize-css/test/materialize-css-jquery.test.ts b/types/materialize-css/test/materialize-css-jquery.test.ts
deleted file mode 100644
index 7bf9faa957..0000000000
--- a/types/materialize-css/test/materialize-css-jquery.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-$(".whatever").sidenav();
-$(".whatever").sidenav({ inDuration: 200 });
-$(".whatever").sidenav("open");
-$(".whatever").sidenav("destroy");
-
-$(".whatever").tabs();
-$(".whatever").tabs({ duration: 200 });
-$(".whatever").tabs("destroy");
-$(".whatever").tabs("select", "id");
-
-$(".whatever").modal();
-$(".whatever").modal({ inDuration: 200 });
-$(".whatever").modal("open");
-$(".whatever").modal("destroy");
-
-$(".whatever").characterCounter();
-$(".whatever").characterCounter("destroy");
-
-$(".whatever").autocomplete({
-    data: {
-        Apple: null,
-        Google: "https://placehold.it/250x250"
-    }
-});
-$(".whatever").autocomplete("updateData", { Microsoft: null });
-
-$(".whatever").tooltip();
-$(".whatever").tooltip({ html: "<img/>" });
-$(".whatever").tooltip("open");
-$(".whatever").tooltip("destroy");
-
-$(".whatever").floatingActionButton();
-$(".whatever").floatingActionButton({ direction: "left" });
-$(".whatever").floatingActionButton("open");
-$(".whatever").floatingActionButton("destroy");
-
-// Toast can not be invoked using jQuery.
-
-$(".whatever").datepicker();
-$(".whatever").datepicker({ defaultDate: new Date() });
-$(".whatever").datepicker("open");
-$(".whatever").datepicker("destroy");
-$(".whatever").datepicker("setDate", new Date());
-$(".whatever").datepicker("gotoDate", new Date());
-
-$(".whatever").timepicker();
-$(".whatever").timepicker({ defaultTime: "13:14" });
-$(".whatever").timepicker("open");
-$(".whatever").timepicker("destroy");
-$(".whatever").timepicker("showView", "hours");
-
-$(".whatever").formSelect();
-$(".whatever").formSelect({ classes: "whatever" });
-$(".whatever").formSelect("destroy");
-
-$(".whatever").dropdown();
-$(".whatever").dropdown({ alignment: "left" });
-$(".whatever").dropdown("open");
-$(".whatever").dropdown("close");
-$(".whatever").dropdown("destroy");
-$(".whatever").dropdown("recalculateDimensions");
diff --git a/types/materialize-css/test/materialize-css-module.test.ts b/types/materialize-css/test/materialize-css-module.test.ts
deleted file mode 100644
index 874e596aaa..0000000000
--- a/types/materialize-css/test/materialize-css-module.test.ts
+++ /dev/null
@@ -1,277 +0,0 @@
-import * as materialize from "materialize-css";
-
-const elem = document.querySelector('.whatever')!;
-
-// Sidenav
-// $ExpectType Sidenav
-new materialize.Sidenav(elem);
-// $ExpectType Sidenav
-const sidenav = new materialize.Sidenav(elem, {
-    edge: "left",
-    inDuration: 300,
-    onCloseStart(el) {
-        // $ExpectType Sidenav
-        this;
-        // $ExpectType Element
-        el;
-    }
-});
-// $ExpectType void
-sidenav.open();
-// $ExpectType void
-sidenav.destroy();
-// $ExpectType SidenavOptions
-sidenav.options;
-// $ExpectType Element
-sidenav.el;
-// $ExpectType boolean
-sidenav.isOpen;
-
-// Tabs
-// $ExpectType Tabs
-new materialize.Tabs(elem);
-// $ExpectType Tabs
-const tabs = new materialize.Tabs(elem, {
-    duration: 200,
-    onShow(content) {
-        // $ExpectType Tabs
-        this;
-        // $ExpectType Element
-        content;
-    }
-});
-// $ExpectType void
-tabs.destroy();
-// $ExpectType void
-tabs.select("id");
-// $ExpectType TabsOptions
-tabs.options;
-// $ExpectType Element
-tabs.el;
-// $ExpectType number
-tabs.index;
-
-// Modal
-// $ExpectType Modal
-new materialize.Modal(elem);
-// $ExpectType Modal
-const modal = new materialize.Modal(elem, {
-    inDuration: 300,
-    ready(el, trigger) {
-        // $ExpectType Modal
-        this;
-        // $ExpectType Element
-        el;
-        // $ExpectType Element
-        trigger;
-    }
-});
-// $ExpectType void
-modal.open();
-// $ExpectType void
-modal.destroy();
-// $ExpectType ModalOptions
-modal.options;
-// $ExpectType Element
-modal.el;
-// $ExpectType boolean
-modal.isOpen;
-
-// CharacterCounter
-// $ExpectType CharacterCounter
-const characterCounter = new materialize.CharacterCounter(elem);
-// $ExpectType void
-characterCounter.destroy();
-// $ExpectType Element
-characterCounter.el;
-
-// Autocomplete
-// $ExpectType Autocomplete
-new materialize.Autocomplete(elem);
-// $ExpectType Autocomplete
-const autocomplete = new materialize.Autocomplete(elem, {
-    data: {
-        Apple: null,
-        Google: "https://placehold.it/250x250"
-    },
-    minLength: 3,
-    onAutocomplete(text) {
-        // $ExpectType Autocomplete
-        this;
-        // $ExpectType string
-        text;
-    },
-    sortFunction(a, b, input) {
-        // $ExpectType string
-        a;
-        // $ExpectType string
-        b;
-        // $ExpectType string
-        input;
-        return 0;
-    }
-});
-// $ExpectType void
-autocomplete.updateData({ Microsoft: null });
-// $ExpectType void
-autocomplete.destroy();
-// $ExpectType AutocompleteOptions
-autocomplete.options;
-// $ExpectType Element
-autocomplete.el;
-// $ExpectType boolean
-autocomplete.isOpen;
-
-// Tooltip
-// $ExpectType Tooltip
-new materialize.Tooltip(elem);
-// $ExpectType Tooltip
-const tooltip = new materialize.Tooltip(elem, {
-    inDuration: 300,
-    position: "right"
-});
-// $ExpectType void
-tooltip.open();
-// $ExpectType void
-tooltip.destroy();
-// $ExpectType TooltipOptions
-tooltip.options;
-// $ExpectType Element
-tooltip.el;
-// $ExpectType boolean
-tooltip.isOpen;
-
-// FloatingActionButton
-// $ExpectType FloatingActionButton
-new materialize.FloatingActionButton(elem);
-// $ExpectType FloatingActionButton
-const fab = new materialize.FloatingActionButton(elem, {
-    direction: 'left'
-});
-// $ExpectType void
-fab.open();
-// $ExpectType void
-fab.destroy();
-// $ExpectType FloatingActionButtonOptions
-fab.options;
-// $ExpectType Element
-fab.el;
-// $ExpectType boolean
-fab.isOpen;
-
-// Toasts
-// $ExpectType Toast
-const toast = materialize.toast({ html: 'I am a toast!' });
-// $ExpectType ToastOptions
-toast.options;
-// $ExpectType Element
-fab.el;
-// $ExpectType void
-toast.dismiss();
-// $ExpectType void
-materialize.Toast.dismissAll();
-
-// DatePicker
-// $ExpectType DatePicker
-new materialize.DatePicker(elem);
-// $ExpectType DatePicker
-const datePicker = new materialize.DatePicker(elem, {
-    defaultDate: new Date(),
-    onSelect(date) {
-        // $ExpectType DatePicker
-        this;
-        // $ExpectType Date
-        date;
-    }
-});
-// $ExpectType void
-datePicker.open();
-// $ExpectType void
-datePicker.setDate(new Date());
-// $ExpectType void
-datePicker.destroy();
-// $ExpectType DatePickerOptions
-datePicker.options;
-// $ExpectType Element
-datePicker.el;
-// $ExpectType boolean
-datePicker.isOpen;
-
-// TimePicker
-// $ExpectType TimePicker
-new materialize.TimePicker(elem);
-// $ExpectType TimePicker
-const timePicker = new materialize.TimePicker(elem, {
-    defaultTime: "13:14"
-});
-// $ExpectType void
-timePicker.open();
-// $ExpectType void
-timePicker.showView("hours");
-// $ExpectType void
-timePicker.destroy();
-// $ExpectType TimePickerOptions
-timePicker.options;
-// $ExpectType Element
-timePicker.el;
-// $ExpectType boolean
-timePicker.isOpen;
-
-// Dropdown
-// $ExpectType Dropdown
-new materialize.Dropdown(elem);
-// $ExpectType Dropdown
-const dropdown = new materialize.Dropdown(elem, {
-    alignment: "left"
-});
-// $ExpectType void
-dropdown.open();
-// $ExpectType void
-dropdown.close();
-// $ExpectType void
-dropdown.destroy();
-// $ExpectType void
-dropdown.recalculateDimensions();
-// $ExpectType Element
-dropdown.dropdownEl;
-// $ExpectType Element
-dropdown.el;
-// $ExpectType number
-dropdown.focusedIndex;
-// $ExpectType string
-dropdown.id;
-// $ExpectType boolean
-dropdown.isOpen;
-// $ExpectType boolean
-dropdown.isScrollable;
-// $ExpectType DropdownOptions
-dropdown.options;
-
-// FormSelect
-// $ExpectType FormSelect
-new materialize.FormSelect(elem);
-// $ExpectType FormSelect
-const formSelect = new materialize.FormSelect(elem, {
-    classes: "whatever",
-    dropdownOptions: {
-        alignment: "left"
-    }
-});
-// $ExpectType string[]
-formSelect.getSelectedValues();
-// $ExpectType void
-formSelect.destroy();
-// $ExpectType FormSelectOptions
-formSelect.options;
-// $ExpectType Element
-formSelect.el;
-// $ExpectType Dropdown
-formSelect.dropdown;
-// $ExpectType HTMLUListElement
-formSelect.dropdownOptions;
-// $ExpectType HTMLInputElement
-formSelect.input;
-// $ExpectType boolean
-formSelect.isMultiple;
-// $ExpectType Element
-formSelect.wrapper;
diff --git a/types/materialize-css/test/modal.test.ts b/types/materialize-css/test/modal.test.ts
new file mode 100644
index 0000000000..3d3923e28b
--- /dev/null
+++ b/types/materialize-css/test/modal.test.ts
@@ -0,0 +1,38 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Modal
+const _modal = new M.Modal(elem);
+// $ExpectType Modal
+const el = M.Modal.init(elem);
+// $ExpectType Modal[]
+const els = M.Modal.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Modal
+new materialize.Modal(elem);
+// $ExpectType Modal
+const modal = new materialize.Modal(elem, {
+    inDuration: 300,
+    onOpenStart(el) {
+        // $ExpectType Modal
+        this;
+        // $ExpectType Element
+        el;
+    }
+});
+// $ExpectType void
+modal.open();
+// $ExpectType void
+modal.destroy();
+// $ExpectType ModalOptions
+modal.options;
+// $ExpectType Element
+modal.el;
+// $ExpectType boolean
+modal.isOpen;
+
+$(".whatever").modal();
+$(".whatever").modal({ inDuration: 200 });
+$(".whatever").modal("open");
+$(".whatever").modal("destroy");
diff --git a/types/materialize-css/test/parallax.test.ts b/types/materialize-css/test/parallax.test.ts
new file mode 100644
index 0000000000..62beb046e7
--- /dev/null
+++ b/types/materialize-css/test/parallax.test.ts
@@ -0,0 +1,24 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Parallax
+const _parallax = new M.Parallax(elem);
+// $ExpectType Parallax
+const el = M.Parallax.init(elem);
+// $ExpectType Parallax[]
+const els = M.Parallax.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Parallax
+const parallax = new materialize.Parallax(elem, { responsiveThreshold: 1 });
+
+// $ExpectType void
+parallax.destroy();
+// $ExpectType Element
+parallax.el;
+// $ExpectType ParallaxOptions
+parallax.options;
+
+$(".whatever").parallax();
+$(".whatever").parallax({ responsiveThreshold: 2 });
+$(".whatever").parallax("destroy");
diff --git a/types/materialize-css/test/pushpin.test.ts b/types/materialize-css/test/pushpin.test.ts
new file mode 100644
index 0000000000..bb521b2cf6
--- /dev/null
+++ b/types/materialize-css/test/pushpin.test.ts
@@ -0,0 +1,34 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Pushpin
+const _pushpin = new M.Pushpin(elem);
+// $ExpectType Pushpin
+const el = M.Pushpin.init(elem);
+// $ExpectType Pushpin[]
+const els = M.Pushpin.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Pushpin
+const pushpin = new materialize.Pushpin(elem, {
+    bottom: 1,
+    offset: 1,
+    onPositionChange(position) {
+        // $ExpectType "pinned" | "pin-top" | "pin-bottom"
+        position;
+    },
+    top: 1
+});
+
+// $ExpectType void
+pushpin.destroy();
+// $ExpectType Element
+pushpin.el;
+// $ExpectType PushpinOptions
+pushpin.options;
+// $ExpectType number
+pushpin.originalOffset;
+
+$(".whatever").pushpin();
+$(".whatever").pushpin({ top: 2 });
+$(".whatever").pushpin("destroy");
diff --git a/types/materialize-css/test/range.test.ts b/types/materialize-css/test/range.test.ts
new file mode 100644
index 0000000000..cf343b0341
--- /dev/null
+++ b/types/materialize-css/test/range.test.ts
@@ -0,0 +1,22 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Range
+const _range = new M.Range(elem);
+// $ExpectType Range
+const el = M.Range.init(elem);
+// $ExpectType Range[]
+const els = M.Range.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Range
+const range = new materialize.Range(elem);
+// $ExpectType void
+range.destroy();
+// $ExpectType Element
+range.el;
+// $ExpectType undefined
+range.options;
+
+$(".whatever").range();
+$(".whatever").range("destroy");
diff --git a/types/materialize-css/test/scrollspy.test.ts b/types/materialize-css/test/scrollspy.test.ts
new file mode 100644
index 0000000000..a797123626
--- /dev/null
+++ b/types/materialize-css/test/scrollspy.test.ts
@@ -0,0 +1,32 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType ScrollSpy
+const _scrollspy = new M.ScrollSpy(elem);
+// $ExpectType ScrollSpy
+const el = M.ScrollSpy.init(elem);
+// $ExpectType ScrollSpy[]
+const els = M.ScrollSpy.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType ScrollSpy
+const scrollspy = new materialize.ScrollSpy(elem, {
+    activeClass: "class",
+    getActiveElement(id) {
+        // $ExpectType string
+        id;
+        return "string";
+    },
+    scrollOffset: 1,
+    throttle: 1
+});
+
+// $ExpectType void
+scrollspy.destroy();
+// $ExpectType Element
+scrollspy.el;
+// $ExpectType ScrollSpyOptions
+scrollspy.options;
+
+$(".whatever").scrollSpy();
+$(".whatever").scrollSpy("destroy");
diff --git a/types/materialize-css/test/sidenav.test.ts b/types/materialize-css/test/sidenav.test.ts
new file mode 100644
index 0000000000..485c3be144
--- /dev/null
+++ b/types/materialize-css/test/sidenav.test.ts
@@ -0,0 +1,39 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Sidenav
+const _sidenav = new M.Sidenav(elem);
+// $ExpectType Sidenav
+const el = M.Sidenav.init(elem);
+// $ExpectType Sidenav[]
+const els = M.Sidenav.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Sidenav
+new materialize.Sidenav(elem);
+// $ExpectType Sidenav
+const sidenav = new materialize.Sidenav(elem, {
+    edge: "left",
+    inDuration: 300,
+    onCloseStart(el) {
+        // $ExpectType Sidenav
+        this;
+        // $ExpectType Element
+        el;
+    }
+});
+// $ExpectType void
+sidenav.open();
+// $ExpectType void
+sidenav.destroy();
+// $ExpectType SidenavOptions
+sidenav.options;
+// $ExpectType Element
+sidenav.el;
+// $ExpectType boolean
+sidenav.isOpen;
+
+$(".whatever").sidenav();
+$(".whatever").sidenav({ inDuration: 200 });
+$(".whatever").sidenav("open");
+$(".whatever").sidenav("destroy");
diff --git a/types/materialize-css/test/slider.test.ts b/types/materialize-css/test/slider.test.ts
new file mode 100644
index 0000000000..c1950ed165
--- /dev/null
+++ b/types/materialize-css/test/slider.test.ts
@@ -0,0 +1,43 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Slider
+const _slider = new M.Slider(elem);
+// $ExpectType Slider
+const el = M.Slider.init(elem);
+// $ExpectType Slider[]
+const els = M.Slider.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Slider
+const slider = new materialize.Slider(elem, {
+    duration: 1,
+    height: 1,
+    indicators: true,
+    interval: 1
+});
+
+// $ExpectType void
+slider.destroy();
+// $ExpectType Element
+slider.el;
+// $ExpectType SliderOptions
+slider.options;
+// $ExpectType number
+slider.activeIndex;
+// $ExpectType void
+slider.next();
+// $ExpectType void
+slider.pause();
+// $ExpectType void
+slider.prev();
+// $ExpectType void
+slider.start();
+
+$(".whatever").slider();
+$(".whatever").slider({ duration: 1 });
+$(".whatever").slider("destroy");
+$(".whatever").slider("next");
+$(".whatever").slider("pause");
+$(".whatever").slider("prev");
+$(".whatever").slider("start");
diff --git a/types/materialize-css/test/tabs.test.ts b/types/materialize-css/test/tabs.test.ts
new file mode 100644
index 0000000000..9c0c0acdad
--- /dev/null
+++ b/types/materialize-css/test/tabs.test.ts
@@ -0,0 +1,38 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Tabs
+const _tabs = new M.Tabs(elem);
+// $ExpectType Tabs
+const el = M.Tabs.init(elem);
+// $ExpectType Tabs[]
+const els = M.Tabs.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Tabs
+new materialize.Tabs(elem);
+// $ExpectType Tabs
+const tabs = new materialize.Tabs(elem, {
+    duration: 200,
+    onShow(content) {
+        // $ExpectType Tabs
+        this;
+        // $ExpectType Element
+        content;
+    }
+});
+// $ExpectType void
+tabs.destroy();
+// $ExpectType void
+tabs.select("id");
+// $ExpectType TabsOptions
+tabs.options;
+// $ExpectType Element
+tabs.el;
+// $ExpectType number
+tabs.index;
+
+$(".whatever").tabs();
+$(".whatever").tabs({ duration: 200 });
+$(".whatever").tabs("destroy");
+$(".whatever").tabs("select", "id");
diff --git a/types/materialize-css/test/taptarget.test.ts b/types/materialize-css/test/taptarget.test.ts
new file mode 100644
index 0000000000..91b00168cd
--- /dev/null
+++ b/types/materialize-css/test/taptarget.test.ts
@@ -0,0 +1,38 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType TapTarget
+const _taptarget = new M.TapTarget(elem);
+// $ExpectType TapTarget
+const el = M.TapTarget.init(elem);
+// $ExpectType TapTarget[]
+const els = M.TapTarget.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType TapTarget
+const taptarget = new materialize.TapTarget(elem, {
+    onClose(origin) {
+        // $ExpectType Element
+        origin;
+    },
+    onOpen(origin) {
+        // $ExpectType Element
+        origin;
+    }
+});
+
+// $ExpectType void
+taptarget.destroy();
+// $ExpectType void
+taptarget.close();
+// $ExpectType void
+taptarget.open();
+// $ExpectType Element
+taptarget.el;
+// $ExpectType TapTargetOptions
+taptarget.options;
+
+$(".whatever").tapTarget();
+$(".whatever").tapTarget("destroy");
+$(".whatever").tapTarget("close");
+$(".whatever").tapTarget("open");
diff --git a/types/materialize-css/test/timepicker.test.ts b/types/materialize-css/test/timepicker.test.ts
new file mode 100644
index 0000000000..6c187b2cfe
--- /dev/null
+++ b/types/materialize-css/test/timepicker.test.ts
@@ -0,0 +1,65 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Timepicker
+const _timePicker = new M.Timepicker(elem);
+// $ExpectType Timepicker
+const el = M.Timepicker.init(elem);
+// $ExpectType Timepicker[]
+const els = M.Timepicker.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Timepicker
+new materialize.Timepicker(elem);
+// $ExpectType Timepicker
+const timePicker = new materialize.Timepicker(elem, {
+    duration: 1,
+    container: "selector",
+    showClearBtn: true,
+    defaultTime: "13:14",
+    fromNow: 1,
+    i18n: { done: "Ok, Mate" },
+    autoClose: true,
+    twelveHour: true,
+    vibrate: true,
+    onOpenStart(el) {
+        // $ExpectType Element
+        el;
+    },
+    onOpenEnd(el) {
+        // $ExpectType Element
+        el;
+    },
+    onCloseStart(el) {
+        // $ExpectType Element
+        el;
+    },
+    onCloseEnd(el) {
+        // $ExpectType Element
+        el;
+    },
+    onSelect(hour, minute) {
+        // $ExpectType number
+        hour;
+        // $ExpectType number
+        minute;
+    }
+});
+// $ExpectType void
+timePicker.open();
+// $ExpectType void
+timePicker.showView("hours");
+// $ExpectType void
+timePicker.destroy();
+// $ExpectType TimepickerOptions
+timePicker.options;
+// $ExpectType Element
+timePicker.el;
+// $ExpectType boolean
+timePicker.isOpen;
+
+$(".whatever").timepicker();
+$(".whatever").timepicker({ defaultTime: "13:14" });
+$(".whatever").timepicker("open");
+$(".whatever").timepicker("destroy");
+$(".whatever").timepicker("showView", "hours");
diff --git a/types/materialize-css/test/toast.test.ts b/types/materialize-css/test/toast.test.ts
new file mode 100644
index 0000000000..ede26bcc20
--- /dev/null
+++ b/types/materialize-css/test/toast.test.ts
@@ -0,0 +1,17 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Toast
+const _toast = M.toast({ html: 'I am a toast!' });
+
+// $ExpectType Toast
+const toast = materialize.toast({ html: 'I am a toast!' });
+// $ExpectType ToastOptions
+toast.options;
+// $ExpectType Element
+toast.el;
+// $ExpectType void
+toast.dismiss();
+// $ExpectType void
+materialize.Toast.dismissAll();
diff --git a/types/materialize-css/test/tooltip.test.ts b/types/materialize-css/test/tooltip.test.ts
new file mode 100644
index 0000000000..db9453e95f
--- /dev/null
+++ b/types/materialize-css/test/tooltip.test.ts
@@ -0,0 +1,33 @@
+import * as materialize from "materialize-css";
+
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType Tooltip
+const _tooltip = new M.Tooltip(elem);
+// $ExpectType Tooltip
+const el = M.Tooltip.init(elem);
+// $ExpectType Tooltip[]
+const els = M.Tooltip.init(document.querySelectorAll('.whatever'));
+
+// $ExpectType Tooltip
+new materialize.Tooltip(elem);
+// $ExpectType Tooltip
+const tooltip = new materialize.Tooltip(elem, {
+    inDuration: 300,
+    position: "right"
+});
+// $ExpectType void
+tooltip.open();
+// $ExpectType void
+tooltip.destroy();
+// $ExpectType TooltipOptions
+tooltip.options;
+// $ExpectType Element
+tooltip.el;
+// $ExpectType boolean
+tooltip.isOpen;
+
+$(".whatever").tooltip();
+$(".whatever").tooltip({ html: "<img/>" });
+$(".whatever").tooltip("open");
+$(".whatever").tooltip("destroy");
diff --git a/types/materialize-css/test/waves.test.ts b/types/materialize-css/test/waves.test.ts
new file mode 100644
index 0000000000..c73ae78904
--- /dev/null
+++ b/types/materialize-css/test/waves.test.ts
@@ -0,0 +1,4 @@
+const elem = document.querySelector('.whatever')!;
+
+// $ExpectType void
+Waves.attach(elem);
diff --git a/types/materialize-css/timepicker.d.ts b/types/materialize-css/timepicker.d.ts
new file mode 100644
index 0000000000..5f9b3ec5bf
--- /dev/null
+++ b/types/materialize-css/timepicker.d.ts
@@ -0,0 +1,136 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Timepicker extends Component<TimepickerOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Timepicker;
+
+        /**
+         * Init Timepicker
+         */
+        static init(els: Element, options?: Partial<TimepickerOptions>): Timepicker;
+
+        /**
+         * Init Timepickers
+         */
+        static init(els: MElements, options?: Partial<TimepickerOptions>): Timepicker[];
+
+        /**
+         * If the picker is open.
+         */
+        isOpen: boolean;
+
+        /**
+         * The selected time.
+         */
+        time: string;
+
+        /**
+         * Open timepicker
+         */
+        open(): void;
+
+        /**
+         * Close timepicker
+         */
+        close(): void;
+
+        /**
+         * Show hours or minutes view on timepicker
+         * @param view The name of the view you want to switch to, 'hours' or 'minutes'.
+         */
+        showView(view: "hours" | "minutes"): void;
+    }
+
+    interface TimepickerOptions {
+        /**
+         * Duration of the transition from/to the hours/minutes view.
+         * @default 350
+         */
+        duration: number;
+
+        /**
+         * Specify a selector for a DOM element to render the calendar in, by default it will be placed before the input.
+         */
+        container: string;
+
+        /**
+         * Show the clear button in the Timepicker
+         * @default false
+         */
+        showClearBtn: boolean;
+
+        /**
+         * Default time to set on the timepicker 'now' or '13:14'
+         * @default 'now';
+         */
+        defaultTime: string;
+
+        /**
+         * Millisecond offset from the defaultTime.
+         * @default 0
+         */
+        fromNow: number;
+
+        /**
+         * Internationalization options
+         */
+        i18n: Partial<InternationalizationOptions>;
+
+        /**
+         * Automatically close picker when minute is selected.
+         * @default false;
+         */
+        autoClose: boolean;
+
+        /**
+         * Use 12 hour AM/PM clock instead of 24 hour clock.
+         * @default true
+         */
+        twelveHour: boolean;
+
+        /**
+         * Vibrate device when dragging clock hand.
+         * @default true
+         */
+        vibrate: boolean;
+
+        /**
+         * Callback function called before modal is opened
+         * @default null
+         */
+        onOpenStart: (this: Modal, el: Element) => void;
+
+        /**
+         * Callback function called after modal is opened
+         * @default null
+         */
+        onOpenEnd: (this: Modal, el: Element) => void;
+
+        /**
+         * Callback function called before modal is closed
+         * @default null
+         */
+        onCloseStart: (this: Modal, el: Element) => void;
+
+        /**
+         * Callback function called after modal is closed
+         * @default null
+         */
+        onCloseEnd: (this: Modal, el: Element) => void;
+
+        /**
+         * Callback function when a time is selected
+         * @default null
+         */
+        onSelect: (this: Modal, hour: number, minute: number) => void;
+    }
+}
+
+interface JQuery {
+    timepicker(method: keyof Pick<M.Timepicker, "open" | "close" | "destroy">): JQuery;
+    timepicker(method: keyof Pick<M.Timepicker, "showView">, view: "hours" | "minutes"): JQuery;
+    timepicker(options?: Partial<M.TimepickerOptions>): JQuery;
+}
diff --git a/types/materialize-css/toast.d.ts b/types/materialize-css/toast.d.ts
new file mode 100644
index 0000000000..4953c7135b
--- /dev/null
+++ b/types/materialize-css/toast.d.ts
@@ -0,0 +1,76 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Toast extends ComponentBase<ToastOptions> {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Toast;
+
+        /**
+         * Describes the current pan state of the Toast.
+         */
+        panning: boolean;
+
+        /**
+         * The remaining amount of time in ms that the toast will stay before dismissal.
+         */
+        timeRemaining: number;
+
+        /**
+         * remove a specific toast
+         */
+        dismiss(): void;
+
+        /**
+         * dismiss all toasts
+         */
+        static dismissAll(): void;
+    }
+
+    interface ToastOptions {
+        /**
+         * The HTML content of the Toast.
+         */
+        html: string;
+
+        /**
+         * Length in ms the Toast stays before dismissal.
+         * @default 4000
+         */
+        displayLength: number;
+
+        /**
+         * Transition in duration in milliseconds.
+         * @default 300
+         */
+        inDuration: number;
+
+        /**
+         * Transition out duration in milliseconds.
+         * @default 375
+         */
+        outDuration: number;
+
+        /**
+         * Classes to be added to the toast element.
+         */
+        classes: string;
+
+        /**
+         * Callback function called when toast is dismissed.
+         */
+        completeCallback: () => void;
+
+        /**
+         * The percentage of the toast's width it takes for a drag to dismiss a Toast.
+         * @default 0.8
+         */
+        activationPercent: number;
+    }
+
+    /**
+     * Create a toast
+     */
+    function toast(options: Partial<ToastOptions>): Toast;
+}
diff --git a/types/materialize-css/tooltip.d.ts b/types/materialize-css/tooltip.d.ts
new file mode 100644
index 0000000000..6b7320a20a
--- /dev/null
+++ b/types/materialize-css/tooltip.d.ts
@@ -0,0 +1,95 @@
+/// <reference path="./common.d.ts" />
+
+declare namespace M {
+    class Tooltip extends Component<TooltipOptions> implements Openable {
+        /**
+         * Get Instance
+         */
+        static getInstance(elem: Element): Tooltip;
+
+        /**
+         * Init Tooltip
+         */
+        static init(els: Element, options?: Partial<TooltipOptions>): Tooltip;
+
+        /**
+         * Init Tooltips
+         */
+        static init(els: MElements, options?: Partial<TooltipOptions>): Tooltip[];
+
+        /**
+         * Show tooltip.
+         */
+        open(): void;
+
+        /**
+         * Hide tooltip.
+         */
+        close(): void;
+
+        /**
+         * If tooltip is open.
+         */
+        isOpen: boolean;
+
+        /**
+         * If tooltip is hovered.
+         */
+        isHovered: boolean;
+    }
+
+    interface TooltipOptions {
+        /**
+         * Delay time before tooltip disappears.
+         * @default 0
+         */
+        exitDelay: number;
+
+        /**
+         * Delay time before tooltip appears.
+         * @default 200
+         */
+        enterDelay: number;
+
+        /**
+         * Can take regular text or HTML strings.
+         * @default null
+         */
+        html: string;
+
+        /**
+         * Set distance tooltip appears away from its activator excluding transitionMovement.
+         * @default 5
+         */
+        margin: number;
+
+        /**
+         * Enter transition duration.
+         * @default 300
+         */
+        inDuration: number;
+
+        /**
+         * Exit transition duration.
+         * @default 250
+         */
+        outDuration: number;
+
+        /**
+         * Set the direction of the tooltip.
+         * @default 'bottom'
+         */
+        position: 'top' | 'right' | 'bottom' | 'left';
+
+        /**
+         * Amount in px that the tooltip moves during its transition.
+         * @default 10
+         */
+        transitionMovement: number;
+    }
+}
+
+interface JQuery {
+    tooltip(method: keyof Pick<M.Tooltip, "open" | "close" | "destroy">): JQuery;
+    tooltip(options?: Partial<M.TooltipOptions>): JQuery;
+}
diff --git a/types/materialize-css/tsconfig.json b/types/materialize-css/tsconfig.json
index 617d1b925a..cf2b279cb7 100644
--- a/types/materialize-css/tsconfig.json
+++ b/types/materialize-css/tsconfig.json
@@ -19,8 +19,30 @@
     },
     "files": [
         "index.d.ts",
-        "test/materialize-css-global.test.ts",
-        "test/materialize-css-module.test.ts",
-        "test/materialize-css-jquery.test.ts"
+        "test/autocomplete.test.ts",
+        "test/carousel.test.ts",
+        "test/character-counter.test.ts",
+        "test/chips.test.ts",
+        "test/collapsible.test.ts",
+        "test/common.test.ts",
+        "test/datepicker.test.ts",
+        "test/dropdown.test.ts",
+        "test/fab.test.ts",
+        "test/formselect.test.ts",
+        "test/inputfields.test.ts",
+        "test/materialbox.test.ts",
+        "test/modal.test.ts",
+        "test/parallax.test.ts",
+        "test/pushpin.test.ts",
+        "test/range.test.ts",
+        "test/scrollspy.test.ts",
+        "test/sidenav.test.ts",
+        "test/slider.test.ts",
+        "test/tabs.test.ts",
+        "test/taptarget.test.ts",
+        "test/timepicker.test.ts",
+        "test/toast.test.ts",
+        "test/tooltip.test.ts",
+        "test/waves.test.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/materialize-css/waves.d.ts b/types/materialize-css/waves.d.ts
new file mode 100644
index 0000000000..cc86b017e4
--- /dev/null
+++ b/types/materialize-css/waves.d.ts
@@ -0,0 +1,9 @@
+declare namespace Waves {
+    /**
+     * Attach Waves to an input element (or any element which doesn't
+     * bubble mouseup/mousedown events).
+     *   Intended to be used with dynamically loaded forms/inputs, or
+     * where the user doesn't want a delegated click handler.
+     */
+    function attach(element: Element): void;
+}

From 4b589138d296cf18ce8f17a42794bc61a7c836f7 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Mon, 7 May 2018 20:01:31 +0200
Subject: [PATCH 0058/1124] [eslint] create NodeListener and extend
 RuleListener (#25399)

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

diff --git a/types/eslint/eslint-tests.ts b/types/eslint/eslint-tests.ts
index a281991918..6a81d69c8a 100644
--- a/types/eslint/eslint-tests.ts
+++ b/types/eslint/eslint-tests.ts
@@ -336,6 +336,7 @@ rule = {
             onCodePathSegmentStart(segment, node) {},
             onCodePathSegmentEnd(segment, node) {},
             onCodePathSegmentLoop(fromSegment, toSegment, node) {},
+            IfStatement(node) {},
             'Program:exit'() {},
         };
     },
diff --git a/types/eslint/index.d.ts b/types/eslint/index.d.ts
index 76f04617d8..89067f97c8 100644
--- a/types/eslint/index.d.ts
+++ b/types/eslint/index.d.ts
@@ -241,7 +241,10 @@ export namespace Rule {
         meta?: RuleMetaData;
     }
 
-    interface RuleListener {
+    type NodeTypes = ESTree.Node['type'];
+    type NodeListener = { [T in NodeTypes]?: (node: ESTree.Node) => void };
+
+    interface RuleListener extends NodeListener {
         onCodePathStart?(codePath: CodePath, node: ESTree.Node): void;
 
         onCodePathEnd?(codePath: CodePath, node: ESTree.Node): void;

From a718acac7debfb4e71e3a2b796cd78798ac17041 Mon Sep 17 00:00:00 2001
From: Robin Tregaskis <lokidokicoki@gmail.com>
Date: Mon, 7 May 2018 19:17:00 +0100
Subject: [PATCH 0059/1124] update: (types/he): version 1.1.1 updates, include
 `decimal` in EncodeOptions interface (#25484)

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

diff --git a/types/he/he-tests.ts b/types/he/he-tests.ts
index 6045574fa5..3fce7214c9 100644
--- a/types/he/he-tests.ts
+++ b/types/he/he-tests.ts
@@ -2,18 +2,18 @@ import he = require('he');
 
 function main() {
     var result: string;
-  
+
     result = he.encode('foo \xa9 bar \u2260 baz qux');
     // 'foo &#xA9; bar &#x2260; baz qux'
-  
+
     he.encode('foo \0 bar');
     // 'foo \0 bar'
-  
+
     // Passing an `options` object to `encode`, to explicitly disallow named references:
     he.encode('foo \xa9 bar \u2260 baz qux', {
         'useNamedReferences': false
     });
-    
+
     he.encode('foo \xa9 bar \u2260 baz qux', {
         'encodeEverything': true
     });
@@ -22,21 +22,43 @@ function main() {
         'encodeEverything': true,
         'useNamedReferences': true
     });
-    
+
     he.encode('\x01', {
         'strict': false
     });
-    // '&#x1;'  
-    
+    // '&#x1;'
+
     he.encode('foo © and & ampersand', {
         'allowUnsafeSymbols': true
     });
-    
+
+    // Using the global default setting (defaults to `false`):
+    he.encode('foo © bar ≠ baz 𝌆 qux');
+    // → 'foo &#xA9; bar &#x2260; baz &#x1D306; qux'
+
+    // Passing an `options` object to `encode`, to explicitly disable decimal escapes:
+    he.encode('foo © bar ≠ baz 𝌆 qux', {
+        'decimal': false
+    });
+    // → 'foo &#xA9; bar &#x2260; baz &#x1D306; qux'
+
+    // Passing an `options` object to `encode`, to explicitly enable decimal escapes:
+    he.encode('foo © bar ≠ baz 𝌆 qux', {
+        'decimal': true
+    });
+    // → 'foo &#169; bar &#8800; baz &#119558; qux'
+
+    // Passing an `options` object to `encode`, to explicitly allow named references and decimal escapes:
+    he.encode('foo © bar ≠ baz 𝌆 qux', {
+        'useNamedReferences': true,
+     'decimal': true
+    });
+
     // Override the global default setting:
     he.encode.options.useNamedReferences = true;
-    
+
     he.decode('foo &copy; bar &ne; baz &#x1D306; qux');
-    
+
     he.decode('foo&ampbar', {
         'isAttributeValue': false
     });
diff --git a/types/he/index.d.ts b/types/he/index.d.ts
index a890ad823c..e729b6bbdc 100644
--- a/types/he/index.d.ts
+++ b/types/he/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for he v0.5.0
+// Type definitions for he v1.1.1
 // Project: https://github.com/mathiasbynens/he
 // Definitions by: Simon Edwards <https://github.com/sedwards2009>
+//                 Robin Tregaskis <https://github.com/lokidokicoki>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // he - "HTML Entities" - A high quality pair of HTML encode and decode functions.
@@ -18,6 +19,18 @@ export interface EncodeOptions {
     */
     useNamedReferences?: boolean;
 
+    /**
+     * The default value for the decimal option is false. If the option is
+     * enabled, encode will generally use decimal escapes (e.g. &#169;)
+     * rather than hexadecimal escapes (e.g. &#xA9;). Beside of this
+     * replacement, the basic behavior remains the same when combined with
+     * other options. For example: if both options useNamedReferences and
+     * decimal are enabled, named references (e.g. &copy;) are used over
+     * decimal escapes. HTML entities without a named reference are encoded
+     * using decimal escapes.
+     */
+    decimal?: boolean;
+
     /**
     * The default value for the encodeEverything option is false. This means
     * that encode() will not use any character references for printable ASCII

From 75b4d30b8124b36b68365a12daa2120cbf547ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20L=C3=B6he?= <bfncs@users.noreply.github.com>
Date: Mon, 7 May 2018 20:18:57 +0200
Subject: [PATCH 0060/1124] Fix react-autocomplete renderItem prop type
 (#25481)

* Fix react-autocomplete renderItem prop type

* [react-autocomplete] Fix missing argument styles in prop renderItem
---
 types/react-autocomplete/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-autocomplete/index.d.ts b/types/react-autocomplete/index.d.ts
index 2234f70c6a..c1e3aefa0f 100644
--- a/types/react-autocomplete/index.d.ts
+++ b/types/react-autocomplete/index.d.ts
@@ -65,7 +65,7 @@ declare namespace Autocomplete {
          * an optional set of styles that can be applied to improve the look/feel
          * of the items in the dropdown menu.
          */
-        renderItem: (item: any) => ReactNode;
+        renderItem: (item: any, isHighlighted: boolean, styles?: CSSProperties) => ReactNode;
         /**
          * Arguments: `items: Array<Any>, value: String, styles: Object`
          *

From 73910f6800506af273586ae30b74da7b3c9329ee Mon Sep 17 00:00:00 2001
From: Gustav Bylund <maistho@gmail.com>
Date: Mon, 7 May 2018 20:22:34 +0200
Subject: [PATCH 0061/1124] [mapbox-gl] Add `trigger()` to GeolocateControl
 (#25442)

Added in https://github.com/mapbox/mapbox-gl-js/pull/6205
---
 types/mapbox-gl/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index f878e2b2bd..28b41baeb0 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -413,6 +413,7 @@ declare namespace mapboxgl {
      */
     export class GeolocateControl extends Control {
         constructor(options?: { positionOptions?: PositionOptions, fitBoundsOptions?: FitBoundsOptions, trackUserLocation?: boolean, showUserLocation?: boolean });
+        trigger(): boolean;
     }
 
     /**

From 4dc5d4ad946056817811e404745b804b604f2cc7 Mon Sep 17 00:00:00 2001
From: Raphael Hsieh <Raffihsieh@gmail.com>
Date: Mon, 7 May 2018 11:25:47 -0700
Subject: [PATCH 0062/1124] Removing type definitions that do not exist
 (#25437)

In the map.js file in Mapbox's codebase, these methods do not exist anymore. https://github.com/mapbox/mapbox-gl-js/blob/master/src/ui/map.js
---
 types/mapbox-gl/index.d.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 28b41baeb0..21116829e5 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -33,14 +33,6 @@ declare namespace mapboxgl {
         
         removeControl(control: IControl): this;
 
-        addClass(klass: string, options?: mapboxgl.StyleOptions): this;
-
-        removeClass(klass: string, options?: mapboxgl.StyleOptions): this;
-
-        setClasses(klasses: string[], options?: mapboxgl.StyleOptions): this;
-
-        hasClass(klass: string): boolean;
-
         getClasses(): string[];
 
         resize(): this;

From 908da1fb1d29877989d9896c2c8f5e8cd3176a33 Mon Sep 17 00:00:00 2001
From: ryym <ryym.64@gmail.com>
Date: Tue, 8 May 2018 03:30:42 +0900
Subject: [PATCH 0063/1124] [react-redux] Update for redux@4.0.0 (retry)
 (#25435)

* [react-redux] Copy current files to v5 sub directory

* [react-redux] Fix v5 tsconfig

* [react-redux] Increase the react-redux version in header comment

* [react-redux] Update type defenitions for redux@4.0.0
---
 types/react-redux/index.d.ts               |  25 +-
 types/react-redux/package.json             |   2 +-
 types/react-redux/react-redux-tests.tsx    |  46 +-
 types/react-redux/v5/index.d.ts            | 310 +++++++
 types/react-redux/v5/package.json          |   6 +
 types/react-redux/v5/react-redux-tests.tsx | 923 +++++++++++++++++++++
 types/react-redux/v5/tsconfig.json         |  29 +
 types/react-redux/v5/tslint.json           |  81 ++
 8 files changed, 1388 insertions(+), 34 deletions(-)
 create mode 100644 types/react-redux/v5/index.d.ts
 create mode 100644 types/react-redux/v5/package.json
 create mode 100644 types/react-redux/v5/react-redux-tests.tsx
 create mode 100644 types/react-redux/v5/tsconfig.json
 create mode 100644 types/react-redux/v5/tslint.json

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 0e3b6ffb88..59d8e1078b 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-redux 5.0.8
+// Type definitions for react-redux 6.0.0
 // Project: https://github.com/rackt/react-redux
 // Definitions by: Qubo <https://github.com/tkqubo>,
 //                 Thomas Hasner <https://github.com/thasner>,
@@ -18,6 +18,11 @@
 // a separate line instead of as a decorator. Discussed in this github issue:
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20796
 
+// NOTE about the wrong react-redux version in the header comment:
+// The actual react-redux version is not 6.0.0, but we had to increase the major version
+// to update this type definitions for redux@4.x from redux@3.x.
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/25321
+
 import * as React from 'react';
 import * as Redux from 'redux';
 
@@ -26,14 +31,14 @@ type StatelessComponent<P> = React.StatelessComponent<P>;
 type Component<P> = React.ComponentType<P>;
 type ReactNode = React.ReactNode;
 type Store<S> = Redux.Store<S>;
-type Dispatch<S> = Redux.Dispatch<S>;
+type Dispatch<A extends Redux.Action = Redux.AnyAction> = Redux.Dispatch<A>;
 type ActionCreator<A> = Redux.ActionCreator<A>;
 
 // Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
 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 interface DispatchProp<S> {
-  dispatch?: Dispatch<S>;
+export interface DispatchProp<A extends Redux.Action = Redux.AnyAction> {
+  dispatch?: Dispatch<A>;
 }
 
 interface AdvancedComponentDecorator<TProps, TOwnProps> {
@@ -75,11 +80,11 @@ export type InferableComponentEnhancer<TInjectedProps> =
  * @param options
  */
 export interface Connect {
-    (): InferableComponentEnhancer<DispatchProp<any>>;
+    (): InferableComponentEnhancer<DispatchProp>;
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>
-    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp<any> & TOwnProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp & TOwnProps, TOwnProps>;
 
     <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
@@ -120,7 +125,7 @@ export interface Connect {
         mapDispatchToProps: null | undefined,
         mergeProps: null | undefined,
         options: Options<State, TStateProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<DispatchProp<any> & TStateProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<DispatchProp & TStateProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
@@ -160,14 +165,14 @@ interface MapStateToPropsFactory<TStateProps, TOwnProps, State> {
 type MapStateToPropsParam<TStateProps, TOwnProps, State> = MapStateToPropsFactory<TStateProps, TOwnProps, State> | MapStateToProps<TStateProps, TOwnProps, State> | null | undefined;
 
 interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
-    (dispatch: Dispatch<any>, ownProps: TOwnProps): TDispatchProps;
+    (dispatch: Dispatch, ownProps: TOwnProps): TDispatchProps;
 }
 
 type MapDispatchToProps<TDispatchProps, TOwnProps> =
     MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | TDispatchProps;
 
 interface MapDispatchToPropsFactory<TDispatchProps, TOwnProps> {
-    (dispatch: Dispatch<any>, ownProps: TOwnProps): MapDispatchToProps<TDispatchProps, TOwnProps>;
+    (dispatch: Dispatch, ownProps: TOwnProps): MapDispatchToProps<TDispatchProps, TOwnProps>;
 }
 
 type MapDispatchToPropsParam<TDispatchProps, TOwnProps> = MapDispatchToPropsFactory<TDispatchProps, TOwnProps> | MapDispatchToProps<TDispatchProps, TOwnProps>;
@@ -235,7 +240,7 @@ export declare function connectAdvanced<S, TProps, TOwnProps, TFactoryOptions =
  * previous object when appropriate.
  */
 export interface SelectorFactory<S, TProps, TOwnProps, TFactoryOptions> {
-    (dispatch: Dispatch<S>, factoryOptions: TFactoryOptions): Selector<S, TProps, TOwnProps>
+    (dispatch: Dispatch, factoryOptions: TFactoryOptions): Selector<S, TProps, TOwnProps>
 }
 
 export interface Selector<S, TProps, TOwnProps> {
diff --git a/types/react-redux/package.json b/types/react-redux/package.json
index 6d68bf2f9b..7f5b19d45b 100644
--- a/types/react-redux/package.json
+++ b/types/react-redux/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.6.0"
+        "redux": "^4.0.0"
     }
 }
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index 07b81ff082..367afedad6 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -1,7 +1,7 @@
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { Store, Dispatch, ActionCreator, createStore, bindActionCreators, ActionCreatorsMapObject } from 'redux';
+import { Store, Dispatch, AnyAction, ActionCreator, createStore, bindActionCreators, ActionCreatorsMapObject } from 'redux';
 import { Connect, connect, createProvider, Provider, DispatchProp, MapStateToProps, Options } from 'react-redux';
 import objectAssign = require('object-assign');
 
@@ -14,7 +14,7 @@ import objectAssign = require('object-assign');
 // output of `connect` to make sure the signature is what is expected
 
 namespace Empty {
-    interface OwnProps { foo: string, dispatch: Dispatch<any> }
+    interface OwnProps { foo: string, dispatch: Dispatch }
 
     class TestComponent extends Component<OwnProps> {}
 
@@ -42,7 +42,7 @@ namespace MapState {
 
 namespace MapStateWithDispatchProp {
     interface OwnProps { foo: string }
-    interface StateProps { bar: number, dispatch: Dispatch<any> }
+    interface StateProps { bar: number, dispatch: Dispatch }
 
     class TestComponent extends Component<OwnProps & StateProps> {}
 
@@ -250,7 +250,7 @@ namespace MapStateAndOptions {
     interface State { state: string; }
     interface OwnProps { foo: string }
     interface StateProps { bar: number }
-    interface DispatchProps { dispatch: Dispatch<any> }
+    interface DispatchProps { dispatch: Dispatch }
 
     class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
 
@@ -295,7 +295,7 @@ function mapStateToProps(state: CounterState) {
 }
 
 // Which action creators does it want to receive by props?
-function mapDispatchToProps(dispatch: Dispatch<CounterState>) {
+function mapDispatchToProps(dispatch: Dispatch) {
     return {
         onIncrement: () => dispatch(increment())
     };
@@ -327,7 +327,7 @@ connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
 // with higher order functions using parameters
 connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
     (initialState: CounterState, ownProps) => mapStateToProps,
-    (dispatch: Dispatch<CounterState>, ownProps) => mapDispatchToProps
+    (dispatch: Dispatch, ownProps) => mapDispatchToProps
 )(Counter);
 // only first argument
 connect<ICounterStateProps, {}, {}, CounterState>(
@@ -415,7 +415,7 @@ ReactDOM.render(
 
 // Inject just dispatch and don't listen to store
 
-const AppWrap = (props: DispatchProp<any> & { children?: React.ReactNode }) => <div />
+const AppWrap = (props: DispatchProp & { children?: React.ReactNode }) => <div />
 const WrappedApp = connect()(AppWrap);
 
 <WrappedApp />
@@ -446,7 +446,7 @@ connect(mapStateToProps2, actionCreators)(TodoApp);
 //    return { todos: state.todos };
 //}
 
-function mapDispatchToProps2(dispatch: Dispatch<TodoState>) {
+function mapDispatchToProps2(dispatch: Dispatch) {
     return { actions: bindActionCreators(actionCreators, dispatch) };
 }
 
@@ -458,7 +458,7 @@ connect(mapStateToProps2, mapDispatchToProps2)(TodoApp);
 //    return { todos: state.todos };
 //}
 
-function mapDispatchToProps3(dispatch: Dispatch<TodoState>) {
+function mapDispatchToProps3(dispatch: Dispatch) {
     return bindActionCreators({ addTodo }, dispatch);
 }
 
@@ -470,7 +470,7 @@ connect(mapStateToProps2, mapDispatchToProps3)(TodoApp);
 //    return { todos: state.todos };
 //}
 
-function mapDispatchToProps4(dispatch: Dispatch<TodoState>) {
+function mapDispatchToProps4(dispatch: Dispatch) {
     return {
         todoActions: bindActionCreators(todoActionCreators, dispatch),
         counterActions: bindActionCreators(counterActionCreators, dispatch)
@@ -485,7 +485,7 @@ connect(mapStateToProps2, mapDispatchToProps4)(TodoApp);
 //    return { todos: state.todos };
 //}
 
-function mapDispatchToProps5(dispatch: Dispatch<TodoState>) {
+function mapDispatchToProps5(dispatch: Dispatch) {
     return {
         actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
     };
@@ -499,7 +499,7 @@ connect(mapStateToProps2, mapDispatchToProps5)(TodoApp);
 //    return { todos: state.todos };
 //}
 
-function mapDispatchToProps6(dispatch: Dispatch<TodoState>) {
+function mapDispatchToProps6(dispatch: Dispatch) {
     return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
 }
 
@@ -541,7 +541,7 @@ interface TestState {
     isLoaded: boolean;
     state1: number;
 }
-class TestComponent extends Component<TestProp & DispatchProp<any>, TestState> { }
+class TestComponent extends Component<TestProp & DispatchProp, TestState> { }
 const WrappedTestComponent = connect()(TestComponent);
 
 // return value of the connect()(TestComponent) is of the type TestComponent
@@ -559,7 +559,7 @@ class NonComponent {}
 
 // stateless functions
 interface HelloMessageProps {
-    dispatch: Dispatch<any>
+    dispatch: Dispatch
     name: string;
  }
 const HelloMessage: React.StatelessComponent<HelloMessageProps> = (props) => {
@@ -585,7 +585,7 @@ namespace TestStatelessFunctionWithMapArguments {
         };
     };
 
-    const mapDispatchToProps = (dispatch: Dispatch<any>, ownProps: GreetingProps) => {
+    const mapDispatchToProps = (dispatch: Dispatch, ownProps: GreetingProps) => {
         return {
             onClick: () => {
                 dispatch({ type: 'GREETING', name: ownProps.name });
@@ -609,7 +609,7 @@ namespace TestTOwnPropsInference {
         state: string;
     }
 
-    class OwnPropsComponent extends React.Component<StateProps & OwnProps & DispatchProp<any>> {
+    class OwnPropsComponent extends React.Component<StateProps & OwnProps & DispatchProp> {
         render() {
             return <div/>;
         }
@@ -647,7 +647,7 @@ namespace TestTOwnPropsInference {
         state: string
     }
 
-    class AllPropsComponent extends React.Component<AllProps & DispatchProp<any>> {
+    class AllPropsComponent extends React.Component<AllProps & DispatchProp> {
         render() {
             return <div/>;
         }
@@ -691,7 +691,7 @@ namespace TestMergedPropsInference {
         return { state: 'string' };
     }
 
-    function mapDispatchToProps(dispatch: Dispatch<any>): DispatchProps {
+    function mapDispatchToProps(dispatch: Dispatch): DispatchProps {
         return { dispatch: 'string' };
     }
 
@@ -729,7 +729,7 @@ namespace Issue16652 {
         comments: ({ id: string } | undefined)[];
     }
 
-    class CommentList extends React.Component<PassedProps & GeneratedStateProps & DispatchProp<any>> {}
+    class CommentList extends React.Component<PassedProps & GeneratedStateProps & DispatchProp> {}
 
     const mapStateToProps = (state: any, ownProps: PassedProps): GeneratedStateProps => {
         return {
@@ -748,7 +748,7 @@ namespace Issue15463 {
     interface ISpinnerProps{
         showGlobalSpinner: boolean;
     }
-    class SpinnerClass extends React.Component<ISpinnerProps & DispatchProp<any>, undefined> {
+    class SpinnerClass extends React.Component<ISpinnerProps & DispatchProp, undefined> {
         render() {
             return (<div />);
         }
@@ -766,7 +766,7 @@ namespace RemoveInjectedAndPassOnRest {
         showGlobalSpinner: boolean;
         foo: string;
     }
-    class SpinnerClass extends React.Component<TProps & DispatchProp<any>, {}> {
+    class SpinnerClass extends React.Component<TProps & DispatchProp, {}> {
         render() {
             return (<div />);
         }
@@ -877,8 +877,8 @@ namespace TestCreateProvider {
     };
 
     interface State { a: number };
-    const store = createStore<State>(() => ({ a: 1 }));
-    const myStore = createStore<State>(() => ({ a: 2 }));
+    const store = createStore<State, AnyAction, {}, {}>(() => ({ a: 1 }));
+    const myStore = createStore<State, AnyAction, {}, {}>(() => ({ a: 2 }));
 
     interface AProps { a: number };
     const A = (props: AProps) => (<h1>A is {props.a}</h1>);
diff --git a/types/react-redux/v5/index.d.ts b/types/react-redux/v5/index.d.ts
new file mode 100644
index 0000000000..0e3b6ffb88
--- /dev/null
+++ b/types/react-redux/v5/index.d.ts
@@ -0,0 +1,310 @@
+// Type definitions for react-redux 5.0.8
+// Project: https://github.com/rackt/react-redux
+// Definitions by: Qubo <https://github.com/tkqubo>,
+//                 Thomas Hasner <https://github.com/thasner>,
+//                 Kenzie Togami <https://github.com/kenzierocks>,
+//                 Curits Layne <https://github.com/clayne11>
+//                 Frank Tan <https://github.com/tansongyang>
+//                 Nicholas Boll <https://github.com/nicholasboll>
+//                 Dibyo Majumdar <https://github.com/mdibyo>
+//                 Prashant Deva <https://github.com/pdeva>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+// Known Issue:
+// There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes
+// they are decorating. Due to this, if you are using @connect() decorator in your code,
+// you will see a bunch of errors from TypeScript. The current workaround is to use connect() as a function call on
+// a separate line instead of as a decorator. Discussed in this github issue:
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20796
+
+import * as React from 'react';
+import * as Redux from 'redux';
+
+type ComponentClass<P> = React.ComponentClass<P>;
+type StatelessComponent<P> = React.StatelessComponent<P>;
+type Component<P> = React.ComponentType<P>;
+type ReactNode = React.ReactNode;
+type Store<S> = Redux.Store<S>;
+type Dispatch<S> = Redux.Dispatch<S>;
+type ActionCreator<A> = Redux.ActionCreator<A>;
+
+// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
+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 interface DispatchProp<S> {
+  dispatch?: Dispatch<S>;
+}
+
+interface AdvancedComponentDecorator<TProps, TOwnProps> {
+    (component: Component<TProps>): ComponentClass<TOwnProps>;
+}
+
+// Injects props and removes them from the prop requirements.
+// 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 TInjectedProps>(
+        component: Component<P>
+    ): ComponentClass<Omit<P, keyof TInjectedProps> & TNeedsProps> & {WrappedComponent: Component<P>}
+}
+
+// Injects props and removes them from the prop requirements.
+// Will not pass through the injected props if they are passed in during
+// render.
+export type InferableComponentEnhancer<TInjectedProps> =
+    InferableComponentEnhancerWithProps<TInjectedProps, {}>
+
+/**
+ * Connects a React component to a Redux store.
+ *
+ * - Without arguments, just wraps the component, without changing the behavior / props
+ *
+ * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
+ * is to override ownProps (as stated in the docs), so what remains is everything that's
+ * not a state or dispatch prop
+ *
+ * - When 3rd param is passed, we don't know if ownProps propagate and whether they
+ * should be valid component props, because it depends on mergeProps implementation.
+ * As such, it is the user's responsibility to extend ownProps interface from state or
+ * dispatch props or both when applicable
+ *
+ * @param mapStateToProps
+ * @param mapDispatchToProps
+ * @param mergeProps
+ * @param options
+ */
+export interface Connect {
+    (): InferableComponentEnhancer<DispatchProp<any>>;
+
+    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>
+    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp<any> & TOwnProps, TOwnProps>;
+
+    <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
+        mapStateToProps: null | undefined,
+        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TDispatchProps & TOwnProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps & TOwnProps, TOwnProps>;
+
+    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: null | undefined,
+        mergeProps: MergeProps<TStateProps, undefined, TOwnProps, TMergedProps>,
+    ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
+
+    <no_state = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}>(
+        mapStateToProps: null | undefined,
+        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
+        mergeProps: MergeProps<undefined, TDispatchProps, TOwnProps, TMergedProps>,
+    ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
+
+    <no_state = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}>(
+        mapStateToProps: null | undefined,
+        mapDispatchToProps: null | undefined,
+        mergeProps: MergeProps<undefined, undefined, TOwnProps, TMergedProps>,
+    ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
+        mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
+    ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
+
+    <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: null | undefined,
+        mergeProps: null | undefined,
+        options: Options<State, TStateProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<DispatchProp<any> & TStateProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}>(
+        mapStateToProps: null | undefined,
+        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
+        mergeProps: null | undefined,
+        options: Options<{}, TStateProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
+        mergeProps: null | undefined,
+        options: Options<State, TStateProps, TOwnProps>
+    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
+
+    <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
+        mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
+        mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
+        mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
+        options: Options<State, TStateProps, TOwnProps, TMergedProps>
+    ): InferableComponentEnhancerWithProps<TMergedProps, TOwnProps>;
+}
+
+/**
+ * The connect function. See {@type Connect} for details.
+ */
+export declare const connect: Connect;
+
+interface MapStateToProps<TStateProps, TOwnProps, State> {
+    (state: State, ownProps: TOwnProps): TStateProps;
+}
+
+interface MapStateToPropsFactory<TStateProps, TOwnProps, State> {
+    (initialState: State, ownProps: TOwnProps): MapStateToProps<TStateProps, TOwnProps, State>;
+}
+
+type MapStateToPropsParam<TStateProps, TOwnProps, State> = MapStateToPropsFactory<TStateProps, TOwnProps, State> | MapStateToProps<TStateProps, TOwnProps, State> | null | undefined;
+
+interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
+    (dispatch: Dispatch<any>, ownProps: TOwnProps): TDispatchProps;
+}
+
+type MapDispatchToProps<TDispatchProps, TOwnProps> =
+    MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | TDispatchProps;
+
+interface MapDispatchToPropsFactory<TDispatchProps, TOwnProps> {
+    (dispatch: Dispatch<any>, ownProps: TOwnProps): MapDispatchToProps<TDispatchProps, TOwnProps>;
+}
+
+type MapDispatchToPropsParam<TDispatchProps, TOwnProps> = MapDispatchToPropsFactory<TDispatchProps, TOwnProps> | MapDispatchToProps<TDispatchProps, TOwnProps>;
+
+interface MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> {
+    (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TMergedProps;
+}
+
+interface Options<State = {}, TStateProps = {}, TOwnProps = {}, TMergedProps = {}> extends ConnectOptions {
+    /**
+     * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
+     * preventing unnecessary updates, assuming that the component is a “pure” component
+     * and does not rely on any input or state other than its props and the selected Redux store’s state.
+     * Defaults to true.
+     * @default true
+     */
+    pure?: boolean;
+
+    /**
+     * When pure, compares incoming store state to its previous value.
+     * @default strictEqual
+     */
+    areStatesEqual?: (nextState: State, prevState: State) => boolean;
+
+    /**
+     * When pure, compares incoming props to its previous value.
+     * @default shallowEqual
+     */
+    areOwnPropsEqual?: (nextOwnProps: TOwnProps, prevOwnProps: TOwnProps) => boolean;
+
+    /**
+     * When pure, compares the result of mapStateToProps to its previous value.
+     * @default shallowEqual
+     */
+    areStatePropsEqual?: (nextStateProps: TStateProps, prevStateProps: TStateProps) => boolean;
+
+    /**
+     * When pure, compares the result of mergeProps to its previous value.
+     * @default shallowEqual
+     */
+    areMergedPropsEqual?: (nextMergedProps: TMergedProps, prevMergedProps: TMergedProps) => boolean;
+}
+
+/**
+ * Connects a React component to a Redux store. It is the base for {@link connect} but is less opinionated about
+ * how to combine <code>state</code>, <code>props</code>, and <code>dispatch</code> into your final props. It makes no
+ * assumptions about defaults or memoization of results, leaving those responsibilities to the caller.It does not
+ * modify the component class passed to it; instead, it returns a new, connected component class for you to use.
+ *
+ * @param selectorFactory The selector factory. See {@type SelectorFactory} for details.
+ * @param connectOptions If specified, further customizes the behavior of the connector. Additionally, any extra
+ *     options will be passed through to your <code>selectorFactory</code> in the <code>factoryOptions</code> argument.
+ */
+export declare function connectAdvanced<S, TProps, TOwnProps, TFactoryOptions = {}>(
+    selectorFactory: SelectorFactory<S, TProps, TOwnProps, TFactoryOptions>,
+    connectOptions?: ConnectOptions & TFactoryOptions
+): AdvancedComponentDecorator<TProps, TOwnProps>;
+
+/**
+ * Initializes a selector function (during each instance's constructor). That selector function is called any time the
+ * connector component needs to compute new props, as a result of a store state change or receiving new props. The
+ * result of <code>selector</code> is expected to be a plain object, which is passed as the props to the wrapped
+ * component. If a consecutive call to <code>selector</code> returns the same object (<code>===</code>) as its previous
+ * call, the component will not be re-rendered. It's the responsibility of <code>selector</code> to return that
+ * previous object when appropriate.
+ */
+export interface SelectorFactory<S, TProps, TOwnProps, TFactoryOptions> {
+    (dispatch: Dispatch<S>, factoryOptions: TFactoryOptions): Selector<S, TProps, TOwnProps>
+}
+
+export interface Selector<S, TProps, TOwnProps> {
+    (state: S, ownProps: TOwnProps): TProps
+}
+
+export interface ConnectOptions {
+    /**
+     * Computes the connector component's displayName property relative to that of the wrapped component. Usually
+     * overridden by wrapper functions.
+     *
+     * @default name => 'ConnectAdvanced('+name+')'
+     * @param componentName
+     */
+    getDisplayName?: (componentName: string) => string
+    /**
+     * Shown in error messages. Usually overridden by wrapper functions.
+     *
+     * @default 'connectAdvanced'
+     */
+    methodName?: string
+    /**
+     * If defined, a property named this value will be added to the props passed to the wrapped component. Its value
+     * will be the number of times the component has been rendered, which can be useful for tracking down unnecessary
+     * re-renders.
+     *
+     * @default undefined
+     */
+    renderCountProp?: string
+    /**
+     * Controls whether the connector component subscribes to redux store state changes. If set to false, it will only
+     * re-render on <code>componentWillReceiveProps</code>.
+     *
+     * @default true
+     */
+    shouldHandleStateChanges?: boolean
+    /**
+     * The key of props/context to get the store. You probably only need this if you are in the inadvisable position of
+     * having multiple stores.
+     *
+     * @default 'store'
+     */
+    storeKey?: string
+    /**
+     * If true, stores a ref to the wrapped component instance and makes it available via getWrappedInstance() method.
+     *
+     * @default false
+     */
+    withRef?: boolean
+}
+
+export interface ProviderProps {
+    /**
+     * The single Redux store in your application.
+     */
+    store?: Store<any>;
+    children?: ReactNode;
+}
+
+/**
+ * Makes the Redux store available to the connect() calls in the component hierarchy below.
+ */
+export class Provider extends React.Component<ProviderProps, {}> { }
+
+/**
+ * Creates a new <Provider> which will set the Redux Store on the passed key of the context. You probably only need this
+ * if you are in the inadvisable position of having multiple stores. You will also need to pass the same storeKey to the
+ * options argument of connect.
+ *
+ * @param storeKey The key of the context on which to set the store.
+ */
+export declare function createProvider(storeKey: string): typeof Provider;
diff --git a/types/react-redux/v5/package.json b/types/react-redux/v5/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/react-redux/v5/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/react-redux/v5/react-redux-tests.tsx b/types/react-redux/v5/react-redux-tests.tsx
new file mode 100644
index 0000000000..07b81ff082
--- /dev/null
+++ b/types/react-redux/v5/react-redux-tests.tsx
@@ -0,0 +1,923 @@
+import { Component, ReactElement } from 'react';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { Store, Dispatch, ActionCreator, createStore, bindActionCreators, ActionCreatorsMapObject } from 'redux';
+import { Connect, connect, createProvider, Provider, DispatchProp, MapStateToProps, Options } from 'react-redux';
+import objectAssign = require('object-assign');
+
+//
+// Quick Start
+// https://github.com/rackt/react-redux/blob/master/docs/quick-start.md#quick-start
+//
+
+// Test cases written in a way to isolate types and variables and verify the
+// output of `connect` to make sure the signature is what is expected
+
+namespace Empty {
+    interface OwnProps { foo: string, dispatch: Dispatch<any> }
+
+    class TestComponent extends Component<OwnProps> {}
+
+    const Test = connect()(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapState {
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+
+    class TestComponent extends Component<OwnProps & StateProps> {}
+
+    const mapStateToProps = (_: any) => ({
+        bar: 1
+    })
+
+    const Test = connect(
+        mapStateToProps
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapStateWithDispatchProp {
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number, dispatch: Dispatch<any> }
+
+    class TestComponent extends Component<OwnProps & StateProps> {}
+
+    const mapStateToProps = (_: any) => ({
+        bar: 1
+    })
+
+    const Test = connect(
+        mapStateToProps
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapStateFactory {
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+
+    class TestComponent extends Component<OwnProps & StateProps> {}
+
+    const mapStateToProps = () => () => ({
+        bar: 1
+    })
+
+    const Test = connect(
+        mapStateToProps
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapDispatch {
+    interface OwnProps { foo: string }
+    interface DispatchProps { onClick: () => void }
+
+    class TestComponent extends Component<OwnProps & DispatchProps> {}
+
+    const mapDispatchToProps = () => ({
+        onClick: () => {}
+    })
+
+    const TestNull = connect(
+        null,
+        mapDispatchToProps,
+    )(TestComponent)
+
+    const verifyNull = <TestNull foo='bar' />
+
+    const TestUndefined = connect(
+        undefined,
+        mapDispatchToProps,
+    )(TestComponent)
+
+    const verifyUndefined = <TestUndefined foo='bar' />
+}
+
+namespace MapStateAndDispatchObject {
+    interface ClickPayload { count: number }
+    const onClick: ActionCreator<ClickPayload> = () => ({ count: 1 });
+    const dispatchToProps = {
+        onClick,
+    };
+
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+    interface DispatchProps { onClick: ActionCreator<ClickPayload> }
+
+    const mapStateToProps = (_: any, __: OwnProps): StateProps => ({
+        bar: 1
+    })
+
+    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+
+    const Test = connect(
+        mapStateToProps,
+        dispatchToProps,
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapDispatchFactory {
+    interface OwnProps { foo: string }
+    interface DispatchProps { onClick: () => void }
+
+    class TestComponent extends Component<OwnProps & DispatchProps> {}
+
+    const mapDispatchToPropsFactory = () => () => ({
+        onClick: () => {}
+    })
+
+    const TestNull = connect(
+        null,
+        mapDispatchToPropsFactory,
+    )(TestComponent)
+
+    const verifyNull = <TestNull foo='bar' />
+
+    const TestUndefined = connect(
+        undefined,
+        mapDispatchToPropsFactory,
+    )(TestComponent)
+
+    const verifyUndefined = <TestUndefined foo='bar' />
+}
+
+namespace MapStateAndDispatch {
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+    interface DispatchProps { onClick: () => void }
+
+    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+
+    const mapStateToProps = () => ({
+        bar: 1
+    })
+
+    const mapDispatchToProps = () => ({
+        onClick: () => {}
+    })
+
+    const Test = connect(
+        mapStateToProps,
+        mapDispatchToProps,
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapStateFactoryAndDispatch {
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+    interface DispatchProps { onClick: () => void }
+
+    const mapStateToPropsFactory = () => () =>({
+        bar: 1
+    })
+
+    const mapDispatchToProps = () => ({
+        onClick: () => {}
+    })
+
+    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+
+    const Test = connect(
+        mapStateToPropsFactory,
+        mapDispatchToProps,
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapStateFactoryAndDispatchFactory {
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+    interface DispatchProps { onClick: () => void }
+
+    const mapStateToPropsFactory = () => () =>({
+        bar: 1
+    })
+
+    const mapDispatchToPropsFactory = () => () => ({
+        onClick: () => {}
+    })
+
+    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+
+    const Test = connect(
+        mapStateToPropsFactory,
+        mapDispatchToPropsFactory,
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapStateAndDispatchAndMerge {
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+    interface DispatchProps { onClick: () => void }
+
+    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+
+    const mapStateToProps = () => ({
+        bar: 1
+    })
+
+    const mapDispatchToProps = () => ({
+        onClick: () => {}
+    })
+
+    const mergeProps = (stateProps: StateProps, dispatchProps: DispatchProps) => (
+        Object.assign({}, stateProps, dispatchProps)
+    )
+
+    const Test = connect(
+        mapStateToProps,
+        mapDispatchToProps,
+        mergeProps,
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+namespace MapStateAndOptions {
+    interface State { state: string; }
+    interface OwnProps { foo: string }
+    interface StateProps { bar: number }
+    interface DispatchProps { dispatch: Dispatch<any> }
+
+    class TestComponent extends Component<OwnProps & StateProps & DispatchProps> {}
+
+    const mapStateToProps = (state: State) => ({
+        bar: 1
+    })
+
+    const areStatePropsEqual = (next: StateProps, current: StateProps) => true;
+
+    const Test = connect<StateProps, DispatchProps, OwnProps, State>(
+        mapStateToProps,
+        null,
+        null,
+        {
+            pure: true,
+            areStatePropsEqual,
+        }
+    )(TestComponent)
+
+    const verify = <Test foo='bar' />
+}
+
+interface CounterState {
+    counter: number;
+}
+declare var increment: Function;
+
+class Counter extends Component<any, any> {
+    render() {
+        return (
+            <button onClick={this.props.onIncrement}>
+                {this.props.value}
+            </button>
+        );
+    }
+}
+
+function mapStateToProps(state: CounterState) {
+    return {
+        value: state.counter
+    };
+}
+
+// Which action creators does it want to receive by props?
+function mapDispatchToProps(dispatch: Dispatch<CounterState>) {
+    return {
+        onIncrement: () => dispatch(increment())
+    };
+}
+
+connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(Counter);
+
+
+@connect(mapStateToProps)
+class CounterContainer extends Component<any, any> {
+
+}
+
+// Ensure connect's first two arguments can be replaced by wrapper functions
+interface ICounterStateProps {
+    value: number
+}
+interface ICounterDispatchProps {
+    onIncrement: () => void
+}
+// with higher order functions
+connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
+    () => mapStateToProps,
+    () => mapDispatchToProps
+)(Counter);
+// with higher order functions using parameters
+connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
+    (initialState: CounterState, ownProps) => mapStateToProps,
+    (dispatch: Dispatch<CounterState>, ownProps) => mapDispatchToProps
+)(Counter);
+// only first argument
+connect<ICounterStateProps, {}, {}, CounterState>(
+    () => mapStateToProps
+)(Counter);
+// wrap only one argument
+connect<ICounterStateProps, ICounterDispatchProps, {}, CounterState>(
+    mapStateToProps,
+    () => mapDispatchToProps
+)(Counter);
+// with extra arguments
+connect<ICounterStateProps, ICounterDispatchProps, {}, ICounterStateProps & ICounterDispatchProps, CounterState>(
+    () => mapStateToProps,
+    () => mapDispatchToProps,
+    (s: ICounterStateProps, d: ICounterDispatchProps) =>
+        objectAssign({}, s, d),
+    { pure: true }
+)(Counter);
+
+
+class App extends Component<any, any> {
+    render(): JSX.Element {
+        // ...
+        return null;
+    }
+}
+
+const targetEl = document.getElementById('root');
+
+ReactDOM.render((
+    <Provider store={store}>
+        {() => <App />}
+    </Provider>
+), targetEl);
+
+//
+// API
+// https://github.com/rackt/react-redux/blob/master/docs/api.md
+//
+declare var store: Store<TodoState>;
+class MyRootComponent extends Component<any, any> {
+
+}
+class TodoApp extends Component<any, any> {}
+interface TodoState {
+    todos: string[]|string;
+}
+interface TodoProps {
+    userId: number;
+}
+interface DispatchProps {
+    addTodo(userId: number, text: string): void;
+    action: Function;
+}
+declare var actionCreators: () => {
+    action: Function;
+}
+declare var dispatchActionCreators: () => DispatchProps;
+declare var addTodo: () => { type: string; };
+declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
+declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
+
+ReactDOM.render(
+    <Provider store={store}>
+        {() => <MyRootComponent />}
+    </Provider>,
+    document.body
+);
+
+//TODO: for React Router 0.13
+////TODO: error TS2339: Property 'run' does not exist on type 'typeof "react-router"'.
+////TODO: error TS2339: Property 'HistoryLocation' does not exist on type 'typeof "react-router"'.
+//declare var routes: any;
+//Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
+//    ReactDOM.render(
+//        <Provider store={store}>
+//            {/*
+//             //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
+//             {() => <Handler routerState={routerState} />} // note "routerState" here: important to pass it down
+//            */}
+//        </Provider>,
+//        document.getElementById('root')
+//    );
+//});
+
+// Inject just dispatch and don't listen to store
+
+const AppWrap = (props: DispatchProp<any> & { children?: React.ReactNode }) => <div />
+const WrappedApp = connect()(AppWrap);
+
+<WrappedApp />
+
+// Inject dispatch and every field in the global state
+
+connect((state: TodoState) => state)(TodoApp);
+
+// Inject dispatch and todos
+
+function mapStateToProps2(state: TodoState) {
+    return { todos: state.todos };
+}
+
+export default connect(mapStateToProps2)(TodoApp);
+
+// Inject todos and all action creators (addTodo, completeTodo, ...)
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+connect(mapStateToProps2, actionCreators)(TodoApp);
+
+// Inject todos and all action creators (addTodo, completeTodo, ...) as actions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps2(dispatch: Dispatch<TodoState>) {
+    return { actions: bindActionCreators(actionCreators, dispatch) };
+}
+
+connect(mapStateToProps2, mapDispatchToProps2)(TodoApp);
+
+// Inject todos and a specific action creator (addTodo)
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps3(dispatch: Dispatch<TodoState>) {
+    return bindActionCreators({ addTodo }, dispatch);
+}
+
+connect(mapStateToProps2, mapDispatchToProps3)(TodoApp);
+
+// Inject todos, todoActionCreators as todoActions, and counterActionCreators as counterActions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps4(dispatch: Dispatch<TodoState>) {
+    return {
+        todoActions: bindActionCreators(todoActionCreators, dispatch),
+        counterActions: bindActionCreators(counterActionCreators, dispatch)
+    };
+}
+
+connect(mapStateToProps2, mapDispatchToProps4)(TodoApp);
+
+// Inject todos, and todoActionCreators and counterActionCreators together as actions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps5(dispatch: Dispatch<TodoState>) {
+    return {
+        actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
+    };
+}
+
+connect(mapStateToProps2, mapDispatchToProps5)(TodoApp);
+
+// Inject todos, and all todoActionCreators and counterActionCreators directly as props
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps6(dispatch: Dispatch<TodoState>) {
+    return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
+}
+
+connect(mapStateToProps2, mapDispatchToProps6)(TodoApp);
+
+// Inject todos of a specific user depending on props
+
+function mapStateToProps3(state: TodoState, ownProps: TodoProps): TodoState {
+    return { todos: state.todos[ownProps.userId] };
+}
+
+connect(mapStateToProps3)(TodoApp);
+
+// Inject todos of a specific user depending on props, and inject props.userId into the action
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
+    return objectAssign({}, ownProps, dispatchProps, {
+        todos: stateProps.todos[ownProps.userId],
+        addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
+    });
+}
+
+connect(mapStateToProps2, dispatchActionCreators, mergeProps)(MyRootComponent);
+
+
+//https://github.com/DefinitelyTyped/DefinitelyTyped/issues/14622#issuecomment-279820358
+//Allow for undefined mapStateToProps
+connect(undefined, mapDispatchToProps6)(TodoApp);
+
+interface TestProp {
+    property1: number;
+    someOtherProperty?: string;
+}
+interface TestState {
+    isLoaded: boolean;
+    state1: number;
+}
+class TestComponent extends Component<TestProp & DispatchProp<any>, TestState> { }
+const WrappedTestComponent = connect()(TestComponent);
+
+// return value of the connect()(TestComponent) is of the type TestComponent
+let ATestComponent: React.ComponentClass<TestProp> = null;
+ATestComponent = TestComponent;
+ATestComponent = WrappedTestComponent;
+
+let anElement: ReactElement<TestProp>;
+<WrappedTestComponent property1={42} />;
+<ATestComponent property1={42} />;
+
+class NonComponent {}
+// this doesn't compile
+//connect()(NonComponent);
+
+// stateless functions
+interface HelloMessageProps {
+    dispatch: Dispatch<any>
+    name: string;
+ }
+const HelloMessage: React.StatelessComponent<HelloMessageProps> = (props) => {
+    return <div>Hello {props.name}</div>;
+}
+let ConnectedHelloMessage = connect()(HelloMessage);
+ReactDOM.render(<ConnectedHelloMessage name="Sebastian" />, document.getElementById('content'));
+
+// stateless functions that uses mapStateToProps and mapDispatchToProps
+namespace TestStatelessFunctionWithMapArguments {
+    interface GreetingProps {
+        name: string;
+        onClick: () => void;
+    }
+
+    function Greeting(props: GreetingProps) {
+        return <div>Hello {props.name}</div>;
+    }
+
+    const mapStateToProps = (state: any, ownProps: GreetingProps) => {
+        return {
+            name: 'Connected! ' + ownProps.name
+        };
+    };
+
+    const mapDispatchToProps = (dispatch: Dispatch<any>, ownProps: GreetingProps) => {
+        return {
+            onClick: () => {
+                dispatch({ type: 'GREETING', name: ownProps.name });
+            }
+        };
+    };
+
+    const ConnectedGreeting = connect(
+        mapStateToProps,
+        mapDispatchToProps
+    )(Greeting);
+}
+
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8787
+namespace TestTOwnPropsInference {
+    interface OwnProps {
+        own: string;
+    }
+
+    interface StateProps {
+        state: string;
+    }
+
+    class OwnPropsComponent extends React.Component<StateProps & OwnProps & DispatchProp<any>> {
+        render() {
+            return <div/>;
+        }
+    }
+
+    function mapStateToPropsWithoutOwnProps(state: any): StateProps {
+        return { state: 'string' };
+    }
+
+    function mapStateToPropsWithOwnProps(state: any, ownProps: OwnProps): StateProps {
+        return { state: 'string' };
+    }
+
+    const ConnectedWithoutOwnProps = connect(mapStateToPropsWithoutOwnProps)(OwnPropsComponent);
+    const ConnectedWithOwnProps = connect(mapStateToPropsWithOwnProps)(OwnPropsComponent);
+    const ConnectedWithTypeHint = connect<StateProps, void, OwnProps>(mapStateToPropsWithoutOwnProps)(OwnPropsComponent);
+
+    // This should not compile, which is good.
+    // React.createElement(ConnectedWithoutOwnProps, { anything: 'goes!' });
+
+    // This compiles, as expected.
+    React.createElement(ConnectedWithOwnProps, { own: 'string' });
+
+    // This should not compile, which is good.
+    // React.createElement(ConnectedWithOwnProps, { anything: 'goes!' });
+
+    // This compiles, as expected.
+    React.createElement(ConnectedWithTypeHint, { own: 'string' });
+
+    // This should not compile, which is good.
+    // React.createElement(ConnectedWithTypeHint, { anything: 'goes!' });
+
+    interface AllProps {
+        own: string
+        state: string
+    }
+
+    class AllPropsComponent extends React.Component<AllProps & DispatchProp<any>> {
+        render() {
+            return <div/>;
+        }
+    }
+
+    type PickedOwnProps = Pick<AllProps, "own">
+    type PickedStateProps = Pick<AllProps, "state">
+
+    const mapStateToPropsForPicked: MapStateToProps<PickedStateProps, PickedOwnProps, {}> = (state: any): PickedStateProps => {
+        return { state: "string" }
+    }
+    const ConnectedWithPickedOwnProps = connect(mapStateToPropsForPicked)(AllPropsComponent);
+    <ConnectedWithPickedOwnProps own="blah" />
+}
+
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/16021
+namespace TestMergedPropsInference {
+    interface StateProps {
+        state: string;
+    }
+
+    interface DispatchProps {
+        dispatch: string;
+    }
+
+    interface OwnProps {
+        own: string;
+    }
+
+    interface MergedProps {
+        merged: string;
+    }
+
+    class MergedPropsComponent extends React.Component<MergedProps> {
+        render() {
+            return <div/>;
+        }
+    }
+
+    function mapStateToProps(state: any): StateProps {
+        return { state: 'string' };
+    }
+
+    function mapDispatchToProps(dispatch: Dispatch<any>): DispatchProps {
+        return { dispatch: 'string' };
+    }
+
+    const ConnectedWithOwnAndState: React.ComponentClass<OwnProps> = connect<StateProps, void, OwnProps, MergedProps>(
+        mapStateToProps,
+        undefined,
+        (stateProps: StateProps) => ({
+            merged: "merged",
+        }),
+    )(MergedPropsComponent);
+
+    const ConnectedWithOwnAndDispatch: React.ComponentClass<OwnProps> = connect<void, DispatchProps, OwnProps, MergedProps>(
+        undefined,
+        mapDispatchToProps,
+        (stateProps: undefined, dispatchProps: DispatchProps) => ({
+            merged: "merged",
+        }),
+    )(MergedPropsComponent);
+
+    const ConnectedWithOwn: React.ComponentClass<OwnProps> = connect<void, void, OwnProps, MergedProps>(
+        undefined,
+        undefined,
+        () => ({
+            merged: "merged",
+        }),
+    )(MergedPropsComponent);
+}
+
+namespace Issue16652 {
+    interface PassedProps {
+        commentIds: string[];
+    }
+
+    interface GeneratedStateProps {
+        comments: ({ id: string } | undefined)[];
+    }
+
+    class CommentList extends React.Component<PassedProps & GeneratedStateProps & DispatchProp<any>> {}
+
+    const mapStateToProps = (state: any, ownProps: PassedProps): GeneratedStateProps => {
+        return {
+            comments: ownProps.commentIds.map(id => ({ id })),
+        };
+    };
+
+    const ConnectedCommentList = connect<GeneratedStateProps, {}, PassedProps>(mapStateToProps)(
+        CommentList
+    );
+
+    <ConnectedCommentList commentIds={['a', 'b', 'c']} />
+}
+
+namespace Issue15463 {
+    interface ISpinnerProps{
+        showGlobalSpinner: boolean;
+    }
+    class SpinnerClass extends React.Component<ISpinnerProps & DispatchProp<any>, undefined> {
+        render() {
+            return (<div />);
+        }
+    }
+
+    export const Spinner = connect((state: any) => {
+        return { showGlobalSpinner: true };
+    })(SpinnerClass);
+
+    <Spinner />
+}
+
+namespace RemoveInjectedAndPassOnRest {
+    interface TProps {
+        showGlobalSpinner: boolean;
+        foo: string;
+    }
+    class SpinnerClass extends React.Component<TProps & DispatchProp<any>, {}> {
+        render() {
+            return (<div />);
+        }
+    }
+
+    export const Spinner = connect((state: any) => {
+        return { showGlobalSpinner: true };
+    })(SpinnerClass);
+
+    <Spinner foo='bar' />
+}
+
+namespace TestControlledComponentWithoutDispatchProp {
+
+    interface MyState {
+        count: number;
+    }
+
+    interface MyProps {
+        label: string;
+        // `dispatch` is optional, but setting it to anything
+        // other than Dispatch<T> will cause an error
+        //
+        // dispatch: Dispatch<any>; // OK
+        // dispatch: number; // ERROR
+    }
+
+    function mapStateToProps(state: MyState) {
+        return {
+            label: `The count is ${state.count}`,
+        }
+    }
+
+    class MyComponent extends React.Component<MyProps> {
+        render() {
+            return <span>{this.props.label}</span>;
+        }
+    }
+
+    const MyFuncComponent = (props: MyProps) => (
+        <span>{props.label}</span>
+    );
+
+    const MyControlledComponent = connect(mapStateToProps)(MyComponent);
+    const MyControlledFuncComponent = connect(mapStateToProps)(MyFuncComponent);
+}
+
+namespace TestDispatchToPropsAsObject {
+    const onClick: ActionCreator<{}> = null;
+    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>;
+    }
+
+    const Header = connect(mapStateToProps, dispatchToProps)(HeaderComponent);
+    <Header />
+}
+
+namespace TestWrappedComponent {
+    type InnerProps = {
+        name: string,
+    };
+    const Inner: React.StatelessComponent<InnerProps> = (props) => {
+        return <h1>{props.name}</h1>;
+    }
+
+    const mapStateToProps = (state: any) => {
+        return {
+            name: "Connected",
+        };
+    };
+    const Connected = connect(mapStateToProps)(Inner);
+
+    // `Inner` and `Connected.WrappedComponent` require explicit `name` prop
+    const TestInner = (props: any) => <Inner name="Inner" />;
+    const TestWrapped = (props: any) => <Connected.WrappedComponent name="Wrapped" />;
+    // `Connected` does not require explicit `name` prop
+    const TestConnected = (props: any) => <Connected />;
+}
+
+namespace TestCreateProvider {
+    const STORE_KEY = 'myStore';
+
+    const MyStoreProvider = createProvider(STORE_KEY);
+
+    const myStoreConnect: Connect = function(
+        mapStateToProps?: any,
+        mapDispatchToProps?: any,
+        mergeProps?: any,
+        options: Options = {},
+    ) {
+        options.storeKey = STORE_KEY;
+        return connect(
+            mapStateToProps,
+            mapDispatchToProps,
+            mergeProps,
+            options,
+        );
+    };
+
+    interface State { a: number };
+    const store = createStore<State>(() => ({ a: 1 }));
+    const myStore = createStore<State>(() => ({ a: 2 }));
+
+    interface AProps { a: number };
+    const A = (props: AProps) => (<h1>A is {props.a}</h1>);
+    const A1 = connect<AProps, {}, {}, State>(state => state)(A);
+    const A2 = myStoreConnect<AProps, {}, {}, State>(state => state)(A);
+
+    const Combined = () => (
+        <Provider store={store}>
+            <MyStoreProvider store={myStore}>
+                <A1 />
+                <A2 />
+            </MyStoreProvider>
+        </Provider>
+    );
+
+    // This renders:
+    // <h1>A is 1</h1>
+    // <h1>A is 2</h1>
+    ReactDOM.render(<Combined />, document.body);
+}
+
+namespace TestTypeInference {
+    interface State { a: number };
+
+    const OnlyState = connect(
+        (state: {a: number}, props: {b: number}) => ({a: state.a, c: state.a + props.b})
+    )(props => <span>{props.a} + {props.b} = {props.c}</span>)
+    interface State { a: number };
+    ReactDOM.render(<OnlyState b={1} />, document.body);
+
+    const OnlyDispatch = connect(
+        undefined,
+        (dispatch, props: {b: number}) => ({action: () => dispatch({type: 'action', b: props.b})})
+    )(props => <span onClick={props.action}>{props.b}</span>)
+    ReactDOM.render(<OnlyDispatch b={1} />, document.body);
+
+    const StateAndDispatch = connect(
+        (state: {a: number}, props: {b: number}) => ({a: state.a, c: state.a + props.b}),
+        (dispatch, props: {b: number}) => ({action: () => dispatch({type: 'action', b: props.b})})
+    )(props => <span>{props.a} + {props.b} = {props.c}</span>)
+    ReactDOM.render(<StateAndDispatch b={1} />, document.body);
+}
diff --git a/types/react-redux/v5/tsconfig.json b/types/react-redux/v5/tsconfig.json
new file mode 100644
index 0000000000..d0eb76b2fc
--- /dev/null
+++ b/types/react-redux/v5/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-redux-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "react-redux": ["react-redux/v5"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/react-redux/v5/tslint.json b/types/react-redux/v5/tslint.json
new file mode 100644
index 0000000000..5a8bb3dd4d
--- /dev/null
+++ b/types/react-redux/v5/tslint.json
@@ -0,0 +1,81 @@
+{
+    "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-object-spread": 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,
+        "use-default-type-parameter": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From fefafb09f4f1240e1b921c8d084d0ea5eba1b054 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 7 May 2018 11:31:29 -0700
Subject: [PATCH 0064/1124] ramda: Use typescript@2.8 (#25424)

---
 types/ramda/index.d.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 69acb41dc6..5a3b58cd5b 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -19,13 +19,12 @@
 //                 Keagan McClelland <https://github.com/CaptJakk>
 //                 Tomas Szabo <https://github.com/deftomat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare let R: R.Static;
 
 declare namespace R {
-    type Diff<T extends string, U extends string> = ({[P in T]: P } & {[P in U]: never } & { [x: string]: never })[T];
-    type Omit<T, K extends string> = Pick<T, Diff<keyof T, K>>;
+    type Omit<T, K extends string> = Pick<T, Exclude<keyof T, K>>;
 
     type Ord = number | string | boolean;
 
@@ -1296,8 +1295,8 @@ declare namespace R {
          * Returns a partial copy of an object containing only the keys specified.  If the key does not exist, the
          * property is ignored.
          */
-        pick<T, K extends string>(names: ReadonlyArray<K>, obj: T): Pick<T, Diff<keyof T, keyof Omit<T, K>>>;
-        pick<K extends string>(names: ReadonlyArray<K>): <T>(obj: T) => Pick<T, Diff<keyof T, keyof Omit<T, K>>>;
+        pick<T, K extends string>(names: ReadonlyArray<K>, obj: T): Pick<T, Exclude<keyof T, Exclude<keyof T, K>>>;
+        pick<K extends string>(names: ReadonlyArray<K>): <T>(obj: T) => Pick<T, Exclude<keyof T, Exclude<keyof T, K>>>;
 
         /**
          * Similar to `pick` except that this one includes a `key: undefined` pair for properties that don't exist.

From 0ec6dc775c1f8d7ab35e5697552a7888708010ae Mon Sep 17 00:00:00 2001
From: Felipe <felipeochoa@users.noreply.github.com>
Date: Mon, 7 May 2018 13:33:47 -0500
Subject: [PATCH 0065/1124] Set redux-batched-subscribe semver limit to <4.0.0
 (#25423)

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

diff --git a/types/redux-batched-subscribe/package.json b/types/redux-batched-subscribe/package.json
index 7c90ffe09e..f5b5c699de 100644
--- a/types/redux-batched-subscribe/package.json
+++ b/types/redux-batched-subscribe/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": ">=1.0.0"
+        "redux": ">=1.0.0 <4.0.0"
     }
 }

From c38ac7f4845f2d8c0542a8dd59ffd0801760fabe Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 7 May 2018 11:35:04 -0700
Subject: [PATCH 0066/1124] es6-shim: Avoid conflict with global PropertyKey
 type (#25421)

---
 types/es6-shim/es6-shim-tests.ts |  8 ++++----
 types/es6-shim/index.d.ts        | 31 ++++++++++++++++---------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/types/es6-shim/es6-shim-tests.ts b/types/es6-shim/es6-shim-tests.ts
index 87f6fba0e5..7d7fdc6db2 100644
--- a/types/es6-shim/es6-shim-tests.ts
+++ b/types/es6-shim/es6-shim-tests.ts
@@ -17,7 +17,7 @@ let r: RegExp = /a/;
 let sym: symbol = {} as symbol;
 let e: Error = new Error();
 let date: Date;
-let key: PropertyKey;
+let key: KeyOfProperty;
 let point: Point = { x: 1, y: 2 };
 let point3d: Point3D = { x: 1, y: 2, z: 3 };
 let point3dOrUndef: Point3D | undefined;
@@ -25,7 +25,7 @@ let pointOrUndef: Point | undefined;
 let arrayOfPoint: Point[] = [];
 let arrayOfPoint3D: Point3D[];
 let arrayOfSymbol: symbol[];
-let arrayOfPropertyKey: PropertyKey[];
+let arrayOfPropertyKey: KeyOfProperty[];
 let arrayOfAny: any[];
 let arrayOfStringAny: [string, any][];
 let arrayLikeOfAny: ArrayLike<any> = [];
@@ -40,8 +40,8 @@ let iterableIteratorOfPointPoint: IterableIteratorShim<[Point, Point]>;
 let iterableIteratorOfNode: IterableIteratorShim<Node>;
 let iterableIteratorOfStringPoint: IterableIteratorShim<[string, Point]>;
 let iterableIteratorOfAny: IterableIteratorShim<any>;
-let iterableIteratorOfPropertyKey: IterableIteratorShim<PropertyKey>;
-let iterableIteratorOfPropertyKeyPoint: IterableIteratorShim<[PropertyKey, Point]>;
+let iterableIteratorOfPropertyKey: IterableIteratorShim<KeyOfProperty>;
+let iterableIteratorOfPropertyKeyPoint: IterableIteratorShim<[KeyOfProperty, Point]>;
 let nodeList: NodeList;
 let pd: PropertyDescriptor = {};
 let pdm: PropertyDescriptorMap = {};
diff --git a/types/es6-shim/index.d.ts b/types/es6-shim/index.d.ts
index 2cf61a9362..e2c1a01f3d 100644
--- a/types/es6-shim/index.d.ts
+++ b/types/es6-shim/index.d.ts
@@ -4,7 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-declare type PropertyKey = string | number | symbol;
+// TODO: As of TypeScript@2.9 there is a global type PropertyKey that should be used instead of this.
+declare type KeyOfProperty = string | number | symbol;
 
 interface IteratorResult<T> {
     done: boolean;
@@ -625,17 +626,17 @@ declare var WeakSet: WeakSetConstructor;
 declare namespace Reflect {
     function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
     function construct(target: Function, argumentsList: ArrayLike<any>): any;
-    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function defineProperty(target: any, propertyKey: KeyOfProperty, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: KeyOfProperty): boolean;
     function enumerate(target: any): IterableIteratorShim<any>;
-    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function get(target: any, propertyKey: KeyOfProperty, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: KeyOfProperty): PropertyDescriptor;
     function getPrototypeOf(target: any): any;
-    function has(target: any, propertyKey: PropertyKey): boolean;
+    function has(target: any, propertyKey: KeyOfProperty): boolean;
     function isExtensible(target: any): boolean;
-    function ownKeys(target: any): Array<PropertyKey>;
+    function ownKeys(target: any): Array<KeyOfProperty>;
     function preventExtensions(target: any): boolean;
-    function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+    function set(target: any, propertyKey: KeyOfProperty, value: any, receiver?: any): boolean;
     function setPrototypeOf(target: any, proto: any): boolean;
 }
 
@@ -653,17 +654,17 @@ declare module "es6-shim" {
     namespace Reflect {
         function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
         function construct(target: Function, argumentsList: ArrayLike<any>): any;
-        function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-        function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+        function defineProperty(target: any, propertyKey: KeyOfProperty, attributes: PropertyDescriptor): boolean;
+        function deleteProperty(target: any, propertyKey: KeyOfProperty): boolean;
         function enumerate(target: any): Iterator<any>;
-        function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-        function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+        function get(target: any, propertyKey: KeyOfProperty, receiver?: any): any;
+        function getOwnPropertyDescriptor(target: any, propertyKey: KeyOfProperty): PropertyDescriptor;
         function getPrototypeOf(target: any): any;
-        function has(target: any, propertyKey: PropertyKey): boolean;
+        function has(target: any, propertyKey: KeyOfProperty): boolean;
         function isExtensible(target: any): boolean;
-        function ownKeys(target: any): Array<PropertyKey>;
+        function ownKeys(target: any): Array<KeyOfProperty>;
         function preventExtensions(target: any): boolean;
-        function set(target: any, propertyKey: PropertyKey, value: any, receiver?: any): boolean;
+        function set(target: any, propertyKey: KeyOfProperty, value: any, receiver?: any): boolean;
         function setPrototypeOf(target: any, proto: any): boolean;
     }
 }

From 014cf4b92cc4fb14b5eebd7e9df6d6eac4f29067 Mon Sep 17 00:00:00 2001
From: Alex Macleod <alex@macleod.io>
Date: Mon, 7 May 2018 19:38:39 +0100
Subject: [PATCH 0067/1124] firefox-webext-browser: remove
 bookmark.import/export (#25044)

They aren't used by any browser and break the bookmarks namespace (no
other properties are accessible on completion)
---
 .../firefox-webext-browser-tests.ts              |  2 ++
 types/firefox-webext-browser/index.d.ts          | 16 ----------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 types/firefox-webext-browser/index.d.ts

diff --git a/types/firefox-webext-browser/firefox-webext-browser-tests.ts b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
index 38169d573a..53f3b5a928 100644
--- a/types/firefox-webext-browser/firefox-webext-browser-tests.ts
+++ b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
@@ -12,3 +12,5 @@ browser._manifest.NativeManifest; // $ExpectError
 // browser.runtime
 const port = browser.runtime.connect();
 port.postMessage(); // $ExpectError
+
+browser.bookmarks.getTree();
diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
old mode 100644
new mode 100755
index d04b7f6aca..1ce4024f4d
--- a/types/firefox-webext-browser/index.d.ts
+++ b/types/firefox-webext-browser/index.d.ts
@@ -3915,10 +3915,6 @@ declare namespace browser.bookmarks {
         type?: BookmarkTreeNodeType;
     }
 
-    export {_import as import};
-
-    export {_export as export};
-
     /* bookmarks functions */
     /**
      * Retrieves the specified BookmarkTreeNode(s).
@@ -3986,18 +3982,6 @@ declare namespace browser.bookmarks {
     /** Recursively removes a bookmark folder. */
     function removeTree(id: string): Promise<void>;
 
-    /**
-     * Imports bookmarks from an html bookmark file
-     * @deprecated Unsupported on Firefox at this time.
-     */
-    function _import(): Promise<void>;
-
-    /**
-     * Exports bookmarks to an html bookmark file
-     * @deprecated Unsupported on Firefox at this time.
-     */
-    function _export(): Promise<void>;
-
     /* bookmarks events */
     /** Fired when a bookmark or folder is created. */
     const onCreated: WebExtEvent<(id: string, bookmark: BookmarkTreeNode) => void>;

From 92662d11faf2f9b4775178ab58cd5d1e71635f30 Mon Sep 17 00:00:00 2001
From: Etienne Martin <github@emartin.ca>
Date: Mon, 7 May 2018 14:41:22 -0400
Subject: [PATCH 0068/1124] Added missing 'circle-opacity-transition' property
 to the 'CirclePaint' interface. (#25295)

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

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 21116829e5..ece34d0938 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -26,11 +26,11 @@ declare namespace mapboxgl {
         constructor(options?: MapboxOptions);
 
         addControl(control: Control, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
-        
+
         addControl(control: IControl, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
 
         removeControl(control: Control): this;
-        
+
         removeControl(control: IControl): this;
 
         getClasses(): string[];
@@ -1096,6 +1096,7 @@ declare namespace mapboxgl {
         'circle-color'?: string | StyleFunction | Expression;
         'circle-blur'?: number | StyleFunction | Expression;
         'circle-opacity'?: number | StyleFunction | Expression;
+        'circle-opacity-transition'?: Transition;
         'circle-translate'?: number[] | Expression;
         'circle-translate-anchor'?: 'map' | 'viewport';
         'circle-pitch-scale'?: 'map' | 'viewport';

From 948a1e803e8edcf01f8ab72994c44be9b788e485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=98i=C4=8Da=C5=99?= <jakub.ricar@gmail.com>
Date: Tue, 8 May 2018 01:41:48 +0700
Subject: [PATCH 0069/1124] [react-bootstrap-daterangepicker] containerClass,
 containerStyles (#25323)

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

diff --git a/types/react-bootstrap-daterangepicker/index.d.ts b/types/react-bootstrap-daterangepicker/index.d.ts
index 1479b1e1c5..5a2cfa4735 100644
--- a/types/react-bootstrap-daterangepicker/index.d.ts
+++ b/types/react-bootstrap-daterangepicker/index.d.ts
@@ -19,6 +19,8 @@ declare namespace ReactBootstrapDaterangepicker {
         onApply?: EventHandler;
         onCancel?: EventHandler;
         onEvent?: EventHandler;
+        containerClass?: string;
+        containerStyles?: React.CSSProperties;
     }
 
     export class DateRangePicker extends React.Component<Props> { }
diff --git a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
index 36484ba416..a5570d94b9 100644
--- a/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
+++ b/types/react-bootstrap-daterangepicker/react-bootstrap-daterangepicker-tests.tsx
@@ -16,6 +16,8 @@ class IntegrationTest extends React.Component {
       cancelClass: "myclass",
       autoApply: true,
       linkedCalendars: true,
+      containerClass: "custom-class",
+      containerStyles: { display: "block" },
     };
 
     return React.createElement(DateRangePicker, props);

From deb8d04dbede59a023db14876aca0e6a09b060e3 Mon Sep 17 00:00:00 2001
From: George <eakarpov@yandex.ru>
Date: Mon, 7 May 2018 21:42:54 +0300
Subject: [PATCH 0070/1124] Update react-redux-i18n for react-redux 5.0.18
 types (#25324)

* Update redux dependency

Update for the current 3.x redux

* Add required restriction of redux

* Action generic removed
---
 types/react-redux-i18n/index.d.ts   | 2 +-
 types/react-redux-i18n/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-redux-i18n/index.d.ts b/types/react-redux-i18n/index.d.ts
index 20cca729bf..f578bee5aa 100644
--- a/types/react-redux-i18n/index.d.ts
+++ b/types/react-redux-i18n/index.d.ts
@@ -21,7 +21,7 @@ declare module 'react-redux-i18n' {
 
   type TranslationObjects = { [lang: string]: SubTranslationObject };
 
-  type DispatchCallback<S> = {
+  type DispatchCallback<S extends redux.Action> = {
     (dispatch?: redux.Dispatch<S>, getState?: () => S): any;
   }
 
diff --git a/types/react-redux-i18n/package.json b/types/react-redux-i18n/package.json
index 6d68bf2f9b..b5b3eb5dd8 100644
--- a/types/react-redux-i18n/package.json
+++ b/types/react-redux-i18n/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.6.0"
+        "redux": "^3.7.2"
     }
 }

From 760f588dcd5e2d26034c036b6e8af36e57271140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Gr=C5=88o?= <m93a.cz@gmail.com>
Date: Mon, 7 May 2018 20:43:37 +0200
Subject: [PATCH 0071/1124] [react-table] Add support for Functional Rendering
 (#25347)

* Added type definitions for functional rendering

https://www.npmjs.com/package/react-table#functional-rendering

* fixed trailing whitespace

* add test for functional rendering

* add missing props to FinalState

* restricted some of the `any` types

* corrected semicolons
---
 types/react-table/index.d.ts            | 46 +++++++++++++++++++++++++
 types/react-table/react-table-tests.tsx | 29 ++++++++++++++--
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index d748fcffb2..ebe531ecfa 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -177,6 +177,13 @@ export interface TableProps extends
 
     /** Server-side callbacks */
     onFetchData: (state: any, instance: any) => void;
+
+    /** Control callback for functional rendering */
+    children: (
+        state: FinalState,
+        makeTable: () => React.ReactElement<any>,
+        instance: Instance
+    ) => React.ReactNode;
 }
 
 export interface ControlledStateOverrideProps {
@@ -254,6 +261,14 @@ export interface ExpandedRows {
     [idx: number]: boolean | ExpandedRows;
 }
 
+export interface DerivedDataObject {
+    _index: number;
+    _nestingLevel: number;
+    _subRows: any;
+    _original: any;
+    [p: string]: any;
+}
+
 export interface ControlledStateCallbackProps {
     /** Called when the page index is changed by the user */
     onPageChange: PageChangeFunction;
@@ -648,15 +663,46 @@ export interface RowInfo {
 }
 
 export interface FinalState extends TableProps {
+    frozen: boolean;
     startRow: number;
     endRow: number;
     pageRows: number;
     padRows: number;
     hasColumnFooter: boolean;
+    hasHeaderGroups: boolean;
     canPrevious: boolean;
     canNext: boolean;
     rowMinWidth: number;
+
+    allVisibleColumns: Column[];
+    allDecoratedColumns: Column[];
+    resolvedData: DerivedDataObject[];
+    sortedData: DerivedDataObject[];
+    headerGroups: any[];
 }
 
 export const ReactTableDefaults: TableProps;
 export default class ReactTable extends React.Component<Partial<TableProps>> { }
+
+export interface Instance extends ReactTable {
+    context: any;
+    props: Partial<TableProps>;
+    refs: any;
+    state: FinalState;
+    filterColumn(...props: any[]): any;
+    filterData(...props: any[]): any;
+    fireFetchData(...props: any[]): any;
+    getDataModel(...props: any[]): any;
+    getMinRows(...props: any[]): any;
+    getPropOrState(...props: any[]): any;
+    getResolvedState(...props: any[]): any;
+    getSortedData(...props: any[]): any;
+    getStateOrProp(...props: any[]): any;
+    onPageChange: PageChangeFunction;
+    onPageSizeChange: PageSizeChangeFunction;
+    resizeColumnEnd(...props: any[]): any;
+    resizeColumnMoving(...props: any[]): any;
+    resizeColumnStart(...props: any[]): any;
+    sortColumn(...props: any[]): any;
+    sortData(...props: any[]): any;
+}
diff --git a/types/react-table/react-table-tests.tsx b/types/react-table/react-table-tests.tsx
index f03bb5e167..b8380125b3 100644
--- a/types/react-table/react-table-tests.tsx
+++ b/types/react-table/react-table-tests.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
 // Import React Table
-import ReactTable, { Column } from "react-table";
+import ReactTable, { Column, FinalState, Instance } from "react-table";
 import "react-table/react-table.css";
 
 const columns: Column[] = [
@@ -154,7 +154,32 @@ const Component = (props: {}) => {
             console.log(newSorted);
           }
         }}
-      />
+      >
+        {(
+          state: FinalState,
+          makeTable: () => React.ReactChild,
+          instance: Instance
+        ) => {
+          return (
+            <div
+              style={{
+                background: "#ffcf00",
+                borderRadius: "5px",
+                overflow: "hidden",
+                padding: "5px"
+              }}
+            >
+              <pre>
+                <code>
+                  state.allVisibleColumns ==={" "}
+                  {JSON.stringify(state.allVisibleColumns, null, 4)}
+                </code>
+              </pre>
+              {makeTable()}
+            </div>
+          );
+        }}
+      </ReactTable>
       <br />
     </div>
   );

From 997a01e2b21cfdc8917728bbdc8971e2a6b30925 Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Mon, 7 May 2018 20:45:07 +0200
Subject: [PATCH 0072/1124] [ArangoDB] Fix collection properties argument &
 index fields type (#25383)

* Forgot about dotted index paths

* CollectionProperties are not an argument type

* Add keyOptions test

* Add proper mergeObjects option to updates

* Add aql.literal, query

* Better type middleware
---
 types/arangodb/arangodb-tests.ts |  41 ++++++-
 types/arangodb/index.d.ts        | 195 +++++++++++++++++++------------
 2 files changed, 156 insertions(+), 80 deletions(-)

diff --git a/types/arangodb/arangodb-tests.ts b/types/arangodb/arangodb-tests.ts
index b498caf6af..da5e1e40c2 100644
--- a/types/arangodb/arangodb-tests.ts
+++ b/types/arangodb/arangodb-tests.ts
@@ -1,4 +1,4 @@
-import { db, aql } from "@arangodb";
+import { db, aql, query } from "@arangodb";
 import { md5 } from "@arangodb/crypto";
 import { createRouter } from "@arangodb/foxx";
 import sessionsMiddleware = require("@arangodb/foxx/sessions");
@@ -21,16 +21,37 @@ const admin = users.firstExample({ username: "admin" })!;
 users.update(admin, { password: md5("hunter2") });
 console.logLines("user", admin._key, admin.username);
 
-const query = aql`
+db._query(aql`
     FOR u IN ${users}
     RETURN u
-`;
+`);
 
-db._createDocumentCollection("bananas").ensureIndex({
+interface Banana {
+    color: string;
+    shape: {
+        type: string;
+        coords: string[];
+    };
+}
+
+const bananas = db._createDocumentCollection("bananas", {
+    waitForSync: false,
+    keyOptions: {
+        type: "autoincrement",
+        increment: 11,
+        offset: 23
+    }
+}) as ArangoDB.Collection<Banana>;
+bananas.ensureIndex({
     type: "hash",
     unique: true,
-    fields: ["color", "shape"]
+    fields: ["color", "shape.type"]
 });
+bananas.updateByExample(
+    bananas.any(),
+    { shape: { type: "round" } },
+    { mergeObjects: true }
+);
 
 const router = createRouter();
 module.context.use(router);
@@ -61,3 +82,13 @@ router.use(
         transport: cookieTransport({ secret: "banana", algorithm: "sha256" })
     })
 );
+
+console.log(
+    query`
+        FOR u IN users
+        ${aql.literal(
+            Math.random() < 0.5 ? "FILTER u.admin" : "FILTER !u.admin"
+        )}
+        RETURN u
+    `.toArray()
+);
diff --git a/types/arangodb/index.d.ts b/types/arangodb/index.d.ts
index 34cf3ef99e..deed6a97c5 100644
--- a/types/arangodb/index.d.ts
+++ b/types/arangodb/index.d.ts
@@ -91,6 +91,7 @@ declare namespace ArangoDB {
     type EngineType = "mmfiles" | "rocksdb";
     type IndexType = "hash" | "skiplist" | "fulltext" | "geo1" | "geo2";
     type ViewType = "arangosearch";
+    type KeyGeneratorType = "traditional" | "autoincrement";
     type ErrorName =
         | "ERROR_NO_ERROR"
         | "ERROR_FAILED"
@@ -463,12 +464,29 @@ declare namespace ArangoDB {
         replicationFactor?: number;
     }
 
+    interface CreateCollectionOptions {
+        waitForSync?: boolean;
+        journalSize?: number;
+        isVolatile?: boolean;
+        isSystem?: boolean;
+        keyOptions?: {
+            type?: KeyGeneratorType;
+            allowUserKeys?: boolean;
+            increment?: number;
+            offset?: number;
+        };
+        numberOfShards?: number;
+        shardKeys?: string[];
+        replicationFactor?: number;
+    }
+
     interface CollectionProperties {
         waitForSync: boolean;
         journalSize: number;
+        isSystem: boolean;
         isVolatile: boolean;
         keyOptions?: {
-            type: string;
+            type: KeyGeneratorType;
             allowUserKeys: boolean;
             increment?: number;
             offset?: number;
@@ -488,7 +506,7 @@ declare namespace ArangoDB {
 
     interface IndexDescription<T> {
         type: IndexType;
-        fields: ReadonlyArray<keyof T>;
+        fields: ReadonlyArray<keyof T | string>;
         sparse?: boolean;
         unique?: boolean;
         deduplicate?: boolean;
@@ -497,7 +515,7 @@ declare namespace ArangoDB {
     interface Index<T extends object = any> {
         id: string;
         type: IndexType;
-        fields: Array<keyof T>;
+        fields: Array<keyof T | string>;
         sparse: boolean;
         unique: boolean;
         deduplicate: boolean;
@@ -520,6 +538,8 @@ declare namespace ArangoDB {
 
     type DocumentLike = ObjectWithId | ObjectWithKey;
 
+    type Patch<T> = { [K in keyof T]?: T[K] | Patch<T[K]> };
+
     interface DocumentMetadata {
         _key: string;
         _id: string;
@@ -572,6 +592,7 @@ declare namespace ArangoDB {
         keepNull?: boolean;
         waitForSync?: boolean;
         limit?: number;
+        mergeObjects?: boolean;
     }
 
     interface RemoveOptions {
@@ -706,24 +727,24 @@ declare namespace ArangoDB {
         ): InsertResult<T>;
         update(
             selector: string | DocumentLike,
-            data: Partial<Document<T>>,
+            data: Patch<Document<T>>,
             options?: UpdateOptions
         ): UpdateResult<T>;
         update(
             selectors: ReadonlyArray<string | DocumentLike>,
-            data: ReadonlyArray<Partial<Document<T>>>,
+            data: ReadonlyArray<Patch<Document<T>>>,
             options?: UpdateOptions
         ): Array<UpdateResult<T>>;
         updateByExample(
             example: Partial<Document<T>>,
-            newValue: Partial<Document<T>>,
+            newValue: Patch<Document<T>>,
             keepNull?: boolean,
             waitForSync?: boolean,
             limit?: number
         ): number;
         updateByExample(
             example: Partial<Document<T>>,
-            newValue: Partial<Document<T>>,
+            newValue: Patch<Document<T>>,
             options?: UpdateByExampleOptions
         ): number;
     }
@@ -745,6 +766,10 @@ declare namespace ArangoDB {
         options?: QueryOptions;
     }
 
+    interface AqlLiteral {
+        toAQL: () => string;
+    }
+
     interface Cursor<T = any> {
         toArray(): T[];
         hasNext(): boolean;
@@ -862,14 +887,14 @@ declare namespace ArangoDB {
         // Collection
         _collection(name: string): Collection;
         _collections(): Collection[];
-        _create(name: string, properties?: CollectionProperties): Collection;
+        _create(name: string, properties?: CreateCollectionOptions): Collection;
         _createDocumentCollection(
             name: string,
-            properties?: CollectionProperties
+            properties?: CreateCollectionOptions
         ): Collection;
         _createEdgeCollection(
             name: string,
-            properties?: CollectionProperties
+            properties?: CreateCollectionOptions
         ): Collection;
         _drop(name: string): void;
         _truncate(name: string): void;
@@ -930,8 +955,26 @@ declare namespace Foxx {
         set?: (res: Response, sid: string) => void;
         clear?: (res: Response) => void;
     }
+    interface CollectionSessionStorage extends SessionStorage {
+        new: () => Session;
+        save: (session: Session) => Session;
+        clear: (session: Session) => boolean;
+        prune: () => string[];
+    }
+    interface SessionsMiddleware extends DelegateMiddleware {
+        storage: SessionStorage;
+        transport: SessionTransport[];
+    }
 
-    type Middleware = (req: Request, res: Response, next: NextFunction) => void;
+    type SimpleMiddleware = (
+        req: Request,
+        res: Response,
+        next: NextFunction
+    ) => void;
+    interface DelegateMiddleware {
+        register: (endpoint: Endpoint) => SimpleMiddleware;
+    }
+    type Middleware = SimpleMiddleware | DelegateMiddleware;
     type Handler = ((req: Request, res: Response) => void);
     type NextFunction = () => void;
 
@@ -1214,97 +1257,97 @@ declare namespace Foxx {
 
     function route(handler: Handler, name?: string): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
-        middleware3: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
+        middleware3: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
-        middleware3: Middleware,
-        middleware4: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
+        middleware3: SimpleMiddleware,
+        middleware4: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
-        middleware3: Middleware,
-        middleware4: Middleware,
-        middleware5: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
+        middleware3: SimpleMiddleware,
+        middleware4: SimpleMiddleware,
+        middleware5: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
-        middleware3: Middleware,
-        middleware4: Middleware,
-        middleware5: Middleware,
-        middleware6: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
+        middleware3: SimpleMiddleware,
+        middleware4: SimpleMiddleware,
+        middleware5: SimpleMiddleware,
+        middleware6: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
-        middleware3: Middleware,
-        middleware4: Middleware,
-        middleware5: Middleware,
-        middleware6: Middleware,
-        middleware7: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
+        middleware3: SimpleMiddleware,
+        middleware4: SimpleMiddleware,
+        middleware5: SimpleMiddleware,
+        middleware6: SimpleMiddleware,
+        middleware7: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
-        middleware3: Middleware,
-        middleware4: Middleware,
-        middleware5: Middleware,
-        middleware6: Middleware,
-        middleware7: Middleware,
-        middleware8: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
+        middleware3: SimpleMiddleware,
+        middleware4: SimpleMiddleware,
+        middleware5: SimpleMiddleware,
+        middleware6: SimpleMiddleware,
+        middleware7: SimpleMiddleware,
+        middleware8: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
     function route(
-        pathOrMiddleware: string | Middleware,
-        middleware1: Middleware,
-        middleware2: Middleware,
-        middleware3: Middleware,
-        middleware4: Middleware,
-        middleware5: Middleware,
-        middleware6: Middleware,
-        middleware7: Middleware,
-        middleware8: Middleware,
-        middleware9: Middleware,
+        pathOrMiddleware: string | SimpleMiddleware,
+        middleware1: SimpleMiddleware,
+        middleware2: SimpleMiddleware,
+        middleware3: SimpleMiddleware,
+        middleware4: SimpleMiddleware,
+        middleware5: SimpleMiddleware,
+        middleware6: SimpleMiddleware,
+        middleware7: SimpleMiddleware,
+        middleware8: SimpleMiddleware,
+        middleware9: SimpleMiddleware,
         handler: Handler,
         name?: string
     ): Endpoint;
@@ -1327,6 +1370,13 @@ declare namespace Foxx {
 
 declare module "@arangodb" {
     function aql(strings: TemplateStringsArray, ...args: any[]): ArangoDB.Query;
+    namespace aql {
+        function literal(value: any): ArangoDB.AqlLiteral;
+    }
+    function query(
+        strings: TemplateStringsArray,
+        ...args: any[]
+    ): ArangoDB.Cursor;
     function time(): number;
     const db: ArangoDB.Database & {
         [key: string]: ArangoDB.Collection | undefined;
@@ -1362,10 +1412,6 @@ declare module "@arangodb/foxx/graphql" {
 }
 
 declare module "@arangodb/foxx/sessions" {
-    interface SessionsMiddleware extends Foxx.Middleware {
-        storage: Foxx.SessionStorage;
-        transport: Foxx.SessionTransport[];
-    }
     interface SessionsOptions {
         storage: Foxx.SessionStorage | string | ArangoDB.Collection;
         transport:
@@ -1375,7 +1421,9 @@ declare module "@arangodb/foxx/sessions" {
             | "header";
         autoCreate?: boolean;
     }
-    function sessionsMiddleware(options: SessionsOptions): Foxx.Middleware;
+    function sessionsMiddleware(
+        options: SessionsOptions
+    ): Foxx.SessionsMiddleware;
     export = sessionsMiddleware;
 }
 
@@ -1386,14 +1434,11 @@ declare module "@arangodb/foxx/sessions/storages/collection" {
         pruneExpired?: boolean;
         autoUpdate?: boolean;
     }
-    interface CollectionStorage extends Foxx.SessionStorage {
-        prune: () => string[];
-    }
     function collectionStorage(
         options:
             | CollectionStorageOptions
             | CollectionStorageOptions["collection"]
-    ): CollectionStorage;
+    ): Foxx.CollectionSessionStorage;
     export = collectionStorage;
 }
 

From 012108d8c6e2a28553c31fc1d4db0170a0cf90b4 Mon Sep 17 00:00:00 2001
From: Mark Polak <mark@thedutchies.com>
Date: Mon, 7 May 2018 20:45:27 +0200
Subject: [PATCH 0073/1124] Remove as attribute from AnchorHTMLAttributes
 (#25388)

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index d5060ddce6..ce80b41c35 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1293,7 +1293,6 @@ declare namespace React {
         rel?: string;
         target?: string;
         type?: string;
-        as?: string;
     }
 
     // tslint:disable-next-line:no-empty-interface

From b2159abc2e2a17b8bc9fb917a9abd7277aca3d50 Mon Sep 17 00:00:00 2001
From: plylrnsdy <plylrnsdy@163.com>
Date: Tue, 8 May 2018 02:46:10 +0800
Subject: [PATCH 0074/1124] update ansi-styles to 3.2.1 (#25398)

* update ansi-styles to 2.3.1

* update fromat function's params of apple rgb

* add more comments in ansi-styles

* add missing field `close` of ansiStyles.color and ansiStyles.bgColor

* update ansi-styles test

* fix two wrong types; update test file; rename identifiers.
---
 types/ansi-styles/ansi-styles-tests.ts |  81 ++++++++++---------
 types/ansi-styles/escape-code.d.ts     | 106 +++++++++++++++++++++++++
 types/ansi-styles/index.d.ts           |  94 +++++++++++++++-------
 3 files changed, 210 insertions(+), 71 deletions(-)
 create mode 100644 types/ansi-styles/escape-code.d.ts

diff --git a/types/ansi-styles/ansi-styles-tests.ts b/types/ansi-styles/ansi-styles-tests.ts
index 235f98dce1..d1d21719b4 100644
--- a/types/ansi-styles/ansi-styles-tests.ts
+++ b/types/ansi-styles/ansi-styles-tests.ts
@@ -1,53 +1,52 @@
+import { EscapeCode } from './escape-code';
+import AnsiStyles = require('ansi-styles');
 
-import ansi = require('ansi-styles');
+let ansiStyles = AnsiStyles as any,
+    nsNames = ['modifier', 'color', 'bgColor'],
+    namespaces = {
+        modifier: ['reset', 'bold', 'dim', 'italic', 'underline', 'inverse', 'hidden', 'strikethrough'],
+        color: ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'gray',
+            'redBright', 'greenBright', 'yellowBright', 'blueBright', 'magentaBright', 'cyanBright', 'whiteBright'],
+        bgColor: ['bgBlack', 'bgRed', 'bgGreen', 'bgYellow', 'bgBlue', 'bgMagenta', 'bgCyan',
+            'bgBlackBright', 'bgRedBright', 'bgGreenBright', 'bgYellowBright', 'bgBlueBright', 'bgMagentaBright', 'bgCyanBright', 'bgWhiteBright'],
+    } as any,
+    styles = [...namespaces.modifier, ...namespaces.color, ...namespaces.bgColor],
+    codePair = ['open', 'close'],
+    codeTypes = ['ansi', 'ansi256', 'ansi16m'],
+    colorFormats = ['ansi', 'rgb', 'hsl', 'hsv', 'hwb', 'cmyk', 'xyz', 'lab', 'lch', 'hex', 'keyword', 'ansi256', 'hcg', 'apple', 'gray'],
+    codesMap = 'codes';
 
 
-var styles = [
-    ansi.reset, 
+checkStyle(ansiStyles, styles);
+nsNames.forEach(ns => checkStyle(ansiStyles[ns], namespaces[ns]));
 
-    ansi.bold, 
-    ansi.dim, 
-    ansi.italic, 
-    ansi.underline, 
-    ansi.inverse, 
-    ansi.hidden, 
-    ansi.strikethrough, 
+checkIsMap(ansiStyles[codesMap], `ansiStyles.${codesMap} not a Map.`);
+nsNames.forEach(ns => checkExist(ansiStyles[ns], `ansiStyles.${ns} is not exist.`));
 
-    ansi.black, 
-    ansi.red, 
-    ansi.green, 
-    ansi.yellow, 
-    ansi.blue, 
-    ansi.magenta, 
-    ansi.cyan, 
-    ansi.white, 
-    ansi.gray, 
+['color', 'bgColor'].forEach(ns => checkConverter(ns, ansiStyles[ns], colorFormats));
 
-    ansi.bgBlack, 
-    ansi.bgRed, 
-    ansi.bgGreen, 
-    ansi.bgYellow, 
-    ansi.bgBlue, 
-    ansi.bgMagenta, 
-    ansi.bgCyan, 
-    ansi.bgWhite
-]
 
-for (var key in styles) {
-    check(key, styles[key])
+function checkStyle(namespace: any, styles: string[]) {
+    styles.forEach(s => checkCodePair(s, namespace[s]));
+}
+function checkCodePair(styleName: string, pair: any): void {
+    codePair.forEach(p => checkIsString(pair[p], `${styleName}.${p} is not a string.`));
 }
 
-function check(key:string, escapeCodes:ansi.EscapeCodePair): void {
-    if (uninitialized(escapeCodes.open)) {
-        throw new Error('key not found ~> ' + key + '.open')
-    }
-    if (uninitialized(escapeCodes.close)) {
-        throw new Error('key not found ~> ' + key + '.close')
-    }
+function checkConverter(nsName: string, namespace: any, formats: string[]) {
+    formats.forEach(f => codeTypes.forEach(t => checkIsFunction(namespace[t][f], `ansiStyles.${nsName}.${t}.${f} is not a function.`)));
+    checkIsString(namespace.close, `${namespace}.close is not a string.`);
 }
 
-function uninitialized(val:any): boolean {
-    return val === null || val === undefined
+function checkExist(val: any, failMsg: string): void {
+    if (val == null) throw new Error(failMsg);
+}
+function checkIsString(val: any, failMsg: string): void {
+    if(typeof val != 'string') throw new Error(failMsg);
+}
+function checkIsFunction(fn: any, failMsg: string): void {
+    if (typeof fn != 'function') throw new Error(failMsg);
+}
+function checkIsMap(map: any, failMsg: string): void {
+    if (!(map instanceof Map)) throw new Error(failMsg);
 }
-
-
diff --git a/types/ansi-styles/escape-code.d.ts b/types/ansi-styles/escape-code.d.ts
new file mode 100644
index 0000000000..e9b1fe9d42
--- /dev/null
+++ b/types/ansi-styles/escape-code.d.ts
@@ -0,0 +1,106 @@
+import * as cssKeywords from 'color-name';
+
+
+export namespace EscapeCode {
+    export interface CodePair {
+        open: string;
+        close: string;
+    }
+
+    interface Modifier {
+        reset: CodePair;
+        bold: CodePair;
+        dim: CodePair;
+        /**
+         * Not widely supported
+         */
+        italic: CodePair;
+        underline: CodePair;
+        inverse: CodePair;
+        hidden: CodePair;
+        /**
+         * Not widely supported
+         */
+        strikethrough: CodePair;
+    }
+    interface Color {
+        black: CodePair;
+        red: CodePair;
+        green: CodePair;
+        yellow: CodePair;
+        blue: CodePair;
+        magenta: CodePair;
+        cyan: CodePair;
+        white: CodePair;
+        /**
+         * bright black
+         */
+        gray: CodePair;
+        grey: CodePair;
+
+        redBright: CodePair;
+        greenBright: CodePair;
+        yellowBright: CodePair;
+        blueBright: CodePair;
+        magentaBright: CodePair;
+        cyanBright: CodePair;
+        whiteBright: CodePair;
+    }
+    interface BackgroundColor {
+        bgBlack: CodePair;
+        bgRed: CodePair;
+        bgGreen: CodePair;
+        bgYellow: CodePair;
+        bgBlue: CodePair;
+        bgMagenta: CodePair;
+        bgCyan: CodePair;
+        bgWhite: CodePair;
+
+        bgBlackBright: CodePair;
+        bgRedBright: CodePair;
+        bgGreenBright: CodePair;
+        bgYellowBright: CodePair;
+        bgBlueBright: CodePair;
+        bgMagentaBright: CodePair;
+        bgCyanBright: CodePair;
+        bgWhiteBright: CodePair;
+    }
+
+    interface Conversions {
+        ansi: (ansi: number) => string
+        rgb: (r: number, g: number, b: number) => string
+        hsl: (h: number, s: number, l: number) => string
+        hsv: (h: number, s: number, v: number) => string
+        hwb: (h: number, w: number, b: number) => string
+        cmyk: (c: number, m: number, y: number, k: number) => string
+        xyz: (x: number, y: number, z: number) => string
+        lab: (l: number, a: number, b: number) => string
+        lch: (l: number, c: number, h: number) => string
+        hex: (hex: string) => string
+        /**
+         * color keyword in css to ansi code
+         */
+        keyword: (keyword: keyof typeof cssKeywords) => string
+        ansi256: (ansi256: number) => string
+        hcg: (h: number, c: number, g: number) => string
+        /**
+         * apple RGB to ansi code
+         */
+        apple: (r: number, g: number, b: number) => string
+        gray: (grayscale: number) => string
+    }
+    interface ColorType {
+        /**
+         * 16 color ansi code
+         */
+        ansi: Conversions
+        /**
+         * 256 color ansi code
+         */
+        ansi256: Conversions
+        /**
+         * truecolor(16 million color) ansi code
+         */
+        ansi16m: Conversions
+    }
+}
diff --git a/types/ansi-styles/index.d.ts b/types/ansi-styles/index.d.ts
index 4522ece77a..a07ac962ab 100644
--- a/types/ansi-styles/index.d.ts
+++ b/types/ansi-styles/index.d.ts
@@ -1,40 +1,74 @@
-// Type definitions for ansi-styles 2.0.1
+// Type definitions for ansi-styles 3.2.1
 // Project: https://github.com/sindresorhus/ansi-styles
 // Definitions by: bryn austin bellomy <https://github.com/brynbellomy>
+//                 plylrnsdy <https://github.com/plylrnsdy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
+import { EscapeCode } from './escape-code';
 
-export interface EscapeCodePair {
-    open: string;
-    close: string;
-}
 
-export declare var reset: EscapeCodePair;
+export const reset: EscapeCode.CodePair;
+export const bold: EscapeCode.CodePair;
+export const dim: EscapeCode.CodePair;
+/**
+ * Not widely supported
+ */
+export const italic: EscapeCode.CodePair;
+export const underline: EscapeCode.CodePair;
+export const inverse: EscapeCode.CodePair;
+export const hidden: EscapeCode.CodePair;
+/**
+ * Not widely supported
+ */
+export const strikethrough: EscapeCode.CodePair;
 
-export declare var bold: EscapeCodePair;
-export declare var dim: EscapeCodePair;
-export declare var italic: EscapeCodePair;
-export declare var underline: EscapeCodePair;
-export declare var inverse: EscapeCodePair;
-export declare var hidden: EscapeCodePair;
-export declare var strikethrough: EscapeCodePair;
+export const black: EscapeCode.CodePair;
+export const red: EscapeCode.CodePair;
+export const green: EscapeCode.CodePair;
+export const yellow: EscapeCode.CodePair;
+export const blue: EscapeCode.CodePair;
+export const magenta: EscapeCode.CodePair;
+export const cyan: EscapeCode.CodePair;
+export const white: EscapeCode.CodePair;
+/**
+ * bright black
+ */
+export const gray: EscapeCode.CodePair;
+export const grey: EscapeCode.CodePair;
 
-export declare var black: EscapeCodePair;
-export declare var red: EscapeCodePair;
-export declare var green: EscapeCodePair;
-export declare var yellow: EscapeCodePair;
-export declare var blue: EscapeCodePair;
-export declare var magenta: EscapeCodePair;
-export declare var cyan: EscapeCodePair;
-export declare var white: EscapeCodePair;
-export declare var gray: EscapeCodePair;
+export const redBright: EscapeCode.CodePair;
+export const greenBright: EscapeCode.CodePair;
+export const yellowBright: EscapeCode.CodePair;
+export const blueBright: EscapeCode.CodePair;
+export const magentaBright: EscapeCode.CodePair;
+export const cyanBright: EscapeCode.CodePair;
+export const whiteBright: EscapeCode.CodePair;
 
-export declare var bgBlack: EscapeCodePair;
-export declare var bgRed: EscapeCodePair;
-export declare var bgGreen: EscapeCodePair;
-export declare var bgYellow: EscapeCodePair;
-export declare var bgBlue: EscapeCodePair;
-export declare var bgMagenta: EscapeCodePair;
-export declare var bgCyan: EscapeCodePair;
-export declare var bgWhite: EscapeCodePair;
+export const bgBlack: EscapeCode.CodePair;
+export const bgRed: EscapeCode.CodePair;
+export const bgGreen: EscapeCode.CodePair;
+export const bgYellow: EscapeCode.CodePair;
+export const bgBlue: EscapeCode.CodePair;
+export const bgMagenta: EscapeCode.CodePair;
+export const bgCyan: EscapeCode.CodePair;
+export const bgWhite: EscapeCode.CodePair;
+
+export const bgBlackBright: EscapeCode.CodePair;
+export const bgRedBright: EscapeCode.CodePair;
+export const bgGreenBright: EscapeCode.CodePair;
+export const bgYellowBright: EscapeCode.CodePair;
+export const bgBlueBright: EscapeCode.CodePair;
+export const bgMagentaBright: EscapeCode.CodePair;
+export const bgCyanBright: EscapeCode.CodePair;
+export const bgWhiteBright: EscapeCode.CodePair;
+
+/**
+ * Raw escape codes (i.e. without the CSI escape prefix \u001B[ and render mode postfix m) are available.
+ *
+ * This is a Map with the open codes as keys and close codes as values.
+ */
+export const codes: Map<number, number>
+export const modifier: EscapeCode.Modifier
+export const color: EscapeCode.Color & EscapeCode.ColorType & { close: string }
+export const bgColor: EscapeCode.BackgroundColor & EscapeCode.ColorType & { close: string }

From 853ede90a6ce0d388e1a3b316490028a3f85819e Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Mon, 7 May 2018 14:48:04 -0400
Subject: [PATCH 0075/1124] node: Add WHATWG URL API types for v6 (#25407)

Added in Node 6.13.0. This copies the respective types from the types
for Node v7.

<https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V6.md#6.13.0>
---
 types/node/v6/index.d.ts    |  46 ++++++++++++++++
 types/node/v6/node-tests.ts | 101 ++++++++++++++++++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 9859d0ba09..3ad6e5a65c 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -1957,8 +1957,54 @@ declare module "url" {
     }
 
     export function parse(urlStr: string, parseQueryString?: boolean, slashesDenoteHost?: boolean): Url;
+    export function format(URL: URL, options?: URLFormatOptions): string;
     export function format(urlObject: UrlObject | string): string;
     export function resolve(from: string, to: string): string;
+
+    export function domainToASCII(domain: string): string;
+    export function domainToUnicode(domain: string): string;
+
+    export interface URLFormatOptions {
+        auth?: boolean;
+        fragment?: boolean;
+        search?: boolean;
+        unicode?: boolean;
+    }
+
+    export class URLSearchParams implements Iterable<string[]> {
+        constructor(init?: URLSearchParams | string | { [key: string]: string | string[] } | Iterable<string[]> );
+        append(name: string, value: string): void;
+        delete(name: string): void;
+        entries(): Iterator<string[]>;
+        forEach(callback: (value: string, name: string) => void): void;
+        get(name: string): string | null;
+        getAll(name: string): string[];
+        has(name: string): boolean;
+        keys(): Iterator<string>;
+        set(name: string, value: string): void;
+        sort(): void;
+        toString(): string;
+        values(): Iterator<string>;
+        [Symbol.iterator](): Iterator<string[]>;
+    }
+
+    export class URL {
+        constructor(input: string, base?: string | URL);
+        hash: string;
+        host: string;
+        hostname: string;
+        href: string;
+        readonly origin: string;
+        password: string;
+        pathname: string;
+        port: string;
+        protocol: string;
+        search: string;
+        readonly searchParams: URLSearchParams;
+        username: string;
+        toString(): string;
+        toJSON(): string;
+    }
 }
 
 declare module "dns" {
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index f9d5a9cd62..4457f83492 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -486,12 +486,113 @@ namespace url_tests {
             pathname: 'search',
             query: { q: "you're a lizard, gary" }
         });
+
+        const myURL = new url.URL('https://a:b@你好你好?abc#foo');
+        url.format(myURL, { fragment: false, unicode: true, auth: false });
     }
 
     {
         var helloUrl = url.parse('http://example.com/?hello=world', true)
         assert.equal(helloUrl.query.hello, 'world');
     }
+
+    {
+        const ascii: string = url.domainToASCII('español.com');
+        const unicode: string = url.domainToUnicode('xn--espaol-zwa.com');
+    }
+
+    {
+        let myURL = new url.URL('https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.hash, '#bar');
+        assert.equal(myURL.host, 'example.org:81');
+        assert.equal(myURL.hostname, 'example.org');
+        assert.equal(myURL.href, 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert.equal(myURL.origin, 'https://example.org:81');
+        assert.equal(myURL.password, 'thepwd');
+        assert.equal(myURL.username, 'theuser');
+        assert.equal(myURL.pathname, '/foo/path');
+        assert.equal(myURL.port, "81");
+        assert.equal(myURL.protocol, "https:");
+        assert.equal(myURL.search, "?query=string");
+        assert.equal(myURL.toString(), 'https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
+        assert(myURL.searchParams instanceof url.URLSearchParams);
+
+        myURL.host = 'example.org:82';
+        myURL.hostname = 'example.com';
+        myURL.href = 'http://other.com';
+        myURL.hash = 'baz';
+        myURL.password = "otherpwd";
+        myURL.username = "otheruser";
+        myURL.pathname = "/otherPath";
+        myURL.port = "82";
+        myURL.protocol = "http";
+        myURL.search = "a=b";
+        assert.equal(myURL.href, 'http://otheruser:otherpwd@other.com:82/otherPath?a=b#baz');
+
+        myURL = new url.URL('/foo', 'https://example.org/');
+        assert.equal(myURL.href, 'https://example.org/foo');
+        assert.equal(myURL.toJSON(), myURL.href);
+    }
+
+    {
+        const searchParams = new url.URLSearchParams('abc=123');
+
+        assert.equal(searchParams.toString(), 'abc=123');
+        searchParams.forEach((value: string, name: string): void => {
+            assert.equal(name, 'abc');
+            assert.equal(value, '123');
+        });
+
+        assert.equal(searchParams.get('abc'), '123');
+
+        searchParams.append('abc', 'xyz');
+
+        assert.deepEqual(searchParams.getAll('abc'), ['123', 'xyz']);
+
+        const entries = searchParams.entries();
+        assert.deepEqual(entries.next(), { value: ["abc", "123"], done: false});
+        assert.deepEqual(entries.next(), { value: ["abc", "xyz"], done: false});
+        assert.deepEqual(entries.next(), { value: undefined, done: true});
+
+        const keys = searchParams.keys();
+        assert.deepEqual(keys.next(), { value: "abc", done: false});
+        assert.deepEqual(keys.next(), { value: "abc", done: false});
+        assert.deepEqual(keys.next(), { value: undefined, done: true});
+
+        const values = searchParams.values();
+        assert.deepEqual(values.next(), { value: "123", done: false});
+        assert.deepEqual(values.next(), { value: "xyz", done: false});
+        assert.deepEqual(values.next(), { value: undefined, done: true});
+
+        searchParams.set('abc', 'b');
+        assert.deepEqual(searchParams.getAll('abc'), ['b']);
+
+        searchParams.delete('a');
+        assert(!searchParams.has('a'));
+        assert.equal(searchParams.get('a'), null);
+
+        searchParams.sort();
+    }
+
+    {
+        const searchParams = new url.URLSearchParams({
+            user: 'abc',
+            query: ['first', 'second']
+        });
+
+        assert.equal(searchParams.toString(), 'user=abc&query=first%2Csecond');
+        assert.deepEqual(searchParams.getAll('query'), ['first,second']);
+    }
+
+    {
+        // Using an array
+        let params = new url.URLSearchParams([
+            ['user', 'abc'],
+            ['query', 'first'],
+            ['query', 'second']
+        ]);
+        assert.equal(params.toString(), 'user=abc&query=first&query=second');
+    }
 }
 
 /////////////////////////////////////////////////////

From 140adad6312727591f3d0509da98646a396023cb Mon Sep 17 00:00:00 2001
From: Mathias Scherer <scherer.mat@gmail.com>
Date: Mon, 7 May 2018 20:48:47 +0200
Subject: [PATCH 0076/1124] Meteor universe i18n (#25415)

* adds typing for meteor univserse i18n package

* fixes test errors in meteor-universe-i18n

* adds tslint:disable-next-line for no-single-declare-module and unified-signatures because of false positives
---
 types/meteor-univserse-i18n/index.d.ts        | 117 ++++++++++++++++++
 .../meteor-univserse-i18n-tests.ts            | 107 ++++++++++++++++
 types/meteor-univserse-i18n/tsconfig.json     |  23 ++++
 types/meteor-univserse-i18n/tslint.json       |   1 +
 4 files changed, 248 insertions(+)
 create mode 100644 types/meteor-univserse-i18n/index.d.ts
 create mode 100644 types/meteor-univserse-i18n/meteor-univserse-i18n-tests.ts
 create mode 100644 types/meteor-univserse-i18n/tsconfig.json
 create mode 100644 types/meteor-univserse-i18n/tslint.json

diff --git a/types/meteor-univserse-i18n/index.d.ts b/types/meteor-univserse-i18n/index.d.ts
new file mode 100644
index 0000000000..66ba85ff90
--- /dev/null
+++ b/types/meteor-univserse-i18n/index.d.ts
@@ -0,0 +1,117 @@
+// Type definitions for https://github.com/vazco/meteor-universe-i18n 1.14
+// Project: meteor-universe-i18n
+// Definitions by: Mathias Scherer <https://github.com/mathewmeconry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="react" />
+/// <reference types="node" />
+
+// tslint:disable-next-line no-single-declare-module
+declare module "meteor/universe:i18n" {
+    import { OutgoingHttpHeaders } from "http";
+
+    namespace i18n {
+        // component functions
+        function createComponent(translator?: Translator, locale?: string, reactjs?: React.ReactInstance, type?: any): new () => React.Component<ReactComponentProps>;
+
+        // translator functions
+        function createTranslator(namespace: string, options?: TranslaterOptions): Translator;
+        function createReactiveTranslator(namespace: string, locale: string): new () => React.Component;
+
+        // translation setter / getter functions
+        function addTranslation(locale: string, namespace: string, translation: string): void;
+        // tslint:disable-next-line unified-signatures
+        function addTranslation(locale: string, namespace: string, key: string, translation: string): void;
+        function addTranslations(locale: string, translationsMap: {}): void;
+        function addTranslations(locale: string, namespace: string, translationsMap: {}): void;
+        function getTranslation(key: string, params?: GetTranslationParams): string;
+        function getTranslation(namespace: string, key: string, params: GetTranslationParams): string;
+        function getTranslation(...key: string[]): string;
+        function __(key: string, params?: GetTranslationParams): string;
+        function __(namespace: string, key: string, params: GetTranslationParams): string;
+        function __(...key: string[]): string;
+        function getTranslations(namespace: string, locale?: string): string[];
+
+        // options setter
+        function setOptions(options: i18nOptions): void;
+
+        // number operations
+        function parseNumber(number: string, locale?: string): string;
+
+        // locale setter / getter
+        function setLocale(locale: string, params?: LocateParams): Promise<void>;
+        function setLocaleOnConnection(locale: string, connectionId?: number): void;
+        function getLocale(): string;
+        function loadLocale(locale: string, params?: LoadLocaleParams): void;
+
+        // executes function in the locale context,
+        // it means that every default locale used inside a called function will be set to a passed locale
+        // keep in mind that locale must be loaded first (if it is not bundled)
+        function runWithLocale(locale: string, func: (...keys: any[]) => void): void;
+
+        // language getters
+        function getLanguages(type?: 'code' | 'name' | 'nativeNames'): string[];
+        function getLanguageName(locale?: string): string;
+        function getLanguageNativeName(locale?: string): string;
+
+        // currency symbols
+        function getCurrencySymbol(locale?: string): string | undefined;
+        function getCurrencyCodes(locale?: string): string[];
+
+        // others
+        function isRTL(locale?: string): boolean;
+        function getAllKeysForLocale(locale?: string, excactlyThis?: boolean): string[];
+
+        // events
+        function onChangeLocale(callback: (locale: string) => void): void;
+    }
+
+    interface ReactComponentProps {
+        _locale?: string;
+        _tagType?: string;
+        _namespace?: string;
+        _props?: React.HTMLAttributes<React.Component>;
+        _translateProps?: string[];
+        _containerType?: string;
+    }
+
+    interface i18nOptions {
+        defaultLocale?: string;
+        open?: string;
+        close?: string;
+        purify?: () => void;
+        hideMissing?: boolean;
+        hostUrl?: string;
+        translationsHeaders?: OutgoingHttpHeaders;
+        sameLocaleOnServerConnection?: boolean;
+    }
+
+    interface GetTranslationParams {
+        _locale?: string;
+        _namespace?: string;
+        [key: string]: any;
+    }
+
+    interface TranslaterOptions {
+        _locale?: string;
+        _purify?: boolean;
+    }
+
+    interface LoadLocaleParams {
+        fresh?: boolean;
+        async?: boolean;
+        silent?: boolean;
+        host?: string;
+        pathOnHost?: string;
+    }
+
+    interface LocateParams {
+        noDownload?: boolean;
+        silent?: boolean;
+        async?: boolean;
+        fresh?: boolean;
+    }
+
+    type Translator = (...args: any[]) => string;
+}
diff --git a/types/meteor-univserse-i18n/meteor-univserse-i18n-tests.ts b/types/meteor-univserse-i18n/meteor-univserse-i18n-tests.ts
new file mode 100644
index 0000000000..fbfb921a18
--- /dev/null
+++ b/types/meteor-univserse-i18n/meteor-univserse-i18n-tests.ts
@@ -0,0 +1,107 @@
+import { i18n, Translator } from 'meteor/universe:i18n';
+
+/**
+ * All code below was copied from the examples at https://github.com/vazco/meteor-universe-i18n
+ * When necessary, code was added to make the examples work (e.g. declaring a variable
+ * that was assumed to have been declared earlier);
+ */
+
+let translator: Translator;
+translator = i18n.createTranslator('test', {
+    _locale: 'de-CH',
+    _purify: true,
+});
+translator = i18n.createTranslator('test');
+
+i18n.createComponent();
+i18n.createComponent(translator);
+i18n.createComponent(translator, 'de-CH');
+
+i18n.addTranslation('de-CH', 'test.foo', 'bar');
+i18n.addTranslation('de-CH', 'test', 'foo', 'bar');
+i18n.addTranslation('en-US', 'Common', 'no', 'No');
+i18n.addTranslation('en-US', 'Common.ok', 'Ok');
+
+i18n.addTranslations('en-US', {
+    Common: {
+        hello: 'Hello {$name} {$0}!'
+    }
+});
+
+i18n.addTranslations('en-US', 'Common', {
+    hello: 'Hello {$name} {$0}!'
+});
+i18n.__('foo');
+i18n.__('foo', { _locale: 'de-CH', _namespace: 'test' });
+i18n.__('test', 'foo', { _locale: 'de-CH' });
+i18n.__('hello', { name: 'Ania' }); // output: Hello Ania!
+i18n.__('lengthOfArr', { length: ['a', 'b', 'c'].length }); // output: length 3
+i18n.__('items', ['a', 'b', 'c']); // output: The first item is a and the last one is c!
+i18n.getTranslations('test', 'de-CH');
+
+i18n.setOptions({
+    // default locale
+    defaultLocale: 'en-US',
+
+    // opens string
+    open: '{$',
+
+    // closes string
+    close: '}',
+
+    // cleanups untrust/unknown tags, to secure your application against XSS attacks.
+    // at browser side, default policy is to sanitize strings as a PCDATA
+    purify: () => { }, // On server side as a default option is that nothing is purifying (but you can provide function for that);
+
+    // decides whether to show when there's no translation in the current and default language
+    hideMissing: false,
+
+    // url to the host with translations (default: Meteor.absoluteUrl());
+    // useful when you want to load translations from a different host
+    hostUrl: 'http://current.host.url/',
+
+    // (on the server side only) gives you the possibility to add/change response headers
+    translationsHeaders: { 'Cache-Control': 'max-age=2628000' },
+
+    // synchronizes server connection with locale on client. (method invoked by client will be with client side locale);
+    sameLocaleOnServerConnection: true
+});
+
+i18n.parseNumber('7013217.715'); // 7,013,217.715
+i18n.parseNumber('16217 and 17217,715'); // 16,217 and 17,217.715
+i18n.parseNumber('7013217.715', 'ru-RU'); // 7 013 217,715
+
+i18n.setLocale('de-CH').then(() => {
+    console.log('already is!');
+});
+
+i18n.setLocaleOnConnection('de-CH');
+i18n.setLocaleOnConnection('de-CH', 1);
+
+i18n.getLocale();
+
+i18n.getLanguages(); // ['en', 'de']
+i18n.getLanguages('name'); // ['English', 'German']
+
+i18n.getLanguageName();
+i18n.getLanguageName('de-CH');
+
+i18n.getLanguageNativeName();
+i18n.getLanguageNativeName('de-CH');
+
+i18n.getCurrencySymbol();
+i18n.getCurrencySymbol('en-US'); // = $
+i18n.getCurrencySymbol('USD'); // = $
+i18n.getCurrencyCodes();
+i18n.getCurrencyCodes('en-US'); // = ["USD", "USN", "USS"]
+
+i18n.isRTL();
+i18n.isRTL('en-US'); // = $
+
+i18n.getAllKeysForLocale();
+i18n.getAllKeysForLocale('de-CH');
+i18n.getAllKeysForLocale('de-CH', true);
+
+i18n.onChangeLocale((newLocale: string) => {
+    console.log(newLocale);
+});
diff --git a/types/meteor-univserse-i18n/tsconfig.json b/types/meteor-univserse-i18n/tsconfig.json
new file mode 100644
index 0000000000..7beab3bd30
--- /dev/null
+++ b/types/meteor-univserse-i18n/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "meteor-univserse-i18n-tests.ts"
+    ]
+}
diff --git a/types/meteor-univserse-i18n/tslint.json b/types/meteor-univserse-i18n/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/meteor-univserse-i18n/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e1a9b0af73aef2948dddb2bc6e32ed0be88a3ad3 Mon Sep 17 00:00:00 2001
From: John Wright <johngeorgewright@users.noreply.github.com>
Date: Mon, 7 May 2018 19:49:20 +0100
Subject: [PATCH 0077/1124] Add the atob & btoa npm module definitions (#25416)

* feat(types): add the atob btoa npm module definitions

* style(lint): shorten typescript version

* chore(tslint): remove unnecessary rules

* chore(tslint): fix linting errors
---
 types/atob/atob-tests.ts |  3 +++
 types/atob/index.d.ts    |  7 +++++++
 types/atob/tsconfig.json | 21 +++++++++++++++++++++
 types/atob/tslint.json   |  3 +++
 types/btoa/btoa-tests.ts |  3 +++
 types/btoa/index.d.ts    |  7 +++++++
 types/btoa/tsconfig.json | 21 +++++++++++++++++++++
 types/btoa/tslint.json   |  3 +++
 8 files changed, 68 insertions(+)
 create mode 100644 types/atob/atob-tests.ts
 create mode 100644 types/atob/index.d.ts
 create mode 100644 types/atob/tsconfig.json
 create mode 100644 types/atob/tslint.json
 create mode 100644 types/btoa/btoa-tests.ts
 create mode 100644 types/btoa/index.d.ts
 create mode 100644 types/btoa/tsconfig.json
 create mode 100644 types/btoa/tslint.json

diff --git a/types/atob/atob-tests.ts b/types/atob/atob-tests.ts
new file mode 100644
index 0000000000..e2e2618387
--- /dev/null
+++ b/types/atob/atob-tests.ts
@@ -0,0 +1,3 @@
+import atob from 'atob';
+
+atob('foo');
diff --git a/types/atob/index.d.ts b/types/atob/index.d.ts
new file mode 100644
index 0000000000..632880f7a6
--- /dev/null
+++ b/types/atob/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for atob 2.1
+// Project: https://git.coolaj86.com/coolaj86/atob.js.git
+// Definitions by: John Wright <https://github.com/johngeorgewright>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export default function(str: string): string;
diff --git a/types/atob/tsconfig.json b/types/atob/tsconfig.json
new file mode 100644
index 0000000000..70dd7f0fdc
--- /dev/null
+++ b/types/atob/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "lib": ["es6"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "atob-tests.ts"
+    ]
+}
diff --git a/types/atob/tslint.json b/types/atob/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/atob/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/btoa/btoa-tests.ts b/types/btoa/btoa-tests.ts
new file mode 100644
index 0000000000..d09cdad23a
--- /dev/null
+++ b/types/btoa/btoa-tests.ts
@@ -0,0 +1,3 @@
+import btoa from 'btoa';
+
+btoa('foo');
diff --git a/types/btoa/index.d.ts b/types/btoa/index.d.ts
new file mode 100644
index 0000000000..cc311ed836
--- /dev/null
+++ b/types/btoa/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for btoa 1.2
+// Project: https://git.coolaj86.com/coolaj86/btoa.js
+// Definitions by: John Wright <https://github.com/johngeorgewright>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export default function(str: string): string;
diff --git a/types/btoa/tsconfig.json b/types/btoa/tsconfig.json
new file mode 100644
index 0000000000..da4e373e68
--- /dev/null
+++ b/types/btoa/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "lib": ["es6"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "btoa-tests.ts"
+    ]
+}
diff --git a/types/btoa/tslint.json b/types/btoa/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/btoa/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From d12082bfdf62c8bdf8a7a71428c77e7c784ebab3 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 7 May 2018 11:49:41 -0700
Subject: [PATCH 0078/1124] core-js: Comment out dict[sym] test (#25420)

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

diff --git a/types/core-js/core-js-tests.ts b/types/core-js/core-js-tests.ts
index ab11eab409..476c97348f 100644
--- a/types/core-js/core-js-tests.ts
+++ b/types/core-js/core-js-tests.ts
@@ -418,7 +418,7 @@ log.disable();
 // Non-standard
 point = dictOfPoint[s];
 point = dictOfPoint[i];
-point = dictOfPoint[sym];
+// point = dictOfPoint[sym];
 dictOfPoint = new Dict(dictOfPoint);
 dictOfAny = new Dict(point);
 dictOfPoint = Dict(dictOfPoint);

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 0079/1124] #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 65b176eaefc9a53c8e9cc615d290cb927947a6bb Mon Sep 17 00:00:00 2001
From: Thomas Charlat <thomas.charlat@gmail.com>
Date: Mon, 7 May 2018 21:34:04 +0200
Subject: [PATCH 0080/1124] [react-redux]: decoration target props should not
 extend injected props, contravariance issue (#25228)

* feat(react-redux): add strict null check

* feat(react-redux): remove improper inference tests

Infered decorated typings would rely on the implicit and false
assumption that decorated component props extend injected props and
own props

#24922
#24913

* fix(react-redux): injected props and decorated component props intersection

* InjectedProps should not have to extend DecoratedProps
* DecoratedProps should not have to extend InjectedProps
* DecoratedProps should extend Intersection<InjectedProps, DecoratedProps>
* Remaining Props should be required on the decoration output

#24913
#24922

* feat(react-redux): add new commiters

* feat(react-redux): 2.9 keyof compatibility depends on Extract (2.8)
---
 types/mirrorx/index.d.ts                 |   2 +-
 types/next-redux-wrapper/index.d.ts      |   2 +-
 types/react-intl-redux/index.d.ts        |   2 +-
 types/react-redux-toastr/index.d.ts      |   2 +-
 types/react-redux/index.d.ts             |  29 ++++++-
 types/react-redux/react-redux-tests.tsx  | 101 ++++++++++++++++-------
 types/react-redux/tsconfig.json          |   2 +-
 types/react-router-redux/index.d.ts      |   2 +-
 types/redux-auth-wrapper/index.d.ts      |   2 +-
 types/redux-devtools/index.d.ts          |   2 +-
 types/redux-form/v6/index.d.ts           |   2 +-
 types/redux-form/v6/redux-form-tests.tsx |   2 +-
 types/redux-little-router/index.d.ts     |   2 +-
 13 files changed, 109 insertions(+), 43 deletions(-)

diff --git a/types/mirrorx/index.d.ts b/types/mirrorx/index.d.ts
index 3e7090eab2..07b26d494c 100644
--- a/types/mirrorx/index.d.ts
+++ b/types/mirrorx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mirrorjs/mirror
 // Definitions by: Aaronphy <https://github.com/aaronphy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as H from 'history';
 
diff --git a/types/next-redux-wrapper/index.d.ts b/types/next-redux-wrapper/index.d.ts
index 16dc88b1a4..cdbcb7b9e5 100644
--- a/types/next-redux-wrapper/index.d.ts
+++ b/types/next-redux-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kirill-konshin/next-redux-wrapper
 // Definitions by: Steve <https://github.com/stevegeek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 /*~ Note that ES6 modules cannot directly export callable functions.
diff --git a/types/react-intl-redux/index.d.ts b/types/react-intl-redux/index.d.ts
index 300bd0542d..daa5dd9926 100644
--- a/types/react-intl-redux/index.d.ts
+++ b/types/react-intl-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ratson/react-intl-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Action } from "redux"
 import { Provider as ReduxProvider } from "react-redux"
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index bf50211775..7c9f30b056 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -4,7 +4,7 @@
 //                 Artyom Stukans <https://github.com/artyomsv>
 //                 Mika Kuitunen <https://github.com/kulmajaba>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 import { Action, ActionCreator, Reducer } from 'redux';
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 59d8e1078b..0519a43bb5 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -8,8 +8,11 @@
 //                 Nicholas Boll <https://github.com/nicholasboll>
 //                 Dibyo Majumdar <https://github.com/mdibyo>
 //                 Prashant Deva <https://github.com/pdeva>
+//                 Thomas Charlat <https://github.com/kallikrein>
+//                 Valentin Descamps <https://github.com/val1984>
+//                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 // Known Issue:
 // There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes
@@ -37,21 +40,39 @@ type ActionCreator<A> = Redux.ActionCreator<A>;
 // Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
 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 interface DispatchProp<A extends Redux.Action = Redux.AnyAction> {
-  dispatch?: Dispatch<A>;
+  dispatch: Dispatch<A>;
 }
 
 interface AdvancedComponentDecorator<TProps, TOwnProps> {
     (component: Component<TProps>): ComponentClass<TOwnProps>;
 }
 
+/**
+ * a property P will be present if :
+ * - 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
+ */
+type Shared<
+    InjectedProps,
+    DecorationTargetProps extends Shared<InjectedProps, DecorationTargetProps>
+    > = {
+        [P in Extract<keyof InjectedProps, keyof DecorationTargetProps>]?: DecorationTargetProps[P] extends InjectedProps[P] ? InjectedProps[P] : never;
+    };
+
 // Injects props and removes them from the prop requirements.
 // 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 TInjectedProps>(
+    <P extends Shared<TInjectedProps, P>>(
         component: Component<P>
-    ): ComponentClass<Omit<P, keyof TInjectedProps> & TNeedsProps> & {WrappedComponent: 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 367afedad6..ebc174dd1c 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -349,8 +349,7 @@ connect<ICounterStateProps, ICounterDispatchProps, {}, ICounterStateProps & ICou
 
 
 class App extends Component<any, any> {
-    render(): JSX.Element {
-        // ...
+    render() {
         return null;
     }
 }
@@ -544,14 +543,12 @@ interface TestState {
 class TestComponent extends Component<TestProp & DispatchProp, TestState> { }
 const WrappedTestComponent = connect()(TestComponent);
 
-// return value of the connect()(TestComponent) is of the type TestComponent
-let ATestComponent: React.ComponentClass<TestProp> = null;
-ATestComponent = TestComponent;
-ATestComponent = WrappedTestComponent;
-
-let anElement: ReactElement<TestProp>;
+// return value of the connect()(TestComponent) is assignable to a ComponentClass<TestProp>
+// ie: DispatchProp has been removed through decoration
+const ADecoratedTestComponent: React.ComponentClass<TestProp> = WrappedTestComponent;
 <WrappedTestComponent property1={42} />;
-<ATestComponent property1={42} />;
+
+const ATestComponent: React.ComponentClass<TestProp> = TestComponent;  // $ExpectError
 
 class NonComponent {}
 // this doesn't compile
@@ -748,7 +745,8 @@ namespace Issue15463 {
     interface ISpinnerProps{
         showGlobalSpinner: boolean;
     }
-    class SpinnerClass extends React.Component<ISpinnerProps & DispatchProp, undefined> {
+
+    class SpinnerClass extends React.Component<ISpinnerProps & DispatchProp> {
         render() {
             return (<div />);
         }
@@ -815,7 +813,7 @@ namespace TestControlledComponentWithoutDispatchProp {
 }
 
 namespace TestDispatchToPropsAsObject {
-    const onClick: ActionCreator<{}> = null;
+    const onClick: ActionCreator<{}> = () => ({});
     const mapStateToProps = (state: any) => {
         return {
             title: state.app.title as string,
@@ -900,24 +898,71 @@ namespace TestCreateProvider {
     ReactDOM.render(<Combined />, document.body);
 }
 
-namespace TestTypeInference {
-    interface State { a: number };
+namespace TestWithoutTOwnPropsDecoratedInference {
 
-    const OnlyState = connect(
-        (state: {a: number}, props: {b: number}) => ({a: state.a, c: state.a + props.b})
-    )(props => <span>{props.a} + {props.b} = {props.c}</span>)
-    interface State { a: number };
-    ReactDOM.render(<OnlyState b={1} />, document.body);
+    interface ForwardedProps {
+        forwarded: string;
+    }
 
-    const OnlyDispatch = connect(
-        undefined,
-        (dispatch, props: {b: number}) => ({action: () => dispatch({type: 'action', b: props.b})})
-    )(props => <span onClick={props.action}>{props.b}</span>)
-    ReactDOM.render(<OnlyDispatch b={1} />, document.body);
+    interface OwnProps {
+        own: string;
+    }
 
-    const StateAndDispatch = connect(
-        (state: {a: number}, props: {b: number}) => ({a: state.a, c: state.a + props.b}),
-        (dispatch, props: {b: number}) => ({action: () => dispatch({type: 'action', b: props.b})})
-    )(props => <span>{props.a} + {props.b} = {props.c}</span>)
-    ReactDOM.render(<StateAndDispatch b={1} />, document.body);
+    interface StateProps {
+        state: string;
+    }
+
+    class WithoutOwnPropsComponentClass extends React.Component<ForwardedProps & StateProps & DispatchProp<any>> {
+        render() {
+            return <div />;
+        }
+    }
+
+    const WithoutOwnPropsComponentStateless: React.StatelessComponent<ForwardedProps & StateProps & DispatchProp<any>> = () => (<div />);
+
+    function mapStateToProps4(state: any, ownProps: OwnProps): StateProps {
+        return { state: 'string' };
+    }
+
+    // these decorations should compile, it is perfectly acceptable to receive props and ignore them
+    const ConnectedWithOwnPropsClass = connect(mapStateToProps4)(WithoutOwnPropsComponentClass);
+    const ConnectedWithOwnPropsStateless = connect(mapStateToProps4)(WithoutOwnPropsComponentStateless);
+    const ConnectedWithTypeHintClass = connect<StateProps, void, OwnProps>(mapStateToProps4)(WithoutOwnPropsComponentClass);
+    const ConnectedWithTypeHintStateless = connect<StateProps, void, OwnProps>(mapStateToProps4)(WithoutOwnPropsComponentStateless);
+
+    // 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
+
+    // This should compile
+    React.createElement(ConnectedWithOwnPropsClass, { own: 'string', forwarded: 'string' });
+    React.createElement(ConnectedWithOwnPropsStateless, { own: 'string', forwarded: 'string' });
+
+    // This should not compile, it is missing ForwardedProps
+    React.createElement(ConnectedWithTypeHintClass, { own: 'string' });  // $ExpectError
+    React.createElement(ConnectedWithTypeHintStateless, { own: 'string' });  // $ExpectError
+
+    interface AllProps {
+        own: string
+        state: string
+    }
+
+    class AllPropsComponent extends React.Component<AllProps & DispatchProp<any>> {
+        render() {
+            return <div />;
+        }
+    }
+
+    type PickedOwnProps = Pick<AllProps, "own">
+    type PickedStateProps = Pick<AllProps, "state">
+
+    const mapStateToPropsForPicked: MapStateToProps<PickedStateProps, PickedOwnProps, {}> = (state: any): PickedStateProps => {
+        return { state: "string" }
+    }
+    const ConnectedWithPickedOwnProps = connect(mapStateToPropsForPicked)(AllPropsComponent);
+    <ConnectedWithPickedOwnProps own="blah" />
 }
diff --git a/types/react-redux/tsconfig.json b/types/react-redux/tsconfig.json
index 981f3c9b0f..5fa4508cd8 100644
--- a/types/react-redux/tsconfig.json
+++ b/types/react-redux/tsconfig.json
@@ -11,7 +11,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",
diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index 7c8d78ccc9..d85db1969e 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -4,7 +4,7 @@
 //                 Shoya Tanaka <https://github.com/8398a7>
 //                 Mykolas <https://github.com/mykolas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import {
     Store,
diff --git a/types/redux-auth-wrapper/index.d.ts b/types/redux-auth-wrapper/index.d.ts
index fc2543385a..728be4a54b 100644
--- a/types/redux-auth-wrapper/index.d.ts
+++ b/types/redux-auth-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mjrussell/redux-auth-wrapper
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, StatelessComponent, ComponentType, ReactType } from "react";
 
diff --git a/types/redux-devtools/index.d.ts b/types/redux-devtools/index.d.ts
index 6bc8c3a4f2..234fb9a4bb 100644
--- a/types/redux-devtools/index.d.ts
+++ b/types/redux-devtools/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { GenericStoreEnhancer } from 'redux';
diff --git a/types/redux-form/v6/index.d.ts b/types/redux-form/v6/index.d.ts
index ce34a772ed..a8209a7643 100644
--- a/types/redux-form/v6/index.d.ts
+++ b/types/redux-form/v6/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Carson Full <https://github.com/carsonf>, Daniel Lytkin <https://github.com/aikoven>, Karol Janyst <https://github.com/LKay>, Luka Zakrajsek <https://github.com/bancek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import {
   ComponentClass,
diff --git a/types/redux-form/v6/redux-form-tests.tsx b/types/redux-form/v6/redux-form-tests.tsx
index 6865051e0d..3ab303ebde 100644
--- a/types/redux-form/v6/redux-form-tests.tsx
+++ b/types/redux-form/v6/redux-form-tests.tsx
@@ -127,7 +127,7 @@ const ConnectedDecoratedInitializeFromStateFormFunction = connect(
 
 // React ComponentClass instead of StatelessComponent
 
-class InitializeFromStateFormClass extends React.Component<Props & DispatchProp<any>> {
+class InitializeFromStateFormClass extends React.Component<Props> {
     render() {
         return InitializeFromStateFormFunction(this.props);
     }
diff --git a/types/redux-little-router/index.d.ts b/types/redux-little-router/index.d.ts
index 10aa3536f1..5ea39ce138 100644
--- a/types/redux-little-router/index.d.ts
+++ b/types/redux-little-router/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/FormidableLabs/redux-little-router
 // Definitions by: priecint <https://github.com/priecint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { Reducer, Middleware, StoreEnhancer } from "redux";

From 2bd1d01fb1d29e9d624a27a8f1d84cfb960f1f33 Mon Sep 17 00:00:00 2001
From: Tim Stirrat <tstirrat@google.com>
Date: Tue, 8 May 2018 05:36:19 +1000
Subject: [PATCH 0081/1124] New types for redux-shortcuts 0.0.3 (#25572)

* New types for redux-shortcuts 0.0.3

* add dom lib, fix typo

* bump TS version to match mousetrap
---
 types/redux-shortcuts/index.d.ts              | 39 ++++++++++++++++++
 types/redux-shortcuts/package.json            |  6 +++
 .../redux-shortcuts/redux-shortcuts-tests.ts  | 41 +++++++++++++++++++
 types/redux-shortcuts/tsconfig.json           | 24 +++++++++++
 types/redux-shortcuts/tslint.json             |  1 +
 5 files changed, 111 insertions(+)
 create mode 100644 types/redux-shortcuts/index.d.ts
 create mode 100644 types/redux-shortcuts/package.json
 create mode 100644 types/redux-shortcuts/redux-shortcuts-tests.ts
 create mode 100644 types/redux-shortcuts/tsconfig.json
 create mode 100644 types/redux-shortcuts/tslint.json

diff --git a/types/redux-shortcuts/index.d.ts b/types/redux-shortcuts/index.d.ts
new file mode 100644
index 0000000000..6b3ab667fb
--- /dev/null
+++ b/types/redux-shortcuts/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for redux-shortcuts 0.0
+// Project: https://github.com/nak2k/node-redux-shortcuts
+// Definitions by: Tim Stirrat <https://github.com/tstirrat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ActionCreator, Action, Dispatch } from "redux";
+import Mousetrap = require('mousetrap');
+
+export {Mousetrap};
+export const mousetrap: MousetrapInstance;
+
+export function bindShortcut(
+    keys: KeyBindings,
+    actionCreator: ActionBindings,
+    preventDefault?: boolean
+): (dispatch: Dispatch<any>) => void;
+
+export function bindShortcuts(
+    ...shortcut: ShortcutDefinition[]
+): (dispatch: Dispatch<any>) => void;
+
+export type KeyBindings = string | string[];
+
+export type ActionBindings =
+    | ActionCreator<Action>
+    | Array<ActionCreator<Action>>;
+
+export type ShortcutDefinition =
+    | BasicShortcutDefinition
+    | ShortcutDefinitionWithPreventDefault;
+
+export type BasicShortcutDefinition = [KeyBindings, ActionBindings];
+
+export type ShortcutDefinitionWithPreventDefault = [
+    KeyBindings,
+    ActionBindings,
+    boolean
+];
diff --git a/types/redux-shortcuts/package.json b/types/redux-shortcuts/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-shortcuts/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-shortcuts/redux-shortcuts-tests.ts b/types/redux-shortcuts/redux-shortcuts-tests.ts
new file mode 100644
index 0000000000..288ffb8b6b
--- /dev/null
+++ b/types/redux-shortcuts/redux-shortcuts-tests.ts
@@ -0,0 +1,41 @@
+import {
+    bindShortcut,
+    bindShortcuts,
+    mousetrap,
+    Mousetrap
+} from "redux-shortcuts";
+
+import { Dispatch, ActionCreator, Action, AnyAction } from "redux";
+
+const dispatch: Dispatch<{}> = (action: any) => action;
+const saveAction: ActionCreator<Action> = () => ({ type: "SAVE" });
+
+bindShortcut("ctrl+s", saveAction)(dispatch);
+
+// preventDefault
+bindShortcut("ctrl+s", saveAction, true)(dispatch);
+
+// multiple actions
+bindShortcut("ctrl+s", [saveAction, saveAction], true)(dispatch);
+
+// multiple bindings
+bindShortcut(["ctrl+s", "shift+s"], saveAction, true)(dispatch);
+
+bindShortcuts(
+    ["/", saveAction],
+    [["/", "ctrl+f"], saveAction], // multi binding
+    ["s", saveAction, true], // preventDefault
+    ["s", saveAction, false],
+    ["s", [saveAction, saveAction], false], // multi actions
+    [["s", "ctrl+s"], [saveAction, saveAction], false] // multi both
+)(dispatch);
+
+// mousetrap (instance)
+mousetrap.bind("ctrl+s", e => /* custom event prop */ e.returnValue);
+mousetrap.unbind("ctrl+s", "keydown");
+mousetrap.trigger("ctrl+s", "keydown");
+mousetrap.reset();
+
+// Mousetrap (static)
+Mousetrap.bindGlobal("ctrl+s", e => e.preventDefault(), "keyup");
+Mousetrap.addKeycodes({ 27: "escape" });
diff --git a/types/redux-shortcuts/tsconfig.json b/types/redux-shortcuts/tsconfig.json
new file mode 100644
index 0000000000..fed0e255d8
--- /dev/null
+++ b/types/redux-shortcuts/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",
+        "redux-shortcuts-tests.ts"
+    ]
+}
diff --git a/types/redux-shortcuts/tslint.json b/types/redux-shortcuts/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-shortcuts/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c9d2d0218543f4aafba5272169bccdd9336fd70e Mon Sep 17 00:00:00 2001
From: Margaret Nolan <nolanmar@google.com>
Date: Mon, 7 May 2018 12:37:08 -0700
Subject: [PATCH 0082/1124] Add 'external' to node v6, v7, v8, v9, and v10
 MemoryUsage interface (#25580)

---
 types/node/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 +
 5 files changed, 5 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 4fd2bf8dc7..12c9551bec 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -621,6 +621,7 @@ declare namespace NodeJS {
         rss: number;
         heapTotal: number;
         heapUsed: number;
+        external: number;
     }
 
     export interface CpuUsage {
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 3ad6e5a65c..92e6fe75ad 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -413,6 +413,7 @@ declare namespace NodeJS {
         rss: number;
         heapTotal: number;
         heapUsed: number;
+        external: number;
     }
 
     export interface CpuUsage {
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 7d2d34cd8b..58497e23d6 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -424,6 +424,7 @@ declare namespace NodeJS {
         rss: number;
         heapTotal: number;
         heapUsed: number;
+        external: number;
     }
 
     export interface CpuUsage {
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 647d479683..5271a8d06a 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -472,6 +472,7 @@ declare namespace NodeJS {
         rss: number;
         heapTotal: number;
         heapUsed: number;
+        external: number;
     }
 
     export interface CpuUsage {
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 66a96401c3..ef189f57c3 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -612,6 +612,7 @@ declare namespace NodeJS {
         rss: number;
         heapTotal: number;
         heapUsed: number;
+        external: number;
     }
 
     export interface CpuUsage {

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 0083/1124] #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 0084/1124] #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 0085/1124] 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 232d7ea3fa21b04cd45a5700741ca8d57791c251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Paiva?= <fabio@paiva.info>
Date: Mon, 7 May 2018 22:21:56 +0200
Subject: [PATCH 0086/1124] Reactstrap - Remove myself as contributor to stop
 receiving notifications #25563 (#25585)

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

diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index c8ff3e452f..2cf1ce6c86 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Ali Hammad Baig <https://github.com/alihammad>
 //                 Marco Falkenberg <https://github.com/mfal>
 //                 Danilo Barros <https://github.com/danilobjr>
-//                 Fábio Paiva <https://github.com/fabiopaiva>
 //                 FaithForHumans <https://github.com/FaithForHumans>
 //                 Kurt Preston <https://github.com/KurtPreston>
 //                 Tim Chen <https://github.com/timc13>

From 08e6b3d9180f0e758aeb3f08b2aefefac7cc1ca4 Mon Sep 17 00:00:00 2001
From: kylegong <kylegong@gmail.com>
Date: Mon, 7 May 2018 13:52:06 -0700
Subject: [PATCH 0087/1124] Fix version comment in material-ui, should be 0.20
 (#25344)

* Fix version comment in material-ui, should be v0.20.0

* Conform to dslint: use version 0.20
---
 types/material-ui/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 307ce84115..2d8631eb22 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for material-ui 0.21
+// Type definitions for material-ui 0.20
 // Project: https://github.com/callemall/material-ui
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 //                 Igor Beagorudsky <https://github.com/theigor>

From e178856691dbdfafd1cd91e5e14f1f79d8c33892 Mon Sep 17 00:00:00 2001
From: Ankur Oberoi <aoberoi@gmail.com>
Date: Mon, 7 May 2018 14:09:10 -0700
Subject: [PATCH 0088/1124] pumpify: add ctor args, duplexify members, tests
 (#25524)

* pumpify: add ctor args, duplexify members, tests

* pumpify: add autoDestroy to PumpifyFactoryOptions
---
 types/pumpify/index.d.ts       | 30 ++++++++++++++++++++++++------
 types/pumpify/pumpify-tests.ts | 12 +++++++++---
 types/pumpify/tsconfig.json    |  1 -
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/types/pumpify/index.d.ts b/types/pumpify/index.d.ts
index 474484b95b..067847b1df 100644
--- a/types/pumpify/index.d.ts
+++ b/types/pumpify/index.d.ts
@@ -1,17 +1,35 @@
 // Type definitions for pumpify 1.4
 // Project: https://github.com/mafintosh/pumpify
 // Definitions by: Justin Beckwith <https://github.com/JustinBeckwith>
+//                 Ankur Oberoi <https://github.com/aoberoi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-import { Stream, Duplex } from 'stream';
+import { Stream, Writable, Readable, Duplex } from 'stream';
+import * as duplexify from 'duplexify';
 
-export = pumpify;
+declare class Pumpify extends Duplex implements duplexify.Duplexify {
+  constructor(...streams: Stream[]);
+  constructor(streams: Stream[]);
+  setPipeline(...streams: Stream[]): void;
+  setPipeline(streams: Stream[]): void;
 
-declare class pumpify extends Duplex {
-  constructor();
-  setPipeline(...args: Stream[]): void;
+  // Duplexify members
+  setWritable(writable: Writable): void;
+  setReadable(readable: Readable): void;
 }
 
-declare namespace pumpify {}
+interface PumpifyFactoryOptions {
+  autoDestroy: boolean;
+  destroy: boolean;
+  objectMode: boolean;
+  highWaterMark: number;
+}
+
+declare namespace Pumpify {
+  let obj: typeof Pumpify;
+  function ctor(opts: PumpifyFactoryOptions): typeof Pumpify;
+}
+
+export = Pumpify;
diff --git a/types/pumpify/pumpify-tests.ts b/types/pumpify/pumpify-tests.ts
index d4dff3bd70..1060c66df0 100644
--- a/types/pumpify/pumpify-tests.ts
+++ b/types/pumpify/pumpify-tests.ts
@@ -1,7 +1,11 @@
-import pumpify from 'pumpify';
-import { Duplex, Transform, PassThrough } from 'stream';
+import * as Pumpify from 'pumpify';
+import { Duplex, Transform, PassThrough, Writable } from 'stream';
 
-class Pumpy extends pumpify {
+new Pumpify();
+new Pumpify(new Writable(), new Writable());
+const pumpify = new Pumpify([new Writable(), new Writable()]);
+
+class Pumpy extends Pumpify {
   constructor() {
     super();
     const dup1 = new Duplex();
@@ -12,3 +16,5 @@ class Pumpy extends pumpify {
 
 const pumpy = new Pumpy();
 pumpy.pipe(new PassThrough());
+
+pumpify.setPipeline(pumpy);
diff --git a/types/pumpify/tsconfig.json b/types/pumpify/tsconfig.json
index 1404589863..c616e0e309 100644
--- a/types/pumpify/tsconfig.json
+++ b/types/pumpify/tsconfig.json
@@ -8,7 +8,6 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "allowSyntheticDefaultImports": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 57c630b520344e90518b78839cb8baa77f522561 Mon Sep 17 00:00:00 2001
From: Saad Quadri <saad@saadq.com>
Date: Mon, 7 May 2018 17:19:37 -0400
Subject: [PATCH 0089/1124] add types for text-table (#25564)

* add types for text-table

* fix rows type
---
 types/text-table/index.d.ts          | 30 +++++++++++
 types/text-table/text-table-tests.ts | 75 ++++++++++++++++++++++++++++
 types/text-table/tsconfig.json       | 23 +++++++++
 types/text-table/tslint.json         |  3 ++
 4 files changed, 131 insertions(+)
 create mode 100644 types/text-table/index.d.ts
 create mode 100644 types/text-table/text-table-tests.ts
 create mode 100644 types/text-table/tsconfig.json
 create mode 100644 types/text-table/tslint.json

diff --git a/types/text-table/index.d.ts b/types/text-table/index.d.ts
new file mode 100644
index 0000000000..00ee4b61e8
--- /dev/null
+++ b/types/text-table/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for text-table 0.2
+// Project: https://github.com/substack/text-table
+// Definitions by: Saad Quadri <https://github.com/saadq>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Generates borderless text table strings suitable for printing to stdout.
+ */
+declare function table(
+    /** An array of arrays containing strings, numbers, or other printable values. */
+    rows: Array<Array<{}>>,
+
+    /** A configuration object to customize table output. */
+    options?: table.Options
+): string;
+
+declare namespace table {
+    interface Options {
+        /** Separator to use between columns, (default: ' '). */
+        hsep?: string;
+
+        /** An array of alignment types for each column, default ['l','l',...]. */
+        align?: Array<'l' | 'r' | 'c' | '.'>;
+
+        /** A callback function to use when calculating the string length. */
+        stringLength?(str: string): number;
+    }
+}
+
+export = table;
diff --git a/types/text-table/text-table-tests.ts b/types/text-table/text-table-tests.ts
new file mode 100644
index 0000000000..49112c8650
--- /dev/null
+++ b/types/text-table/text-table-tests.ts
@@ -0,0 +1,75 @@
+import table = require('text-table');
+
+let output: string;
+
+output = table([
+    ['master', '0123456789abcdef'],
+    ['staging', 'fedcba9876543210']
+]);
+
+output = table(
+    [
+        ['0.1.2'],
+        ['11.22.33'],
+        ['5.6.7'],
+        ['1.22222'],
+        ['12345.'],
+        ['5555.'],
+        ['123']
+    ],
+    { align: ['.'] }
+);
+
+output = table(
+    [
+        ['beep', '1024'],
+        ['boop', '334.212'],
+        ['foo', '1006'],
+        ['bar', '45.6'],
+        ['baz', '123.']
+    ],
+    { align: ['l', '.'] }
+);
+
+output = table(
+    [
+        ['beep', '1024', 'xyz'],
+        ['boop', '3388450', 'tuv'],
+        ['foo', '10106', 'qrstuv'],
+        ['bar', '45', 'lmno']
+    ],
+    { align: ['l', 'c', 'l'] }
+);
+
+output = table(
+    [
+        ['Red', 'Green', 'Blue'],
+        ['Bold', 'Underline', 'Italic'],
+        ['Inverse', 'Strike', 'Blink'],
+        ['bar', '45', 'lmno']
+    ],
+    {
+        align: ['l', 'c', 'l'],
+        stringLength: s => s.length
+    }
+);
+
+output = table(
+    [
+        ['beep', '1024'],
+        ['boop', '33450'],
+        ['foo', '1006'],
+        ['bar', '45']
+    ],
+    { align: ['l', 'r'] }
+);
+
+output = table(
+    [
+        ['true', true],
+        ['false', false],
+        ['foo', 1006],
+        ['bar', {}]
+    ],
+    { align: ['l', 'r'] }
+);
diff --git a/types/text-table/tsconfig.json b/types/text-table/tsconfig.json
new file mode 100644
index 0000000000..ba82cddd4c
--- /dev/null
+++ b/types/text-table/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",
+        "text-table-tests.ts"
+    ]
+}
diff --git a/types/text-table/tslint.json b/types/text-table/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/text-table/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 0c23284637983455f4aff76ae58c54b11b1a9974 Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Tue, 8 May 2018 03:23:58 +0530
Subject: [PATCH 0090/1124] [svgo] Export Options type (#25587)

---
 types/svgo/index.d.ts    | 51 +++++++++++++++++++++-------------------
 types/svgo/svgo-tests.ts |  8 +++++--
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/types/svgo/index.d.ts b/types/svgo/index.d.ts
index 5642a33cd1..388b885044 100644
--- a/types/svgo/index.d.ts
+++ b/types/svgo/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/svg/svgo
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 Gilad Gray <https://github.com/giladgray>
+//                 Aankhen <https://github.com/Aankhen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -288,29 +289,6 @@ interface Svg2JsOptions {
     position?: boolean;
 }
 
-interface Options {
-    /** Output as Data URI string. */
-    datauri?: "base64" | "enc" | "unenc";
-
-    /** Precision of floating point numbers. Will be passed to each plugin that suppors this param. */
-    floatPrecision?: number;
-
-    /** Use full set of plugins. */
-    full?: boolean;
-
-    /** Options for rendering optimized SVG from AST. */
-    js2svg?: Js2SvgOptions;
-
-    /**
-     * Individual plugin configurations.
-     * For specific options, see plugin source in https://github.com/svg/svgo/tree/master/plugins.
-     */
-    plugins?: PluginConfig[];
-
-    /** Options for parsing original SVG into AST. */
-    svg2js?: Svg2JsOptions;
-}
-
 interface SvgInfo {
     path?: string;
 }
@@ -321,8 +299,33 @@ interface OptimizedSvg {
 }
 
 declare class SVGO {
-    constructor(options?: Options);
+    constructor(options?: SVGO.Options);
     optimize(svgString: string, info?: SvgInfo): Promise<OptimizedSvg>;
 }
 
+declare namespace SVGO {
+    interface Options {
+        /** Output as Data URI string. */
+        datauri?: "base64" | "enc" | "unenc";
+
+        /** Precision of floating point numbers. Will be passed to each plugin that suppors this param. */
+        floatPrecision?: number;
+
+        /** Use full set of plugins. */
+        full?: boolean;
+
+        /** Options for rendering optimized SVG from AST. */
+        js2svg?: Js2SvgOptions;
+
+        /**
+         * Individual plugin configurations.
+         * For specific options, see plugin source in https://github.com/svg/svgo/tree/master/plugins.
+         */
+        plugins?: PluginConfig[];
+
+        /** Options for parsing original SVG into AST. */
+        svg2js?: Svg2JsOptions;
+    }
+}
+
 export = SVGO;
diff --git a/types/svgo/svgo-tests.ts b/types/svgo/svgo-tests.ts
index 34664ce31f..c06e6d61a5 100644
--- a/types/svgo/svgo-tests.ts
+++ b/types/svgo/svgo-tests.ts
@@ -8,7 +8,9 @@ svgo = new SVGO({ plugins: [{ cleanupAttrs: {} }] });
 svgo = new SVGO({ datauri: "base64" });
 svgo = new SVGO({ floatPrecision: 2 });
 svgo = new SVGO({ full: true });
-svgo = new SVGO({
+
+// SVGO options
+const options: SVGO.Options = {
     plugins: [],
     datauri: "enc",
     floatPrecision: 2,
@@ -20,7 +22,9 @@ svgo = new SVGO({
     svg2js: {
         trim: true,
     }
-});
+};
+
+svgo = new SVGO(options);
 
 // SVGO instance methods
 svgo.optimize(`<?xml version="1.0" encoding="utf-8"?><svg></svg>`, { path: "filepath" })

From 27e6a748e97e4b485d550cd515c31647ea792cf0 Mon Sep 17 00:00:00 2001
From: Bradley Ayers <bradley.ayers@gmail.com>
Date: Tue, 8 May 2018 09:06:48 +1000
Subject: [PATCH 0091/1124] fix(storybook__addon-storyshots): improve
 imageSnapshot options (#25504)

* fix(storybook__addon-storyshots): improve imageSnapshot options

* fix(storybook__addon-storyshots): correct imageSnapshot signature
---
 types/storybook__addon-storyshots/index.d.ts  | 11 +++++++----
 .../storybook__addon-storyshots-tests.ts      | 19 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/types/storybook__addon-storyshots/index.d.ts b/types/storybook__addon-storyshots/index.d.ts
index 01df2538ae..cbece6e354 100644
--- a/types/storybook__addon-storyshots/index.d.ts
+++ b/types/storybook__addon-storyshots/index.d.ts
@@ -6,7 +6,7 @@
 
 import * as React from 'react';
 import { StoryObject } from '@storybook/react';
-import { Page } from "puppeteer";
+import { Page, NavigationOptions, ScreenshotOptions } from "puppeteer";
 
 export type Test = (options: {
     story: StoryObject;
@@ -34,9 +34,12 @@ export interface ImageSnapshotOptions {
 }
 
 export function imageSnapshot(options?: {
-    storybookUrl: string;
-    getMatchOptions: (options: ImageSnapshotOptions) => { failureThreshold: number, failureThresholdType: 'percent' };
-    beforeScreenshot: (page: Page, options: ImageSnapshotOptions) => Promise<void>;
+    storybookUrl?: string;
+    getMatchOptions?: (options: ImageSnapshotOptions) => { failureThreshold: number, failureThresholdType: 'percent' };
+    getScreenshotOptions?: (options: ImageSnapshotOptions) => ScreenshotOptions;
+    beforeScreenshot?: (page: Page, options: ImageSnapshotOptions) => Promise<void>;
+    getGotoOptions?: (options: ImageSnapshotOptions) => NavigationOptions;
+    chromeExecutablePath?: string;
 }): Test;
 
 export function multiSnapshotWithOptions(options: SnapshotOptions): Test;
diff --git a/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts b/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts
index 3a97a50e71..a2bafa6a14 100644
--- a/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts
+++ b/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts
@@ -1,4 +1,4 @@
-import initStoryshots, { multiSnapshotWithOptions, snapshotWithOptions, getSnapshotFileName, renderOnly } from "@storybook/addon-storyshots";
+import initStoryshots, { multiSnapshotWithOptions, snapshotWithOptions, getSnapshotFileName, renderOnly, imageSnapshot } from "@storybook/addon-storyshots";
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import 'jest';
@@ -26,6 +26,23 @@ initStoryshots({
     test: renderOnly
 });
 
+initStoryshots({
+    configPath: "",
+    test: imageSnapshot({
+        storybookUrl: "http://localhost:9002"
+    })
+});
+
+initStoryshots({
+    configPath: "",
+    test: imageSnapshot({
+        storybookUrl: "http://localhost:9002",
+        getScreenshotOptions: ({ context, url }) => ({ path: "/foo" }),
+        getGotoOptions: ({ context, url }) => ({ timeout: 10 }),
+        chromeExecutablePath: "/usr/local/bin/chrome"
+    })
+});
+
 initStoryshots({
     framework: 'react',
     configPath: '',

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 0092/1124] 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 0093/1124] 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 0094/1124] 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 0095/1124] 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 0096/1124] 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 fdb0cdc4ad2d860ef02bcf3e4db1c4edbc733f98 Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <deb2001-github@yahoo.de>
Date: Tue, 8 May 2018 15:55:39 +0200
Subject: [PATCH 0097/1124] [node] Add some NodeJS 10 changes

---
 types/node/index.d.ts    | 20 +++++++++++++++-----
 types/node/node-tests.ts |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 12c9551bec..762b0f6be6 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -561,6 +561,7 @@ declare namespace NodeJS {
         on(event: string | symbol, listener: (...args: any[]) => void): this;
         once(event: string | symbol, listener: (...args: any[]) => void): this;
         removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+        off(event: string | symbol, listener: (...args: any[]) => void): this;
         removeAllListeners(event?: string | symbol): this;
         setMaxListeners(n: number): this;
         getMaxListeners(): number;
@@ -1004,7 +1005,8 @@ declare module "events" {
 
     namespace internal {
         export class EventEmitter extends internal {
-            static listenerCount(emitter: EventEmitter, event: string | symbol): number; // deprecated
+            /** @deprecated since v4.0.0 */
+            static listenerCount(emitter: EventEmitter, event: string | symbol): number;
             static defaultMaxListeners: number;
 
             addListener(event: string | symbol, listener: (...args: any[]) => void): this;
@@ -1013,6 +1015,7 @@ declare module "events" {
             prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
             prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
             removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+            off(event: string | symbol, listener: (...args: any[]) => void): this;
             removeAllListeners(event?: string | symbol): this;
             setMaxListeners(n: number): this;
             getMaxListeners(): number;
@@ -5732,6 +5735,8 @@ declare module "crypto" {
         digest(): Buffer;
         digest(encoding: HexBase64Latin1Encoding): string;
     }
+
+    /** @deprecated since v10.0.0 use createCipheriv() */
     export function createCipher(algorithm: string, password: any): Cipher;
     export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
     export interface Cipher extends NodeJS.ReadWriteStream {
@@ -5745,6 +5750,7 @@ declare module "crypto" {
         getAuthTag(): Buffer;
         setAAD(buffer: Buffer): this;
     }
+    /** @deprecated since v10.0.0 use createCipheriv() */
     export function createDecipher(algorithm: string, password: any): Decipher;
     export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
     export interface Decipher extends NodeJS.ReadWriteStream {
@@ -5830,17 +5836,16 @@ declare module "crypto" {
     export function getCurves(): string[];
     export function getHashes(): string[];
     export interface ECDH {
+        convertKey(key: string | Buffer /*| TypedArray*/ | DataView, curve: string, inputEncoding?: string, outputEncoding?: string, format?: string): Buffer | string;
         generateKeys(): Buffer;
-        generateKeys(encoding: HexBase64Latin1Encoding): string;
-        generateKeys(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        generateKeys(encoding: HexBase64Latin1Encoding, format?: ECDHKeyFormat): string;
         computeSecret(other_public_key: Buffer): Buffer;
         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
         getPrivateKey(): Buffer;
         getPrivateKey(encoding: HexBase64Latin1Encoding): string;
         getPublicKey(): Buffer;
-        getPublicKey(encoding: HexBase64Latin1Encoding): string;
-        getPublicKey(encoding: HexBase64Latin1Encoding, format: ECDHKeyFormat): string;
+        getPublicKey(encoding: HexBase64Latin1Encoding, format?: ECDHKeyFormat): string;
         setPrivateKey(private_key: Buffer): void;
         setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
     }
@@ -6257,11 +6262,16 @@ declare module "assert" {
         }
 
         export function fail(message: string): never;
+        /** @deprecated since v10.0.0 */
         export function fail(actual: any, expected: any, message?: string, operator?: string): never;
         export function ok(value: any, message?: string): void;
+        /** @deprecated use strictEqual() */
         export function equal(actual: any, expected: any, message?: string): void;
+        /** @deprecated use notStrictEqual() */
         export function notEqual(actual: any, expected: any, message?: string): void;
+        /** @deprecated use deepStrictEqual() */
         export function deepEqual(actual: any, expected: any, message?: string): void;
+        /** @deprecated use notDeepStrictEqual() */
         export function notDeepEqual(acutal: any, expected: any, message?: string): void;
         export function strictEqual(actual: any, expected: any, message?: string): void;
         export function notStrictEqual(actual: any, expected: any, message?: string): void;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index efc00ef201..5d9c80c168 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -109,6 +109,7 @@ namespace events_tests {
         result = emitter.prependListener(event, listener);
         result = emitter.prependOnceListener(event, listener);
         result = emitter.removeListener(event, listener);
+        result = emitter.off(event, listener);
         result = emitter.removeAllListeners();
         result = emitter.removeAllListeners(event);
         result = emitter.setMaxListeners(42);

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 0098/1124] 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 842899eee264b5952b9c837abe00d90aef998d8a Mon Sep 17 00:00:00 2001
From: eritikass <eritikass@gmail.com>
Date: Tue, 8 May 2018 17:39:09 +0300
Subject: [PATCH 0099/1124] Add types for graphql-depth-limit (#25568)

* add types for graphql-depth-limit

* improve type declaration

* remove "strict-export-declare-modifiers" rule disable
---
 .../graphql-depth-limit-tests.ts              | 29 +++++++++++++++++++
 types/graphql-depth-limit/index.d.ts          | 14 +++++++++
 types/graphql-depth-limit/tsconfig.json       | 23 +++++++++++++++
 types/graphql-depth-limit/tslint.json         |  1 +
 4 files changed, 67 insertions(+)
 create mode 100644 types/graphql-depth-limit/graphql-depth-limit-tests.ts
 create mode 100644 types/graphql-depth-limit/index.d.ts
 create mode 100644 types/graphql-depth-limit/tsconfig.json
 create mode 100644 types/graphql-depth-limit/tslint.json

diff --git a/types/graphql-depth-limit/graphql-depth-limit-tests.ts b/types/graphql-depth-limit/graphql-depth-limit-tests.ts
new file mode 100644
index 0000000000..68a5aa51f9
--- /dev/null
+++ b/types/graphql-depth-limit/graphql-depth-limit-tests.ts
@@ -0,0 +1,29 @@
+import graphqlDepthLimit = require('graphql-depth-limit');
+import {
+    GraphQLSchema,
+    DocumentNode,
+    buildSchema,
+    Source,
+    parse,
+    validate,
+    specifiedRules
+} from 'graphql';
+
+const schema: GraphQLSchema = buildSchema(`
+  # graphql schema goes here...
+`);
+const document: DocumentNode = parse(new Source(`
+  # graphql query goes here...
+`, 'GraphQL request'));
+
+validate(schema, document, [ graphqlDepthLimit(5) ]);
+
+validate(schema, document, [ ...specifiedRules, graphqlDepthLimit(10) ]);
+
+validate(schema, document, [ graphqlDepthLimit(
+    10,
+    { ignore: [ /_trusted$/, 'idontcare' ] },
+    (depths: any) => {
+        // do something....
+    },
+)]);
diff --git a/types/graphql-depth-limit/index.d.ts b/types/graphql-depth-limit/index.d.ts
new file mode 100644
index 0000000000..281f8fdaff
--- /dev/null
+++ b/types/graphql-depth-limit/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for graphql-depth-limit 1.1
+// Project: https://github.com/stems/graphql-depth-limit#readme
+// Definitions by: Siim Tiilen <https://github.com/eritikass>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+declare function depthLimit(depthLimit: number, options?: depthLimit.Options, callback?: (obj: any) => void): any;
+export = depthLimit;
+
+declare namespace depthLimit {
+    interface Options {
+        ignore: Array<string | RegExp | ((queryDepths: any[]) => boolean)>;
+    }
+}
diff --git a/types/graphql-depth-limit/tsconfig.json b/types/graphql-depth-limit/tsconfig.json
new file mode 100644
index 0000000000..5c59137102
--- /dev/null
+++ b/types/graphql-depth-limit/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "graphql-depth-limit-tests.ts"
+    ]
+}
diff --git a/types/graphql-depth-limit/tslint.json b/types/graphql-depth-limit/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/graphql-depth-limit/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c5907ddf17f21380a252fc4d0037afc6d0f75c04 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Tue, 8 May 2018 17:54:37 +0300
Subject: [PATCH 0100/1124] [redux-actions@2.3.0] More specific definitions
 (#25286)

* [redux-actions@2.3.0] More specific definitions

* [redux-actions@2.3.0] Better combineActions/handleAction typing

* Added _dummy field

* Removed useless toString() declaration
---
 types/redux-actions/index.d.ts             | 50 ++++++++++++++-----
 types/redux-actions/redux-actions-tests.ts | 56 +++++++++++++++++++++-
 2 files changed, 92 insertions(+), 14 deletions(-)

diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 7247ed11d9..e342570a5b 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -1,9 +1,11 @@
-// Type definitions for redux-actions 2.2
+// Type definitions for redux-actions 2.3
 // Project: https://github.com/acdlite/redux-actions
 // Definitions by: Jack Hsu <https://github.com/jaysoo>,
 //                 Alex Gorbatchev <https://github.com/alexgorbatchev>,
 //                 Alec Hill <https://github.com/alechill>
+//                 Alexey Pelykh <https://github.com/alexey-pelykh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 export as namespace ReduxActions;
 
@@ -22,6 +24,11 @@ export interface ActionMeta<Payload, Meta> extends Action<Payload> {
     meta: Meta;
 }
 
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/combineActions.js#L27
+export interface CombinedActionType {
+    _dummy: undefined;
+}
+
 export type ReducerMapValue<State, Payload> = Reducer<State, Payload> | ReducerNextThrow<State, Payload> | ReducerMap<State, Payload>;
 
 export interface ReducerMap<State, Payload> {
@@ -42,13 +49,17 @@ export interface ReducerNextThrowMeta<State, Payload, Meta> {
     throw?(state: State, action: ActionMeta<Payload, Meta>): State;
 }
 
-export type ActionFunctions<Payload> =
-    ActionFunction0<Action<Payload>> |
-    ActionFunction1<any, Action<Payload>> |
-    ActionFunction2<any, any, Action<Payload>> |
-    ActionFunction3<any, any, any, Action<Payload>> |
-    ActionFunction4<any, any, any, any, Action<Payload>> |
-    ActionFunctionAny<Action<Payload>>;
+export type BaseActionFunctions<TAction> =
+    ActionFunction0<TAction> |
+    ActionFunction1<any, TAction> |
+    ActionFunction2<any, any, TAction> |
+    ActionFunction3<any, any, any, TAction> |
+    ActionFunction4<any, any, any, any, TAction> |
+    ActionFunctionAny<TAction>;
+
+export type ActionFunctions<Payload> = BaseActionFunctions<Action<Payload>>;
+
+export type ActionWithMetaFunctions<Payload, Meta> = BaseActionFunctions<ActionMeta<Payload, Meta>>;
 
 export type Reducer<State, Payload> = (state: State, action: Action<Payload>) => State;
 
@@ -62,9 +73,10 @@ export type ActionFunction3<T1, T2, T3, R> = (t1: T1, t2: T2, t3: T3) => R;
 export type ActionFunction4<T1, T2, T3, T4, R> = (t1: T1, t2: T2, t3: T3, t4: T4) => R;
 export type ActionFunctionAny<R> = (...args: any[]) => R;
 
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/createAction.js#L6
 export function createAction(
     actionType: string
-): ActionFunction0<Action<void>>;
+): ActionFunctionAny<Action<any>>;
 
 export function createAction<Payload>(
     actionType: string,
@@ -95,6 +107,12 @@ export function createAction<Payload>(
     actionType: string
 ): ActionFunction1<Payload, Action<Payload>>;
 
+export function createAction<Meta>(
+    actionType: string,
+    payloadCreator: null | undefined,
+    metaCreator: ActionFunctionAny<Meta>
+): ActionFunctionAny<ActionMeta<any, Meta>>;
+
 export function createAction<Payload, Meta>(
     actionType: string,
     payloadCreator: ActionFunctionAny<Payload>,
@@ -126,13 +144,13 @@ export function createAction<Payload, Meta, Arg1, Arg2, Arg3, Arg4>(
 ): ActionFunction4<Arg1, Arg2, Arg3, Arg4, ActionMeta<Payload, Meta>>;
 
 export function handleAction<State, Payload>(
-    actionType: string | ActionFunctions<Payload>,
+    actionType: string | ActionFunctions<Payload> | CombinedActionType,
     reducer: Reducer<State, Payload> | ReducerNextThrow<State, Payload>,
     initialState: State
 ): Reducer<State, Payload>;
 
 export function handleAction<State, Payload, Meta>(
-    actionType: { toString(): string },
+    actionType: string | ActionWithMetaFunctions<Payload, Meta> | CombinedActionType,
     reducer: ReducerMeta<State, Payload, Meta> | ReducerNextThrowMeta<State, Payload, Meta>,
     initialState: State
 ): Reducer<State, Payload>;
@@ -152,7 +170,8 @@ export function handleActions<State, Payload, Meta>(
     initialState: State
 ): ReducerMeta<State, Payload, Meta>;
 
-export function combineActions(...actionTypes: Array<ActionFunctions<any> | string>): string;
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/combineActions.js#L21
+export function combineActions(...actionTypes: Array<ActionFunctions<any> | string | symbol>): CombinedActionType;
 
 export interface ActionMap<Payload, Meta> {
     [actionType: string]:
@@ -168,3 +187,10 @@ export function createActions<Payload>(
 ): {
     [actionName: string]: ActionFunctionAny<Action<Payload>>
 };
+
+export function createActions(
+    actionMapOrIdentityAction: ActionMap<any, any> | string,
+    ...identityActions: string[]
+): {
+    [actionName: string]: ActionFunctionAny<Action<any>>
+};
diff --git a/types/redux-actions/redux-actions-tests.ts b/types/redux-actions/redux-actions-tests.ts
index 7fa5744f22..b2e7eab899 100644
--- a/types/redux-actions/redux-actions-tests.ts
+++ b/types/redux-actions/redux-actions-tests.ts
@@ -194,17 +194,69 @@ actionMetaFrom2Args.meta.remote;
 typedState = typedActionHandlerReducerMetaMap({ value: 0 }, actionMetaFrom2Args);
 
 const act0 = ReduxActions.createAction('ACTION0');
-act0().payload === null;
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/__tests__/createAction-test.js#L111
+act0().payload; // $ExpectType any
+act0().payload === undefined;
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/__tests__/createAction-test.js#L122
+act0({ foo: 'bar' }).payload.foo === 'bar';
+
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/__tests__/createAction-test.js#L122
+const act0_meta = ReduxActions.createAction('ACTION0_META', null, () => ({ foo: 'bar' }));
+act0_meta().payload; // $ExpectType any
+act0_meta().meta.foo === 'bar';
 
 const act1 = ReduxActions.createAction<string>('ACTION1');
+act1('hello').payload; // $ExpectType string
 act1('hello').payload === 'hello';
 
+const act1_meta = ReduxActions.createAction('ACTION1_META', null, (foo: string) => ({ foo }));
+act1_meta('hello').payload; // $ExpectType any
+act1_meta('hello').payload === 'hello';
+act1_meta('hello').meta.foo === 'hello';
+
+const act1_type_meta = ReduxActions.createAction('ACTION1_TYPE_META', (x: number) => x, () => ({ foo: 'bar' }));
+act1_type_meta(42).payload; // $ExpectType number
+act1_type_meta(42).meta.foo === 'bar';
+
+const act1_identity = ReduxActions.createAction('ACTION1_IDENTITY', (x: string) => x);
+act1_identity('hello').payload; // $ExpectType string
+act1_identity('hello').payload === 'hello';
+
 const act2 = ReduxActions.createAction('ACTION2', (s: {load: boolean}) => s);
 act2({load: true}).payload.load; // $ExpectType boolean
 
 const act3 = ReduxActions.createAction('ACTION3', (s: string) => ({s}));
 act3('hello').payload.s === 'hello';
 
+const act4 = ReduxActions.createAction('ACTION4', null, (x1: string, x2: number) => ({}));
+act4('hello', 42).payload; // $ExpectType any
+Object.getOwnPropertyNames(act4('hello', 42).payload).length === 2;
+
+const act5 = ReduxActions.createAction('ACTION5', null, (...args: any[]) => ({}));
+act5('hello', 42).payload; // $ExpectType any
+Object.getOwnPropertyNames(act5('hello', 42).payload).length === 2;
+
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/__tests__/createActions-test.js#L66
+const { actions0_actionOne, actions0_actionTwo } = ReduxActions.createActions({
+    ACTION_ONE: (key: string, value: number) => ({ [key]: value }),
+    ACTION_TWO: (first: string, second: number) => ([first, second])
+});
+actions0_actionOne('value', 1).payload; // $ExpectType any
+actions0_actionOne('value', 1).payload.value === 1;
+actions0_actionTwo('value', 2).payload; // $ExpectType any
+actions0_actionTwo('value', 2).payload[0] === 'value';
+actions0_actionTwo('value', 2).payload[1] === 2;
+
+// https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/__tests__/createActions-test.js#L66
+interface Actions1Payload {
+    [key: string]: number;
+}
+const { actions1_actionOne } = ReduxActions.createActions({
+    ACTION_ONE: (key: string, value: number): Actions1Payload => ({ [key]: value })
+});
+actions1_actionOne('value', 1).payload; // $ExpectType Actions1Payload
+actions1_actionOne('value', 1).payload.value === 1;
+
 ReduxActions.handleAction<{ hello: string }, string>(act1, (state, action) => {
     return { hello: action.payload };
 }, {hello: 'greetings'});
@@ -220,7 +272,7 @@ ReduxActions.handleAction(act3, (state, action) => {
 ReduxActions.handleAction(ReduxActions.combineActions(act1, act3, act2), (state, action) => state + 1, 0);
 
 ReduxActions.handleActions({
-    [ReduxActions.combineActions(act1, act3, act2)](state, action) {
+    [`${ReduxActions.combineActions(act1, act3, act2)}`](state, action) {
         return state + 1;
     }
 }, 0);

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 0101/1124] 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 0102/1124] 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 2c008db385bba962a35e32b30bed3e8d05a2722e Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Tue, 8 May 2018 20:07:59 +0300
Subject: [PATCH 0103/1124] daterangepicker: typings for v3.0.1 (#25476)

* daterangepicker: typings for v3.0.1

See release notes for v3.0.0: https://github.com/dangrossman/daterangepicker/releases/tag/v3.0.0

* fix react-bootstrap-daterangepicker

* fix linting errors

* support for .data('daterangepicker')
---
 .../daterangepicker/daterangepicker-tests.ts  | 146 +++++++++++-------
 types/daterangepicker/index.d.ts              | 118 ++++++++------
 types/daterangepicker/tslint.json             |  80 +---------
 .../index.d.ts                                |   2 +-
 4 files changed, 164 insertions(+), 182 deletions(-)

diff --git a/types/daterangepicker/daterangepicker-tests.ts b/types/daterangepicker/daterangepicker-tests.ts
index db79671721..2f8ab867e4 100644
--- a/types/daterangepicker/daterangepicker-tests.ts
+++ b/types/daterangepicker/daterangepicker-tests.ts
@@ -1,80 +1,116 @@
-import moment = require("moment")
-import daterangepicker = require("daterangepicker");
+import moment = require('moment');
+import daterangepicker = require('daterangepicker');
 
 function tests_simple() {
     $('#daterange').daterangepicker();
-    $('input[name="daterange"]').daterangepicker({
-        timePicker: true,
-        timePickerIncrement: 30,
-        locale: {
-            format: 'MM/DD/YYYY h:mm A'
-        }
-    });
+    $('input[name="daterange"]')
+        .daterangepicker({
+            timePicker: true,
+            timePickerIncrement: 30,
+            locale: {
+                format: 'MM/DD/YYYY h:mm A'
+            },
+            maxSpan: { days: 10 },
+            applyButtonClasses: 'my-apply-class',
+            cancelButtonClasses: 'my-cancel-class',
+            showDropdowns: true,
+            maxYear: 3000,
+            minYear: 2000
+        })
+        .data('daterangepicker')
+        .remove();
 
     $('#reportrange').daterangepicker({
         ranges: {
-            'Today': [moment(), moment()],
-            'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+            Today: [moment(), moment()],
+            Yesterday: [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
             'Last 7 Days': [moment().subtract(6, 'days'), moment()],
             'Last 30 Days': [moment().subtract(29, 'days'), moment()],
             'This Month': [moment().startOf('month'), moment().endOf('month')],
-            'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+            'Last Month': [
+                moment()
+                    .subtract(1, 'month')
+                    .startOf('month'),
+                moment()
+                    .subtract(1, 'month')
+                    .endOf('month')
+            ]
         }
     });
 
-    $('input[name="datefilter"]').on('apply.daterangepicker', function (ev, picker) {
-        $(this).val(picker.startDate.format('MM/DD/YYYY') + ' - ' + picker.endDate.format('MM/DD/YYYY'));
+    $('input[name="datefilter"]').on('apply.daterangepicker', function(ev, picker) {
+        $(this).val(
+            `${picker.startDate.format('MM/DD/YYYY')} - ${picker.endDate.format('MM/DD/YYYY')}`
+        );
     });
 
-
-    $('input[name="datefilter"]').on('cancel.daterangepicker', function (ev, picker) {
+    $('input[name="datefilter"]').on('cancel.daterangepicker', function(ev, picker) {
         $(this).val('');
     });
 
-    $('#demo').daterangepicker({
-        "startDate": "05/06/2016",
-        "endDate": "05/12/2016"
-    }, function (start: moment.Moment, end: moment.Moment, label: string) {
-        console.log("New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')");
-    });
-
-    $(function() {
-
-    function cb(start: moment.Moment, end: moment.Moment) {
-        $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
-    }
-    cb(moment().subtract(29, 'days'), moment());
-
-    $('#reportrange').daterangepicker({
-        ranges: {
-           'Today': [moment(), moment()],
-           'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-           'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-           'Last 30 Days': [moment().subtract(29, 'days'), moment()],
-           'This Month': [moment().startOf('month'), moment().endOf('month')],
-           'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-        }
-    }, cb);
-
-    $('#reportrange').daterangepicker({
-        ranges: {
-           'Today': [moment(), moment()],
-           'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-           'Last 7 Days': [moment().subtract(6, 'days'), moment()],
-           'Last 30 Days': [moment().subtract(29, 'days'), moment()]
+    $('#demo').daterangepicker(
+        {
+            startDate: '05/06/2016',
+            endDate: '05/12/2016'
         },
-        showCustomRangeLabel: false
-    }, cb);
+        (start: moment.Moment, end: moment.Moment, label: string) => {
+            console.log(
+                "New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')"
+            );
+        }
+    );
 
-    $('#endDate').daterangepicker({
-        singleDatePicker: true,
-        startDate: moment()
+    $(() => {
+        function cb(start: moment.Moment, end: moment.Moment) {
+            $('#reportrange span').html(
+                `${start.format('MMMM D, YYYY')} - ${end.format('MMMM D, YYYY')}`
+            );
+        }
+        cb(moment().subtract(29, 'days'), moment());
+
+        $('#reportrange').daterangepicker(
+            {
+                ranges: {
+                    Today: [moment(), moment()],
+                    Yesterday: [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                    'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                    'Last 30 Days': [moment().subtract(29, 'days'), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                    'Last Month': [
+                        moment()
+                            .subtract(1, 'month')
+                            .startOf('month'),
+                        moment()
+                            .subtract(1, 'month')
+                            .endOf('month')
+                    ]
+                }
+            },
+            cb
+        );
+
+        $('#reportrange').daterangepicker(
+            {
+                ranges: {
+                    Today: [moment(), moment()],
+                    Yesterday: [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
+                    'Last 7 Days': [moment().subtract(6, 'days'), moment()],
+                    'Last 30 Days': [moment().subtract(29, 'days'), moment()]
+                },
+                showCustomRangeLabel: false
+            },
+            cb
+        );
+
+        $('#endDate').daterangepicker({
+            singleDatePicker: true,
+            startDate: moment()
+        });
     });
-});
 }
 
 declare const host: HTMLElement;
 function test_from_amd() {
-    var picker = new daterangepicker(host);
-    console.log(picker.startDate.format("YYYY-MM-DD"));
+    const picker = new daterangepicker(host);
+    console.log(picker.startDate.format('YYYY-MM-DD'));
 }
diff --git a/types/daterangepicker/index.d.ts b/types/daterangepicker/index.d.ts
index 5a82950ca9..9267a801b2 100644
--- a/types/daterangepicker/index.d.ts
+++ b/types/daterangepicker/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Date Range Picker v2.1.30
+// Type definitions for Date Range Picker 3.0
 // Project: http://www.daterangepicker.com/
 // Definitions by: SirMartin <https://github.com/SirMartin>
 //                 Steven Masala <https://github.com/smasala>
@@ -7,62 +7,81 @@
 // TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
-import moment = require("moment");
+import moment = require('moment');
 
 declare global {
     interface JQuery {
-        daterangepicker(settings?: daterangepicker.Settings): JQuery;
-        daterangepicker(settings?: daterangepicker.Settings, callback?: daterangepicker.DataRangePickerCallback): JQuery;
+        daterangepicker: ((
+            options?: daterangepicker.Options,
+            callback?: daterangepicker.DataRangePickerCallback
+        ) => JQuery) & { defaultOptions?: daterangepicker.Options };
+        data(key: 'daterangepicker'): daterangepicker | undefined;
     }
 }
 
-declare const daterangepicker: daterangepicker.DateRangePicker;
+declare class daterangepicker {
+    constructor(
+        element: HTMLElement,
+        options?: daterangepicker.Options,
+        callback?: daterangepicker.DataRangePickerCallback
+    );
+
+    startDate: moment.Moment;
+    endDate: moment.Moment;
+    container: JQuery;
+
+    setStartDate(date: daterangepicker.DateOrString): void;
+    setEndDate(date: daterangepicker.DateOrString): void;
+    remove(): void;
+}
 
 declare namespace daterangepicker {
-    type DataRangePickerCallback = (start: moment.Moment, end: moment.Moment, label: string | null) => any;
+    type DataRangePickerCallback = (
+        start: moment.Moment,
+        end: moment.Moment,
+        label: string | null
+    ) => void;
 
-    interface DateRangePicker {
-        new (element: HTMLElement, settings?: daterangepicker.Settings, callback?: DataRangePickerCallback): DateRangePicker;
-
-        startDate: moment.Moment;
-        endDate: moment.Moment;
-        container: JQuery;
-
-        setStartDate(date: Date | moment.Moment | string): void;
-        setEndDate(date: Date | moment.Moment | string): void;
-        remove(): void;
-    }
+    type DateOrString = string | moment.Moment | Date;
 
     interface DatepickerEventObject extends JQueryEventObject {
         date: Date;
         format(format?: string): string;
     }
 
-    interface Settings {
+    interface Options {
         /**
          * The start of the initially selected date range
          */
-        startDate?: string | moment.Moment | Date;
+        startDate?: DateOrString;
         /**
          * The end of the initially selected date range
          */
-        endDate?: string | moment.Moment | Date;
+        endDate?: DateOrString;
         /**
-         *  The earliest date a user may select
+         * The earliest date a user may select
          */
-        minDate?: string | moment.Moment | Date;
+        minDate?: DateOrString;
         /**
          * The latest date a user may select
          */
-        maxDate?: string | moment.Moment | Date;
+        maxDate?: DateOrString;
         /**
          * The maximum span between the selected start and end dates. Can have any property you can add to a moment object (i.e. days, months)
          */
-        dateLimit?: any;
+        maxSpan?: moment.MomentInput | moment.Duration;
         /**
          * Show year and month select boxes above calendars to jump to a specific month and year
          */
         showDropdowns?: boolean;
+        /**
+         * The minimum year shown in the dropdowns when `showDropdowns` is set to true.
+         */
+        minYear?: number;
+        /**
+         * The maximum year shown in the dropdowns when `showDropdowns` is set to true.
+         */
+        maxYear?: number;
         /**
          * Show localized week numbers at the start of each week on the calendars
          */
@@ -90,15 +109,25 @@ declare namespace daterangepicker {
         /**
          * Set predefined date ranges the user can select from.Each key is the label for the range, and its value an array with two dates representing the bounds of the range.
          */
-        ranges?: any;
+        ranges?: { [name: string]: [DateOrString, DateOrString] };
         /**
-         * (string: 'left'/'right'/'center') Whether the picker appears aligned to the left, to the right, or centered under the HTML element it's attached to
+         * Whether to show the 'Custom Range' label or just pre-defined ranges
          */
-        opens?: string;
+        showCustomRangeLabel?: boolean;
         /**
-         * (string: 'down' or 'up') Whether the picker appears below (default) or above the HTML element it's attached to
+         * Normally, if you use the `ranges` option to specify pre-defined date ranges, calendars
+         * for choosing a custom date range are not shown until the user clicks "Custom Range".
+         * When this option is set to true, the calendars for choosing a custom date range are always shown instead.
          */
-        drops?: string;
+        alwaysShowCalendars?: boolean;
+        /**
+         * Whether the picker appears aligned to the left, to the right, or centered under the HTML element it's attached to
+         */
+        opens?: 'left' | 'right' | 'center';
+        /**
+         * Whether the picker appears below (default) or above the HTML element it's attached to
+         */
+        drops?: 'down' | 'up';
         /**
          * CSS class names that will be added to all buttons in the picker
          */
@@ -106,11 +135,11 @@ declare namespace daterangepicker {
         /**
          * CSS class string that will be added to the apply button
          */
-        applyClass?: string;
+        applyButtonClasses?: string;
         /**
-        * CSS class string that will be added to the cancel button
-        */
-        cancelClass?: string;
+         * CSS class string that will be added to the cancel button
+         */
+        cancelButtonClasses?: string;
         /**
          * Allows you to provide localized strings for buttons and labels, customize the date display format, and change the first day of week for the calendars.
          */
@@ -124,33 +153,28 @@ declare namespace daterangepicker {
          */
         autoApply?: boolean;
         /**
-         * When enabled, the two calendars displayed will always be for two sequential months (i.e.January and February), and both will be advanced when clicking the left or right arrows above the calendars.When disabled, the two calendars can be individually advanced and display any month/ year.
+         * When enabled, the two calendars displayed will always be for two sequential months (i.e.
+         * January and February), and both will be advanced when clicking the left or right arrows
+         * above the calendars.When disabled, the two calendars can be individually advanced and
+         * display any month/ year.
          */
         linkedCalendars?: boolean;
-        /**
-         * jQuery selector of the parent element that the date range picker will be added to, if not provided this will be 'body'
-         */
-        parentEl?: string;
         /**
          * A function that is passed each date in the two calendars before they are displayed, and may return true or false to indicate whether that date should be available for selection or not.
          */
-        isInvalidDate?(startDate: string | moment.Moment | Date, endDate?: string | moment.Moment | Date): boolean;
+        isInvalidDate?(startDate: DateOrString, endDate?: DateOrString): boolean;
         /**
          * A function that is passed each date in the two calendars before they are displayed, and may return a string or array of CSS class names to apply to that date's calendar cell.
          */
-        isCustomDate?(date: string | moment.Moment | Date): string | string[] | undefined;
+        isCustomDate?(date: DateOrString): string | string[] | undefined;
         /**
          * Indicates whether the date range picker should automatically update the value of an < input > element it's attached to at initialization and when the selected dates change.
          */
         autoUpdateInput?: boolean;
         /**
-        * Normally, if you use the ranges option to specify pre- defined date ranges, calendars for choosing a custom date range are not shown until the user clicks "Custom Range".When this option is set to true, the calendars for choosing a custom date range are always shown instead.
-        */
-        alwaysShowCalendars?: boolean;
-        /**
-        * Whether to show the 'Custom Range' label or just pre-defined ranges
-        */
-        showCustomRangeLabel?: boolean;
+         * jQuery selector of the parent element that the date range picker will be added to, if not provided this will be 'body'
+         */
+        parentEl?: string;
     }
 
     interface Locale {
diff --git a/types/daterangepicker/tslint.json b/types/daterangepicker/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/daterangepicker/tslint.json
+++ b/types/daterangepicker/tslint.json
@@ -1,79 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-bootstrap-daterangepicker/index.d.ts b/types/react-bootstrap-daterangepicker/index.d.ts
index 5a2cfa4735..26fb15f45a 100644
--- a/types/react-bootstrap-daterangepicker/index.d.ts
+++ b/types/react-bootstrap-daterangepicker/index.d.ts
@@ -11,7 +11,7 @@ declare namespace ReactBootstrapDaterangepicker {
 
     export interface EventHandler { (event?: any, picker?: any): any; }
 
-    export interface Props extends  daterangepicker.Settings{
+    export interface Props extends daterangepicker.Options{
         onShow?: EventHandler;
         onHide?: EventHandler;
         onShowCalendar?: EventHandler;

From 1b920ca75b2a33f3d7ac3892edcac46992f0a081 Mon Sep 17 00:00:00 2001
From: Maksim Sharipov <m.v.sharipov@gmail.com>
Date: Tue, 8 May 2018 20:09:57 +0300
Subject: [PATCH 0104/1124] [react-router] Add generic param for staticContext
 (#25482)

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

diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 23f2f4f78a..32834eed79 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -16,6 +16,7 @@
 //                 Egor Shulga <https://github.com/egorshulga>
 //                 Youen Toupin <https://github.com/neuoy>
 //                 Rahul Raina <https://github.com/rraina>
+//                 Maksim Sharipov <https://github.com/pret-a-porter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -58,11 +59,15 @@ export interface RedirectProps {
 }
 export class Redirect extends React.Component<RedirectProps, any> { }
 
-export interface RouteComponentProps<P> {
-  match: match<P>;
-  location: H.Location;
+export interface StaticContext {
+  statusCode?: number;
+}
+
+export interface RouteComponentProps<P, C extends StaticContext = StaticContext> {
   history: H.History;
-  staticContext?: any;
+  location: H.Location;
+  match: match<P>;
+  staticContext: C | undefined;
 }
 
 export interface RouteProps {

From 5660c8b81612570d43e67815d84ccbc0f8b53f16 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 8 May 2018 10:10:51 -0700
Subject: [PATCH 0105/1124] hexo-log: Remove dependencies on test frameworks
 (#25511)

---
 types/hexo-log/hexo-log-tests.ts | 132 +++++++++++--------------------
 1 file changed, 47 insertions(+), 85 deletions(-)

diff --git a/types/hexo-log/hexo-log-tests.ts b/types/hexo-log/hexo-log-tests.ts
index 9d0c263c03..a6fbcced57 100644
--- a/types/hexo-log/hexo-log-tests.ts
+++ b/types/hexo-log/hexo-log-tests.ts
@@ -1,90 +1,52 @@
-import mocha = require('mocha');
-import chai = require('chai');
-const should = chai.should();
-import rewire = require('rewire');
-import sinon = require('sinon');
 import logger = require('hexo-log');
 
-const _c = logger();
-type HexoLogger = typeof _c;
+declare function it(s: string, cb: () => void): void;
 
-describe('hexo-log', () => {
-    const loggerModule = rewire<(options?: { name?: string; silent?: boolean; debug?: boolean; }) => HexoLogger>('./');
+it('add alias for levels', () => {
+    const log = logger();
 
-    it('add alias for levels', () => {
-        const log = logger();
-
-        log.d.should.eql(log.debug);
-        log.i.should.eql(log.info);
-        log.w.should.eql(log.warn);
-        log.e.should.eql(log.error);
-        log.log.should.eql(log.info);
-    });
-
-    it('default name is hexo', () => {
-        const log = logger();
-
-        log.fields.name.should.eql('hexo');
-    });
-
-    it('options.name', () => {
-        const log = logger({ name: 'foo' });
-
-        log.fields.name.should.eql('foo');
-    });
-
-    it('level should be trace if options.debug is true', () => {
-        const log: any = logger({ debug: true });
-
-        log.streams[0].level.should.eql(10);
-    });
-
-    it('should add file stream if options.debug is true', () => {
-        const log: any = logger({ debug: true });
-
-        log.streams[1].path.should.eql('debug.log');
-    });
-
-    it('should remove console stream if options.silent is true', () => {
-        const log: any = logger({ silent: true });
-
-        log.streams.length.should.eql(0);
-    });
-
-    it('should display time if options.debug is true', () => {
-        const spy = sinon.spy();
-        const now = new Date();
-
-        loggerModule.__with__({
-            process: {
-                stdout: {
-                    write: spy
-                }
-            }
-        })(() => {
-            sinon.useFakeTimers(now.valueOf());
-            const log = loggerModule({ debug: true });
-            log.info('test');
-            sinon.restore(undefined);
-        });
-
-        spy.args[0][0].should.contain(now.toISOString().substring(11, 23));
-    });
-
-    it('should print error to process.stderr stream', () => {
-        const spy = sinon.spy();
-
-        loggerModule.__with__({
-            process: {
-                stderr: {
-                    write: spy
-                }
-            }
-        })(() => {
-            const log = loggerModule();
-            log.error('test');
-        });
-
-        spy.calledOnce.should.be.true;
-    });
+    log.d === log.debug;
+    log.i === log.info;
+    log.w === log.warn;
+    log.e === log.error;
+    log.log === log.info;
+});
+
+it('default name is hexo', () => {
+    const log = logger();
+
+    log.fields.name === 'hexo';
+});
+
+it('options.name', () => {
+    const log = logger({ name: 'foo' });
+    log.fields === 'foo';
+});
+
+it('level should be trace if options.debug is true', () => {
+    const log = logger({ debug: true });
+    // TODO
+    // log.streams[0].level.should.eql(10);
+});
+
+it('should add file stream if options.debug is true', () => {
+    const log = logger({ debug: true });
+    // TODO
+    // log.streams[1].path === 'debug.log';
+});
+
+it('should remove console stream if options.silent is true', () => {
+    const log = logger({ silent: true });
+    // TODO
+    // log.streams.length === 0;
+});
+
+it('should display time if options.debug is true', () => {
+    const log = logger({ debug: true });
+    log.info('test');
+});
+
+it('should print error to process.stderr stream', () => {
+    const log = logger();
+    log.error('test');
 });

From 229e28706ec8da157e56d24d6cc20bc10f1a8ea4 Mon Sep 17 00:00:00 2001
From: Trygve Wastvedt <trygve.wastvedt@gmail.com>
Date: Tue, 8 May 2018 12:12:01 -0500
Subject: [PATCH 0106/1124] A-Frame additions (#25006)

* Add new PropertyTypes

* A-Frame: Expand registerComponent test.

* Add generics to properties, components, and systems.

* Add missing ShaderDefinition interface.

* Add missing event data.

* Add missing throttle and throttleTick functions.

* Update Typescript version

* Use classes for component, system, and geometry

* Add tests for class inheritance.

* Improve defaults, rename ComponentBase -> ComponentDefault

* Saw the sign - many simplifications, return to interfaces
Can't extend a class definition that doesn't exist at runtime, so we need to use interfaces?

* Remove unnecessary generics

* Simplified some references, added a couple tests.

* Moving undefined system from generic to property.

* Revert "Update Typescript version"

This reverts commit 43ef72cef75b0bcee2d04eddcaa0f594290ec46f.
---
 types/aframe/aframe-tests.ts |  73 +++++++++++++--
 types/aframe/index.d.ts      | 171 +++++++++++++++++++----------------
 types/aframe/tslint.json     |   1 -
 3 files changed, 160 insertions(+), 85 deletions(-)

diff --git a/types/aframe/aframe-tests.ts b/types/aframe/aframe-tests.ts
index 5af66a09d1..5e2bd23e36 100644
--- a/types/aframe/aframe-tests.ts
+++ b/types/aframe/aframe-tests.ts
@@ -21,9 +21,9 @@ type MyEntity = AFrame.Entity<{
 	material: THREE.Material;
 	sound: { pause(): void };
 }>;
-const camera = document.querySelector<MyEntity>('a-entity[camera]').components.camera;
-const material = document.querySelector<MyEntity>('a-entity[material]').components.material;
-document.querySelector<MyEntity>('a-entity[sound]').components.sound.pause();
+const camera = (document.querySelector('a-entity[camera]') as MyEntity).components.camera;
+const material = (document.querySelector('a-entity[material]') as MyEntity).components.material;
+(document.querySelector('a-entity[sound]') as MyEntity).components.sound.pause();
 
 entity.getDOMAttribute('geometry').primitive;
 
@@ -38,21 +38,82 @@ entity.addEventListener('child-detached', (event) => {
 });
 
 // Components
-const Component = AFRAME.registerComponent('test', {});
+
+interface TestComponent extends AFrame.Component {
+	multiply: (f: number) => number;
+
+	data: {
+		myProperty: any[],
+		string: string,
+		num: number
+	};
+
+	system: TestSystem;
+}
+
+const Component = AFRAME.registerComponent<TestComponent>('test-component', {
+	schema: {
+		myProperty: {
+			default: [],
+			parse() { return [true]; },
+		},
+		string: { type: 'string' },
+		num: 0
+	},
+	init() {
+		this.data.num = 0;
+	},
+	update() {},
+	tick() {},
+	remove() {},
+	pause() {},
+	play() {},
+
+	multiply(this: TestComponent, f: number) {
+		// Reference to system because both were registered with the same name.
+		return f * this.data.num * this.system.data.counter;
+	}
+});
 
 // Scene
 const scene = document.querySelector('a-scene');
 scene.hasLoaded;
 
 // System
-const system = scene.systems['systemName'];
+
+interface TestSystem extends AFrame.System {
+	data: {
+		counter: number;
+	};
+}
+
+const testSystem: AFrame.SystemDefinition<TestSystem> = {
+	schema: {
+		counter: 0
+	},
+
+	init() {
+		this.data.counter = 1;
+	}
+};
+
+AFRAME.registerSystem('test-component', testSystem);
 
 // Register Custom Geometry
-AFRAME.registerGeometry('a-test-geometry', {
+
+interface TestGeometry extends AFrame.Geometry {
+	schema: AFrame.MultiPropertySchema<{
+		groupIndex: number;
+	}>;
+}
+
+AFRAME.registerGeometry<TestGeometry>('a-test-geometry', {
 	schema: {
 		groupIndex: { default: 0 }
 	},
 	init(data) {
 		this.geometry = new THREE.Geometry();
+		const temp = data.groupIndex;
+		temp;
 	}
 });
diff --git a/types/aframe/index.d.ts b/types/aframe/index.d.ts
index 0da1ed0ef5..b405de0273 100644
--- a/types/aframe/index.d.ts
+++ b/types/aframe/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://aframe.io/
 // Definitions by: Paul Shannon <https://github.com/devpaul>
 //                 Roberto Ritger <https://github.com/bertoritger>
+//                 Trygve Wastvedt <https://github.com/twastvedt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -19,7 +20,7 @@ declare var hasNativeWebVRImplementation: boolean;
 interface Document {
     createElement(tagName: string): AFrame.Entity;
     querySelector(selectors: 'a-scene'): AFrame.Scene;
-	querySelector<T extends AFrame.Entity<any>>(selectors: string): T;
+	querySelector(selectors: string): AFrame.Entity<any>;
 	querySelectorAll(selectors: string): NodeListOf<AFrame.Entity<any> | Element>;
 }
 
@@ -36,15 +37,15 @@ declare namespace AFrame {
 		components: { [ key: string ]: ComponentDescriptor };
 		geometries: { [ key: string ]: GeometryDescriptor };
 		primitives: { [ key: string ]: Entity };
-		registerComponent(name: string, component: ComponentDefinition): ComponentConstructor;
+		registerComponent<T extends Component>(name: string, component: ComponentDefinition<T>): ComponentConstructor<T>;
 		registerElement(name: string, element: ANode): void;
-		registerGeometry(name: string, geometry: GeometryDefinition): Geometry;
+		registerGeometry<T extends Geometry>(name: string, geometry: GeometryDefinition<T>): GeometryConstructor<T>;
 		registerPrimitive(name: string, primitive: PrimitiveDefinition): void;
-		registerShader(name: string, shader: any): void;
-		registerSystem(name: string, definition: SystemDefinition): void;
+		registerShader<T extends Shader>(name: string, shader: T): ShaderConstructor<T>;
+		registerSystem<T extends System>(name: string, definition: SystemDefinition<T>): SystemConstructor<T>;
 		schema: SchemaUtils;
 		shaders: { [ key: string ]: ShaderDescriptor };
-		systems: { [key: string]: System };
+		systems: { [key: string]: SystemConstructor };
 		THREE: typeof THREE;
 		TWEEN: typeof TWEEN;
 		utils: Utils;
@@ -89,54 +90,39 @@ declare namespace AFrame {
 		tick(): void;
 	}
 
-	interface Component {
+	interface Component<T extends { [key: string]: any } = any, S extends System = System> {
 		attrName?: string;
-		data?: any;
+		data: T;
 		dependencies?: string[];
 		el: Entity;
 		id: string;
 		multiple?: boolean;
 		name: string;
-		schema: Schema;
+		schema: Schema<T>;
+		system: S | undefined;
 
-		init(data?: any): void;
-		pause(): void;
-		play(): void;
-		remove(): void;
-		tick?(time: number, timeDelta: number): void;
-		update(oldData: any): void;
-		updateSchema?(): void;
+		init(this: this, data?: T): void;
+		pause(this: this): void;
+		play(this: this): void;
+		remove(this: this): void;
+		tick?(this: this, time: number, timeDelta: number): void;
+		update(this: this, oldData: T): void;
+		updateSchema?(this: this): void;
 
-		extendSchema(update: Schema): void;
-		flushToDOM(): void;
+		extendSchema(this: this, update: Schema): void;
+		flushToDOM(this: this): void;
 	}
 
-	interface ComponentConstructor {
-		new (el: Entity, name: string, id: string): Component;
+	interface ComponentConstructor<T extends Component> {
+		new (el: Entity, attrValue: string, id: string): T;
 	}
 
-	interface ComponentDefinition {
-		dependencies?: string[];
-		el?: Entity;
-		id?: string;
-		multiple?: boolean;
-		schema?: Schema;
+	type ComponentDefinition<T extends Component = Component> = Partial<T>;
 
-		init?(data?: any): void;
-		pause?(): void;
-		play?(): void;
-		remove?(): void;
-		tick?(time: number, timeDelta: number): void;
-		update?(oldData: any): void;
-		updateSchema?(): void;
-
-		[ key: string ]: any;
-	}
-
-	interface ComponentDescriptor {
-		Component: Component;
-		dependencies: string[] | null;
-		multiple: boolean | null;
+	interface ComponentDescriptor<T extends Component = Component> {
+		Component: ComponentConstructor<T>;
+		dependencies: string[] | undefined;
+		multiple: boolean | undefined;
 
 		// internal APIs2
 		// parse
@@ -144,7 +130,6 @@ declare namespace AFrame {
 		// schema
 		// stringify
 		// type
-		[ key: string ]: any;
 	}
 
 	interface Coordinate {
@@ -153,8 +138,14 @@ declare namespace AFrame {
 		z: number;
 	}
 
+	interface DefaultComponents {
+		position: Component<Coordinate>;
+		rotation: Component<Coordinate>;
+		scale: Component<Coordinate>;
+	}
+
 	interface Entity<C = ObjectMap<Component>> extends ANode {
-		components: C;
+		components: C & DefaultComponents;
 		isPlaying: boolean;
 		object3D: THREE.Object3D;
 		object3DMap: ObjectMap<THREE.Object3D>;
@@ -165,8 +156,8 @@ declare namespace AFrame {
 		/**
 		 * @deprecated since 0.4.0
 		 */
-		getComputedAttribute<T = Component>(attr: string): T;
-		getDOMAttribute<T = any>(attr: string): T;
+		getComputedAttribute(attr: string): Component;
+		getDOMAttribute(attr: string): any;
 		getObject3D(type: string): THREE.Object3D;
 		getOrCreateObject3D(type: string, construct: any): THREE.Object3D;
 		is(stateName: string): boolean;
@@ -179,7 +170,6 @@ declare namespace AFrame {
 
 		// getAttribute specific usages
 		getAttribute(type: string): any;
-		getAttribute<T = Component>(attr: string): T;
 		getAttribute(type: 'position' | 'rotation' | 'scale'): Coordinate;
 
 		// setAttribute specific usages
@@ -192,12 +182,18 @@ declare namespace AFrame {
 		addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 	}
 
-	type DetailEvent<D> = Event & { detail: D };
+	type DetailEvent<D> = Event & {
+		detail: D;
+		target: EventTarget & Entity;
+	};
 
 	interface EntityEventMap {
 		'child-attached': DetailEvent<{ el: Element | Entity }>;
 		'child-detached': DetailEvent<{ el: Element | Entity }>;
-		'componentchanged': DetailEvent<{ name: string }>;
+		'componentchanged': DetailEvent<{
+			name: string,
+			id: string
+		}>;
 		'componentremoved': DetailEvent<{
 			name: string,
 			id: string,
@@ -215,23 +211,28 @@ declare namespace AFrame {
 	interface Geometry {
 		name: string;
 		geometry: THREE.Geometry;
-		schema: Schema;
-		update(data: object): void;
-		[ key: string ]: any;
+		schema: Schema<any>;
+
+		init(this: this, data: { [P in keyof this['schema']]: any }): void;
+		// Would like the above to be:
+		//  init?(this: this, data?: { [P in keyof T['schema']]: T['schema'][P]['default'] } ): void;
+		//  I think this is prevented by the following issue: https://github.com/Microsoft/TypeScript/issues/21760.
 	}
 
-	interface GeometryDefinition extends ComponentDefinition {
-		geometry?: THREE.Geometry;
+	interface GeometryConstructor<T extends Geometry> {
+		new (): T;
 	}
 
-	interface GeometryDescriptor {
-		Geometry: Geometry;
+	type GeometryDefinition<T extends Geometry = Geometry> = Partial<T>;
+
+	interface GeometryDescriptor<T extends Geometry = Geometry> {
+		Geometry: GeometryConstructor<T>;
 		schema: Schema;
 	}
 
-	interface MultiPropertySchema {
-		[ key: string ]: SinglePropertySchema<any>;
-	}
+	type MultiPropertySchema<T extends { [key: string ]: any }> = {
+		[P in keyof T]: SinglePropertySchema<T[P]> | T[P];
+	};
 
 	interface PrimitiveDefinition {
 		defaultComponents?: any; // TODO cleanup type
@@ -240,8 +241,9 @@ declare namespace AFrame {
 		transforms?: any; // TODO cleanup type
 	}
 
-	type PropertyTypes = 'array' | 'boolean' | 'color' | 'int' | 'number' | 'selector' |
-		'selectorAll' | 'src' | 'string' | 'vec2' | 'vec3' | 'vec4';
+	type PropertyTypes = 'array' | 'asset' | 'audio' | 'boolean' | 'color' |
+		'int' | 'map' | 'model' | 'number' | 'selector' | 'selectorAll' |
+		'string' | 'vec2' | 'vec3' | 'vec4';
 
 	type SceneEvents = 'enter-vr' | 'exit-vr' | 'loaded' | 'renderstart';
 
@@ -265,7 +267,7 @@ declare namespace AFrame {
 		addEventListener(type: SceneEvents, listener: EventListener, useCapture?: boolean): void;
 	}
 
-	type Schema = SinglePropertySchema<any> | MultiPropertySchema;
+	type Schema<T = { [key: string]: any }> = SinglePropertySchema<T> | MultiPropertySchema<T>;
 
 	interface SchemaUtils {
 		isSingleProperty(schema: Schema): boolean;
@@ -274,11 +276,25 @@ declare namespace AFrame {
 
 	interface Shader {
 		name: string;
-		schema: Schema;
+		data: { [key: string]: any };
+		schema: Schema<this['data']>;
+		material: THREE.Material;
+		vertexShader: string;
+		fragmentShader: string;
+
+		init(this: this, data?: this['data']): void;
+		tick?(this: this, time: number, timeDelta: number): void;
+		update(this: this, oldData: this['data']): void;
 	}
 
-	interface ShaderDescriptor {
-		Shader: Shader;
+	interface ShaderConstructor<T extends Shader> {
+		new (): T;
+	}
+
+	type ShaderDefinition<T extends Shader = Shader> = Partial<T>;
+
+	interface ShaderDescriptor<T extends Shader = Shader> {
+		Shader: ShaderConstructor<T>;
 		schema: Schema;
 	}
 
@@ -287,27 +303,23 @@ declare namespace AFrame {
 		'default'?: T;
 		parse?(value: string): T;
 		stringify?(value: T): string;
-		[ key: string ]: any;
 	}
 
 	interface System {
-		data: any;
-		schema: Schema;
-		init(): void;
-		pause(): void;
-		play(): void;
-		tick?(): void;
+		data: { [key: string]: any };
+		schema: Schema<this['data']>;
+		init(this: this): void;
+		pause(this: this): void;
+		play(this: this): void;
+		tick?(this: this, t: number, dt: number): void;
 	}
 
-	interface SystemDefinition {
-		schema?: Schema;
-		init?(): void;
-		pause?(): void;
-		play?(): void;
-		tick?(): void;
-		[ key: string ]: any;
+	interface SystemConstructor<T extends System = System> {
+		new (scene: Scene): T;
 	}
 
+	type SystemDefinition<T extends System = System> = Partial<T>;
+
 	interface Utils {
 		coordinates: {
 			isCoordinate(value: string): boolean;
@@ -326,5 +338,8 @@ declare namespace AFrame {
 		diff(a: object, b: object): object;
 		extend(target: object, ... source: object[]): object;
 		extendDeep(target: object, ... source: object[]): object;
+
+		throttle(tickFunction: () => void, minimumInterval: number, optionalContext?: {}): (t: number, dt: number) => void;
+		throttleTick(tickFunction: (t: number, dt: number) => void, minimumInterval: number, optionalContext?: {}): (t: number, dt: number) => void;
 	}
 }
diff --git a/types/aframe/tslint.json b/types/aframe/tslint.json
index 71ee04c4e1..495d29983d 100644
--- a/types/aframe/tslint.json
+++ b/types/aframe/tslint.json
@@ -1,6 +1,5 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-unnecessary-generics": false
     }
 }

From a62e6431c78b51ea9d8876e2426dc6c063b4daae Mon Sep 17 00:00:00 2001
From: Michael Wei <mwei@cs.ucsd.edu>
Date: Tue, 8 May 2018 10:13:11 -0700
Subject: [PATCH 0107/1124] tough-cookie: add store parameter to
 deserializeSync interface (#25588)

* add store parameter to deserializeSync interface

* add test

* add test, v2.3.4

* remove patch level version
---
 types/tough-cookie/index.d.ts            | 3 ++-
 types/tough-cookie/tough-cookie-tests.ts | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/types/tough-cookie/index.d.ts b/types/tough-cookie/index.d.ts
index ee431874dc..d4e9a58548 100644
--- a/types/tough-cookie/index.d.ts
+++ b/types/tough-cookie/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/salesforce/tough-cookie
 // Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
 //                 LiJinyao <https://github.com/LiJinyao>
+//                 Michael Wei <https://github.com/no2chem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -151,7 +152,7 @@ export class CookieJar {
     static deserialize(serialized: CookieJar.Serialized | string, store: Store, cb: (err: Error | null, object: CookieJar) => void): void;
     static deserialize(serialized: CookieJar.Serialized | string, cb: (err: Error | null, object: CookieJar) => void): void;
 
-    static deserializeSync(serialized: CookieJar.Serialized | string): CookieJar;
+    static deserializeSync(serialized: CookieJar.Serialized | string, store?: Store): CookieJar;
 
     static fromJSON(string: string): CookieJar;
 
diff --git a/types/tough-cookie/tough-cookie-tests.ts b/types/tough-cookie/tough-cookie-tests.ts
index 8798e0d840..0ce120a144 100644
--- a/types/tough-cookie/tough-cookie-tests.ts
+++ b/types/tough-cookie/tough-cookie-tests.ts
@@ -1,4 +1,4 @@
-import { Cookie, CookieJar } from 'tough-cookie';
+import { Cookie, CookieJar, MemoryCookieStore } from 'tough-cookie';
 
 let header = '';
 const cb = () => { };
@@ -13,3 +13,6 @@ cookiejar.setCookie(cookie, 'http://currentdomain.example.com/path', cb);
 cookiejar.getCookies('http://example.com/otherpath', (err, cookies) => {
     // res.headers['cookie'] = cookies.join('; ');
 });
+
+CookieJar.deserializeSync("test cookie with store", new MemoryCookieStore());
+CookieJar.deserializeSync("test cookie");

From a62969017adaa952eab5d2d720afeeebbd326dfc Mon Sep 17 00:00:00 2001
From: Thomas Sawkins <sawkins.tom@gmail.com>
Date: Wed, 9 May 2018 03:14:13 +1000
Subject: [PATCH 0108/1124] add missing initalRouteKey property on
 NavigationStackRouterConfig (#25590)

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index d5f9801b5d..1233ca39e3 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -20,7 +20,7 @@
 // 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
@@ -313,6 +313,7 @@ export interface NavigationStackRouterConfig {
   initialRouteParams?: NavigationParams;
   paths?: NavigationPathsConfig;
   navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
+  initialRouteKey?: string;
 }
 
 export type NavigationStackAction =
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 6b8b5c99e8..b00b0a27fc 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -50,6 +50,7 @@ const viewStyle: ViewStyle = {
 };
 
 const ROUTE_NAME_START_SCREEN = "StartScreen";
+const ROUTE_KEY_START_SCREEN = "StartScreen-key";
 
 interface StartScreenNavigationParams {
     id: number;
@@ -131,6 +132,7 @@ export const AppNavigator = StackNavigator(
     routeConfigMap,
     {
         initialRouteName: ROUTE_NAME_START_SCREEN,
+        initialRouteKey: ROUTE_KEY_START_SCREEN,
         initialRouteParams,
         navigationOptions,
     },

From 31f0a918297dbec6ad011cbf1c8b8b3433daa412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onat=20Yi=C4=9Fit=20Mercan?= <onatmercan@gmail.com>
Date: Tue, 8 May 2018 18:22:01 +0100
Subject: [PATCH 0109/1124] add padding settings for intercom-web (#25595)

---
 types/intercom-web/index.d.ts            |  3 +++
 types/intercom-web/intercom-web-tests.ts | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/types/intercom-web/index.d.ts b/types/intercom-web/index.d.ts
index a0b4e71015..563d241c31 100755
--- a/types/intercom-web/index.d.ts
+++ b/types/intercom-web/index.d.ts
@@ -4,6 +4,7 @@
 //            customize-the-intercom-messenger/the-intercom-javascript-api
 // Definitions by: Andrew Fong <https://github.com/fongandrew>
 //                 Samer Albahra <https://github.com/salbahra>
+//                 Onat Yigit Mercan <https://github.com/onatm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Intercom_ {
@@ -27,6 +28,8 @@ declare namespace Intercom_ {
       monthly_spend?: number,
       [index: string]: any;
     };
+    vertical_padding?: number;
+    horizontal_padding?: number;
   }
 
   type IntercomCommand = 'boot'
diff --git a/types/intercom-web/intercom-web-tests.ts b/types/intercom-web/intercom-web-tests.ts
index 22eeddc8fa..b07013322d 100755
--- a/types/intercom-web/intercom-web-tests.ts
+++ b/types/intercom-web/intercom-web-tests.ts
@@ -60,3 +60,15 @@ intercomSettings = {
   user_id: "12345",
   user_hash: "775c502lcc1087d12398571837c"
 };
+
+/*
+  From https://docs.intercom.com/configure-intercom-for-your-product-or-site/
+         customize-the-intercom-messenger/
+         customize-the-intercom-messenger-technical
+*/
+intercomSettings = {
+  app_id: "pi3243fa",
+  alignment: "left",
+  horizontal_padding: 20,
+  vertical_padding: 20
+};

From 5a46131513ca2766699779eeb2a80a82049a4c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Szabo?= <tomas.szabo@deftomat.com>
Date: Tue, 8 May 2018 19:22:35 +0200
Subject: [PATCH 0110/1124] [Ramda] Improved memoize definition (#25596)

* Ramda: improved memoize definition

* Ramda: improved memoize definition (fixed test)
---
 types/ramda/index.d.ts     | 4 +++-
 types/ramda/ramda-tests.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 5a3b58cd5b..8ef80d60e1 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1021,11 +1021,13 @@ declare namespace R {
         median(list: ReadonlyArray<number>): number;
 
         /**
+         * @deprecated since v0.25.0
+         *
          * Creates a new function that, when invoked, caches the result of calling fn for a given argument set and
          * returns the result. Subsequent calls to the memoized fn with the same argument set will not result in an
          * additional call to fn; instead, the cached result for that set of arguments will be returned.
          */
-        memoize<T = any>(fn: (...a: any[]) => T): (...a: any[]) => T;
+        memoize<T extends (...args: any[]) => any>(fn: T): T;
 
         /**
          * A customisable version of R.memoize. memoizeWith takes an additional function that will be applied to a given
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 81eb438535..0133f82e95 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -305,7 +305,7 @@ R.times(i, 5);
     function stringLength(str: string): number {
       return str.length;
     }
-    const memoStringLength = R.memoize<number>(stringLength);
+    const memoStringLength = R.memoize(stringLength);
     const isLong = memoStringLength('short') > 10; // false
 })();
 

From ba59e57720225142c838be0a390d75ac18dd62d3 Mon Sep 17 00:00:00 2001
From: James Bromwell <943160+thw0rted@users.noreply.github.com>
Date: Tue, 8 May 2018 19:23:49 +0200
Subject: [PATCH 0111/1124] node, ws: address() method on Server and related
 classes can return a string (#25597)

* node: ClearTextStream hasn't existed for 3 years

* node: move AddressInfo to net module; address() can return string

* ws: Server.address() can return string (same as net.Server.address etc)

* Fix some tests that assumed Server.address returns AddressInfo
Amending commit message to re-trigger Travis build.
---
 types/net-keepalive/net-keepalive-tests.ts    |  4 +-
 types/node/index.d.ts                         | 44 ++++++-------------
 types/node/node-tests.ts                      | 19 ++++----
 types/node/v9/index.d.ts                      | 44 ++++++-------------
 types/node/v9/node-tests.ts                   | 19 ++++----
 types/smtp-server/smtp-server-tests.ts        |  3 +-
 .../swaggerize-express-tests.ts               |  4 +-
 types/ws/index.d.ts                           |  2 +-
 8 files changed, 52 insertions(+), 87 deletions(-)

diff --git a/types/net-keepalive/net-keepalive-tests.ts b/types/net-keepalive/net-keepalive-tests.ts
index 68b71daff4..71b5104e27 100644
--- a/types/net-keepalive/net-keepalive-tests.ts
+++ b/types/net-keepalive/net-keepalive-tests.ts
@@ -9,7 +9,7 @@ const server = Net.createServer((socket) => {
 })
 
 server.listen(1337, '127.0.0.1', () => {
-    const {port, address} = server.address()
+    const {port, address} = server.address() as Net.AddressInfo
     const clientSocket = Net.createConnection({
         port, host: address
     }, () => {
@@ -18,4 +18,4 @@ server.listen(1337, '127.0.0.1', () => {
         NetKeepAlive.setKeepAliveProbes(clientSocket, 1)
         clientSocket.end()
     })
-})
\ No newline at end of file
+})
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 12c9551bec..a25b8afb22 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2666,6 +2666,12 @@ declare module "net" {
 
     type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
 
+    export interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
     export interface SocketConstructorOpts {
         fd?: number;
         allowHalfOpen?: boolean;
@@ -2713,7 +2719,7 @@ declare module "net" {
         setTimeout(timeout: number, callback?: Function): this;
         setNoDelay(noDelay?: boolean): this;
         setKeepAlive(enable?: boolean, initialDelay?: number): this;
-        address(): { port: number; family: string; address: string; };
+        address(): AddressInfo | string;
         unref(): void;
         ref(): void;
 
@@ -2829,7 +2835,7 @@ declare module "net" {
         listen(handle: any, backlog?: number, listeningListener?: Function): this;
         listen(handle: any, listeningListener?: Function): this;
         close(callback?: Function): this;
-        address(): { port: number; family: string; address: string; };
+        address(): AddressInfo | string;
         getConnections(cb: (error: Error | null, count: number) => void): void;
         ref(): this;
         unref(): this;
@@ -2905,22 +2911,17 @@ declare module "net" {
 }
 
 declare module "dgram" {
-    import * as events from "events";
+    import { AddressInfo } from "net";
     import * as dns from "dns";
+    import * as events from "events";
 
-    interface RemoteInfo {
+    export interface RemoteInfo {
         address: string;
         family: string;
         port: number;
     }
 
-    interface AddressInfo {
-        address: string;
-        family: string;
-        port: number;
-    }
-
-    interface BindOptions {
+    export interface BindOptions {
         port: number;
         address?: string;
         exclusive?: boolean;
@@ -2928,7 +2929,7 @@ declare module "dgram" {
 
     type SocketType = "udp4" | "udp6";
 
-    interface SocketOptions {
+    export interface SocketOptions {
         type: SocketType;
         reuseAddr?: boolean;
         recvBufferSize?: number;
@@ -2947,7 +2948,7 @@ declare module "dgram" {
         bind(callback?: () => void): void;
         bind(options: BindOptions, callback?: Function): void;
         close(callback?: () => void): void;
-        address(): AddressInfo;
+        address(): AddressInfo | string;
         setBroadcast(flag: boolean): void;
         setTTL(ttl: number): void;
         setMulticastTTL(ttl: number): void;
@@ -5624,23 +5625,6 @@ declare module "tls" {
         prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
     }
 
-    export interface ClearTextStream extends stream.Duplex {
-        authorized: boolean;
-        authorizationError: Error;
-        getPeerCertificate(): any;
-        getCipher: {
-            name: string;
-            version: string;
-        };
-        address: {
-            port: number;
-            family: string;
-            address: string;
-        };
-        remoteAddress: string;
-        remotePort: number;
-    }
-
     export interface SecurePair {
         encrypted: any;
         cleartext: any;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index efc00ef201..d6751541b9 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -1551,7 +1551,7 @@ namespace dgram_tests {
         ds.bind(4123, 'localhost', () => { });
         ds.bind(4123, () => { });
         ds.bind(() => { });
-        var ai: dgram.AddressInfo = ds.address();
+        const addr: net.AddressInfo | string = ds.address();
         ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
         });
         ds.send(new Buffer("hello"), 5000, "127.0.0.1");
@@ -1564,7 +1564,7 @@ namespace dgram_tests {
         let _boolean: boolean;
         let _err: Error;
         let _str: string;
-        let _rinfo: dgram.AddressInfo;
+        let _rinfo: net.AddressInfo;
         /**
          * events.EventEmitter
          * 1. close
@@ -1580,7 +1580,7 @@ namespace dgram_tests {
         _socket = _socket.addListener("listening", () => { });
         _socket = _socket.addListener("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _boolean = _socket.emit("close");
@@ -1595,7 +1595,7 @@ namespace dgram_tests {
         _socket = _socket.on("listening", () => { });
         _socket = _socket.on("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _socket = _socket.once("close", () => { });
@@ -1605,7 +1605,7 @@ namespace dgram_tests {
         _socket = _socket.once("listening", () => { });
         _socket = _socket.once("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _socket = _socket.prependListener("close", () => { });
@@ -1615,7 +1615,7 @@ namespace dgram_tests {
         _socket = _socket.prependListener("listening", () => { });
         _socket = _socket.prependListener("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _socket = _socket.prependOnceListener("close", () => { });
@@ -1625,7 +1625,7 @@ namespace dgram_tests {
         _socket = _socket.prependOnceListener("listening", () => { });
         _socket = _socket.prependOnceListener("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
     }
 
@@ -2730,10 +2730,7 @@ namespace net_tests {
         server = server.close((...args: any[]) => { });
 
         // test the types of the address object fields
-        let address = server.address();
-        address.port = 1234;
-        address.family = "ipv4";
-        address.address = "127.0.0.1";
+        let address: net.AddressInfo | string = server.address();
     }
 
     {
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index ef189f57c3..5063a1ee81 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -2657,6 +2657,12 @@ declare module "net" {
 
     type LookupFunction = (hostname: string, options: dns.LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void) => void;
 
+    export interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
     export interface SocketConstructorOpts {
         fd?: number;
         allowHalfOpen?: boolean;
@@ -2704,7 +2710,7 @@ declare module "net" {
         setTimeout(timeout: number, callback?: Function): this;
         setNoDelay(noDelay?: boolean): this;
         setKeepAlive(enable?: boolean, initialDelay?: number): this;
-        address(): { port: number; family: string; address: string; };
+        address(): AddressInfo | string;
         unref(): void;
         ref(): void;
 
@@ -2820,7 +2826,7 @@ declare module "net" {
         listen(handle: any, backlog?: number, listeningListener?: Function): this;
         listen(handle: any, listeningListener?: Function): this;
         close(callback?: Function): this;
-        address(): { port: number; family: string; address: string; };
+        address(): AddressInfo | string;
         getConnections(cb: (error: Error | null, count: number) => void): void;
         ref(): this;
         unref(): this;
@@ -2896,22 +2902,17 @@ declare module "net" {
 }
 
 declare module "dgram" {
-    import * as events from "events";
+    import { AddressInfo } from "net";
     import * as dns from "dns";
+    import * as events from "events";
 
-    interface RemoteInfo {
+    export interface RemoteInfo {
         address: string;
         family: string;
         port: number;
     }
 
-    interface AddressInfo {
-        address: string;
-        family: string;
-        port: number;
-    }
-
-    interface BindOptions {
+    export interface BindOptions {
         port: number;
         address?: string;
         exclusive?: boolean;
@@ -2919,7 +2920,7 @@ declare module "dgram" {
 
     type SocketType = "udp4" | "udp6";
 
-    interface SocketOptions {
+    export interface SocketOptions {
         type: SocketType;
         reuseAddr?: boolean;
         recvBufferSize?: number;
@@ -2938,7 +2939,7 @@ declare module "dgram" {
         bind(callback?: () => void): void;
         bind(options: BindOptions, callback?: Function): void;
         close(callback?: () => void): void;
-        address(): AddressInfo;
+        address(): AddressInfo | string;
         setBroadcast(flag: boolean): void;
         setTTL(ttl: number): void;
         setMulticastTTL(ttl: number): void;
@@ -5139,23 +5140,6 @@ declare module "tls" {
         prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
     }
 
-    export interface ClearTextStream extends stream.Duplex {
-        authorized: boolean;
-        authorizationError: Error;
-        getPeerCertificate(): any;
-        getCipher: {
-            name: string;
-            version: string;
-        };
-        address: {
-            port: number;
-            family: string;
-            address: string;
-        };
-        remoteAddress: string;
-        remotePort: number;
-    }
-
     export interface SecurePair {
         encrypted: any;
         cleartext: any;
diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts
index efc00ef201..d6751541b9 100644
--- a/types/node/v9/node-tests.ts
+++ b/types/node/v9/node-tests.ts
@@ -1551,7 +1551,7 @@ namespace dgram_tests {
         ds.bind(4123, 'localhost', () => { });
         ds.bind(4123, () => { });
         ds.bind(() => { });
-        var ai: dgram.AddressInfo = ds.address();
+        const addr: net.AddressInfo | string = ds.address();
         ds.send(new Buffer("hello"), 0, 5, 5000, "127.0.0.1", (error: Error, bytes: number): void => {
         });
         ds.send(new Buffer("hello"), 5000, "127.0.0.1");
@@ -1564,7 +1564,7 @@ namespace dgram_tests {
         let _boolean: boolean;
         let _err: Error;
         let _str: string;
-        let _rinfo: dgram.AddressInfo;
+        let _rinfo: net.AddressInfo;
         /**
          * events.EventEmitter
          * 1. close
@@ -1580,7 +1580,7 @@ namespace dgram_tests {
         _socket = _socket.addListener("listening", () => { });
         _socket = _socket.addListener("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _boolean = _socket.emit("close");
@@ -1595,7 +1595,7 @@ namespace dgram_tests {
         _socket = _socket.on("listening", () => { });
         _socket = _socket.on("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _socket = _socket.once("close", () => { });
@@ -1605,7 +1605,7 @@ namespace dgram_tests {
         _socket = _socket.once("listening", () => { });
         _socket = _socket.once("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _socket = _socket.prependListener("close", () => { });
@@ -1615,7 +1615,7 @@ namespace dgram_tests {
         _socket = _socket.prependListener("listening", () => { });
         _socket = _socket.prependListener("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
 
         _socket = _socket.prependOnceListener("close", () => { });
@@ -1625,7 +1625,7 @@ namespace dgram_tests {
         _socket = _socket.prependOnceListener("listening", () => { });
         _socket = _socket.prependOnceListener("message", (msg, rinfo) => {
             let _msg: Buffer = msg;
-            let _rinfo: dgram.AddressInfo = rinfo;
+            let _rinfo: net.AddressInfo = rinfo;
         });
     }
 
@@ -2730,10 +2730,7 @@ namespace net_tests {
         server = server.close((...args: any[]) => { });
 
         // test the types of the address object fields
-        let address = server.address();
-        address.port = 1234;
-        address.family = "ipv4";
-        address.address = "127.0.0.1";
+        let address: net.AddressInfo | string = server.address();
     }
 
     {
diff --git a/types/smtp-server/smtp-server-tests.ts b/types/smtp-server/smtp-server-tests.ts
index 5be0634ebb..839d4ee3bc 100644
--- a/types/smtp-server/smtp-server-tests.ts
+++ b/types/smtp-server/smtp-server-tests.ts
@@ -1,3 +1,4 @@
+import { AddressInfo } from 'net';
 import { SMTPServer, SMTPServerAddress, SMTPServerAuthentication, SMTPServerAuthenticationResponse, SMTPServerOptions, SMTPServerSession } from 'smtp-server';
 import { Readable } from 'stream';
 
@@ -71,6 +72,6 @@ server.on('close', () => {
 });
 
 server.listen(port, () => {
-    const address = server.server.address();
+    const address = server.server.address() as AddressInfo;
     console.log(`Listening on [${address.address}]:${address.port}`);
 });
diff --git a/types/swaggerize-express/swaggerize-express-tests.ts b/types/swaggerize-express/swaggerize-express-tests.ts
index 9dd0e1e718..46ada50a77 100644
--- a/types/swaggerize-express/swaggerize-express-tests.ts
+++ b/types/swaggerize-express/swaggerize-express-tests.ts
@@ -1,6 +1,7 @@
 import http = require('http');
 import express = require('express');
 import swaggerize = require('swaggerize-express');
+import { AddressInfo } from 'net';
 
 const api = {
     swagger: "2.0",
@@ -50,5 +51,6 @@ app.use(swaggerize(<swaggerize.Options>{
 }));
 
 var server = app.listen(18888, 'localhost', function () {
-    (<swaggerize.SwaggerizedExpress>app).swagger.api.host = server.address().address + ':' + server.address().port;
+    const addr = server.address() as AddressInfo;
+    (<swaggerize.SwaggerizedExpress>app).swagger.api.host = addr.address + ':' + addr.port;
 });
diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index f9bda66eba..9bdf092f38 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -176,7 +176,7 @@ declare namespace WebSocket {
 
         constructor(options?: ServerOptions, callback?: () => void);
 
-        address(): { port: number; family: string; address: string; };
+        address(): net.AddressInfo | string;
         close(cb?: (err?: Error) => void): void;
         handleUpgrade(request: http.IncomingMessage, socket: net.Socket,
             upgradeHead: Buffer, callback: (client: WebSocket) => void): void;

From 96e3ca235598a06104f2e33484f19a480d3b9b4d Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Tue, 8 May 2018 22:56:43 +0530
Subject: [PATCH 0112/1124] Add gulp-svgmin types (#25599)

---
 types/gulp-svgmin/gulp-svgmin-tests.ts | 51 ++++++++++++++++++++++++++
 types/gulp-svgmin/index.d.ts           | 17 +++++++++
 types/gulp-svgmin/tsconfig.json        | 23 ++++++++++++
 types/gulp-svgmin/tslint.json          |  1 +
 4 files changed, 92 insertions(+)
 create mode 100644 types/gulp-svgmin/gulp-svgmin-tests.ts
 create mode 100644 types/gulp-svgmin/index.d.ts
 create mode 100644 types/gulp-svgmin/tsconfig.json
 create mode 100644 types/gulp-svgmin/tslint.json

diff --git a/types/gulp-svgmin/gulp-svgmin-tests.ts b/types/gulp-svgmin/gulp-svgmin-tests.ts
new file mode 100644
index 0000000000..2d3d6e7e44
--- /dev/null
+++ b/types/gulp-svgmin/gulp-svgmin-tests.ts
@@ -0,0 +1,51 @@
+import svgmin = require("gulp-svgmin");
+import { basename, extname } from "path";
+
+// From tests
+
+svgmin({ plugins: [] });
+svgmin({ plugins: [{ removeDoctype: false }] });
+svgmin({ plugins: [{ removeDoctype: false }, { removeComments: false }] });
+
+// From examples given in README
+
+// $ExpectType Transform
+svgmin();
+
+// $ExpectType Transform
+svgmin({
+    plugins: [{
+        removeDoctype: false
+    }, {
+        removeComments: false
+    }, {
+        cleanupNumericValues: {
+            floatPrecision: 2
+        }
+    }, {
+        convertColors: {
+            names2hex: false,
+            rgb2hex: false
+        }
+    }]
+});
+
+// $ExpectType Transform
+svgmin({
+    js2svg: {
+        pretty: true
+    }
+});
+
+// $ExpectType Transform
+svgmin(function getOptions(file) {
+    const prefix = basename(file.relative, extname(file.relative));
+    return {
+        plugins: [{
+            cleanupIDs: {
+                prefix: prefix + '-',
+                minify: true
+            }
+        }]
+    };
+});
diff --git a/types/gulp-svgmin/index.d.ts b/types/gulp-svgmin/index.d.ts
new file mode 100644
index 0000000000..08c84bc930
--- /dev/null
+++ b/types/gulp-svgmin/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for gulp-svgmin 1.2
+// Project: https://github.com/ben-eb/gulp-svgmin
+// Definitions by: Aankhen <https://github.com/Aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+// (required because svgo specifies 2.2)
+
+/// <reference types="node"/>
+
+import SVGO = require("svgo");
+import { Transform } from "stream";
+import * as File from "vinyl";
+
+export = GulpSvgmin;
+
+declare function GulpSvgmin(cb: (file: File) => SVGO.Options): Transform;
+declare function GulpSvgmin(options?: SVGO.Options): Transform;
diff --git a/types/gulp-svgmin/tsconfig.json b/types/gulp-svgmin/tsconfig.json
new file mode 100644
index 0000000000..1d94db7181
--- /dev/null
+++ b/types/gulp-svgmin/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",
+        "gulp-svgmin-tests.ts"
+    ]
+}
diff --git a/types/gulp-svgmin/tslint.json b/types/gulp-svgmin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-svgmin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a58126129bcd2f2d98aa0553857c5f561a6774fd Mon Sep 17 00:00:00 2001
From: Harm van der Werf <harmvdwerf@gmail.com>
Date: Tue, 8 May 2018 19:29:33 +0200
Subject: [PATCH 0113/1124] Added missing iteration assertions (#25606)

---
 types/chai-spies/chai-spies-tests.ts | 21 +++++++++
 types/chai-spies/index.d.ts          | 67 ++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/types/chai-spies/chai-spies-tests.ts b/types/chai-spies/chai-spies-tests.ts
index 1d99f0add2..f5247ba13f 100644
--- a/types/chai-spies/chai-spies-tests.ts
+++ b/types/chai-spies/chai-spies-tests.ts
@@ -88,6 +88,27 @@ spyStringArg('foo');
 expect(spyStringArg).to.have.been.called.always.with.exactly('foo');
 spyStringArg.should.have.been.called.always.with.exactly('foo');
 
+// .first / .second / .third
+const spyStringIteratedArg = chai.spy((arg: string) => arg);
+spyStringIteratedArg('foo');
+spyStringIteratedArg('bar');
+spyStringIteratedArg('baz');
+expect(spyStringIteratedArg).to.have.been.first.called.with('foo');
+spyStringIteratedArg.should.have.been.first.called.with('foo');
+expect(spyStringIteratedArg).to.have.been.first.called.with('bar');
+spyStringIteratedArg.should.have.been.first.called.with('bar');
+expect(spyStringIteratedArg).to.have.been.first.called.with('baz');
+spyStringIteratedArg.should.have.been.first.called.with('baz');
+
+// .nth
+const spyStringNthArg = chai.spy((arg: string) => arg);
+spyStringNthArg('foo');
+spyStringNthArg('bar');
+expect(spyStringNthArg).on.nth(1).be.called.with('foo');
+spyStringNthArg.should.on.nth(1).be.called.with('foo');
+expect(spyStringNthArg).on.nth(2).be.called.with('bar');
+spyStringNthArg.should.on.nth(2).be.called.with('bar');
+
 // .once
 expect(spy).to.have.been.called.once;
 expect(spy).to.not.have.been.called.once;
diff --git a/types/chai-spies/index.d.ts b/types/chai-spies/index.d.ts
index ffed6e594b..75f702ca37 100644
--- a/types/chai-spies/index.d.ts
+++ b/types/chai-spies/index.d.ts
@@ -10,6 +10,10 @@ declare namespace Chai {
         spy: ChaiSpies.Spy;
     }
 
+    interface LanguageChains {
+        on: Assertion;
+    }
+
     interface Assertion {
         /**
          * ####.spy
@@ -31,6 +35,28 @@ declare namespace Chai {
          * Note that ```called``` can be used as a chainable method.  
          */
         called: ChaiSpies.Called;
+
+        /**
+         *  * ####.been
+         * * Assert that something has been spied on. Negation passes through.
+         * * ```ts
+         * * expect(spy).to.have.been.called();
+         * * spy.should.have.been.called();
+         * ```
+         * Note that ```been``` can be used as a chainable method.
+         */
+        been: ChaiSpies.Been;
+
+        /**
+         *  * ####.nth (function)
+         * * Assert that something has been spied on on a certain index. Negation passes through.
+         * * ```ts
+         * * expect(spy).on.nth(5).be.called.with('foobar');
+         * * spy.should.on.nth(5).be.called.with('foobar');
+         * ```
+         * Note that ```nth``` can be used as a chainable method.
+         */
+        nth(index: number): Assertion;
     }
 }
 
@@ -224,6 +250,47 @@ declare namespace ChaiSpies {
         lt(n: number): Chai.Assertion;
     }
 
+    interface Been extends Chai.Assertion {
+        (): Chai.Assertion;
+        called: Called;
+
+        /**
+         * ####.first
+         * Assert that a spy has been called first.
+         * ```ts
+         * expect(spy).to.have.been.called.first;
+         * expect(spy).to.not.have.been.called.first;
+         * spy.should.have.been.called.first;
+         * spy.should.not.have.been.called.first;
+         * ```
+         */
+        first: Chai.Assertion;
+
+        /**
+         * ####.second
+         * Assert that a spy has been called second.
+         * ```ts
+         * expect(spy).to.have.been.called.second;
+         * expect(spy).to.not.have.been.called.second;
+         * spy.should.have.been.called.second;
+         * spy.should.not.have.been.called.second;
+         * ```
+         */
+        second: Chai.Assertion;
+
+        /**
+         * ####.third
+         * Assert that a spy has been called third.
+         * ```ts
+         * expect(spy).to.have.been.called.third;
+         * expect(spy).to.not.have.been.called.third;
+         * spy.should.have.been.called.third;
+         * spy.should.not.have.been.called.third;
+         * ```
+         */
+        third: Chai.Assertion;
+    }
+
     interface With {
         /**
          * ####.with

From 50c7c42a3a78dae9a1f18c057cac687bbb4b74c4 Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Tue, 8 May 2018 19:30:40 +0200
Subject: [PATCH 0114/1124] [ArangoDB] Update geo index type (#25607)

* Update geo index type

* Add test
---
 types/arangodb/arangodb-tests.ts | 6 +++++-
 types/arangodb/index.d.ts        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/types/arangodb/arangodb-tests.ts b/types/arangodb/arangodb-tests.ts
index da5e1e40c2..7e0fd6383e 100644
--- a/types/arangodb/arangodb-tests.ts
+++ b/types/arangodb/arangodb-tests.ts
@@ -1,4 +1,4 @@
-import { db, aql, query } from "@arangodb";
+import { aql, db, query } from "@arangodb";
 import { md5 } from "@arangodb/crypto";
 import { createRouter } from "@arangodb/foxx";
 import sessionsMiddleware = require("@arangodb/foxx/sessions");
@@ -52,6 +52,10 @@ bananas.updateByExample(
     { shape: { type: "round" } },
     { mergeObjects: true }
 );
+bananas.ensureIndex({
+    type: "geo",
+    fields: ["latLng"]
+});
 
 const router = createRouter();
 module.context.use(router);
diff --git a/types/arangodb/index.d.ts b/types/arangodb/index.d.ts
index deed6a97c5..5c3f56020f 100644
--- a/types/arangodb/index.d.ts
+++ b/types/arangodb/index.d.ts
@@ -89,7 +89,7 @@ declare namespace ArangoDB {
         | "network authentication required";
     type EdgeDirection = "any" | "inbound" | "outbound";
     type EngineType = "mmfiles" | "rocksdb";
-    type IndexType = "hash" | "skiplist" | "fulltext" | "geo1" | "geo2";
+    type IndexType = "hash" | "skiplist" | "fulltext" | "geo";
     type ViewType = "arangosearch";
     type KeyGeneratorType = "traditional" | "autoincrement";
     type ErrorName =

From fdd601312f9b022994fd67b913a1aa6537978f33 Mon Sep 17 00:00:00 2001
From: veggiesaurus <accomrie@gmail.com>
Date: Tue, 8 May 2018 19:30:57 +0200
Subject: [PATCH 0115/1124] added typed array to scatter data (#25608)

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

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 6b405d3e53..ac35dc064b 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -347,6 +347,7 @@ export interface ModeBarButton {
 // Data
 
 export type Datum = string | number | Date;
+export type TypedArray = Int8Array | Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array;
 
 export type Dash = 'solid' | 'dot' | 'dash' | 'longdash' | 'dashdot' | 'longdashdot';
 
@@ -356,9 +357,9 @@ export type Color = string | Array<string | undefined | null> | Array<Array<stri
 // Bar Scatter
 export interface ScatterData {
 	type: 'bar' | 'pointcloud' | 'scatter' | 'scattergl' | 'scatter3d';
-	x: Datum[] | Datum[][];
-	y: Datum[] | Datum[][];
-	z: Datum[] | Datum[][] | Datum[][][];
+	x: Datum[] | Datum[][] | TypedArray;
+	y: Datum[] | Datum[][] | TypedArray;
+	z: Datum[] | Datum[][] | Datum[][][] | TypedArray;
 	xy: Float32Array;
 	xaxis: string;
 	yaxis: string;

From 8a9ef8623acf1bc1c0c5f05648fb025eba61f7ac Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Tue, 8 May 2018 18:32:13 +0100
Subject: [PATCH 0116/1124] Node: remove myself as author (#25610)

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index a25b8afb22..18a9bacccd 100644
--- a/types/node/index.d.ts
+++ b/types/node/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 ccee94967ac831f6c3481d963f4c575fa47038fb Mon Sep 17 00:00:00 2001
From: Niklas Mollenhauer <nikeee@users.noreply.github.com>
Date: Tue, 8 May 2018 19:32:49 +0200
Subject: [PATCH 0117/1124] Remove typings of ids package (#25611)

---
 notNeededPackages.json  |  6 ++++
 types/ids/ids-tests.ts  |  9 -----
 types/ids/index.d.ts    | 53 ---------------------------
 types/ids/tsconfig.json | 23 ------------
 types/ids/tslint.json   | 79 -----------------------------------------
 5 files changed, 6 insertions(+), 164 deletions(-)
 delete mode 100644 types/ids/ids-tests.ts
 delete mode 100644 types/ids/index.d.ts
 delete mode 100644 types/ids/tsconfig.json
 delete mode 100644 types/ids/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 6f3e4fe093..dd5523d102 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -660,6 +660,12 @@
             "sourceRepoURL": "https://github.com/ashtuchkin/iconv-lite",
             "asOfVersion": "0.4.14"
         },
+        {
+            "libraryName": "ids",
+            "typingsPackageName": "ids",
+            "sourceRepoURL": "https://github.com/bpmn-io/ids",
+            "asOfVersion": "0.2.2"
+        },
         {
             "libraryName": "immutability-helper",
             "typingsPackageName": "immutability-helper",
diff --git a/types/ids/ids-tests.ts b/types/ids/ids-tests.ts
deleted file mode 100644
index 16ba06e34f..0000000000
--- a/types/ids/ids-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import Ids = require('ids');
-
-const ids = new Ids();
-
-const next = ids.next(); // returns id
-
-ids.claim('f71a81'); // claim id as already existing
-
-ids.assigned('f71a81'); // true if id was already generated / claimed
diff --git a/types/ids/index.d.ts b/types/ids/index.d.ts
deleted file mode 100644
index f744f77a5c..0000000000
--- a/types/ids/index.d.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-// Type definitions for ids 0.2.0
-// Project: https://github.com/bpmn-io/ids
-// Definitions by: Jan Steinbruecker <https://github.com/3fd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = Ids;
-
-declare class Ids {
-
-    /**
-     * Create a new id generator / cache instance.
-     * @param {number[]} [seed] a seed that is used internally.
-     */
-    constructor(seed?: number[]);
-
-    /**
-     * Returns true if the given id has already been assigned.
-     * @param {string} id
-     * @return {boolean}
-     */
-    assigned(id: string): boolean;
-
-    /**
-     * Manually claim an existing id.
-     * @param {string} id
-     * @param {*} [element] element the id is claimed by
-     */
-    claim(id: string, element?: any): void;
-
-    /** Clear all claimed ids. */
-    clear(): void;
-
-    /**
-     * Generate a next id.
-     * @param {*} [element] element to bind the id to
-     * @return {string} id
-     */
-    next(element?: any): string;
-
-    /**
-     * Generate a next id with a given prefix.
-     * @param {*} [element] element to bind the id to
-     * @return {string} id
-     */
-    nextPrefixed(prefix: string, element?: any): string;
-
-    /**
-     * Unclaim an id.
-     * @param {string} id - the id to unclaim
-     */
-    unclaim(id: string): void;
-
-}
diff --git a/types/ids/tsconfig.json b/types/ids/tsconfig.json
deleted file mode 100644
index 1c739774db..0000000000
--- a/types/ids/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ids-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ids/tslint.json b/types/ids/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/ids/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}

From 162624a97f201482e3aca2b0e095761f890700e8 Mon Sep 17 00:00:00 2001
From: Nickolay Alexandrov <nick.alexandrov@gmail.com>
Date: Wed, 9 May 2018 00:40:30 +0700
Subject: [PATCH 0118/1124] Changed string to "TableName in Knex and .from()
 (#25615)

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

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 90a700b7dc..ffb5d0a70e 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -23,7 +23,7 @@ type ColumnName = string | Knex.Raw | Knex.QueryBuilder | {[key: string]: string
 type TableName = string | Knex.Raw | Knex.QueryBuilder;
 
 interface Knex extends Knex.QueryInterface {
-    (tableName?: string): Knex.QueryBuilder;
+    (tableName?: TableName): Knex.QueryBuilder;
     VERSION: string;
     __knex__: string;
 
@@ -179,7 +179,7 @@ declare namespace Knex {
     }
 
     interface Table {
-        (tableName: string): QueryBuilder;
+        (tableName: TableName): QueryBuilder;
         (callback: Function): QueryBuilder;
         (raw: Raw): QueryBuilder;
     }

From 44e58864bd91be092a86bf48472cf4d44b9a83d1 Mon Sep 17 00:00:00 2001
From: Ifiok Jr <ifiokotung@gmail.com>
Date: Tue, 8 May 2018 18:56:54 +0100
Subject: [PATCH 0119/1124] react-native-autocomplete-input types added
 (#25617)

---
 .../index.d.ts                                | 84 +++++++++++++++++++
 .../react-native-autocomplete-input-tests.tsx | 35 ++++++++
 .../tsconfig.json                             | 24 ++++++
 .../tslint.json                               |  1 +
 4 files changed, 144 insertions(+)
 create mode 100644 types/react-native-autocomplete-input/index.d.ts
 create mode 100644 types/react-native-autocomplete-input/react-native-autocomplete-input-tests.tsx
 create mode 100644 types/react-native-autocomplete-input/tsconfig.json
 create mode 100644 types/react-native-autocomplete-input/tslint.json

diff --git a/types/react-native-autocomplete-input/index.d.ts b/types/react-native-autocomplete-input/index.d.ts
new file mode 100644
index 0000000000..f6c5f06eb6
--- /dev/null
+++ b/types/react-native-autocomplete-input/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for react-native-autocomplete-input 3.5
+// Project: https://github.com/l-urence/react-native-autocomplete-input#readme
+// Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { Component, ReactNode } from 'react';
+import {
+    GestureResponderHandlers,
+    ListViewProperties,
+    StyleProp,
+    TextInputProperties,
+    ViewStyle,
+} from 'react-native';
+
+export interface AutocompleteProps<T> extends TextInputProperties {
+    /**
+     * style
+     * These styles will be applied to the container which surrounds the autocomplete component.
+     */
+    containerStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * bool
+     * Set to true to hide the suggestion list.
+     */
+    hideResults?: boolean;
+
+    /**
+     * array
+     * An array with suggestion items to be rendered in renderItem(item). Any array with length > 0 will open the suggestion list and any array with length < 1 will hide the list.
+     */
+    data: T[];
+
+    /**
+     * style
+     * These styles will be applied to the container which surrounds the textInput component.
+     */
+    inputContainerStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * style
+     * These styles will be applied to the container which surrounds the result list.
+     */
+    listContainerStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * style
+     * These style will be applied to the result list.
+     */
+    listStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * function
+     * onShowResult will be called when the autocomplete suggestions appear or disappear.
+     */
+    onShowResult?(showResults: boolean): void;
+
+    /**
+     * function
+     * onStartShouldSetResponderCapture will be passed to the result list view container (onStartShouldSetResponderCapture).
+     */
+    onStartShouldSetResponderCapture?: GestureResponderHandlers['onStartShouldSetResponderCapture'];
+
+    /**
+     * function
+     * renderItem will be called to render the data objects which will be displayed in the result view below the text input.
+     */
+    renderItem(item: T): ReactNode;
+
+    /**
+     * function
+     * renderSeparator will be called to render the list separators which will be displayed between the list elements in the result view below the text input.
+     */
+    renderSeparator?: ListViewProperties['renderSeparator'];
+
+    /**
+     * function
+     * render custom TextInput. All props passed to this function.
+     */
+    renderTextInput?(props: TextInputProperties): ReactNode;
+}
+
+export default class Autocomplete<T> extends Component<AutocompleteProps<T>> {}
diff --git a/types/react-native-autocomplete-input/react-native-autocomplete-input-tests.tsx b/types/react-native-autocomplete-input/react-native-autocomplete-input-tests.tsx
new file mode 100644
index 0000000000..b9ddaa3ae2
--- /dev/null
+++ b/types/react-native-autocomplete-input/react-native-autocomplete-input-tests.tsx
@@ -0,0 +1,35 @@
+import Autocomplete from 'react-native-autocomplete-input';
+import * as React from 'react';
+import {
+  StyleSheet,
+  Text,
+  TouchableOpacity,
+  View
+} from 'react-native';
+
+interface Item { query: string; value: string; }
+
+class AutocompleteExample extends React.Component<{}, {query: string}> {
+    state = {
+        query: ''
+    };
+
+    filterData(query: string): Item[] {
+        return [{query: '', value: 'here i am'}];
+    }
+
+    render() {
+        const { query } = this.state;
+        const data = this.filterData(query);
+        return (<Autocomplete
+            data={data}
+            defaultValue={query}
+            onChangeText={text => this.setState({ query: text })}
+            renderItem={(item: Item) => (
+                <TouchableOpacity onPress={() => this.setState({ query: item.query })}>
+                    <Text>{item.value}</Text>
+                </TouchableOpacity>
+            )}
+        />);
+    }
+}
diff --git a/types/react-native-autocomplete-input/tsconfig.json b/types/react-native-autocomplete-input/tsconfig.json
new file mode 100644
index 0000000000..a96ec56028
--- /dev/null
+++ b/types/react-native-autocomplete-input/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "jsx": "react",
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-autocomplete-input-tests.tsx"
+    ]
+}
diff --git a/types/react-native-autocomplete-input/tslint.json b/types/react-native-autocomplete-input/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-autocomplete-input/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From bc47bffd04576bb3cdd1d090c221dd2035c83816 Mon Sep 17 00:00:00 2001
From: Roman Jurkov <winfinit@gmail.com>
Date: Tue, 8 May 2018 13:59:19 -0400
Subject: [PATCH 0120/1124] added missing formatOutOfCountryCallingNumber
 function to definitions of google-libphonenumber (#25513)

* updated google-libphonenumber utils function with formatOutOfCountryCallingNumber that was missing

* updated spaces
---
 types/google-libphonenumber/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/google-libphonenumber/index.d.ts b/types/google-libphonenumber/index.d.ts
index 9a46ac69a6..dd73c56790 100644
--- a/types/google-libphonenumber/index.d.ts
+++ b/types/google-libphonenumber/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for libphonenumber v7.4.3
 // Project: https://github.com/googlei18n/libphonenumber, https://github.com/seegno/google-libphonenumber
 // Definitions by: Leon Yu <https://github.com/leonyu>
+//		   Roman Jurkov <https://github.com/winfinit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace libphonenumber {
@@ -112,6 +113,7 @@ declare namespace libphonenumber {
     export class PhoneNumberUtil {
         static getInstance(): PhoneNumberUtil
         format(phoneNumber: PhoneNumber, format: PhoneNumberFormat): string;
+        formatOutOfCountryCallingNumber(phoneNumber: PhoneNumber, regionDialingFrom?: string): string;
         getNddPrefixForRegion(regionCode?: string, stripNonDigits?: boolean): string | undefined;
         getNumberType(phoneNumber: PhoneNumber): PhoneNumberType;
         getCountryCodeForRegion(supportedRegion:string):string;

From ad87ac4fdaaffd8e08c06e7ab3db9bafc2994a45 Mon Sep 17 00:00:00 2001
From: Ian Luca <ian.naph@gmail.com>
Date: Tue, 8 May 2018 16:05:54 -0300
Subject: [PATCH 0121/1124] [puppeteer] adding missing waitForXPath method
 (#25609)

* adding missing waitForXPath method

* remove trailing whitespce

* add waitForXPath method usage
---
 types/puppeteer/index.d.ts         | 5 +++++
 types/puppeteer/puppeteer-tests.ts | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 54ef9b722a..510ae37107 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -900,6 +900,11 @@ export interface FrameBase {
     selector: string,
     options?: { visible?: boolean; hidden?: boolean; timeout?: number }
   ): Promise<ElementHandle>;
+
+  waitForXPath(
+    xpath: string,
+    options?: { visible?: boolean; hidden?: boolean; timeout?: number }
+  ): Promise<ElementHandle>;
 }
 
 export interface Frame extends FrameBase {
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index 043c2f5c78..05065e043a 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -117,9 +117,15 @@ puppeteer.launch().then(async browser => {
   await watchDog;
 
   let currentURL: string;
+
   page
     .waitForSelector("img", { visible: true })
-    .then(() => console.log("First URL with image: " + currentURL));
+    .then(() => console.log("First URL with image by selector: " + currentURL));
+
+  page
+    .waitForXPath("//img", { visible: true })
+    .then(() => console.log("First URL with image by xpath: " + currentURL));
+
   for (currentURL of [
     "https://example.com",
     "https://google.com",

From 6406de8be61b870a4fb2da4469063e96c6553e6b Mon Sep 17 00:00:00 2001
From: cleto100 <mic_hell2033@hotmail.com>
Date: Tue, 8 May 2018 16:44:21 -0300
Subject: [PATCH 0122/1124] =?UTF-8?q?Adding=20offset=20to=20for=20CommonAx?=
 =?UTF-8?q?e=20interface=20definition=20which=20is=20boolean=20=E2=80=A6?=
 =?UTF-8?q?=20(#25620)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index e6db82bc5a..90f6de10a7 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -513,6 +513,7 @@ declare namespace Chart {
         gridLines?: GridLineOptions;
         barThickness?: number;
         scaleLabel?: ScaleTitleOptions;
+        offset?: boolean;
         beforeUpdate?(scale?: any): void;
         beforeSetDimension?(scale?: any): void;
         beforeDataLimits?(scale?: any): void;

From 1809675f6aa278270f7148412f922ca4362f869a Mon Sep 17 00:00:00 2001
From: l-jonas <l-jonas@users.noreply.github.com>
Date: Tue, 8 May 2018 21:51:10 +0200
Subject: [PATCH 0123/1124] Add types for the package "blocked" (#25593)

* Add types for the package "blocked"

* Update author

* Rename MyFunction to Blocked

* Make options optional

* Return Node.JS timer instead of custom declaration
---
 types/blocked/blocked-tests.ts |  7 +++++++
 types/blocked/index.d.ts       | 24 ++++++++++++++++++++++++
 types/blocked/tsconfig.json    | 23 +++++++++++++++++++++++
 types/blocked/tslint.json      |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 types/blocked/blocked-tests.ts
 create mode 100644 types/blocked/index.d.ts
 create mode 100644 types/blocked/tsconfig.json
 create mode 100644 types/blocked/tslint.json

diff --git a/types/blocked/blocked-tests.ts b/types/blocked/blocked-tests.ts
new file mode 100644
index 0000000000..f43eb82cba
--- /dev/null
+++ b/types/blocked/blocked-tests.ts
@@ -0,0 +1,7 @@
+import * as blocked from 'blocked';
+
+blocked((ms: number) => {
+  // todo: show warning
+}, {
+  threshold: 10
+});
diff --git a/types/blocked/index.d.ts b/types/blocked/index.d.ts
new file mode 100644
index 0000000000..5292011f23
--- /dev/null
+++ b/types/blocked/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for blocked 1.2
+// Project: https://github.com/visionmedia/node-blocked#readme
+// Definitions by: Jonas Lochmann <https://github.com/l-jonas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/*~ Note that ES6 modules cannot directly export callable functions.
+ *~ This file should be imported using the CommonJS-style:
+ *~   import x = require('someLibrary');
+ *~
+ *~ Refer to the documentation to understand common
+ *~ workarounds for this limitation of ES6 modules.
+ */
+
+export = Blocked;
+
+declare function Blocked(callback: (ms: number) => void, options?: Blocked.Options): NodeJS.Timer;
+
+declare namespace Blocked {
+  interface Options {
+    threshold: number;  // in milliseconds
+  }
+}
diff --git a/types/blocked/tsconfig.json b/types/blocked/tsconfig.json
new file mode 100644
index 0000000000..3b110548b0
--- /dev/null
+++ b/types/blocked/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "blocked-tests.ts"
+    ]
+}
diff --git a/types/blocked/tslint.json b/types/blocked/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/blocked/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c37cd112da5bd8a9095db54009584355862a6a0b Mon Sep 17 00:00:00 2001
From: Josh Goldberg <joshuakgoldberg@outlook.com>
Date: Tue, 8 May 2018 15:07:18 -0700
Subject: [PATCH 0124/1124] Added jest-axe typings (#25623)

* Started on jest-axe

* Fixed up some things

* TS@2.4

* lint fix; axe-core dependency

* Update index.d.ts

* Update jest-axe-tests.ts
---
 types/jest-axe/index.d.ts        | 85 ++++++++++++++++++++++++++++++++
 types/jest-axe/jest-axe-tests.ts | 19 +++++++
 types/jest-axe/package.json      |  6 +++
 types/jest-axe/tsconfig.json     | 23 +++++++++
 types/jest-axe/tslint.json       |  1 +
 5 files changed, 134 insertions(+)
 create mode 100644 types/jest-axe/index.d.ts
 create mode 100644 types/jest-axe/jest-axe-tests.ts
 create mode 100644 types/jest-axe/package.json
 create mode 100644 types/jest-axe/tsconfig.json
 create mode 100644 types/jest-axe/tslint.json

diff --git a/types/jest-axe/index.d.ts b/types/jest-axe/index.d.ts
new file mode 100644
index 0000000000..f16f4e7651
--- /dev/null
+++ b/types/jest-axe/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for jest-axe 2.2
+// Project: https://github.com/nickcolley/jest-axe
+// Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="jest" />
+
+import { AxeResults, Result, RunOnly } from "axe-core";
+
+/**
+ * Version of the aXe verifier with defaults set.
+ *
+ * @remarks You can still pass additional options to this new instance;
+ *          they will be merged with the defaults.
+ */
+export const axe: JestAxe;
+
+/**
+ * Core options to run aXe.
+ */
+export interface AxeOptions {
+    elementRef?: boolean;
+    iframes?: boolean;
+    rules?: object;
+    runOnly?: RunOnly;
+    selectors?: boolean;
+}
+
+/**
+ * Runs aXe on HTML.
+ *
+ * @param html   Raw HTML string to verify with aXe.
+ * @param options   Options to run aXe.
+ * @returns Promise for the results of running aXe.
+ */
+export type JestAxe = (html: string, options?: AxeOptions) => Promise<AxeResults>;
+
+/**
+ * Creates a new aXe verifier function.
+ *
+ * @param options   Options to run aXe.
+ * @returns New aXe verifier function.
+ */
+export function configureAxe(options?: AxeOptions): JestAxe;
+
+/**
+ * Results from asserting whether aXe verification passed.
+ */
+export interface AssertionsResult {
+    /**
+     * Actual checked aXe verification results.
+     */
+    actual: Result[];
+
+    /**
+     * @returns Message from the Jest assertion.
+     */
+    message(): string;
+
+    /**
+     * Whether the assertion passed.
+     */
+    pass: boolean;
+}
+
+/**
+ * Asserts an aXe-verified result has no violations.
+ *
+ * @param results   aXe verification result, if not running via expect().
+ * @returns Jest expectations for the aXe result.
+ */
+export type IToHaveNoViolations = (results?: Partial<AxeResults>) => AssertionsResult;
+
+export const toHaveNoViolations: {
+    toHaveNoViolations: IToHaveNoViolations;
+};
+
+declare global {
+    namespace jest {
+        interface Matchers<R> {
+            toHaveNoViolations: IToHaveNoViolations;
+        }
+    }
+}
diff --git a/types/jest-axe/jest-axe-tests.ts b/types/jest-axe/jest-axe-tests.ts
new file mode 100644
index 0000000000..38caeb88eb
--- /dev/null
+++ b/types/jest-axe/jest-axe-tests.ts
@@ -0,0 +1,19 @@
+import { configureAxe, axe, toHaveNoViolations, JestAxe } from "jest-axe";
+
+expect.extend(toHaveNoViolations);
+
+const newJestWithDefaults: JestAxe = configureAxe();
+
+const newJestWithOptions: JestAxe = configureAxe({
+    elementRef: false,
+    iframes: false,
+    rules: {},
+    runOnly: {
+        type: "rules",
+    },
+    selectors: false,
+});
+
+const sameJest: JestAxe = axe;
+
+expect("").toHaveNoViolations();
diff --git a/types/jest-axe/package.json b/types/jest-axe/package.json
new file mode 100644
index 0000000000..d9427293a7
--- /dev/null
+++ b/types/jest-axe/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "axe-core": "^2.6.1"
+    }
+}
diff --git a/types/jest-axe/tsconfig.json b/types/jest-axe/tsconfig.json
new file mode 100644
index 0000000000..887813c869
--- /dev/null
+++ b/types/jest-axe/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-axe-tests.ts"
+    ]
+}
diff --git a/types/jest-axe/tslint.json b/types/jest-axe/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jest-axe/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e199aed403b6d0052546da0cc21c571c57d5c383 Mon Sep 17 00:00:00 2001
From: Ben <rockingskier@gmail.com>
Date: Wed, 9 May 2018 00:12:37 +0100
Subject: [PATCH 0125/1124] StompJS: Add argument types to unsubscribe (#25621)

Add argument types to unsubscribe: https://github.com/stomp-js/stomp-websocket/blob/master/src/stomp.coffee#L600-L603
---
 types/stompjs/index.d.ts       | 2 +-
 types/stompjs/stompjs-tests.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/stompjs/index.d.ts b/types/stompjs/index.d.ts
index 91d5277fba..d78fa1b5d9 100644
--- a/types/stompjs/index.d.ts
+++ b/types/stompjs/index.d.ts
@@ -32,7 +32,7 @@ export class Client {
 
     send(destination: string, headers?: {}, body?: string): any;
     subscribe(destination: string, callback?: (message: Message) => any, headers?: {}): any;
-    unsubscribe(): any;
+    unsubscribe(id: string): any;
 
     begin(transaction: string): any;
     commit(transaction: string): any;
diff --git a/types/stompjs/stompjs-tests.ts b/types/stompjs/stompjs-tests.ts
index fcc0c46ff5..d7d5e45fde 100644
--- a/types/stompjs/stompjs-tests.ts
+++ b/types/stompjs/stompjs-tests.ts
@@ -64,7 +64,7 @@ client.send('destination', {}, 'body');
 client.subscribe('destination', (message) => { });
 client.subscribe('destination', (message) => { }, {});
 
-client.unsubscribe();
+client.unsubscribe('id');
 
 client.begin('transaction');
 

From 9bf9e4c95bbf8db44d08ce6a9aa01e726573758c Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Wed, 9 May 2018 15:11:26 +1000
Subject: [PATCH 0126/1124] Updated type definitions to 0.15.12

---
 types/react-calendar-timeline/index.d.ts | 139 +++++++++++++----------
 1 file changed, 77 insertions(+), 62 deletions(-)

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 69e5d037dc..649a301bb3 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -1,71 +1,86 @@
-// Type definitions for react-calendar-timeline v0.8.1
+// Type definitions for react-calendar-timeline v0.15.12
 // Project: https://github.com/namespace-ee/react-calendar-timeline
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
+//				   Alex Maclean <https://github.com/acemac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
 /// <reference types="react"/>
 
 declare module "react-calendar-timeline" {
-    interface ReactCalendarTimeline {
-        groups: {
-            id: number;
-            title: any; // string | Element (React.ClassicComponentClass<any>);
-        }[];
-        items:{
-            id: number;
-            group: number;
-            title?: any; // string | Element (React.ClassicComponentClass<any>);
-            start_time: any;
-            end_time: any;
-            canMove?: boolean;
-            canResize?: boolean;
-            canChangeGroup?: boolean;
-            className?: string;
-        }[];
-        keys?:{
-            groupIdKey: string;
-            groupTitleKey: string;
-            itemIdKey: string;
-            itemTitleKey: string;
-            itemGroupKey: string;
-            itemTimeStartKey: string;
-            itemTimeEndKey: string;
-        };
-        sidebarWidth?: number;
-        dragSnap?: number;
-        minResizeWidth?: number;
-        fixedHeader?: "fixed" | "none";
-        zIndexStart?: number;
-        lineHeight?: number;
-        headerLabelGroupHeight?: number;
-        headerLabelHeight?: number;
-        itemHeightRatio?: number;
-        minZoom?: number;
-        maxZoom?: number;
-        canMove?: boolean;
-        canChangeGroup?: boolean;
-        canResize?: boolean;
-        useResizeHandle?: boolean;
-        stackItems?: boolean;
-        traditionalZoom?: boolean;
-        itemTouchSendsClick?: boolean;
-        onItemMove?(itemId:any, dragTime:any, newGroupOrder:any): any;
-        onItemResize?(itemId:any, newResizeEnd:any): any;
-        onItemSelect?(itemId:any): any;
-        onItemClick?(itemId:any): any;
-        onCanvasClick?(groupId:any, time:any, e:any): any;
-        onItemDoubleClick?(itemId:any): any;
-        moveResizeValidator?(action:any, itemId:any, time:any): any;
-        defaultTimeStart?: any;
-        defaultTimeEnd?: any;
-        visibleTimeStart?: number;
-        visibleTimeEnd?: number;
-        onTimeChange?(visibleTimeStart:any, visibleTimeEnd:any): any;
-        onTimeInit?(visibleTimeStart:any, visibleTimeEnd:any): any;
-        onBoundsChange?(canvasTimeStart:any, canvasTimeEnd:any): any;
-        children?: any;
-    }
-    let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimeline>;
-    export default ReactCalendarTimeline;
+
+  export interface TimelineGroup {
+    id: number;
+    title: string | JSX.Element;
+  }
+
+  export interface TimelineItem {
+    id: number;
+    group: number;
+    title?: string | JSX.Element;
+    start_time: any;
+    end_time: any;
+    canMove?: boolean;
+    canResize?: boolean;
+    canChangeGroup?: boolean;
+    className?: string;
+  }
+
+  export interface TimelineContext {
+    visibletimeStart: number,
+    visibleTimeEnd: number,
+    timelineWidth: number
+  }
+
+  export interface ReactCalendarTimelineProps {
+      groups: TimelineGroup[];
+      items: TimelineItem[];
+      keys?:{
+          groupIdKey: string;
+          groupTitleKey: string;
+          itemIdKey: string;
+          itemTitleKey: string;
+          itemGroupKey: string;
+          itemTimeStartKey: string;
+          itemTimeEndKey: string;
+      };
+      sidebarWidth?: number;
+      dragSnap?: number;
+      minResizeWidth?: number;
+      fixedHeader?: "fixed" | "none";
+      zIndexStart?: number;
+      lineHeight?: number;
+      headerLabelGroupHeight?: number;
+      headerLabelHeight?: number;
+      itemHeightRatio?: number;
+      minZoom?: number;
+      maxZoom?: number;
+      canMove?: boolean;
+      canChangeGroup?: boolean;
+      canResize?: boolean;
+      useResizeHandle?: boolean;
+      stackItems?: boolean;
+      traditionalZoom?: boolean;
+      itemTouchSendsClick?: boolean;
+      onItemMove?(itemId:number, dragTime:number, newGroupOrder:number): any;
+      onItemResize?(itemId:number, newResizeEnd: number, edge: "left" | "right"): any;
+      onItemSelect?(itemId:number, e: any, time: number): any;
+      onItemClick?(itemId:number, e: any, time: number): any;
+      onCanvasClick?(groupId:number, time:number, e:any): any;
+      onItemDoubleClick?(itemId:number, e: any, time: number): any;
+      moveResizeValidator?(action:"move" | "resize", itemId:number, time:number, resizeEdge: "left" | "right"): any;
+      defaultTimeStart?: any;
+      defaultTimeEnd?: any;
+      visibleTimeStart?: number;
+      visibleTimeEnd?: number;
+      onTimeChange?(visibleTimeStart: number, visibleTimeEnd: number, updateScrollCanvas: (start: number, end: number) => void): any;
+      onTimeInit?(visibleTimeStart: number, visibleTimeEnd: number): any;
+      onBoundsChange?(canvasTimeStart: number, canvasTimeEnd: number): any;
+      children?: any;
+      fullUpdate?: boolean;
+      itemRenderer?: (item: TimelineItem, context: TimelineContext) => JSX.Element;
+      groupRenderer?: (group: TimelineGroup, isRightSidebar: boolean) => JSX.Element;
+  }
+  let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimelineProps>;
+  export default ReactCalendarTimeline;
 }

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 0127/1124] 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 0128/1124] 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 449a5e2d87e20f1dc33944eee4debb473a15045d Mon Sep 17 00:00:00 2001
From: Jonas L <jonas@determapp.de>
Date: Wed, 9 May 2018 15:20:01 +0200
Subject: [PATCH 0129/1124] Add rolling rate limiter

---
 types/rolling-rate-limiter/index.d.ts         | 38 +++++++++++++++++++
 .../rolling-rate-limiter-tests.ts             | 36 ++++++++++++++++++
 types/rolling-rate-limiter/tsconfig.json      | 23 +++++++++++
 types/rolling-rate-limiter/tslint.json        |  1 +
 4 files changed, 98 insertions(+)
 create mode 100644 types/rolling-rate-limiter/index.d.ts
 create mode 100644 types/rolling-rate-limiter/rolling-rate-limiter-tests.ts
 create mode 100644 types/rolling-rate-limiter/tsconfig.json
 create mode 100644 types/rolling-rate-limiter/tslint.json

diff --git a/types/rolling-rate-limiter/index.d.ts b/types/rolling-rate-limiter/index.d.ts
new file mode 100644
index 0000000000..0de8235fc2
--- /dev/null
+++ b/types/rolling-rate-limiter/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for rolling-rate-limiter 0.1
+// Project: https://github.com/peterkhayes/rolling-rate-limiter
+// Definitions by: Jonas Lochmann <https://github.com/l-jonas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = RollingRateLimiter;
+
+declare function RollingRateLimiter(options: RollingRateLimiter.InMemoryOptions): RollingRateLimiter.SyncOrAsyncLimiter;
+declare function RollingRateLimiter(options: RollingRateLimiter.WithRedisOptions): RollingRateLimiter.AsyncLimiter;
+
+declare namespace RollingRateLimiter {
+  interface GeneralOptions {
+    interval: number;
+    maxInInterval: number;
+    minDifference?: number;
+  }
+
+  interface RedisOptions {
+    redis: CompatibleRedisClient;
+    namespace?: string;
+  }
+
+  interface CompatibleRedisClient {
+    multi: () => any;
+  }
+
+  type InMemoryOptions = GeneralOptions;
+  type WithRedisOptions = GeneralOptions & RedisOptions;
+
+  type AsyncLimiterWithToken = (token: string, callback: AsyncLimiterCallback) => void;
+  type AsyncLimiterWithoutToken = (callback: AsyncLimiterCallback) => void;
+  type AsyncLimiterCallback = (err: any, timeLeft: number, actionsLeft: number) => void;
+  type AsyncLimiter = AsyncLimiterWithToken & AsyncLimiterWithToken;
+
+  type SyncLimiter = (token?: string) => number;
+
+  type SyncOrAsyncLimiter = SyncLimiter & AsyncLimiter;
+}
diff --git a/types/rolling-rate-limiter/rolling-rate-limiter-tests.ts b/types/rolling-rate-limiter/rolling-rate-limiter-tests.ts
new file mode 100644
index 0000000000..1318b8d425
--- /dev/null
+++ b/types/rolling-rate-limiter/rolling-rate-limiter-tests.ts
@@ -0,0 +1,36 @@
+import * as RateLimiter from 'rolling-rate-limiter';
+
+/*
+  Setup:
+*/
+
+const limiter = RateLimiter({
+  // in miliseconds
+  interval: 1000,
+  maxInInterval: 10,
+  // optional: the minimum time (in miliseconds) between any two actions
+  minDifference: 100
+});
+
+/*
+  Action:
+*/
+
+function attemptAction(userId: string) {
+  // Argument should be a unique identifier for a user if one exists.
+  // If none is provided, the limiter will not differentiate between users.
+  const timeLeft = limiter(userId);
+
+  if (timeLeft > 0) {
+    // limit was exceeded, action should not be allowed
+    // timeLeft is the number of ms until the next action will be allowed
+    // note that this can be treated as a boolean, since 0 is falsy
+  } else {
+    // limit was not exceeded, action should be allowed
+  }
+}
+
+/*
+  Note that the in-memory version can also operate asynchronously.
+  The syntax is identical to the redis implementation below.
+*/
diff --git a/types/rolling-rate-limiter/tsconfig.json b/types/rolling-rate-limiter/tsconfig.json
new file mode 100644
index 0000000000..0b526f946e
--- /dev/null
+++ b/types/rolling-rate-limiter/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",
+        "rolling-rate-limiter-tests.ts"
+    ]
+}
diff --git a/types/rolling-rate-limiter/tslint.json b/types/rolling-rate-limiter/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rolling-rate-limiter/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0130/1124] 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 0131/1124] 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 98a5d96dad224d595f8aea21e050f31fb2bad145 Mon Sep 17 00:00:00 2001
From: "Jimi (Dimitris) Charalampidis" <jimikar@gmail.com>
Date: Wed, 9 May 2018 21:24:55 +0300
Subject: [PATCH 0132/1124] Improve types (#25654)

---
 types/stompjs/index.d.ts       | 22 +++++++++++-----------
 types/stompjs/stompjs-tests.ts |  7 ++++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/types/stompjs/index.d.ts b/types/stompjs/index.d.ts
index d78fa1b5d9..4c591367dc 100644
--- a/types/stompjs/index.d.ts
+++ b/types/stompjs/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for stompjs 2.3
 // Project: https://github.com/jmesnil/stomp-websocket
-// Definitions by: Jimi Charalampidis <https://github.com/jimic>, Stefan Erichsen <https://github.com/Dr4k4n>
+// Definitions by: Jimi Charalampidis <https://github.com/jimic>
+//                 Stefan Erichsen <https://github.com/Dr4k4n>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -9,7 +10,7 @@ export const VERSIONS: {
     V1_0: string,
     V1_1: string,
     V1_2: string,
-    supportedVersions: () => Array<string>
+    supportedVersions: () => string[]
 };
 
 export class Client {
@@ -31,8 +32,8 @@ export class Client {
     disconnect(disconnectCallback: () => any, headers?: {}): any;
 
     send(destination: string, headers?: {}, body?: string): any;
-    subscribe(destination: string, callback?: (message: Message) => any, headers?: {}): any;
-    unsubscribe(id: string): any;
+    subscribe(destination: string, callback?: (message: Message) => any, headers?: {}): Subscription;
+    unsubscribe(id: string): void;
 
     begin(transaction: string): any;
     commit(transaction: string): any;
@@ -42,23 +43,22 @@ export class Client {
     nack(messageID: string, subscription: string, headers?: {}): any;
 }
 
-export interface Message {
-    command: string;
-    headers: {};
-    body: string;
+export interface Subscription {
+    id: string;
+    unsubscribe(): void;
+}
 
+export interface Message extends Frame {
     ack(headers?: {}): any;
     nack(headers?: {}): any;
 }
 
-export class Frame implements Message {
+export class Frame {
     command: string;
     headers: {};
     body: string;
     constructor(command: string, headers?: {}, body?: string);
 
-    ack(headers?: {}): any;
-    nack(headers?: {}): any;
     toString(): string;
     static sizeOfUTF8(s: string): number;
     static unmarshall(datas: any): any;
diff --git a/types/stompjs/stompjs-tests.ts b/types/stompjs/stompjs-tests.ts
index d7d5e45fde..9a3841e41a 100644
--- a/types/stompjs/stompjs-tests.ts
+++ b/types/stompjs/stompjs-tests.ts
@@ -61,10 +61,11 @@ client.send('destination');
 client.send('destination', {});
 client.send('destination', {}, 'body');
 
-client.subscribe('destination', (message) => { });
-client.subscribe('destination', (message) => { }, {});
+let subscription = client.subscribe('destination', (message) => { });
+subscription = client.subscribe('destination', (message) => { }, {});
+subscription.unsubscribe();
 
-client.unsubscribe('id');
+client.unsubscribe(subscription.id);
 
 client.begin('transaction');
 

From 2b2d81c2260c7d7e3699eee46c32fa24e1f84186 Mon Sep 17 00:00:00 2001
From: Ender Doe <ender@shpazzle.com>
Date: Wed, 9 May 2018 14:26:37 -0400
Subject: [PATCH 0133/1124] Fixed Three Edge Geometry definition (#25627)

---
 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 dd7bd22adf..351084f0d1 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -7029,7 +7029,7 @@ export class DodecahedronGeometry extends Geometry {
 }
 
 export class EdgesGeometry extends BufferGeometry {
-    constructor(geometry: BufferGeometry, thresholdAngle: number);
+    constructor(geometry: BufferGeometry | Geometry, thresholdAngle: number);
 }
 
 export class ExtrudeGeometry extends Geometry {

From 208df7b962daaf8e9f17ddb8f7b60fe3a7f35213 Mon Sep 17 00:00:00 2001
From: Karl von Randow <karl@xk72.com>
Date: Thu, 10 May 2018 06:26:58 +1200
Subject: [PATCH 0134/1124] react-onsenui: update Modal to match documentation
 (#25628)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://onsen.io/v2/api/react/Modal.html

Added “lift” animation and changed show and hide methods.
---
 types/react-onsenui/index.d.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index 00437e099b..91055d25b4 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -200,11 +200,14 @@ export class Dialog extends Component<{
 }, any> {}
 
 export class Modal extends Component<{
-    animation?: "fade" | "none",
-    animationOptions?: AnimationOptions
-    onShow?(): void,
-    onHide?(): void,
-    isOpen?: boolean
+    animation?: "fade" | "lift" | "none",
+    animationOptions?: AnimationOptions,
+    onPreShow?(): void,
+    onPostShow?(): void,
+    onPreHide?(): void,
+    onPostHide?(): void,
+    isOpen?: boolean,
+    onDeviceBackButton?(): void,
 }, any> {}
 
 export class Popover extends Component<{

From 28aa8747043a5937c25e0639a27a5537c06d4b83 Mon Sep 17 00:00:00 2001
From: Dechen Zhuang <raphaelsoul@163.com>
Date: Thu, 10 May 2018 02:31:10 +0800
Subject: [PATCH 0135/1124] add electronPath for constructor (#25525)

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

diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index 60c73d850f..b36d014b63 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -158,6 +158,7 @@ declare namespace Nightmare {
         typeInterval?: number;
         x?: number;
         y?: number;
+        electronPath?: string;
         openDevTools?: {
             /**
              * Opens the devtools with specified dock state, can be right, bottom, undocked, detach.

From d2159cc9cc6b7bef8b735a22139b3d8f52e95f85 Mon Sep 17 00:00:00 2001
From: Samuel Vaillant <samuel.vllnt@gmail.com>
Date: Wed, 9 May 2018 20:34:07 +0200
Subject: [PATCH 0136/1124] fix(algoliasearch): add missing createIfNotExists
 on partial update (#25652)

* fix(algoliasearch): add createIfNotExists in callback version of partialUpdateObject(s)

* fix(algoliasearch): add createIfNotExists in promise version of partialUpdateObject(s)

* test(algoliasearch): add tests for partialUpdateObject(s)
---
 types/algoliasearch/algoliasearch-tests.ts | 13 +++++++++++++
 types/algoliasearch/index.d.ts             |  9 +++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index b8cd1db6c5..2898f889fc 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -150,4 +150,17 @@ let _algoliaQueryParameters: QueryParameters = {
 let index: Index = algoliasearch('', '').initIndex('');
 
 let search = index.search({ query: '' });
+
 index.search({ query: '' }, (err, res) => {});
+
+// partialUpdateObject
+index.partialUpdateObject({}, () => {});
+index.partialUpdateObject({}, false, () => {});
+index.partialUpdateObject({}).then(() => {});
+index.partialUpdateObject({}, false).then(() => {});
+
+// partialUpdateObjects
+index.partialUpdateObjects([{}], () => {});
+index.partialUpdateObjects([{}], false, () => {});
+index.partialUpdateObjects([{}]).then(() => {});
+index.partialUpdateObjects([{}], false).then(() => {});
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index fca13ac161..87c1f79a0e 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -286,14 +286,13 @@ declare namespace algoliasearch {
      * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
      */
     partialUpdateObject(object: {}, cb: (err: Error, res: Task) => void): void;
+    partialUpdateObject(object: {}, createIfNotExists: boolean, cb: (err: Error, res: Task) => void): void;
     /**
      * Update parameters of a list of objects
      * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
      */
-    partialUpdateObjects(
-      objects: {}[],
-      cb: (err: Error, res: Task) => void
-    ): void;
+    partialUpdateObjects(objects: {}[], cb: (err: Error, res: Task) => void): void;
+    partialUpdateObjects(objects: {}[], createIfNotExists: boolean, cb: (err: Error, res: Task) => void): void;
     /**
      * Delete a specific object
      * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
@@ -531,11 +530,13 @@ declare namespace algoliasearch {
      * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
      */
     partialUpdateObject(object: {}): Promise<Task>;
+    partialUpdateObject(object: {}, createIfNotExists: boolean): Promise<Task>;
     /**
      * Update parameters of a list of objects
      * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
      */
     partialUpdateObjects(objects: {}[]): Promise<Task>;
+    partialUpdateObjects(objects: {}[], createIfNotExists?: boolean): Promise<Task>;
     /**
      * Delete a specific object
      * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects

From 7b519d78edc545bc913242c3eae9470b712fb81a Mon Sep 17 00:00:00 2001
From: Edo Rivai <edo.rivai@gmail.com>
Date: Wed, 9 May 2018 20:34:48 +0200
Subject: [PATCH 0137/1124] [knex] Allow usage of Raw in Where (#25638)

* Allow usage of Raw in Where

* [knex] Fix typo
---
 types/knex/index.d.ts    | 4 ++--
 types/knex/knex-tests.ts | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index ffb5d0a70e..624fde2d01 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -269,8 +269,8 @@ declare namespace Knex {
         (callback: QueryCallback): QueryBuilder;
         (object: Object): QueryBuilder;
         (columnName: string, value: Value | null): QueryBuilder;
-        (columnName: string, operator: string, value: Value | null): QueryBuilder;
-        (columnName: string, operator: string, query: QueryBuilder): QueryBuilder;
+        (columnName: string, operator: string, value: Value | QueryBuilder | null): QueryBuilder;
+        (left: Raw, operator: string, right: Value | QueryBuilder | null): QueryBuilder;
     }
 
     interface WhereRaw extends RawQueryBuilder {
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index eaf186a186..9167ad3f77 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -206,6 +206,11 @@ knex('users').where('votes', '>', 100);
 knex('users').where('votes', null);
 knex('users').where('votes', 'is not', null);
 
+// Using Raw in where
+knex('users').where(knex.raw('votes + 1'), '>', 101);
+knex('users').where(knex.raw('votes + 1'), '>', knex.raw('100 + 1'));
+knex('users').where('votes', '>', knex.raw('100 + 1'));
+
 var subquery = knex('users').where('votes', '>', 100).andWhere('status', 'active').orWhere('name', 'John').select('id');
 knex('accounts').where('id', 'in', subquery);
 

From 0fa5da1423c32790fa9f3e36dbe2bea6d89792e4 Mon Sep 17 00:00:00 2001
From: "Seunghwa (Steve) Song" <sshtel@gmail.com>
Date: Thu, 10 May 2018 03:36:36 +0900
Subject: [PATCH 0138/1124] fix: passport-http-bearer Strategy class should
 implement interface (#25526)

bump up version to 0.0.2
---
 package.json                          | 2 +-
 types/passport-http-bearer/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index db67595b77..37d1f4d48b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "definitely-typed",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped",
   "repository": {
     "type": "git",
diff --git a/types/passport-http-bearer/index.d.ts b/types/passport-http-bearer/index.d.ts
index 58da308106..14f6f91e26 100644
--- a/types/passport-http-bearer/index.d.ts
+++ b/types/passport-http-bearer/index.d.ts
@@ -28,7 +28,7 @@ interface VerifyFunctionWithRequest {
     (req: express.Request, token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
 }
 
-declare class Strategy extends passport.Strategy {
+declare class Strategy implements passport.Strategy {
     constructor(verify: VerifyFunction);
     constructor(options: IStrategyOptions, verify: VerifyFunction);
     constructor(options: IStrategyOptions, verify: VerifyFunctionWithRequest);

From 37a8e994f89b1460bea3d4712a60e5c2aaebdfb6 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Wed, 9 May 2018 13:38:08 -0500
Subject: [PATCH 0139/1124] webpack: Updated module rules types against
 WebpackOptions.json schema in v4 (#25566)

* Updated module rules types against WebpackOptions.json schema in v4

* Fixed T[] lintting error

* Removed redundant definition in RuleSetCondition

* Fixed Loader reference in extract-text-webpack-plugin
---
 types/extract-text-webpack-plugin/index.d.ts |   8 +-
 types/webpack/index.d.ts                     | 304 +++++++++++--------
 types/webpack/webpack-tests.ts               |  14 +
 3 files changed, 189 insertions(+), 137 deletions(-)

diff --git a/types/extract-text-webpack-plugin/index.d.ts b/types/extract-text-webpack-plugin/index.d.ts
index 61b381d253..f0cc7bf65c 100644
--- a/types/extract-text-webpack-plugin/index.d.ts
+++ b/types/extract-text-webpack-plugin/index.d.ts
@@ -4,16 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { Plugin, NewLoader, OldLoader } from 'webpack';
+import { Plugin, Loader } from 'webpack';
 
 export = ExtractTextPlugin;
 
-/**
- * extract-text-webpack-plugin has no support for .options instead of .query yet.
- * See https://github.com/webpack/extract-text-webpack-plugin/issues/281
- */
-type Loader = string | OldLoader | NewLoader;
-
 /**
  * Use an `ExtractTextPlugin` instance and a loader returned by `extract` in concert to write files to disk instead of loading them into others.
  * Usage example at https://github.com/webpack/extract-text-webpack-plugin#usage-example-with-css
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index e422c58b32..05113ea6d4 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -205,9 +205,9 @@ declare namespace webpack {
 
     interface Module {
         /** A array of applied pre loaders. */
-        preLoaders?: Rule[];
+        preLoaders?: RuleSetRule[];
         /** A array of applied post loaders. */
-        postLoaders?: Rule[];
+        postLoaders?: RuleSetRule[];
         /** A RegExp or an array of RegExps. Don’t parse files matching. */
         noParse?: RegExp | RegExp[] | ((content: string) => boolean);
         unknownContextRequest?: string;
@@ -223,7 +223,7 @@ declare namespace webpack {
         wrappedContextCritical?: boolean;
         strictExportPresence?: boolean;
         /** An array of rules applied for modules. */
-        rules: Rule[];
+        rules: RuleSetRule[];
     }
 
     interface Resolve {
@@ -357,143 +357,187 @@ declare namespace webpack {
         __dirname?: boolean | string;
         [nodeBuiltin: string]: boolean | string | undefined;
     }
-
-    interface BaseConditionSpec {
-        /** The Condition must match. The convention is the provide a string or array of strings here, but it's not enforced. */
-        include?: Condition;
-        /** The Condition must NOT match. The convention is the provide a string or array of strings here, but it's not enforced. */
-        exclude?: Condition;
-    }
-    interface TestConditionSpec extends BaseConditionSpec {
-        /** The Condition must match. The convention is the provide a RegExp or array of RegExps here, but it's not enforced. */
-        test: Condition;
-    }
-    interface AndConditionSpec extends BaseConditionSpec {
-        /** All Conditions must match. */
-        and: Condition[];
-    }
-    interface OrConditionSpec extends BaseConditionSpec {
-        /** Any Condition must match. */
-        or: Condition[];
-    }
-    interface NotConditionSpec extends BaseConditionSpec {
-        /** The Condition must NOT match. */
-        not: Condition;
-    }
-    type ConditionSpec = TestConditionSpec | OrConditionSpec | AndConditionSpec | NotConditionSpec;
-
-    // tslint:disable-next-line:no-empty-interface
-    interface ConditionArray extends Array<Condition> { }
-    type Condition = string | RegExp | ((absPath: string) => boolean) | ConditionSpec | ConditionArray;
-
-    interface OldLoader {
-        loader: string;
-        query?: { [name: string]: any };
-    }
     interface NewLoader {
         loader: string;
         options?: { [name: string]: any };
     }
-    type Loader = string | OldLoader | NewLoader;
+    type Loader = string | NewLoader;
+
     interface ParserOptions {
         [optName: string]: any;
         system?: boolean;
     }
-    /**
-     * There are direct and delegate rules. Direct Rules need a test, Delegate rules delegate to subrules bringing their own.
-     * Direct rules can optionally contain delegate keys (oneOf, rules).
-     *
-     * These types exist to enforce that a rule has the keys `((loader XOR loaders) AND test) OR oneOf OR rules`
-     */
-    interface BaseRule {
-        /**
-         * Specifies the category of the loader. No value means normal loader.
-         *
-         * There is also an additional category "inlined loader" which are loaders applied inline of the import/require.
-         *
-         * All loaders are sorted in the order post, inline, normal, pre and used in this order.
-         *
-         * All normal loaders can be omitted (overridden) by prefixing ! in the request.
-         *
-         * All normal and pre loaders can be omitted (overridden) by prefixing -! in the request.
-         *
-         * All normal, post and pre loaders can be omitted (overridden) by prefixing !! in the request.
-         *
-         * Inline loaders and ! prefixes should not be used as they are non-standard. They may be use by loader generated code.
-         */
-        enforce?: 'pre' | 'post';
-        /** A condition that must be met */
-        test?: Condition | Condition[];
-        /** A condition that must not be met */
-        exclude?: Condition | Condition[];
-        /** A condition that must be met */
-        include?: Condition | Condition[];
-        /** A Condition matched with the resource. */
-        resource?: Condition | Condition[];
-        /** A Condition matched with the resource query. */
-        resourceQuery?: Condition | Condition[];
-        /** A condition matched with the issuer */
-        issuer?: Condition | Condition[];
-        /**
-         * An object with parser options. All applied parser options are merged.
-         *
-         * For each different parser options object a new parser is created and plugins can apply plugins depending on the parser options.
-         * Many of the default plugins apply their parser plugins only if a property in the parser options is not set or true.
-         */
-        parser?: ParserOptions;
-        /** An array of Rules that is also used when the Rule matches. */
-        rules?: Rule[];
-        /** An array of Rules from which only the first matching Rule is used when the Rule matches. */
-        oneOf?: Rule[];
-        /** Configures module resolving. */
-        resolve?: Resolve;
-        /** Configures the module type. */
-        type?: "javascript/auto" | "javascript/esm" | "javascript/dynamic" | "json" | "webassembly/experimental";
-        /** Flags a module as with or without side effects */
-        sideEffects?: boolean;
-    }
-    interface BaseDirectRule extends BaseRule {
-        /** A condition that must be met */
-        test: Condition | Condition[];
-    }
-    // Direct Rules
-    interface BaseSingleLoaderRule extends BaseDirectRule {
-        /** Loader name or an object with name and options */
-        loader: Loader;
-    }
-    interface OldLoaderRule extends BaseSingleLoaderRule {
-        /**
-         * Loader options
-         * @deprecated:
-         */
-        query?: { [name: string]: any };
-    }
-    interface NewLoaderRule extends BaseSingleLoaderRule {
-        options?: { [name: string]: any };
-    }
-    type LoaderRule = OldLoaderRule | NewLoaderRule;
-    interface OldUseRule extends BaseDirectRule {
-        /**
-         * A array of loaders.
-         * @deprecated  use `use` instead
-         */
-        loaders: string[];
-    }
-    interface NewUseRule extends BaseDirectRule {
-        /** A loader or array of loaders */
-        use: Loader | Loader[];
-    }
-    type UseRule = OldUseRule | NewUseRule;
 
-    // Delegate Rules
-    interface RulesRule extends BaseRule {
-        /** An array of Rules that is also used when the Rule matches. */
-        rules: Rule[];
+    type RuleSetCondition = string
+        | {
+            [k: string]: any;
+        }
+        | {
+            /**
+             * Logical AND
+             */
+            and?: RuleSetConditions;
+            /**
+             * Exclude all modules matching any of these conditions
+             */
+            exclude?: RuleSetCondition;
+            /**
+             * Exclude all modules matching not any of these conditions
+             */
+            include?: RuleSetCondition;
+            /**
+             * Logical NOT
+             */
+            not?: RuleSetConditions;
+            /**
+             * Logical OR
+             */
+            or?: RuleSetConditions;
+            /**
+             * Exclude all modules matching any of these conditions
+             */
+            test?: RuleSetCondition;
+        };
+    type RuleSetConditions = RuleSetCondition[];
+
+    interface RuleSetRule {
+        /**
+         * Enforce this rule as pre or post step
+         */
+        enforce?: "pre" | "post";
+        /**
+         * Shortcut for resource.exclude
+         */
+        exclude?: RuleSetCondition & {
+            [k: string]: any;
+        };
+        /**
+         * Shortcut for resource.include
+         */
+        include?: RuleSetCondition & {
+            [k: string]: any;
+        };
+        /**
+         * Match the issuer of the module (The module pointing to this module)
+         */
+        issuer?: RuleSetCondition & {
+            [k: string]: any;
+        };
+        /**
+         * Shortcut for use.loader
+         */
+        loader?: RuleSetLoader | RuleSetUse;
+        /**
+         * Shortcut for use.loader
+         */
+        loaders?: RuleSetUse;
+        /**
+         * Only execute the first matching rule in this array
+         */
+        oneOf?: RuleSetRules;
+        /**
+         * Shortcut for use.options
+         */
+        options?: RuleSetQuery;
+        /**
+         * Options for parsing
+         */
+        parser?: {
+            [k: string]: any;
+        };
+        /**
+         * Options for the resolver
+         */
+        resolve?: Resolve;
+        /**
+         * Flags a module as with or without side effects
+         */
+        sideEffects?: boolean;
+        /**
+         * Shortcut for use.query
+         */
+        query?: RuleSetQuery;
+        /**
+         * Module type to use for the module
+         */
+        type?: "javascript/auto" | "javascript/dynamic" | "javascript/esm" | "json" | "webassembly/experimental";
+        /**
+         * Match the resource path of the module
+         */
+        resource?: RuleSetCondition & {
+            [k: string]: any;
+        };
+        /**
+         * Match the resource query of the module
+         */
+        resourceQuery?: RuleSetCondition;
+        /**
+         * Match the child compiler name
+         */
+        compiler?: RuleSetCondition;
+        /**
+         * Match and execute these rules when this rule is matched
+         */
+        rules?: RuleSetRules;
+        /**
+         * Shortcut for resource.test
+         */
+        test?: RuleSetCondition & {
+            [k: string]: any;
+        };
+        /**
+         * Modifiers applied to the module when rule is matched
+         */
+        use?: RuleSetUse;
     }
-    interface OneOfRule extends BaseRule {
-        oneOf: Rule[];
-    }
-    type Rule = LoaderRule | UseRule | RulesRule | OneOfRule;
+    type RuleSetLoader = string;
+    type RuleSetUse =
+        | RuleSetUseItem
+        | {
+            [k: string]: any;
+        }
+        | RuleSetUseItem[];
+    type RuleSetUseItem =
+        | RuleSetLoader
+        | {
+            [k: string]: any;
+        }
+        | {
+            /**
+             * Loader name
+             */
+            loader?: RuleSetLoader;
+            /**
+             * Loader options
+             */
+            options?: RuleSetQuery;
+            /**
+             * Unique loader identifier
+             */
+            ident?: string;
+            /**
+             * Loader query
+             */
+            query?: RuleSetQuery;
+        };
+    type RuleSetQuery =
+        | {
+            [k: string]: any;
+        }
+        | string;
+    type CommonArrayOfStringOrStringArrayValues = Array<(string | string[])>;
+    type CommonArrayOfStringValues = string[];
+    type RuleSetRules = RuleSetRule[];
+
+    /**
+     * @deprecated Use RuleSetCondition instead
+     */
+    type Condition = RuleSetCondition;
+
+    /**
+     * @deprecated Use RuleSetRule instead
+     */
+    type Rule = RuleSetRule;
 
     namespace Options {
         // tslint:disable-next-line:max-line-length
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 4ce24fb25d..803e227c4a 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -684,3 +684,17 @@ class BannerPlugin extends webpack.Plugin {
         });
     }
 }
+
+configuration = {
+    module: {
+        rules: [
+            {
+                test: /\.css$/,
+                oneOf: [
+                    { resourceQuery: /global/, use: ["style-loader", "css-loader"] },
+                    { use: ["to-string-loader", "css-loader"] }
+                ]
+            }
+        ]
+    }
+};

From 1786d266d6d1c64dc3fca9eeab8e3fd3f5d45c83 Mon Sep 17 00:00:00 2001
From: Bonggyun Lee <deptno@gmail.com>
Date: Thu, 10 May 2018 03:40:44 +0900
Subject: [PATCH 0140/1124] add R.project curry definition (#25635)

* fix R.project curry

* mend
---
 types/ramda/index.d.ts     | 2 ++
 types/ramda/ramda-tests.ts | 1 +
 2 files changed, 3 insertions(+)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 8ef80d60e1..7301b28aae 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -18,6 +18,7 @@
 //                 Jack Leigh <https://github.com/leighman>
 //                 Keagan McClelland <https://github.com/CaptJakk>
 //                 Tomas Szabo <https://github.com/deftomat>
+//                 Bonggyun Lee <https://github.com/deptno>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1489,6 +1490,7 @@ declare namespace R {
          * Reasonable analog to SQL `select` statement.
          */
         project<T, U>(props: ReadonlyArray<string>, objs: ReadonlyArray<T>): U[];
+        project<T, U>(props: ReadonlyArray<string>): (objs: ReadonlyArray<T>) => U[];
 
         /**
          * Returns a function that when supplied an object returns the indicated property of that object, if it exists.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 0133f82e95..8cbbf9ceac 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1619,6 +1619,7 @@ class Rectangle {
     const fred = {name: "Fred", age: 12, hair: "brown", grade: 7};
     const kids = [abby, fred];
     R.project(["name", "grade"], kids); // => [{name: 'Abby', grade: 2}, {name: 'Fred', grade: 7}]
+    R.project(["name", "grade"])(kids); // => [{name: 'Abby', grade: 2}, {name: 'Fred', grade: 7}]
 };
 
 () => {

From c74cce8223038428704c64ef43db4c0fbdb79e8a Mon Sep 17 00:00:00 2001
From: l-jonas <l-jonas@users.noreply.github.com>
Date: Wed, 9 May 2018 20:52:14 +0200
Subject: [PATCH 0141/1124] Add types for recaptcha2 (#25643)

---
 types/recaptcha2/index.d.ts          | 33 ++++++++++++++++++++++++++++
 types/recaptcha2/recaptcha2-tests.ts | 19 ++++++++++++++++
 types/recaptcha2/tsconfig.json       | 23 +++++++++++++++++++
 types/recaptcha2/tslint.json         |  1 +
 4 files changed, 76 insertions(+)
 create mode 100644 types/recaptcha2/index.d.ts
 create mode 100644 types/recaptcha2/recaptcha2-tests.ts
 create mode 100644 types/recaptcha2/tsconfig.json
 create mode 100644 types/recaptcha2/tslint.json

diff --git a/types/recaptcha2/index.d.ts b/types/recaptcha2/index.d.ts
new file mode 100644
index 0000000000..78391ade16
--- /dev/null
+++ b/types/recaptcha2/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for recaptcha2 1.3
+// Project: https://github.com/fereidani/recaptcha2#readme
+// Definitions by: Jonas Lochmann <https://github.com/l-jonas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = Recaptcha2;
+
+declare class Recaptcha2 {
+  constructor(options: Recaptcha2.Options);
+
+  getRequestOptions<T extends object>(body: T): Recaptcha2.RequestOptions<T>;
+  validate(token: string): Promise<void>;
+  validateRequest(req: object, ip: string): Promise<void>;
+  translateErrors(errorCodes: string): string;
+  translateErrors(errorCodes: string[]): string[];
+  formElement(htmlClass: string): string;
+}
+
+declare namespace Recaptcha2 {
+  interface Options {
+    siteKey: string;
+    secretKey: string;
+    ssl?: boolean;
+  }
+
+  interface RequestOptions<T> {
+    uri: string;
+    method: 'POST';
+    json: true;
+    form: T;
+  }
+}
diff --git a/types/recaptcha2/recaptcha2-tests.ts b/types/recaptcha2/recaptcha2-tests.ts
new file mode 100644
index 0000000000..15ef3537e7
--- /dev/null
+++ b/types/recaptcha2/recaptcha2-tests.ts
@@ -0,0 +1,19 @@
+import * as reCAPTCHA from 'recaptcha2';
+
+const recaptcha = new reCAPTCHA({
+  siteKey: 'your-site-key',
+  secretKey: 'your-secret-key'
+});
+
+const key = 'invalid';
+
+recaptcha.validate(key)
+  .then(() => {
+    // validated and secure
+  })
+  .catch((errorCodes) => {
+    // translate error codes to human readable text
+    const message = recaptcha.translateErrors(errorCodes);
+  });
+
+const formSnippet = recaptcha.formElement('recaptcha');
diff --git a/types/recaptcha2/tsconfig.json b/types/recaptcha2/tsconfig.json
new file mode 100644
index 0000000000..196e86baf0
--- /dev/null
+++ b/types/recaptcha2/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",
+        "recaptcha2-tests.ts"
+    ]
+}
diff --git a/types/recaptcha2/tslint.json b/types/recaptcha2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/recaptcha2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 74e9c498d9505259380da9fd35e2e8e791ea8dae Mon Sep 17 00:00:00 2001
From: l-jonas <l-jonas@users.noreply.github.com>
Date: Wed, 9 May 2018 20:57:38 +0200
Subject: [PATCH 0142/1124] Add types for tokgen (#25644)

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

diff --git a/types/tokgen/index.d.ts b/types/tokgen/index.d.ts
new file mode 100644
index 0000000000..50a1abf7b9
--- /dev/null
+++ b/types/tokgen/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for tokgen 1.0
+// Project: https://github.com/maxtruxa/tokgen#readme
+// Definitions by: Jonas Lochmann <https://github.com/l-jonas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = TokenGenerator;
+
+declare class TokenGenerator {
+  constructor(options?: TokenGenerator.Options);
+
+  generate(length?: number): string;
+  generate(length: number, callback: TokenGenerator.Callback): void;
+  generate(callback: TokenGenerator.Callback): void;
+}
+
+declare namespace TokenGenerator {
+  interface OptionsObject {
+    chars?: string;
+    length?: number;
+  }
+
+  type Options = number | string | OptionsObject;
+  type Callback = (error: any, token: string) => void;
+}
diff --git a/types/tokgen/tokgen-tests.ts b/types/tokgen/tokgen-tests.ts
new file mode 100644
index 0000000000..af3f384fcd
--- /dev/null
+++ b/types/tokgen/tokgen-tests.ts
@@ -0,0 +1,20 @@
+import * as TokenGenerator from 'tokgen';
+
+const generator1 = new TokenGenerator();
+const generator2 = new TokenGenerator('0-9a-f');
+const generator3 = new TokenGenerator({chars: '0-9a-f'});
+const generator4 = new TokenGenerator(8);
+const generator5 = new TokenGenerator({length: 8});
+const generator6 = new TokenGenerator({chars: '0-9a-f', length: 8});
+
+const token1 = generator1.generate();
+
+const token2 = generator1.generate(10);
+
+generator1.generate((error, token) => {
+  // nothing to do in this test
+});
+
+generator1.generate(8, (error, token) => {
+  // nothing to do in this test
+});
diff --git a/types/tokgen/tsconfig.json b/types/tokgen/tsconfig.json
new file mode 100644
index 0000000000..5a6995c482
--- /dev/null
+++ b/types/tokgen/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",
+        "tokgen-tests.ts"
+    ]
+}
diff --git a/types/tokgen/tslint.json b/types/tokgen/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tokgen/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 69c6d7f7c1e13ee9e07fc6fed26d672ebf3098e5 Mon Sep 17 00:00:00 2001
From: l-jonas <l-jonas@users.noreply.github.com>
Date: Wed, 9 May 2018 21:17:58 +0200
Subject: [PATCH 0143/1124] Add types for seed-random (#25642)

---
 types/seed-random/index.d.ts           | 22 ++++++++++++++++++++++
 types/seed-random/seed-random-tests.ts | 26 ++++++++++++++++++++++++++
 types/seed-random/tsconfig.json        | 23 +++++++++++++++++++++++
 types/seed-random/tslint.json          |  1 +
 4 files changed, 72 insertions(+)
 create mode 100644 types/seed-random/index.d.ts
 create mode 100644 types/seed-random/seed-random-tests.ts
 create mode 100644 types/seed-random/tsconfig.json
 create mode 100644 types/seed-random/tslint.json

diff --git a/types/seed-random/index.d.ts b/types/seed-random/index.d.ts
new file mode 100644
index 0000000000..a7dfc33e3f
--- /dev/null
+++ b/types/seed-random/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for seed-random 2.2
+// Project: https://github.com/ForbesLindesay/seed-random
+// Definitions by: Jonas Lochmann <https://github.com/l-jonas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*
+ * Usage:
+ *  import * as seed from 'seed-random';
+ */
+
+export = SeedRandom;
+
+declare function SeedRandom(seed?: string, options?: SeedRandom.Options): () => number;
+
+declare namespace SeedRandom {
+  interface Options {
+    global?: boolean;
+    entropy?: boolean;
+  }
+
+  function resetGlobal(): void;
+}
diff --git a/types/seed-random/seed-random-tests.ts b/types/seed-random/seed-random-tests.ts
new file mode 100644
index 0000000000..9872f63dfa
--- /dev/null
+++ b/types/seed-random/seed-random-tests.ts
@@ -0,0 +1,26 @@
+/// <reference types="node" />
+
+import * as assert from 'assert';
+import * as seed from 'seed-random';
+
+const trueRandomA = seed();
+const trueRandomB = seed();
+assert(trueRandomA() !== trueRandomB());
+
+const fakeRandomA = seed('foo');
+const fakeRandomB = seed('foo');
+assert(fakeRandomA() === fakeRandomB());
+
+const fakeRandomC = seed('foo', {entropy: true});
+const fakeRandomD = seed('foo', {entropy: true});
+assert(fakeRandomC() !== fakeRandomD());
+
+// override global Math.random
+seed('foo', {global: true});
+const numA = Math.random();
+seed('foo', {global: true});
+const numB = Math.random();
+assert(numA === numB);
+
+// reset to default Math.random
+seed.resetGlobal();
diff --git a/types/seed-random/tsconfig.json b/types/seed-random/tsconfig.json
new file mode 100644
index 0000000000..2a332b0baf
--- /dev/null
+++ b/types/seed-random/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",
+        "seed-random-tests.ts"
+    ]
+}
diff --git a/types/seed-random/tslint.json b/types/seed-random/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/seed-random/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 49ecfa4536c9f5102cea2db42f750994c70b0a44 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <joshuakgoldberg@outlook.com>
Date: Wed, 9 May 2018 12:33:56 -0700
Subject: [PATCH 0144/1124] Used a conditional type for Sinon's stub class
 typings  (#25656)

* Used a conditional type for Sinon's stub class typings

* mochaccino
---
 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              | 12 +++++++++---
 types/sinon/sinon-tests.ts          |  9 +++++++++
 12 files changed, 28 insertions(+), 13 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..0bc7d112fc 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -5,8 +5,9 @@
 //                 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
@@ -566,15 +567,20 @@ 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;
 }
 
 declare const Sinon: Sinon.SinonStatic;
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 17e8cc6084..c6ffc7a51e 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -154,6 +154,15 @@ function testSandbox() {
     sandbox.createStubInstance<TestCreateStubInstance>(TestCreateStubInstance).someTestMethod('some argument');
 }
 
+class OneFunctionOneNumber {
+    memberFunction() { }
+    memberNumber: number;
+}
+
+const stubInstance = sinon.createStubInstance<OneFunctionOneNumber>(OneFunctionOneNumber);
+const memberFunction: sinon.SinonStub = stubInstance.memberFunction;
+const memberNumber: number = stubInstance.memberNumber;
+
 function testPromises() {
     let resolveStub = sinon.stub().resolves();
     resolveStub = sinon.stub().resolves(10);

From ccfc17b9560fef0392ca9a35ed39534f68622e8c Mon Sep 17 00:00:00 2001
From: Guillaume <guillaumeroyer.mail@gmail.com>
Date: Wed, 9 May 2018 20:36:41 +0100
Subject: [PATCH 0145/1124] fix(ngtoaster): update definitions for v2.2.0
 (#25529)

- also indent with 4 spaces
---
 types/ngtoaster/index.d.ts         | 208 ++++++++++++++++-------------
 types/ngtoaster/ngtoaster-tests.ts |  86 +++++++-----
 types/ngtoaster/tslint.json        |  74 +---------
 3 files changed, 167 insertions(+), 201 deletions(-)

diff --git a/types/ngtoaster/index.d.ts b/types/ngtoaster/index.d.ts
index caf9bd0539..092e1a7b0e 100644
--- a/types/ngtoaster/index.d.ts
+++ b/types/ngtoaster/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for angularjs-toaster v0.4.13
+// Type definitions for angularjs-toaster 2.2
 // Project: https://github.com/jirikavi/AngularJS-Toaster
 // Definitions by: Ben Tesser <https://github.com/btesser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,100 +10,126 @@ export = ngtoaster;
 export as namespace toaster;
 
 declare namespace ngtoaster {
-  interface IToasterService {
-    pop(params:IPopParams): void
-    /**
-     * @param {string} type Type of toaster  -- 'error', 'info', 'wait', 'success', and 'warning'
-     */
-    pop(type?:string, title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number, showCloseButton?:boolean): void
-    error(params: IPopParams): void
-    error(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    info(params: IPopParams): void
-    info(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    wait(params: IPopParams): void
-    wait(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    success(params: IPopParams): void
-    success(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    warning(params: IPopParams): void
-    warning(title?:string, body?:string, timeout?:number, bodyOutputType?:string, clickHandler?:EventListener,
-        toasterId?:number): void
-    clear(): void
-    toast:IToast;
-  }
+    interface IToasterService {
+        pop(params: IPopParams): void;
+        /**
+         * @param type Type of toaster  -- 'error', 'info', 'wait', 'success', and 'warning'
+         */
+        pop(type?: string, title?: string, body?: string, timeout?: number, bodyOutputType?: string, clickHandler?: EventListener,
+            toasterId?: number, showCloseButton?: boolean, toastId?: string|number,
+            onHideCallback?: IToastCallback): IPopReturn;
+        error(params: IPopParams): void;
+        error(title?: string, body?: string, timeout?: number, bodyOutputType?: string, clickHandler?: EventListener,
+            toasterId?: number, showCloseButton?: boolean, toastId?: string|number,
+            onHideCallback?: IToastCallback): IPopReturn;
+        info(params: IPopParams): void;
+        info(title?: string, body?: string, timeout?: number, bodyOutputType?: string, clickHandler?: EventListener,
+            toasterId?: number, showCloseButton?: boolean, toastId?: string|number,
+            onHideCallback?: IToastCallback): IPopReturn;
+        wait(params: IPopParams): void;
+        wait(title?: string, body?: string, timeout?: number, bodyOutputType?: string, clickHandler?: EventListener,
+            toasterId?: number, showCloseButton?: boolean, toastId?: string|number,
+            onHideCallback?: IToastCallback): IPopReturn;
+        success(params: IPopParams): void;
+        success(title?: string, body?: string, timeout?: number, bodyOutputType?: string, clickHandler?: EventListener,
+            toasterId?: number, showCloseButton?: boolean, toastId?: string|number,
+            onHideCallback?: IToastCallback): IPopReturn;
+        warning(params: IPopParams): void;
+        warning(title?: string, body?: string, timeout?: number, bodyOutputType?: string, clickHandler?: EventListener,
+            toasterId?: number, showCloseButton?: boolean, toastId?: string|number,
+            onHideCallback?: IToastCallback): IPopReturn;
+        clear(toasterId?: number, toastId?: string|number): void;
+        toast: IToast;
+    }
 
-  interface IToasterEventRegistry {
-    setup(): void
-    subscribeToNewToastEvent(onNewToast:IToastEventListener): void
-    subscribeToClearToastsEvent(onClearToasts:IToastEventListener): void
-    unsubscribeToNewToastEvent(onNewToast:IToastEventListener): void
-    unsubscribeToClearToastsEvent(onClearToasts:IToastEventListener): void
-  }
+    interface IToasterEventRegistry {
+        setup(): void;
+        subscribeToNewToastEvent(onNewToast: IToastEventListener): void;
+        subscribeToClearToastsEvent(onClearToasts: IToastEventListener): void;
+        unsubscribeToNewToastEvent(onNewToast: IToastEventListener): void;
+        unsubscribeToClearToastsEvent(onClearToasts: IToastEventListener): void;
+    }
 
-  interface IPopParams extends IToast{
-    toasterId?: number;
-  }
+    interface IPopParams extends IToast {
+        toasterId?: number;
+    }
 
-  interface IToastEventListener {
-    (event:Event, toasterId: number): void;
-  }
+    interface IPopReturn {
+        toasterId: number;
+        toastId: string|number;
+    }
 
-  interface IToast {
-    /**
-     * Acceptable types are:
-     * 'error', 'info', 'wait', 'success', and 'warning'
-     */
-    type?: string;
-    title?: string;
-    body?: string;
-    timeout?: number;
-    bodyOutputType?: string;
-    clickHandler?: EventListener;
-    showCloseButton?: boolean;
-  }
+    type IToastCallback = (toast: IToast) => void;
 
-  interface IToasterConfig {
-    /**
-     * limits max number of toasts
-     */
-    limit?: number;
-    'tap-to-dismiss'?: boolean;
-    'close-button'?: boolean;
-    'newest-on-top'?: boolean;
-    'time-out'?: number;
-    'icon-classes'?: IIconClasses;
-    /**
-     * Options include:
-     * '', 'trustedHtml', 'template', 'templateWithData'
-     */
-    'body-output-type'?: string;
-    'body-template'?: string;
-    'icon-class'?: string;
-    /**
-     * Options include:
-     * 'toast-top-full-width', 'toast-bottom-full-width', 'toast-center',
-     * 'toast-top-left', 'toast-top-center', 'toast-top-rigt',
-     * 'toast-bottom-left', 'toast-bottom-center', 'toast-bottom-rigt',
-     */
-    'position-class'?: string;
-    'title-class'?: string;
-    'message-class'?: string;
-    'prevent-duplicates'?: boolean;
-    /**
-     * stop timeout on mouseover and restart timer on mouseout
-     */
-    'mouseover-timer-stop'?: boolean;
-  }
+    type IToastEventListener = (event: Event, toasterId: number, toastId: string|number) => void;
 
-  interface IIconClasses {
-    error: string;
-    info: string;
-    wait: string;
-    success: string;
-    warning: string;
-  }
+    interface IToast {
+        /**
+         * Acceptable types are:
+         * 'error', 'info', 'wait', 'success', and 'warning'
+         */
+        type?: string;
+        title?: string;
+        body?: string;
+        timeout?: number;
+        bodyOutputType?: string;
+        clickHandler?: EventListener;
+        showCloseButton?: boolean;
+        closeHtml?: string;
+        toastId?: string|number;
+        /**
+         * Called when the toast has been displayed.
+         * @param toast the displayed toast
+         */
+        onShowCallback?: IToastCallback;
+        /**
+         * Called when the toast has been removed.
+         * @param toast the displayed toast
+         */
+        onHideCallback?: IToastCallback;
+        directiveData?: any;
+        tapToDismiss?: boolean;
+    }
+
+    interface IToasterConfig {
+        /**
+         * limits max number of toasts
+         */
+        limit?: number;
+        'tap-to-dismiss'?: boolean;
+        'close-button'?: boolean;
+        'close-html'?: string;
+        'newest-on-top'?: boolean;
+        'time-out'?: number;
+        'icon-classes'?: IIconClasses;
+        /**
+         * Options include:
+         * '', 'trustedHtml', 'template', 'templateWithData'
+         */
+        'body-output-type'?: string;
+        'body-template'?: string;
+        'icon-class'?: string;
+        /**
+         * Options include:
+         * 'toast-top-full-width', 'toast-bottom-full-width', 'toast-center',
+         * 'toast-top-left', 'toast-top-center', 'toast-top-rigt',
+         * 'toast-bottom-left', 'toast-bottom-center', 'toast-bottom-rigt',
+         */
+        'position-class'?: string;
+        'title-class'?: string;
+        'message-class'?: string;
+        'prevent-duplicates'?: boolean;
+        /**
+         * stop timeout on mouseover and restart timer on mouseout
+         */
+        'mouseover-timer-stop'?: boolean;
+    }
+
+    interface IIconClasses {
+        error: string;
+        info: string;
+        wait: string;
+        success: string;
+        warning: string;
+    }
 }
diff --git a/types/ngtoaster/ngtoaster-tests.ts b/types/ngtoaster/ngtoaster-tests.ts
index eb30c181d4..0640ba2191 100644
--- a/types/ngtoaster/ngtoaster-tests.ts
+++ b/types/ngtoaster/ngtoaster-tests.ts
@@ -1,45 +1,57 @@
-import ngtoaster = require("ngtoaster");
-import * as ng from 'angular';
+import ngtoaster = require('ngtoaster');
 import * as angular from 'angular';
 
 class NgToasterTestController {
-  constructor(public $scope: ng.IScope, public $window: ng.IWindowService, public toaster: ngtoaster.IToasterService) {
-    this.bar = 'Hi';
-  }
-  bar: string;
-
-  pop(): void {
-    this.toaster.success({ title: "title", body: "text1" });
-    this.toaster.error("title", "text2");
-    this.toaster.pop({ type: 'wait', title: "title", body: "text" });
-    this.toaster.pop('success', "title", '<ul><li>Render html</li></ul>', 5000, 'trustedHtml');
-    this.toaster.pop('error', "title", '<ul><li>Render html</li></ul>', null, 'trustedHtml');
-    this.toaster.pop('wait', "title", null, null, 'template');
-    this.toaster.pop('warning', "title", "myTemplate.html", null, 'template');
-    this.toaster.pop('note', "title", "text");
-    this.toaster.pop('success', "title", 'Its address is https://google.com.', 5000, 'trustedHtml', (toaster: ngtoaster.IToast): boolean => {
-      var match = toaster.body.match(/http[s]?:\/\/[^\s]+/);
-      if (match) {
-        this.$window.open(match[0]);
-      }
-      return true;
-    });
-    this.toaster.pop('warning', "Hi ", "{template: 'myTemplateWithData.html', data: 'MyData'}", 15000, 'templateWithData');
-  }
-
-  goToLink(toaster: ngtoaster.IToast): boolean {
-    var match = toaster.body.match(/http[s]?:\/\/[^\s]+/);
-    if (match) {
-      this.$window.open(match[0]);
+    constructor(
+        public $scope: angular.IScope,
+        public $window: angular.IWindowService,
+        public toaster: ngtoaster.IToasterService
+    ) {
+        this.bar = 'Hi';
     }
-    return true;
-  }
+    bar: string;
 
-  clear(): void {
-    this.toaster.clear();
-  }
+    pop(): void {
+        this.toaster.success({ title: 'title', body: 'text1' });
+        this.toaster.error('title', 'text2');
+        this.toaster.pop({
+            type: 'wait',
+            title: 'title',
+            body: 'text',
+            onShowCallback: (toast) => {
+                this.toaster.clear(null, toast.toastId);
+            }
+        });
+        this.toaster.pop('success', 'title', '<ul><li>Render html</li></ul>', 5000, 'trustedHtml');
+        this.toaster.pop('error', 'title', '<ul><li>Render html</li></ul>', null, 'trustedHtml');
+        this.toaster.pop('wait', 'title', null, null, 'template');
+        this.toaster.pop('warning', 'title', 'myTemplate.html', null, 'template');
+        this.toaster.pop('note', 'title', 'text');
+        this.toaster.pop('success', 'title', 'Its address is https://google.com.', 5000, 'trustedHtml', (toaster: ngtoaster.IToast): boolean => {
+            const match = toaster.body.match(/http[s]?:\/\/[^\s]+/);
+            if (match) {
+                this.$window.open(match[0]);
+            }
+            return true;
+        });
+        this.toaster.pop('warning', 'Hi ', `{template: 'myTemplateWithData.html', data: 'MyData'}`, 15000, 'templateWithData');
+    }
+
+    goToLink(toaster: ngtoaster.IToast): boolean {
+        const match = toaster.body.match(/http[s]?:\/\/[^\s]+/);
+        if (match) {
+            this.$window.open(match[0]);
+        }
+        return true;
+    }
+
+    clear(): void {
+        this.toaster.clear();
+        this.toaster.clear(1);
+        this.toaster.clear(null, 'mytoast');
+    }
 }
 
 angular
-  .module('main', ['ngAnimate', 'toaster'])
-  .controller('myController', NgToasterTestController);
\ No newline at end of file
+    .module('main', ['ngAnimate', 'toaster'])
+    .controller('myController', NgToasterTestController);
diff --git a/types/ngtoaster/tslint.json b/types/ngtoaster/tslint.json
index a41bf5d19a..eaaf55d976 100644
--- a/types/ngtoaster/tslint.json
+++ b/types/ngtoaster/tslint.json
@@ -1,79 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
         "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "interface-name": false
     }
 }

From 20c0779394e32453c3b90d336055d8108aedcf6f Mon Sep 17 00:00:00 2001
From: Anjun Wang <wanganjun1992@hotmail.com>
Date: Thu, 10 May 2018 03:38:44 +0800
Subject: [PATCH 0146/1124] [arrify] generic improvement (#25629)

* [arrify] generic improvement

* [arrify] add test code

* [arrify] fix linting error: replace let with const

* [arrify] fix linting error: remove consecutive blank lines
---
 types/arrify/arrify-tests.ts | 72 +++++++++++++++++++++++++++++++++++
 types/arrify/index.d.ts      | 73 ++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/types/arrify/arrify-tests.ts b/types/arrify/arrify-tests.ts
index 12995781bf..3fee89133d 100644
--- a/types/arrify/arrify-tests.ts
+++ b/types/arrify/arrify-tests.ts
@@ -1,5 +1,6 @@
 import * as arrify from 'arrify';
 
+/***************** arrify<T> *****************/
 arrify(null);
 arrify<number>(null);
 
@@ -12,3 +13,74 @@ arrify([2, 3]);
 function test(val?: string | string[]) {
     arrify(val);
 }
+/***************** arrify<T> *****************/
+
+/***************** arrify<T1, T2> *****************/
+arrify<number, string>(undefined); // returns []
+
+arrify<number, string>(null); // returns []
+
+{
+    const value: number | string[] = 2018;
+    arrify<number, string>(value); // returns [2018]
+}
+
+{
+    const value: number[] | string | string[] = ['a', 'b'];
+    arrify<number, string>(value); // returns ['a', 'b']
+}
+/***************** arrify<T1, T2> *****************/
+
+/***************** arrify<T1, T2, T3> *****************/
+arrify<boolean, number, string>(undefined);
+
+arrify<boolean, number, string>(null);
+
+{
+    const value: boolean | number[] | string[] = true;
+    // returns [true]
+    arrify<boolean, number, string>(value);
+}
+
+{
+    const value: boolean[] | number | string[] = ['a', 'b'];
+    // returns ['a', 'b']
+    arrify<boolean, number, string>(value);
+}
+/***************** arrify<T1, T2, T3> *****************/
+
+/***************** arrify<T1, T2, T3, T4> *****************/
+arrify<boolean, Date, number, string>(undefined);
+
+arrify<boolean, Date, number, string>(null);
+
+{
+    const value: boolean | Date | number[] | string[] = new Date(2018);
+    // returns [ new Date(2018) ]
+    arrify<boolean, Date, number, string>(value);
+}
+
+{
+    const value: boolean[] | Date[] | number | string = [true, false];
+    // returns [true, false]
+    arrify<boolean, Date, number, string>(value);
+}
+/***************** arrify<T1, T2, T3, T4> *****************/
+
+/***************** arrify<T1, T2, T3, T4, T5> *****************/
+arrify<boolean, Date, number, RegExp, string>(undefined);
+
+arrify<boolean, Date, number, RegExp, string>(null);
+
+{
+    const value: boolean | Date | number[] | RegExp | string[] = /test/;
+    // returns [ /test/ ]
+    arrify<boolean, Date, number, RegExp, string>(value);
+}
+
+{
+    const value: boolean[] | Date[] | number | RegExp[] | string = [/test1/, /test2/];
+    // returns [/test1/, /test2/]
+    arrify<boolean, Date, number, RegExp, string>(value);
+}
+/***************** arrify<T1, T2, T3, T4, T5> *****************/
diff --git a/types/arrify/index.d.ts b/types/arrify/index.d.ts
index 43c06af05f..7c3c588ea6 100644
--- a/types/arrify/index.d.ts
+++ b/types/arrify/index.d.ts
@@ -14,5 +14,78 @@
  * arrify([2, 3])    // returns [2, 3]
  */
 declare function arrify<T>(val: undefined | null | T | T[]): T[];
+
+/**
+ * @example
+ * // returns []
+ * arrify<number, string>(undefined);
+ * @example
+ * // returns []
+ * arrify<number, string>(null);
+ * @example
+ * let value: number | string[] = 2018;
+ * // returns [2018]
+ * arrify<number, string>(value);
+ * @example
+ * let value: number[] | string | string[] = ['a', 'b'];
+ * // returns ['a', 'b']
+ * arrify<number, string>(value);
+ */
+declare function arrify<T1, T2>(val: undefined | null | T1 | T2 | T1[] | T2[]): T1[] | T2[];
+
+/**
+ * @example
+ * // returns []
+ * arrify<boolean, number, string>(undefined);
+ * @example
+ * // returns []
+ * arrify<boolean, number, string>(null);
+ * @example
+ * let value: boolean | number[] | string[] = true;
+ * // returns [true]
+ * arrify<boolean, number, string>(value);
+ * @example
+ * let value: boolean[] | number | string[] = ['a', 'b'];
+ * // returns ['a', 'b']
+ * arrify<boolean, number, string>(value);
+ */
+declare function arrify<T1, T2, T3>(val: undefined | null | T1 | T2 | T3 | T1[] | T2[] | T3[]): T1[] | T2[] | T3[];
+
+/**
+ * @example
+ * // returns []
+ * arrify<boolean, Date, number, string>(undefined);
+ * @example
+ * // returns []
+ * arrify<boolean, Date, number, string>(null);
+ * @example
+ * let value: boolean | Date | number[] | string[] = new Date(2018);
+ * // returns [ new Date(2018) ]
+ * arrify<boolean, Date, number, string>(value);
+ * @example
+ * let value: boolean[] | Date[] | number | string = [true, false];
+ * // returns [true, false]
+ * arrify<boolean, Date, number, string>(value);
+ */
+declare function arrify<T1, T2, T3, T4>(val: undefined | null | T1 | T2 | T3 | T4 | T1[] | T2[] | T3[] | T4[]): T1[] | T2[] | T3[] | T4[];
+
+/**
+ * @example
+ * // returns []
+ * arrify<boolean, Date, number, RegExp, string>(undefined);
+ * @example
+ * // returns []
+ * arrify<boolean, Date, number, RegExp, string>(null);
+ * @example
+ * let value: boolean | Date | number[] | RegExp | string[] = /test/;
+ * // returns [ /test/ ]
+ * arrify<boolean, Date, number, RegExp, string>(value);
+ * @example
+ * let value: boolean[] | Date[] | number | RegExp[] | string = [/test1/, /test2/];
+ * // returns [/test1/, /test2/]
+ * arrify<boolean, Date, number, RegExp, string>(value);
+ */
+declare function arrify<T1, T2, T3, T4, T5>(val: undefined | null | T1 | T2 | T3 | T4 | T5 | T1[] | T2[] | T3[] | T4[] | T5[]): T1[] | T2[] | T3[] | T4[] | T5[];
+
 declare namespace arrify {}
 export = arrify;

From c7331be0bf0fc117590323546183a6bf097cc022 Mon Sep 17 00:00:00 2001
From: Scott Escue <scott.escue@southernfiredsoftware.com>
Date: Wed, 9 May 2018 14:39:54 -0500
Subject: [PATCH 0147/1124] [amazon-cognito-auth-js] Creating package (#25622)

* Creating initial type definitions for 'amazon-cognito-auth-js', which include all JSDoc from the ES source code. I'm attempting to follow the same interface naming conventions found in aws/amazon-cognito-identity-js. I've deviated from the standard package template by creating a /test subfolder that contains the conventionally named test file along with a second file that references types from a global namespace.

* Removing tslint interface-name rule override and removing "I" prefix
from interface names.

* Improving tests by ensuring all interface types are explicitly
referenced.

* Removing unnecessary .editorconfig in package directory.
---
 types/amazon-cognito-auth-js/index.d.ts       | 577 ++++++++++++++++++
 .../test/amazon-cognito-auth-js-tests.ts      | 162 +++++
 .../test/amazon-cognito-auth-js-umd-tests.ts  |  22 +
 types/amazon-cognito-auth-js/tsconfig.json    |  25 +
 types/amazon-cognito-auth-js/tslint.json      |   1 +
 5 files changed, 787 insertions(+)
 create mode 100644 types/amazon-cognito-auth-js/index.d.ts
 create mode 100644 types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-tests.ts
 create mode 100644 types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-umd-tests.ts
 create mode 100644 types/amazon-cognito-auth-js/tsconfig.json
 create mode 100644 types/amazon-cognito-auth-js/tslint.json

diff --git a/types/amazon-cognito-auth-js/index.d.ts b/types/amazon-cognito-auth-js/index.d.ts
new file mode 100644
index 0000000000..d828fccfc8
--- /dev/null
+++ b/types/amazon-cognito-auth-js/index.d.ts
@@ -0,0 +1,577 @@
+// Type definitions for amazon-cognito-auth-js 1.2
+// Project: https://github.com/aws/amazon-cognito-auth-js
+// Definitions by: Scott Escue <https://github.com/scottescue>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/*
+ * Create global variable to provide access to types when used without module
+ * loading.
+ */
+export as namespace AmazonCognitoIdentity;
+
+// Stubs the XDomainRequest built-in from older IE browsers, does not follow the project's interface naming convention
+export interface XDomainRequest {
+    readonly responseText: string;
+    timeout: number;
+    onprogress: () => void;
+    ontimeout: () => void;
+    onerror: () => void;
+    onload: () => void;
+
+    open(method: string, url: string): void;
+    send(data: string): void;
+    abort(): void;
+}
+
+export interface CognitoSessionData {
+    /**
+     * The session's Id token.
+     */
+    IdToken?: CognitoIdToken;
+
+    /**
+     * The session's refresh token.
+     */
+    RefreshToken?: CognitoRefreshToken;
+
+    /**
+     * The session's access token.
+     */
+    AccessToken?: CognitoAccessToken;
+
+    /**
+     * The session's token scopes.
+     */
+    TokenScopes?: CognitoTokenScopes;
+
+    /**
+     * The session's state.
+     */
+    State?: string;
+}
+
+export interface CognitoAuthOptions {
+    /**
+     * Required: User pool application client id.
+     */
+    ClientId: string;
+
+    /**
+     * Required: The application/user-pools Cognito web hostname,this is set at the Cognito console.
+     */
+    AppWebDomain: string;
+
+    /**
+     * Optional: The token scopes
+     */
+    TokenScopesArray?: ReadonlyArray<string>;
+
+    /**
+     * Required: Required: The redirect Uri, which will be launched after authentication as signed in.
+     */
+    RedirectUriSignIn: string;
+
+    /**
+     * Required: The redirect Uri, which will be launched when signed out.
+     */
+    RedirectUriSignOut: string;
+
+    /**
+     * Optional: Pre-selected identity provider (this allows to automatically trigger social provider authentication flow).
+     */
+    IdentityProvider?: string;
+
+    /**
+     * Optional: UserPoolId for the configured cognito userPool.
+     */
+    UserPoolId?: string;
+
+    /**
+     * Optional: boolean flag indicating if the data collection is enabled to support cognito advanced security features. By default, this flag is set to true.
+     */
+    AdvancedSecurityDataCollectionFlag?: boolean;
+}
+
+export interface CognitoAuthUserHandler {
+    onSuccess: (authSession: CognitoAuthSession) => void;
+    onFailure: (err: any) => void;
+}
+
+export interface CognitoConstants {
+    DOMAIN_SCHEME: string;
+    DOMAIN_PATH_SIGNIN: string;
+    DOMAIN_PATH_TOKEN: string;
+    DOMAIN_PATH_SIGNOUT: string;
+    DOMAIN_QUERY_PARAM_REDIRECT_URI: string;
+    DOMAIN_QUERY_PARAM_SIGNOUT_URI: string;
+    DOMAIN_QUERY_PARAM_RESPONSE_TYPE: string;
+    DOMAIN_QUERY_PARAM_IDENTITY_PROVIDER: string;
+    DOMAIN_QUERY_PARAM_USERCONTEXTDATA: string;
+    CLIENT_ID: string;
+    STATE: string;
+    SCOPE: string;
+    TOKEN: string;
+    CODE: string;
+    POST: string;
+    PARAMETERERROR: string;
+    SCOPETYPEERROR: string;
+    QUESTIONMARK: string;
+    POUNDSIGN: string;
+    COLONDOUBLESLASH: string;
+    SLASH: string;
+    AMPERSAND: string;
+    EQUALSIGN: string;
+    SPACE: string;
+    CONTENTTYPE: string;
+    CONTENTTYPEVALUE: string;
+    AUTHORIZATIONCODE: string;
+    IDTOKEN: string;
+    ACCESSTOKEN: string;
+    REFRESHTOKEN: string;
+    ERROR: string;
+    ERROR_DESCRIPTION: string;
+    STRINGTYPE: string;
+    STATELENGTH: number;
+    STATEORIGINSTRING: string;
+    WITHCREDENTIALS: string;
+    UNDEFINED: string;
+    SELF: string;
+    HOSTNAMEREGEX: RegExp;
+    QUERYPARAMETERREGEX1: RegExp;
+    QUERYPARAMETERREGEX2: RegExp;
+    HEADER: { 'Content-Type': string };
+}
+
+export class CognitoIdToken {
+    /**
+     * Constructs a new CognitoIdToken object
+     * @param IdToken The JWT Id token
+     */
+    constructor(IdToken: string);
+
+    /**
+     * @returns the record's token.
+     */
+    getJwtToken(): string;
+
+    /**
+     * Sets new value for id token.
+     * @param idToken The JWT Id token
+     */
+    setJwtToken(idToken: string): void;
+
+    /**
+     * @returns the token's expiration (exp member).
+     */
+    getExpiration(): number;
+
+    /**
+     * @returns the token's payload.
+     */
+    decodePayload(): object;
+}
+
+export class CognitoRefreshToken {
+    /**
+     * Constructs a new CognitoRefreshToken object
+     * @param RefreshToken The JWT refresh token.
+     */
+    constructor(RefreshToken: string);
+
+    /**
+     * @returns the record's token.
+     */
+    getToken(): string;
+
+    /**
+     * Sets new value for refresh token.
+     * @param refreshToken The JWT refresh token.
+     */
+    setToken(refreshToken: string): void;
+}
+
+export class CognitoAccessToken {
+    /**
+     * Constructs a new CognitoAccessToken object
+     * @param AccessToken The JWT access token.
+     */
+    constructor(AccessToken: string);
+
+    /**
+     * @returns the record's token.
+     */
+    getJwtToken(): string;
+
+    /**
+     * Sets new value for access token.
+     * @param accessToken The JWT access token.
+     */
+    setJwtToken(accessToken: string): void;
+
+    /**
+     * @returns the token's expiration (exp member).
+     */
+    getExpiration(): number;
+
+    /**
+     * @returns the username from payload.
+     */
+    getUsername(): string;
+
+    /**
+     * @returns the token's payload.
+     */
+    decodePayload(): object;
+}
+
+export class CognitoTokenScopes {
+    /**
+     * Constructs a new CognitoTokenScopes object
+     * @param TokenScopesArray The token scopes
+     */
+    constructor(TokenScopesArray: ReadonlyArray<string>);
+
+    /**
+     * @returns the token scopes.
+     */
+    getScopes(): string[];
+
+    /**
+     * Sets new value for token scopes.
+     * @param tokenScopes The token scopes
+     */
+    setTokenScopes(tokenScopes: ReadonlyArray<string>): void;
+}
+
+export class CognitoAuthSession {
+    /**
+     * Constructs a new CognitoUserSession object
+     * @param sessionData The session's tokens, scopes, and state.
+     */
+    constructor(sessionData: CognitoSessionData);
+
+    /**
+     *  @returns the session's Id token
+     */
+    getIdToken(): CognitoIdToken;
+
+    /**
+     * Set a new Id token
+     * @param IdToken The session's Id token.
+     */
+    setIdToken(IdToken: CognitoIdToken): void;
+
+    /**
+     * @returns the session's refresh token
+     */
+    getRefreshToken(): CognitoRefreshToken;
+
+    /**
+     * Set a new Refresh token
+     * @param RefreshToken The session's refresh token.
+     */
+    setRefreshToken(RefreshToken: CognitoRefreshToken): void;
+
+    /**
+     * @returns the session's access token
+     */
+    getAccessToken(): CognitoAccessToken;
+
+    /**
+     * Set a new Access token
+     * @param AccessToken The session's access token.
+     */
+    setAccessToken(AccessToken: CognitoAccessToken): void;
+
+    /**
+     * @returns the session's token scopes
+     */
+    getTokenScopes(): CognitoTokenScopes;
+
+    /**
+     * Set new token scopes
+     * @param tokenScopes The session's token scopes.
+     */
+    setTokenScopes(tokenScopes: CognitoTokenScopes): void;
+
+    /**
+     * @returns the session's state
+     */
+    getState(): string;
+
+    /**
+     * Set new state
+     * @param state The session's state.
+     */
+    setState(State: string): void;
+
+    /**
+     * Checks to see if the session is still valid based on session expiry information found
+     * in Access and Id Tokens and the current time
+     * @returns if the session is still valid
+     */
+    isValid(): boolean;
+}
+
+export class CognitoAuth {
+    /**
+     * Called on success or error.
+     */
+    userhandler: CognitoAuthUserHandler;
+
+    /**
+     * Constructs a new CognitoAuth object
+     * @param options Creation options
+     */
+    constructor(options: CognitoAuthOptions);
+
+    /**
+     * @returns the constants
+     */
+    getCognitoConstants(): CognitoConstants;
+
+    /**
+     * @returns the client id
+     */
+    getClientId(): string;
+
+    /**
+     * @returns the app web domain
+     */
+    getAppWebDomain(): string;
+
+    /**
+     * method for getting the current user of the application from the local storage
+     *
+     * @returns the user retrieved from storage
+     */
+    getCurrentUser(): string;
+
+    /**
+     * method for setting the current user's name
+     * @param Username the user's name
+     */
+    setUser(Username: string): void;
+
+    /**
+     * sets response type to 'code'
+     */
+    useCodeGrantFlow(): void;
+
+    /**
+     * sets response type to 'token'
+     */
+    useImplicitFlow(): void;
+
+    /**
+     * @returns the current session for this user
+     */
+    getSignInUserSession(): CognitoAuthSession;
+
+    /**
+     * @returns the user's username
+     */
+    getUsername(): string;
+
+    /**
+     * @param Username the user's username
+     */
+    setUsername(Username: string): void;
+
+    /**
+     * @returns the user's state
+     */
+    getState(): string;
+
+    /**
+     * @param State the user's state
+     */
+    setState(State: string): void;
+
+    /**
+     * This is used to get a session, either from the session object or from the local storage, or by using a refresh token
+     * @param RedirectUriSignIn Required: The redirect Uri, which will be launched after authentication.
+     * @param TokenScopesArray Required: The token scopes, it is an array of strings specifying all scopes for the tokens.
+     */
+    getSession(): void;
+
+    /**
+     * Parse the http request response and proceed according to different response types.
+     * @param httpRequestResponse the http request response
+     */
+    parseCognitoWebResponse(httpRequestResponse: string): void;
+
+    /**
+     * Get the query parameter map and proceed according to code response type.
+     * @param Query parameter map
+     */
+    getCodeQueryParameter(map: ReadonlyMap<string, string>): void;
+
+    /**
+     * Get the query parameter map and proceed according to token response type.
+     * @param Query parameter map
+     */
+    getTokenQueryParameter(map: ReadonlyMap<string, string>): void;
+
+    /**
+     * Get cached tokens and scopes and return a new session using all the cached data.
+     * @returns the auth session
+     */
+    getCachedSession(): CognitoAuthSession;
+
+    /**
+     * This is used to get last signed in user from local storage
+     * @returns the last user name
+     */
+    getLastUser(): string;
+
+    /**
+     * This is used to save the session tokens and scopes to local storage.
+     */
+    cacheTokensScopes(): void;
+
+    /**
+     * Compare two sets if they are identical.
+     * @param set1 one set
+     * @param set2 the other set
+     * @returns boolean value is true if two sets are identical
+     */
+    compareSets(set1: ReadonlySet<any>, set2: ReadonlySet<any>): boolean;
+
+    /**
+     * Get the hostname from url.
+     * @param url the url string
+     * @returns hostname string
+     */
+    getHostName(url: string): string;
+
+    /**
+     * Get http query parameters and return them as a map.
+     * @param url the url string
+     * @param splitMark query parameters split mark (prefix)
+     * @returns map
+     */
+    getQueryParameters(url: string, splitMark: string): Map<string, string>;
+
+    /**
+     * helper function to generate a random string
+     * @param length the length of string
+     * @param chars a original string
+     * @returns a random value.
+     */
+    generateRandomString(length: number, chars: string): string;
+
+    /**
+     * This is used to clear the session tokens and scopes from local storage
+     */
+    clearCachedTokensScopes(): void;
+
+    /**
+     * This is used to build a user session from tokens retrieved in the authentication result
+     * @param refreshToken Successful auth response from server.
+     */
+    refreshSession(refreshToken: string): void;
+
+    /**
+     * Make the http POST request.
+     * @param header header JSON object
+     * @param body body JSON object
+     * @param url string
+     * @param onSuccess callback
+     * @param onFailure callback
+     */
+    makePOSTRequest(header: object, body: object, url: string,
+        onSuccess: (responseText: string) => void,
+        onFailure: (responseText: string) => void): void;
+
+    /**
+     * Create the XHR object
+     * @param method which method to call
+     * @param url the url string
+     * @returns xhr
+     */
+    createCORSRequest(method: string, url: string): XMLHttpRequest | XDomainRequest;
+
+    /**
+     * The http POST request onFailure callback.
+     * @param err the error object
+     */
+    onFailure(err: any): void;
+
+    /**
+     * The http POST request onSuccess callback when refreshing tokens.
+     * @param jsonData tokens
+     */
+    onSuccessRefreshToken(jsonData: string): void;
+
+    /**
+     * The http POST request onSuccess callback when exchanging code for tokens.
+     * @param jsonData tokens
+     */
+    onSuccessExchangeForToken(jsonData: string): void;
+
+    /**
+     * Launch Cognito Auth UI page.
+     * @param URL the url to launch
+     */
+    launchUri(URL: string): void;
+
+    /**
+     * @returns scopes string
+     */
+    getSpaceSeperatedScopeString(): string;
+
+    /**
+     * Create the FQDN(fully qualified domain name) for authorization endpoint.
+     * @returns url
+     */
+    getFQDNSignIn(): string;
+
+    /**
+     * Sign out the user.
+     */
+    signOut(): void;
+
+    /**
+     * Create the FQDN(fully qualified domain name) for signout endpoint.
+     * @returns url
+     */
+    getFQDNSignOut(): string;
+
+    /**
+     * This method returns the encoded data string used for cognito advanced security feature.
+     * This would be generated only when developer has included the JS used for collecting the
+     * data on their client. Please refer to documentation to know more about using AdvancedSecurity
+     * features
+     */
+    getUserContextData(): string;
+
+    /**
+     * Helper method to let the user know if he has either a valid cached session
+     * or a valid authenticated session from the app integration callback.
+     * @returns userSignedIn
+     */
+    isUserSignedIn(): boolean;
+}
+
+export class DateHelper {
+    /**
+     * @returns The current time in "ddd MMM D HH:mm:ss UTC YYYY" format.
+     */
+    getNowString(): string;
+}
+
+export class StorageHelper {
+    /**
+     * This is used to get a storage object
+     * @returns the storage
+     */
+    constructor();
+
+    /**
+     * This is used to return the storage
+     * @returns the storage
+     */
+    getStorage(): Storage;
+}
diff --git a/types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-tests.ts b/types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-tests.ts
new file mode 100644
index 0000000000..42e58185e4
--- /dev/null
+++ b/types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-tests.ts
@@ -0,0 +1,162 @@
+import * as lib from 'amazon-cognito-auth-js';
+
+const idToken: lib.CognitoIdToken = new lib.CognitoIdToken('fak3T0ken1==');
+idToken.decodePayload(); // $ExpectType object
+idToken.setJwtToken('fak3T0ken2=='); // $ExpectType void
+idToken.getJwtToken(); // $ExpectType string
+idToken.getExpiration(); // $ExpectType number
+
+const refreshToken: lib.CognitoRefreshToken = new lib.CognitoRefreshToken('refreshplease==');
+refreshToken.setToken('refreshagainplease=='); // $ExpectType void
+refreshToken.getToken(); // $ExpectType string
+
+const accessToken: lib.CognitoAccessToken = new lib.CognitoAccessToken('fak3T0ken3==');
+accessToken.decodePayload(); // $ExpectType object
+accessToken.setJwtToken('fak3T0ken4=='); // $ExpectType void
+accessToken.getJwtToken(); // $ExpectType string
+accessToken.getExpiration(); // $ExpectType number
+accessToken.getUsername(); // $ExpectType string
+
+const tokenScopes: lib.CognitoTokenScopes = new lib.CognitoTokenScopes(['email', 'custom1']);
+tokenScopes.setTokenScopes(['openid']); // $ExpectType void
+tokenScopes.getScopes(); // $ExpectType string[]
+
+let sessionData: lib.CognitoSessionData = {};
+let authSession: lib.CognitoAuthSession = new lib.CognitoAuthSession(sessionData);
+
+sessionData = {
+    IdToken: idToken,
+    RefreshToken: refreshToken,
+    AccessToken: accessToken,
+    TokenScopes: tokenScopes,
+    State: '/myapp/home'
+};
+authSession = new lib.CognitoAuthSession(sessionData);
+
+authSession.setIdToken(new lib.CognitoIdToken('fak3T0ken5==')); // $ExpectType void
+authSession.setRefreshToken(new lib.CognitoRefreshToken('refreshmeyetagain==')); // $ExpectType void
+authSession.setAccessToken(new lib.CognitoAccessToken('fak3T0ken6==')); // $ExpectType void
+authSession.setTokenScopes(new lib.CognitoTokenScopes(['email'])); // $ExpectType void
+authSession.setState('/myapp/login'); // $ExpectType void
+authSession.getIdToken(); // $ExpectType CognitoIdToken
+authSession.getRefreshToken(); // $ExpectType CognitoRefreshToken
+authSession.getAccessToken(); // $ExpectType CognitoAccessToken
+authSession.getTokenScopes(); // $ExpectType CognitoTokenScopes
+authSession.getState(); // $ExpectType string
+
+let authOptions: lib.CognitoAuthOptions = {
+    ClientId: '1a2b3c4d5e6f7g',
+    AppWebDomain: 'myapp.auth.us-east-1.amazoncognito.com',
+    RedirectUriSignIn: 'https://myapp.com/login',
+    RedirectUriSignOut: 'https://myapp.com/logout'
+};
+let auth: lib.CognitoAuth = new lib.CognitoAuth(authOptions);
+
+authOptions = {
+    ClientId: '1a2b3c4d5e6f7g',
+    AppWebDomain: 'myapp.auth.us-east-1.amazoncognito.com',
+    TokenScopesArray: ['email', 'openid'],
+    RedirectUriSignIn: 'https://myapp.com/login',
+    RedirectUriSignOut: 'https://myapp.com/logout',
+    IdentityProvider: 'Facebook',
+    UserPoolId: 'us-east-1_faKE4ReAl',
+    AdvancedSecurityDataCollectionFlag: true
+};
+auth = new lib.CognitoAuth(authOptions);
+
+auth.getClientId(); // $ExpectType string
+auth.getAppWebDomain(); // $ExpectType string
+auth.getCurrentUser(); // $ExpectType string
+auth.setUser('jane.doe'); // $ExpectType void
+auth.useCodeGrantFlow(); // $ExpectType void
+auth.useImplicitFlow(); // $ExpectType void
+auth.getSignInUserSession(); // $ExpectType CognitoAuthSession
+auth.getUsername(); // $ExpectType string
+auth.setUsername('john.doe'); // $ExpectType void
+auth.getState(); // $ExpectType string
+auth.setState('/myhost/default.htm'); // $ExpectType void
+auth.getSession(); // $ExpectType void
+auth.parseCognitoWebResponse('url&stuff=true'); // $ExpectType void
+auth.getCodeQueryParameter(new Map());  // $ExpectType void
+auth.getTokenQueryParameter(new Map()); // $ExpectType void
+auth.getCachedSession(); // $ExpectType CognitoAuthSession
+auth.getLastUser(); // $ExpectType string
+auth.cacheTokensScopes(); // $ExpectType void
+auth.compareSets(new Set(['1']), new Set(['1'])); // $ExpectType boolean
+auth.getHostName('https://site.com/page?size=10'); // $ExpectType string
+auth.getQueryParameters('http://site.com?1=1&2=2', '?'); // $ExpectType Map<string, string>
+auth.generateRandomString(5, '159erf'); // $ExpectType string
+auth.clearCachedTokensScopes(); // $ExpectType void
+auth.refreshSession('refreshToken=='); // $ExpectType void
+// $ExpectType void
+auth.makePOSTRequest({ 'Content-Type': 'application/json' }, { pool: '2' },
+    'https://auth.com/signin',
+    (data) => console.log(data),
+    (error) => console.log(error));
+auth.createCORSRequest('POST', '/myapp/login'); // $ExpectType XMLHttpRequest | XDomainRequest
+auth.onFailure('request failed'); // $ExpectType void
+auth.onSuccessRefreshToken('{"name":"John", "age":31}'); // $ExpectType void
+auth.onSuccessExchangeForToken('{"name":"Jane", "age":30}'); // $ExpectType void
+auth.launchUri('https://auth.com/login'); // $ExpectType void
+auth.getSpaceSeperatedScopeString(); // $ExpectType string
+auth.getFQDNSignIn(); // $ExpectType string
+auth.signOut(); // $ExpectType void
+auth.getFQDNSignOut(); // $ExpectType string
+auth.getUserContextData(); // $ExpectType string
+auth.isUserSignedIn(); // $ExpectType boolean
+
+const userHandler: lib.CognitoAuthUserHandler = {
+    onSuccess: (authSession: lib.CognitoAuthSession) => console.log(authSession),
+    onFailure: (error: any) => console.log(error)
+};
+auth.userhandler = userHandler;
+
+const constants: lib.CognitoConstants = auth.getCognitoConstants();
+constants.DOMAIN_SCHEME; // $ExpectType string
+constants.DOMAIN_PATH_SIGNIN; // $ExpectType string
+constants.DOMAIN_PATH_TOKEN; // $ExpectType string
+constants.DOMAIN_PATH_SIGNOUT; // $ExpectType string
+constants.DOMAIN_QUERY_PARAM_REDIRECT_URI; // $ExpectType string
+constants.DOMAIN_QUERY_PARAM_SIGNOUT_URI; // $ExpectType string
+constants.DOMAIN_QUERY_PARAM_RESPONSE_TYPE; // $ExpectType string
+constants.DOMAIN_QUERY_PARAM_IDENTITY_PROVIDER; // $ExpectType string
+constants.DOMAIN_QUERY_PARAM_USERCONTEXTDATA; // $ExpectType string
+constants.CLIENT_ID; // $ExpectType string
+constants.STATE; // $ExpectType string
+constants.SCOPE; // $ExpectType string
+constants.TOKEN; // $ExpectType string
+constants.CODE; // $ExpectType string
+constants.POST; // $ExpectType string
+constants.PARAMETERERROR; // $ExpectType string
+constants.SCOPETYPEERROR; // $ExpectType string
+constants.QUESTIONMARK; // $ExpectType string
+constants.POUNDSIGN; // $ExpectType string
+constants.COLONDOUBLESLASH; // $ExpectType string
+constants.SLASH; // $ExpectType string
+constants.AMPERSAND; // $ExpectType string
+constants.EQUALSIGN; // $ExpectType string
+constants.SPACE; // $ExpectType string
+constants.CONTENTTYPE; // $ExpectType string
+constants.CONTENTTYPEVALUE; // $ExpectType string
+constants.AUTHORIZATIONCODE; // $ExpectType string
+constants.IDTOKEN; // $ExpectType string
+constants.ACCESSTOKEN; // $ExpectType string
+constants.REFRESHTOKEN; // $ExpectType string
+constants.ERROR; // $ExpectType string
+constants.ERROR_DESCRIPTION; // $ExpectType string
+constants.STRINGTYPE; // $ExpectType string
+constants.STATELENGTH; // $ExpectType number
+constants.STATEORIGINSTRING; // $ExpectType string
+constants.WITHCREDENTIALS; // $ExpectType string
+constants.UNDEFINED; // $ExpectType string
+constants.SELF; // $ExpectType string
+constants.HOSTNAMEREGEX; // $ExpectType RegExp
+constants.QUERYPARAMETERREGEX1; // $ExpectType RegExp
+constants.QUERYPARAMETERREGEX2; // $ExpectType RegExp
+constants.HEADER['Content-Type']; // $ExpectType string
+
+const dateHelper: lib.DateHelper = new lib.DateHelper();
+dateHelper.getNowString(); // $ExpectType string
+
+const storageHelper: lib.StorageHelper = new lib.StorageHelper();
+storageHelper.getStorage(); // $ExpectType Storage
diff --git a/types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-umd-tests.ts b/types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-umd-tests.ts
new file mode 100644
index 0000000000..1e30dbbeb8
--- /dev/null
+++ b/types/amazon-cognito-auth-js/test/amazon-cognito-auth-js-umd-tests.ts
@@ -0,0 +1,22 @@
+AmazonCognitoIdentity.CognitoIdToken; // $ExpectType typeof CognitoIdToken
+AmazonCognitoIdentity.CognitoRefreshToken; // $ExpectType typeof CognitoRefreshToken
+AmazonCognitoIdentity.CognitoAccessToken; // $ExpectType typeof CognitoAccessToken
+AmazonCognitoIdentity.CognitoTokenScopes; // $ExpectType typeof CognitoTokenScopes
+AmazonCognitoIdentity.CognitoAuthSession; // $ExpectType typeof CognitoAuthSession
+AmazonCognitoIdentity.CognitoAuth; // $ExpectType typeof CognitoAuth
+AmazonCognitoIdentity.DateHelper; // $ExpectType typeof DateHelper
+AmazonCognitoIdentity.StorageHelper; // $ExpectType typeof StorageHelper
+
+const sessionData: AmazonCognitoIdentity.CognitoSessionData = {};
+new AmazonCognitoIdentity.CognitoAuthSession(sessionData);
+
+const authOptions: AmazonCognitoIdentity.CognitoAuthOptions = {
+    ClientId: '1a2b3c4d5e6f7g',
+    AppWebDomain: 'myapp.auth.us-east-1.amazoncognito.com',
+    RedirectUriSignIn: 'https://myapp.com/login',
+    RedirectUriSignOut: 'https://myapp.com/logout'
+};
+const auth = new AmazonCognitoIdentity.CognitoAuth(authOptions);
+auth.userhandler; // $ExpectType CognitoAuthUserHandler
+auth.getCognitoConstants(); // $ExpectType CognitoConstants
+auth.createCORSRequest('', ''); // $ExpectType XMLHttpRequest | XDomainRequest
diff --git a/types/amazon-cognito-auth-js/tsconfig.json b/types/amazon-cognito-auth-js/tsconfig.json
new file mode 100644
index 0000000000..df5a9f2d73
--- /dev/null
+++ b/types/amazon-cognito-auth-js/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/amazon-cognito-auth-js-tests.ts",
+        "test/amazon-cognito-auth-js-umd-tests.ts"
+    ]
+}
diff --git a/types/amazon-cognito-auth-js/tslint.json b/types/amazon-cognito-auth-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/amazon-cognito-auth-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0148/1124] 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 e3e32dbd4156b360ae175a63cc5db48ad3af6c43 Mon Sep 17 00:00:00 2001
From: Lohn IMAI <mail@lohn.me>
Date: Thu, 10 May 2018 07:11:26 +0900
Subject: [PATCH 0149/1124] Fixes next/document types (#25540)

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

diff --git a/types/next/document.d.ts b/types/next/document.d.ts
index 4696819626..b8ae0864ba 100644
--- a/types/next/document.d.ts
+++ b/types/next/document.d.ts
@@ -1,15 +1,46 @@
 import * as React from "react";
+import * as http from "http";
+
+export interface Context {
+    err?: Error;
+    req: http.IncomingMessage;
+    res: http.ServerResponse;
+    pathname: string;
+    query?: {
+        [key: string]:
+            | boolean
+            | boolean[]
+            | number
+            | number[]
+            | string
+            | string[];
+    };
+    asPath: string;
+
+    renderPage(
+        enhancer?: (page: React.Component) => React.ComponentType<any>
+    ): {
+        html?: string;
+        head: Array<React.ReactElement<any>>;
+        errorHtml: string;
+    };
+}
 
 export interface DocumentProps {
     __NEXT_DATA__?: any;
     dev?: boolean;
     chunks?: string[];
+    html?: string;
     head?: Array<React.ReactElement<any>>;
+    errorHtml?: string;
     styles?: Array<React.ReactElement<any>>;
+
     [key: string]: any;
 }
 
 export class Head extends React.Component<any> {}
 export class Main extends React.Component {}
 export class NextScript extends React.Component {}
-export default class extends React.Component<DocumentProps> {}
+export default class extends React.Component<DocumentProps> {
+    static getInitialProps(ctx: Context): DocumentProps;
+}

From db27d0733da7b86c8649ec9295bd426e2c987876 Mon Sep 17 00:00:00 2001
From: Nico Jansen <jansennico@gmail.com>
Date: Thu, 10 May 2018 00:11:52 +0200
Subject: [PATCH 0150/1124]  fix(node): add support for
 `Buffer.from(uint8Array)` (#25630)

* fix(Node buffer): add support for `from(buffer)`

* refactor(Node buffer): consolidate overloads of `Buffer.from`
---
 types/node/index.d.ts    |  2 +-
 types/node/node-tests.ts | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 18a9bacccd..d7ebab4fd0 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -379,7 +379,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 /*| TypedArray*/): Buffer;
+    from(data: any[] | string | Buffer | ArrayBuffer | Uint8Array /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index d6751541b9..d428cf8753 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -432,10 +432,13 @@ function bufferTests() {
         // String
         const buf3: Buffer = Buffer.from('this is a tést');
         // ArrayBuffer
-        const arr: Uint16Array = new Uint16Array(2);
-        arr[0] = 5000;
-        arr[1] = 4000;
-        const buf4: Buffer = Buffer.from(arr.buffer);
+        const arrUint16: Uint16Array = new Uint16Array(2);
+        arrUint16[0] = 5000;
+        arrUint16[1] = 4000;
+        const buf4: Buffer = Buffer.from(arrUint16.buffer);
+        const arrUint8: Uint8Array = new Uint8Array(2);
+        const buf5: Buffer = Buffer.from(arrUint8);
+        const buf6: Buffer = Buffer.from(buf1);
     }
 
     // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])

From 8889c1c89c0cc368928421264442a38458f9f0da Mon Sep 17 00:00:00 2001
From: Tycho Grouwstra <tychogrouwstra@gmail.com>
Date: Thu, 10 May 2018 00:15:44 +0200
Subject: [PATCH 0151/1124] list among Ramda type authors to get @'d in issues
 (#25660)

see #25430.
---
 types/ramda/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 7301b28aae..9849ee48b1 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for ramda 0.25
 // Project: https://github.com/donnut/typescript-ramda
 // Definitions by: Erwin Poeze <https://github.com/donnut>
+//                 Tycho Grouwstra <https://github.com/tycho01>
 //                 Matt DeKrey <https://github.com/mdekrey>
 //                 Matt Dziuban <https://github.com/mrdziuban>
 //                 Stephen King <https://github.com/sbking>

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 0152/1124] 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 0153/1124] 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 0913d50a3c465569a601b5c05989344c468a474d Mon Sep 17 00:00:00 2001
From: Sam Walsh <web@samwalsh.co.nz>
Date: Thu, 10 May 2018 15:05:36 +1200
Subject: [PATCH 0154/1124] [react-content-loader] Introduce `primaryOpacity`
 and `secondaryOpacity` props + bump version to 3.1.2

---
 types/react-content-loader/index.d.ts         | 35 +++++++++++++++----
 .../react-content-loader-tests.tsx            |  8 +++--
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index 21f58664ca..8f677125c1 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -1,22 +1,43 @@
-// Type definitions for react-content-loader 2.0
+// Type definitions for react-content-loader 3.1.2
 // Project: https://github.com/danilowoz/react-content-loader
 // Definitions by: Alaa Masoud <https://github.com/alaatm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import * as React from 'react';
+import * as React from "react";
 
 export interface ContentLoaderProps {
     style?: React.CSSProperties;
-    type?: 'facebook' | 'instagram' | 'list' | 'bullet-list' | 'code';
+    type?: "facebook" | "instagram" | "list" | "bullet-list" | "code";
     speed?: number;
     width?: number;
     height?: number;
     primaryColor?: string;
     secondaryColor?: string;
-    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';
+    primaryOpacity?: number;
+    secondaryOpacity?: number;
+    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";
     className?: string;
 }
-export default class ContentLoader extends React.Component<ContentLoaderProps> { }
+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 4eeeecedc1..7ec300639c 100644
--- a/types/react-content-loader/react-content-loader-tests.tsx
+++ b/types/react-content-loader/react-content-loader-tests.tsx
@@ -1,15 +1,17 @@
-import * as React from 'react';
-import ContentLoader from 'react-content-loader';
+import * as React from "react";
+import ContentLoader from "react-content-loader";
 
 const CustomComponent = () => {
     return (
         <ContentLoader
-            style={{ borderBottom: '1px solid' }}
+            style={{ borderBottom: "1px solid" }}
             speed={1}
             height={100}
             width={100}
             primaryColor="#333"
             secondaryColor="#999"
+            primaryOpacity={0.06}
+            secondaryOpacity={0.12}
             preserveAspectRatio="xMinYMin meet"
             className="my-class"
         >

From 87c10bee3de52d67cbf82387779c5dc880317230 Mon Sep 17 00:00:00 2001
From: Sam Walsh <web@samwalsh.co.nz>
Date: Thu, 10 May 2018 15:11:09 +1200
Subject: [PATCH 0155/1124] Change to 3.1 instead of 3.1.2

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

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index 8f677125c1..21a3d7f3a5 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-content-loader 3.1.2
+// Type definitions for react-content-loader 3.1
 // Project: https://github.com/danilowoz/react-content-loader
 // Definitions by: Alaa Masoud <https://github.com/alaatm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 173f530f62d5c5b3059db900a0a33cf504b447b8 Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Thu, 10 May 2018 14:04:08 +1000
Subject: [PATCH 0156/1124] Added missing api

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

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 649a301bb3..013e652760 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -44,7 +44,11 @@ declare module "react-calendar-timeline" {
           itemTimeStartKey: string;
           itemTimeEndKey: string;
       };
+      selected?: number[];
       sidebarWidth?: number;
+      sidebarContent?: any;
+      rightSidebarWidth?: number;
+      rightSidebarContent?: any;
       dragSnap?: number;
       minResizeWidth?: number;
       fixedHeader?: "fixed" | "none";

From 5ba41a77899f4e665056ae17b2f8903e8af83a02 Mon Sep 17 00:00:00 2001
From: Jonas L <jonas@determapp.de>
Date: Thu, 10 May 2018 06:05:11 +0200
Subject: [PATCH 0157/1124] rolling-rate-limiter: replace intersection by
 extending interface

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

diff --git a/types/rolling-rate-limiter/index.d.ts b/types/rolling-rate-limiter/index.d.ts
index 0de8235fc2..c81c8304d7 100644
--- a/types/rolling-rate-limiter/index.d.ts
+++ b/types/rolling-rate-limiter/index.d.ts
@@ -15,7 +15,7 @@ declare namespace RollingRateLimiter {
     minDifference?: number;
   }
 
-  interface RedisOptions {
+  interface WithRedisOptions extends GeneralOptions {
     redis: CompatibleRedisClient;
     namespace?: string;
   }
@@ -25,7 +25,6 @@ declare namespace RollingRateLimiter {
   }
 
   type InMemoryOptions = GeneralOptions;
-  type WithRedisOptions = GeneralOptions & RedisOptions;
 
   type AsyncLimiterWithToken = (token: string, callback: AsyncLimiterCallback) => void;
   type AsyncLimiterWithoutToken = (callback: AsyncLimiterCallback) => void;

From 9f85c6e169398dea19dae58ca0702906ebef5bba Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Thu, 10 May 2018 14:07:43 +1000
Subject: [PATCH 0158/1124] relaxed type safety

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

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 013e652760..5726e08365 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -11,13 +11,13 @@ declare module "react-calendar-timeline" {
 
   export interface TimelineGroup {
     id: number;
-    title: string | JSX.Element;
+    title: any;
   }
 
   export interface TimelineItem {
     id: number;
     group: number;
-    title?: string | JSX.Element;
+    title?: any;
     start_time: any;
     end_time: any;
     canMove?: boolean;
@@ -82,8 +82,8 @@ declare module "react-calendar-timeline" {
       onBoundsChange?(canvasTimeStart: number, canvasTimeEnd: number): any;
       children?: any;
       fullUpdate?: boolean;
-      itemRenderer?: (item: TimelineItem, context: TimelineContext) => JSX.Element;
-      groupRenderer?: (group: TimelineGroup, isRightSidebar: boolean) => JSX.Element;
+      itemRenderer?: (item: TimelineItem, context: TimelineContext) => any;
+      groupRenderer?: (group: TimelineGroup, isRightSidebar: boolean) => any;
   }
   let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimelineProps>;
   export default ReactCalendarTimeline;

From 5bd088f20f254368d4f3dc1a4287dabce8c20501 Mon Sep 17 00:00:00 2001
From: Sam Walsh <web@samwalsh.co.nz>
Date: Thu, 10 May 2018 16:16:52 +1200
Subject: [PATCH 0159/1124] Add samwalshnz as contributor to
 react-content-loader

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

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index 21a3d7f3a5..508d3eb719 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-content-loader 3.1
 // Project: https://github.com/danilowoz/react-content-loader
 // Definitions by: Alaa Masoud <https://github.com/alaatm>
+//                 Sam Walsh <https://github.com/samwalshnz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 1b2c3539da5e40fd5aa720909074139ad0e07ca1 Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Thu, 10 May 2018 15:34:43 +1000
Subject: [PATCH 0160/1124] Added missing API. Fixed incorrect.

---
 types/react-calendar-timeline/index.d.ts | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 5726e08365..86c79ca7ae 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -8,16 +8,16 @@
 /// <reference types="react"/>
 
 declare module "react-calendar-timeline" {
-
-  export interface TimelineGroup {
+ 
+   export interface TimelineGroup {
     id: number;
-    title: any;
+    title: React.ReactNode;
   }
 
   export interface TimelineItem {
     id: number;
     group: number;
-    title?: any;
+    title?: React.ReactNode;
     start_time: any;
     end_time: any;
     canMove?: boolean;
@@ -51,18 +51,21 @@ declare module "react-calendar-timeline" {
       rightSidebarContent?: any;
       dragSnap?: number;
       minResizeWidth?: number;
-      fixedHeader?: "fixed" | "none";
-      zIndexStart?: number;
+      stickyOffset?: number;
+      stickyHeader?: boolean;
+      headerRef?: any;
       lineHeight?: number;
       headerLabelGroupHeight?: number;
       headerLabelHeight?: number;
       itemHeightRatio?: number;
       minZoom?: number;
       maxZoom?: number;
+      clickTolerance?: number;
       canMove?: boolean;
       canChangeGroup?: boolean;
       canResize?: boolean;
       useResizeHandle?: boolean;
+      showCursorLine?: boolean;
       stackItems?: boolean;
       traditionalZoom?: boolean;
       itemTouchSendsClick?: boolean;
@@ -70,8 +73,9 @@ declare module "react-calendar-timeline" {
       onItemResize?(itemId:number, newResizeEnd: number, edge: "left" | "right"): any;
       onItemSelect?(itemId:number, e: any, time: number): any;
       onItemClick?(itemId:number, e: any, time: number): any;
-      onCanvasClick?(groupId:number, time:number, e:any): any;
       onItemDoubleClick?(itemId:number, e: any, time: number): any;
+      onCanvasClick?(groupId:number, time:number, e:any): any;
+      onCanvasDoubleClick?(groupId:number, time:number, e:any): any;
       moveResizeValidator?(action:"move" | "resize", itemId:number, time:number, resizeEdge: "left" | "right"): any;
       defaultTimeStart?: any;
       defaultTimeEnd?: any;
@@ -80,10 +84,12 @@ declare module "react-calendar-timeline" {
       onTimeChange?(visibleTimeStart: number, visibleTimeEnd: number, updateScrollCanvas: (start: number, end: number) => void): any;
       onTimeInit?(visibleTimeStart: number, visibleTimeEnd: number): any;
       onBoundsChange?(canvasTimeStart: number, canvasTimeEnd: number): any;
+      onZoom?(timelineContext: TimelineContext): any;
       children?: any;
       fullUpdate?: boolean;
-      itemRenderer?: (item: TimelineItem, context: TimelineContext) => any;
-      groupRenderer?: (group: TimelineGroup, isRightSidebar: boolean) => any;
+      itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactNode;
+      groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactNode;
+      minimumWidthForItemContentVisibility?: number;
   }
   let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimelineProps>;
   export default ReactCalendarTimeline;

From 043c18633eb26b41cb403de2af680236b67b0eac Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Thu, 10 May 2018 12:48:54 +0200
Subject: [PATCH 0161/1124] Add trim format specifier

---
 types/d3-format/d3-format-tests.ts |  1 +
 types/d3-format/index.d.ts         | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/types/d3-format/d3-format-tests.ts b/types/d3-format/d3-format-tests.ts
index 5ab53a45a7..5702870640 100644
--- a/types/d3-format/d3-format-tests.ts
+++ b/types/d3-format/d3-format-tests.ts
@@ -64,6 +64,7 @@ const zero: boolean = specifier.zero;
 const width: number | undefined = specifier.width;
 const comma: boolean = specifier.comma;
 const precision: number | undefined = specifier.precision;
+const trim: boolean = specifier.trim;
 const type: 'e' | 'f' | 'g' | 'r' | 's' | '%' | 'p' | 'b' | 'o' | 'd' | 'x' | 'X' | 'c' | '' | 'n' = specifier.type;
 
 const formatString: string = specifier.toString();
diff --git a/types/d3-format/index.d.ts b/types/d3-format/index.d.ts
index bb0473a4fb..0508606148 100644
--- a/types/d3-format/index.d.ts
+++ b/types/d3-format/index.d.ts
@@ -1,12 +1,12 @@
-// Type definitions for D3JS d3-format module 1.2
+// Type definitions for D3JS d3-format module 1.3
 // Project: https://github.com/d3/d3-format/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
-//             Alex Ford <https://github.com/gustavderdrache>
-//             Boris Yankov <https://github.com/borisyankov>
-//             denisname <https://github.com/denisname>
+//                 Alex Ford <https://github.com/gustavderdrache>
+//                 Boris Yankov <https://github.com/borisyankov>
+//                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.2.0
+// Last module patch version validated against: 1.3.0
 
 /**
  * Specification of locale to use when creating a new FormatLocaleObject
@@ -124,6 +124,11 @@ export interface FormatSpecifier {
      * See precisionFixed and precisionRound for help picking an appropriate precision.
      */
     precision: number | undefined;
+    /**
+     * The '~' option trims insignificant trailing zeros across all format types.
+     * This is most commonly used in conjunction with types 'r', 'e', 's' and '%'.
+     */
+    trim: boolean;
     /**
      * The available type values are:
      *
@@ -140,9 +145,9 @@ export interface FormatSpecifier {
      * 'x' - hexadecimal notation, using lower-case letters, rounded to integer.
      * 'X' - hexadecimal notation, using upper-case letters, rounded to integer.
      * 'c' - converts the integer to the corresponding unicode character before printing.
-     * '' (none) - like g, but trim insignificant trailing zeros.
      *
-     * The type 'n' is also supported as shorthand for ',g'. For the 'g', 'n' and '' (none) types,
+     * The type '' (none) is also supported as shorthand for '~g' (with a default precision of 12 instead of 6), and
+     * the type 'n' is shorthand for ',g'. For the 'g', 'n' and '' (none) types,
      * decimal notation is used if the resulting string would have precision or fewer digits; otherwise, exponent notation is used.
      */
     type: 'e' | 'f' | 'g' | 'r' | 's' | '%' | 'p' | 'b' | 'o' | 'd' | 'x' | 'X' | 'c' | '' | 'n';
@@ -175,7 +180,7 @@ export function formatDefaultLocale(defaultLocale: FormatLocaleDefinition): Form
  *
  * Uses the current default locale.
  *
- * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][type].
+ * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][~][type].
  * For reference, an explanation of the segments of the specifier string, refer to the FormatSpecifier interface properties.
  *
  * @param specifier A Specifier string.
@@ -191,7 +196,7 @@ export function format(specifier: string): (n: number | { valueOf(): number }) =
  *
  * Uses the current default locale.
  *
- * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][type].
+ * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][~][type].
  * For reference, an explanation of the segments of the specifier string, refer to the FormatSpecifier interface properties.
  *
  * @param specifier A Specifier string.
@@ -204,7 +209,7 @@ export function formatPrefix(specifier: string, value: number): (n: number | { v
  * Parses the specified specifier, returning an object with exposed fields that correspond to the
  * format specification mini-language and a toString method that reconstructs the specifier.
  *
- * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][type].
+ * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][~][type].
  * For reference, an explanation of the segments of the specifier string, refer to the FormatSpecifier interface properties.
  *
  * @param specifier A specifier string.

From baa3dc9f9c5065bc6208877fdbf2f7b46b54a553 Mon Sep 17 00:00:00 2001
From: Sergio Freitas <giodefreitas@gmail.com>
Date: Thu, 10 May 2018 11:49:31 +0100
Subject: [PATCH 0162/1124] Added Definitions for Component Class.

---
 types/video.js/index.d.ts | 126 +++++++++++++++++++++++++++++---------
 1 file changed, 97 insertions(+), 29 deletions(-)

diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index eaf49a1833..3a658fc05f 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -4,6 +4,7 @@
 //                 Simon Clériot <https://github.com/scleriot>
 //                 Sean Bennett <https://github.com/SWBennett06>
 //                 Christoph Wagner <https://github.com/IgelCampus>
+//                 Gio Freitas <https://github.com/giofreitas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // The Video.js API allows you to interact with the video through
@@ -15,6 +16,9 @@ export = videojs;
 export as namespace videojs;
 
 declare namespace videojs {
+	const getComponent: typeof Component.getComponent;
+	const registerComponent: typeof Component.registerComponent;
+
 	interface PlayerOptions {
 		techOrder?: string[];
 		sourceOrder?: boolean;
@@ -35,6 +39,7 @@ declare namespace videojs {
 		language?: string;
 		notSupportedMessage?: string;
 		plugins?: any;
+		poster?: string;
 	}
 
 	interface Source {
@@ -42,39 +47,102 @@ declare namespace videojs {
 		src: string;
 	}
 
-	interface Player {
-		play(): Player;
-		pause(): Player;
-		paused(): boolean;
-		src(newSource: string | Source | Source[]): Player;
-		currentTime(seconds: number): Player;
-		currentTime(): number;
-		duration(): number;
+	interface Dimensions {
+		width: number;
+		height: number;
+	}
+
+	class Component {
+		constructor(player: Player, options: any);
+
+		static getComponent(name: 'Player'|'player'): typeof Player;
+		static getComponent(name: 'Component'|'component' | string): typeof Component;
+		static registerComponent(name: string, ComponentToRegister: typeof Component): typeof Component;
+
+		$(selector: string, context?: string|Element): Element;
+		$$(selector: string, context?: string|Element): NodeList;
+		addClass(classToAdd: string): void;
+		blur(): void;
+		cancelAnimationFrame(id: number): number;
+		children(): Component[];
+		clearInterval(intervalId: number): number;
+		clearTimeout(timeoutId: number): number;
+		contentEl(): Element;
+		createEl(tagNameopt?: string, properties?: any, attributes?: any): Element;
+		currentDimension(widthOrHeight: 'width'|'height'): number;
+		currentDimensions(): Dimensions;
+		currentHeight(): number;
+		currentWidth(): number;
+		dimension(widthOrHeight: 'width'|'height'): number;
+		dimension(widthOrHeight: 'width'|'height', num: string|number, skipListenersopt?: boolean): void;
+		dimensions(width: string|number, height: string|number): void;
+		dispose(): void;
+		el(): Element;
+		enableTouchActivity(): void;
+		focus(): void;
+		getAttribute(attribute: string): string|null;
+		getChild(name: string): Component|undefined;
+		getChildById(id: string): Component|undefined;
+		hasClass(classToCheck: string): boolean;
+		height(): number|string;
+		height(num: number|string, skipListeners?: boolean): void;
+		hide(): void;
+		id(): string;
+		initChildren(): void;
+		localize(key: string, tokens?: string[], defaultValue?: string): string;
+		name(): string;
+		options(obj: any): any;
+		player(): Player;
+		ready(callback: (this: this) => void): this;
+		removeAttribute(attribute: string): void;
+		removeChild(component: Component): void;
+		removeClass(classToRemove: string): void;
+		requestAnimationFrame(fn: () => void): number;
+		setAttribute(attribute: string, value: string): void;
+		setInterval(fn: () => void, interval: number): number;
+		setTimeout(fn: () => void, timeout: number): number;
+		show(): void;
+		toggleClass(classToToggle: string, predicate?: string): void;
+		triggerReady(): void;
+		width(): string | number;
+		width(num: number, skipListeners?: number): void;
+	}
+
+	class Player extends Component {
+        autoplay(value?: boolean): string;
+		addRemoteTextTrack(options: {}): HTMLTrackElement;
 		buffered(): TimeRanges;
 		bufferedPercent(): number;
-		volume(percentAsDecimal: number): TimeRanges;
-		volume(): number;
-		width(): number;
-		width(pixels: number): Player;
-		height(): number;
-		height(pixels: number): Player;
-		size(width: number, height: number): Player;
-		requestFullScreen(): Player;
 		cancelFullScreen(): Player;
-		requestFullscreen(): Player;
-		exitFullscreen(): Player;
-		ready(callback: (this: Player) => void): Player;
-		on(eventName: string, callback: (eventObject: Event) => void): void;
-		off(eventName?: string, callback?: (eventObject: Event) => void): void;
-		dispose(): void;
-		addRemoteTextTrack(options: {}): HTMLTrackElement;
-		removeRemoteTextTrack(track: HTMLTrackElement): void;
-		poster(val?: string): string | Player;
-		playbackRate(rate?: number): number;
 		controls(bool?: boolean): boolean;
-        muted(muted?: boolean): boolean;
-        preload(value?: boolean): string;
-        autoplay(value?: boolean): string;
+		currentTime(): number;
+		currentTime(seconds: number): Player;
+		duration(): number;
+		exitFullscreen(): Player;
+		height(): number;
+		height(num: number): void;
+		languageSwitch(options: any): void;
         loop(value?: boolean): string;
+        muted(muted?: boolean): boolean;
+		off(eventName?: string, callback?: (eventObject: Event) => void): void;
+		on(eventName: string, callback: (eventObject: Event) => void): void;
+		pause(): Player;
+		paused(): boolean;
+		play(): Player;
+		playbackRate(rate?: number): number;
+		poster(val?: string): string | Player;
+        preload(value?: boolean): string;
+		removeRemoteTextTrack(track: HTMLTrackElement): void;
+		requestFullScreen(): Player;
+		size(width: number, height: number): Player;
+		src(newSource: string | Source | Source[]): Player;
+		volume(): number;
+		volume(percentAsDecimal: number): TimeRanges;
+		width(): number;
+		width(num: number): void;
+	}
+
+	namespace dom {
+		function appendContent(element: Element, content: any): Element;
 	}
 }

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 0163/1124] 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 c5ac0628883e7dfbd78960289543df5831e10ec3 Mon Sep 17 00:00:00 2001
From: "skubarenko.andrey" <andrey.skubarenko@devexpress.com>
Date: Tue, 8 May 2018 12:42:15 +0300
Subject: [PATCH 0164/1124] Add type definitions for the DevExpress Bootstrap
 ASP.NET Core Controls

---
 .../devexpress-aspnetcore-bootstrap-tests.ts  |   13 +
 .../index.d.ts                                | 2495 +++++++++++++++++
 .../tsconfig.json                             |   24 +
 .../tslint.json                               |    3 +
 4 files changed, 2535 insertions(+)
 create mode 100644 types/devexpress-aspnetcore-bootstrap/devexpress-aspnetcore-bootstrap-tests.ts
 create mode 100644 types/devexpress-aspnetcore-bootstrap/index.d.ts
 create mode 100644 types/devexpress-aspnetcore-bootstrap/tsconfig.json
 create mode 100644 types/devexpress-aspnetcore-bootstrap/tslint.json

diff --git a/types/devexpress-aspnetcore-bootstrap/devexpress-aspnetcore-bootstrap-tests.ts b/types/devexpress-aspnetcore-bootstrap/devexpress-aspnetcore-bootstrap-tests.ts
new file mode 100644
index 0000000000..55eae3c27f
--- /dev/null
+++ b/types/devexpress-aspnetcore-bootstrap/devexpress-aspnetcore-bootstrap-tests.ts
@@ -0,0 +1,13 @@
+declare let button: DevExpress.AspNetCore.BootstrapButton;
+button.on('click', e => {});
+button.doClick();
+button.once('click', e => {});
+
+declare let accordion: DevExpress.AspNetCore.BootstrapAccordion;
+accordion.on('init', e => {});
+const firstGroup = accordion.getGroup(0);
+if (firstGroup) {
+    const groupText = firstGroup.getText();
+    const item = firstGroup.getItemByName('item10');
+    item && item.getEnabled();
+}
diff --git a/types/devexpress-aspnetcore-bootstrap/index.d.ts b/types/devexpress-aspnetcore-bootstrap/index.d.ts
new file mode 100644
index 0000000000..9422ccd2f7
--- /dev/null
+++ b/types/devexpress-aspnetcore-bootstrap/index.d.ts
@@ -0,0 +1,2495 @@
+// Type definitions for DevExpress ASP.NET 181.3
+// Project: http://devexpress.com/
+// Definitions by: DevExpress Inc. <https://github.com/devexpress>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare namespace DevExpress.AspNetCore {
+    enum BootstrapSchedulerGroupType {
+        Date = "Date",
+        None = "None",
+        Resource = "Resource",
+    }
+    enum BootstrapSchedulerViewType {
+        Day = "Day",
+        WorkWeek = "WorkWeek",
+        Week = "Week",
+        Month = "Month",
+        Timeline = "Timeline",
+        FullWeek = "FullWeek",
+        Agenda = "Agenda",
+    }
+    enum BootstrapSchedulerAppointmentType {
+        Normal = "Normal",
+        Pattern = "Pattern",
+        Occurrence = "Occurrence",
+        ChangedOccurrence = "ChangedOccurrence",
+        DeletedOccurrence = "DeletedOccurrence",
+    }
+    enum BootstrapSchedulerRecurrenceRange {
+        NoEndDate = "NoEndDate",
+        OccurrenceCount = "OccurrenceCount",
+        EndByDate = "EndByDate",
+    }
+    enum BootstrapSchedulerRecurrenceType {
+        Daily = "Daily",
+        Weekly = "Weekly",
+        Monthly = "Monthly",
+        Yearly = "Yearly",
+        Hourly = "Hourly",
+    }
+    enum WeekDays {
+        Sunday = 1,
+        Monday = 2,
+        Tuesday = 4,
+        Wednesday = 8,
+        Thursday = 16,
+        Friday = 32,
+        Saturday = 64,
+        WeekendDays = 65,
+        WorkDays = 62,
+        EveryDay = 127,
+    }
+    enum WeekOfMonth {
+        None = 0,
+        First = 1,
+        Second = 2,
+        Third = 3,
+        Fourth = 4,
+        Last = 5,
+    }
+    enum BootstrapPopupControlCloseReason {
+        API = "API",
+        CloseButton = "CloseButton",
+        OuterMouseClick = "OuterMouseClick",
+        MouseOut = "MouseOut",
+        Escape = "Escape",
+    }
+
+    const Utils: {
+        getControls: () => Control[];
+        getSerializedEditorValuesInContainer: (containerOrId: string | HTMLElement, processInvisibleEditors?: boolean) => any;
+        getEditorValuesInContainer: (containerOrId: string | HTMLElement, processInvisibleEditors?: boolean) => any;
+    };
+
+    interface EventArgs {
+        readonly sender: Control;
+    }
+
+    interface CancelEventArgs extends EventArgs {
+        cancel: boolean;
+    }
+
+    interface BeginCallbackEventArgs extends EventArgs {
+        readonly command: string;
+    }
+
+    interface ProcessingModeEventArgs extends EventArgs {
+        processOnServer: boolean;
+    }
+
+    interface ProcessingModeCancelEventArgs extends ProcessingModeEventArgs {
+        cancel: boolean;
+    }
+
+    interface GlobalBeginCallbackEventArgs extends BeginCallbackEventArgs {
+        readonly control: Control;
+    }
+
+    interface EndCallbackEventArgs extends EventArgs { // tslint:disable-line:no-empty-interface
+    }
+
+    interface GlobalEndCallbackEventArgs extends EndCallbackEventArgs {
+        readonly control: Control;
+    }
+
+    interface CustomDataCallbackEventArgs extends EventArgs {
+        result: string;
+    }
+
+    interface CallbackErrorEventArgs extends EventArgs {
+        handled: boolean;
+        message: string;
+    }
+
+    interface GlobalCallbackErrorEventArgs extends CallbackErrorEventArgs {
+        readonly control: Control;
+    }
+
+    interface EditValidationEventArgs extends EventArgs {
+        errorText: string;
+        isValid: boolean;
+        value: string;
+    }
+
+    interface ValidationCompletedEventArgs extends EventArgs {
+        readonly container: any;
+        readonly firstInvalidControl: Control;
+        readonly firstVisibleInvalidControl: Control;
+        readonly invisibleControlsValidated: boolean;
+        isValid: boolean;
+        readonly validationGroup: string;
+    }
+
+    interface EditClickEventArgs extends EventArgs {
+        readonly htmlElement: any;
+        readonly htmlEvent: any;
+    }
+
+    interface EditKeyEventArgs extends EventArgs {
+        readonly htmlEvent: any;
+    }
+
+    class Control {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly name: string;
+        adjustControl(): void;
+        getHeight(): number;
+        getMainElement(): any;
+        getParentControl(): any;
+        getVisible(): boolean;
+        getWidth(): number;
+        inCallback(): boolean;
+        sendMessageToAssistiveTechnology(message: string): void;
+        setHeight(height: number): void;
+        setVisible(visible: boolean): void;
+        setWidth(width: number): void;
+        on<K extends keyof ControlEventMap>(eventName: K, callback: (this: Control, args?: ControlEventMap[K]) => void): this;
+        once<K extends keyof ControlEventMap>(eventName: K, callback: (this: Control, args?: ControlEventMap[K]) => void): this;
+        off<K extends keyof ControlEventMap>(): this; // tslint:disable-line:no-unnecessary-generics
+        off<K extends keyof ControlEventMap>(eventName: K): this; // tslint:disable-line:unified-signatures no-unnecessary-generics
+        off<K extends keyof ControlEventMap>(eventName: K, callback: (this: Control, args?: ControlEventMap[K]) => void): this; // tslint:disable-line:unified-signatures
+    }
+    interface ControlEventMap {
+        "init": EventArgs;
+    }
+
+    class BootstrapClientEdit extends Control {
+        focus(): void;
+        getCaption(): string;
+        getEnabled(): boolean;
+        getErrorText(): string;
+        getInputElement(): any;
+        getIsValid(): boolean;
+        getReadOnly(): boolean;
+        getValue(): any;
+        setCaption(caption: string): void;
+        setEnabled(value: boolean): void;
+        setErrorText(errorText: string): void;
+        setIsValid(isValid: boolean): void;
+        setReadOnly(readOnly: boolean): void;
+        setValue(value: any): void;
+        validate(): void;
+        on<K extends keyof BootstrapClientEditEventMap>(eventName: K, callback: (this: BootstrapClientEdit, args?: BootstrapClientEditEventMap[K]) => void): this;
+        once<K extends keyof BootstrapClientEditEventMap>(eventName: K, callback: (this: BootstrapClientEdit, args?: BootstrapClientEditEventMap[K]) => void): this;
+        off<K extends keyof BootstrapClientEditEventMap>(eventName?: K, callback?: (this: BootstrapClientEdit, args?: BootstrapClientEditEventMap[K]) => void): this;
+    }
+    interface BootstrapClientEditEventMap extends ControlEventMap {
+        "gotFocus": EventArgs;
+        "lostFocus": EventArgs;
+        "validation": EditValidationEventArgs;
+        "valueChanged": ProcessingModeEventArgs;
+    }
+
+    interface AccordionItemEventArgs extends ProcessingModeEventArgs {
+        readonly htmlElement: object;
+        readonly htmlEvent: object;
+        readonly item: BootstrapAccordionItem;
+    }
+
+    interface AccordionGroupEventArgs extends EventArgs {
+        readonly group: BootstrapAccordionGroup;
+    }
+
+    interface AccordionGroupCancelEventArgs extends ProcessingModeCancelEventArgs {
+        readonly group: BootstrapAccordionGroup;
+    }
+
+    interface AccordionGroupClickEventArgs extends AccordionGroupCancelEventArgs {
+        readonly htmlElement: object;
+        readonly htmlEvent: object;
+    }
+
+    class BootstrapAccordion extends Control {
+        collapseAll(): void;
+        expandAll(): void;
+        getActiveGroup(): BootstrapAccordionGroup | null;
+        getGroup(index: number): BootstrapAccordionGroup | null;
+        getGroupByName(name: string): BootstrapAccordionGroup | null;
+        getGroupCount(): number;
+        getItemByName(name: string): BootstrapAccordionItem | null;
+        getSelectedItem(): BootstrapAccordionItem | null;
+        setActiveGroup(group: BootstrapAccordionGroup): void;
+        setSelectedItem(item: BootstrapAccordionItem): void;
+        on<K extends keyof BootstrapAccordionEventMap>(eventName: K, callback: (this: BootstrapAccordion, args?: BootstrapAccordionEventMap[K]) => void): this;
+        once<K extends keyof BootstrapAccordionEventMap>(eventName: K, callback: (this: BootstrapAccordion, args?: BootstrapAccordionEventMap[K]) => void): this;
+        off<K extends keyof BootstrapAccordionEventMap>(eventName?: K, callback?: (this: BootstrapAccordion, args?: BootstrapAccordionEventMap[K]) => void): this;
+    }
+    interface BootstrapAccordionEventMap extends ControlEventMap {
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "expandedChanged": AccordionGroupEventArgs;
+        "expandedChanging": AccordionGroupCancelEventArgs;
+        "headerClick": AccordionGroupClickEventArgs;
+        "itemClick": AccordionItemEventArgs;
+    }
+
+    class BootstrapAccordionGroup {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly index: number;
+        readonly name: string;
+        readonly navBar: BootstrapAccordion | null;
+        getEnabled(): boolean;
+        getExpanded(): boolean;
+        getHeaderBadgeIconCssClass(): string;
+        getHeaderBadgeText(): string;
+        getItem(index: number): BootstrapAccordionItem | null;
+        getItemByName(name: string): BootstrapAccordionItem | null;
+        getItemCount(): number;
+        getText(): string;
+        getVisible(): boolean;
+        setExpanded(value: boolean): void;
+        setHeaderBadgeIconCssClass(cssClass: string): void;
+        setHeaderBadgeText(text: string): void;
+        setText(text: string): void;
+        setVisible(value: boolean): void;
+    }
+
+    class BootstrapAccordionItem {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly group: BootstrapAccordionGroup | null;
+        readonly index: number;
+        readonly name: string;
+        readonly navBar: BootstrapAccordion | null;
+        getBadgeIconCssClass(): string;
+        getBadgeText(): string;
+        getEnabled(): boolean;
+        getIconCssClass(): string;
+        getImageUrl(): string;
+        getNavigateUrl(): string;
+        getText(): string;
+        getVisible(): boolean;
+        setBadgeIconCssClass(cssClass: string): void;
+        setBadgeText(text: string): void;
+        setEnabled(value: boolean): void;
+        setIconCssClass(cssClass: string): void;
+        setImageUrl(value: string): void;
+        setNavigateUrl(value: string): void;
+        setText(value: string): void;
+        setVisible(value: boolean): void;
+    }
+
+    class BootstrapBinaryImage extends BootstrapClientEdit {
+        clear(): void;
+        getUploadedFileName(): string;
+        getValue(): any;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        setSize(width: number, height: number): void;
+        setValue(value: any): void;
+        on<K extends keyof BootstrapBinaryImageEventMap>(eventName: K, callback: (this: BootstrapBinaryImage, args?: BootstrapBinaryImageEventMap[K]) => void): this;
+        once<K extends keyof BootstrapBinaryImageEventMap>(eventName: K, callback: (this: BootstrapBinaryImage, args?: BootstrapBinaryImageEventMap[K]) => void): this;
+        off<K extends keyof BootstrapBinaryImageEventMap>(eventName?: K, callback?: (this: BootstrapBinaryImage, args?: BootstrapBinaryImageEventMap[K]) => void): this;
+    }
+    interface BootstrapBinaryImageEventMap extends BootstrapClientEditEventMap {
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "click": EditClickEventArgs;
+        "endCallback": EndCallbackEventArgs;
+    }
+
+    interface ButtonClickEventArgs extends ProcessingModeEventArgs {
+        readonly cancelEventAndBubble: boolean;
+    }
+
+    class BootstrapButton extends Control {
+        doClick(): void;
+        focus(): void;
+        getBadgeIconCssClass(): string;
+        getBadgeText(): string;
+        getChecked(): boolean;
+        getEnabled(): boolean;
+        getImageUrl(): string;
+        getText(): string;
+        setBadgeIconCssClass(cssClass: string): void;
+        setBadgeText(text: string): void;
+        setChecked(value: boolean): void;
+        setEnabled(value: boolean): void;
+        setImageUrl(value: string): void;
+        setText(value: string): void;
+        on<K extends keyof BootstrapButtonEventMap>(eventName: K, callback: (this: BootstrapButton, args?: BootstrapButtonEventMap[K]) => void): this;
+        once<K extends keyof BootstrapButtonEventMap>(eventName: K, callback: (this: BootstrapButton, args?: BootstrapButtonEventMap[K]) => void): this;
+        off<K extends keyof BootstrapButtonEventMap>(eventName?: K, callback?: (this: BootstrapButton, args?: BootstrapButtonEventMap[K]) => void): this;
+    }
+    interface BootstrapButtonEventMap extends ControlEventMap {
+        "checkedChanged": ProcessingModeEventArgs;
+        "click": ButtonClickEventArgs;
+        "gotFocus": EventArgs;
+        "lostFocus": EventArgs;
+    }
+
+    interface CalendarCustomDisabledDateEventArgs extends EventArgs {
+        readonly date: Date;
+        isDisabled: boolean;
+    }
+
+    class BootstrapCalendar extends BootstrapClientEdit {
+        clearSelection(): void;
+        deselectDate(date: Date): void;
+        deselectRange(start: Date, end: Date): void;
+        getEnabled(): boolean;
+        getMaxDate(): Date;
+        getMinDate(): Date;
+        getSelectedDate(): Date;
+        getSelectedDates(): Date[];
+        getVisibleDate(): Date;
+        isDateSelected(date: Date): boolean;
+        selectDate(date: Date): void;
+        selectRange(start: Date, end: Date): void;
+        setEnabled(enabled: boolean): void;
+        setMaxDate(date: Date): void;
+        setMinDate(date: Date): void;
+        setSelectedDate(date: Date): void;
+        setVisibleDate(date: Date): void;
+        on<K extends keyof BootstrapCalendarEventMap>(eventName: K, callback: (this: BootstrapCalendar, args?: BootstrapCalendarEventMap[K]) => void): this;
+        once<K extends keyof BootstrapCalendarEventMap>(eventName: K, callback: (this: BootstrapCalendar, args?: BootstrapCalendarEventMap[K]) => void): this;
+        off<K extends keyof BootstrapCalendarEventMap>(eventName?: K, callback?: (this: BootstrapCalendar, args?: BootstrapCalendarEventMap[K]) => void): this;
+    }
+    interface BootstrapCalendarEventMap extends BootstrapClientEditEventMap {
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "customDisabledDate": CalendarCustomDisabledDateEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "selectionChanged": ProcessingModeEventArgs;
+        "visibleMonthChanged": ProcessingModeEventArgs;
+    }
+
+    interface GridToolbarItemClickEventArgs extends ProcessingModeEventArgs {
+        readonly item: BootstrapMenuItem;
+        readonly toolbarIndex: number;
+        readonly toolbarName: string;
+        usePostBack: boolean;
+    }
+
+    class BootstrapGridBase extends Control {
+        getToolbar(index: number): BootstrapMenu | null;
+        getToolbarByName(name: string): BootstrapMenu | null;
+        on<K extends keyof BootstrapGridBaseEventMap>(eventName: K, callback: (this: BootstrapGridBase, args?: BootstrapGridBaseEventMap[K]) => void): this;
+        once<K extends keyof BootstrapGridBaseEventMap>(eventName: K, callback: (this: BootstrapGridBase, args?: BootstrapGridBaseEventMap[K]) => void): this;
+        off<K extends keyof BootstrapGridBaseEventMap>(eventName?: K, callback?: (this: BootstrapGridBase, args?: BootstrapGridBaseEventMap[K]) => void): this;
+    }
+    interface BootstrapGridBaseEventMap extends ControlEventMap {
+        "toolbarItemClick": GridToolbarItemClickEventArgs;
+    }
+
+    interface CardViewColumnCancelEventArgs extends CancelEventArgs {
+        readonly column: BootstrapCardViewColumn;
+    }
+
+    interface CardViewCardFocusingEventArgs extends CancelEventArgs {
+        readonly htmlEvent: any;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewCardClickEventArgs extends CancelEventArgs {
+        readonly htmlEvent: any;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewCustomButtonEventArgs extends ProcessingModeEventArgs {
+        readonly buttonID: string;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewSelectionEventArgs extends ProcessingModeEventArgs {
+        readonly isAllRecordsOnPage: boolean;
+        readonly isChangedOnServer: boolean;
+        readonly isSelected: boolean;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewFocusEventArgs extends ProcessingModeEventArgs {
+        readonly isChangedOnServer: boolean;
+    }
+
+    interface CardViewBatchEditStartEditingEventArgs extends CancelEventArgs {
+        readonly cardValues: any;
+        focusedColumn: BootstrapCardViewColumn;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewBatchEditEndEditingEventArgs extends CancelEventArgs {
+        readonly cardValues: any;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewBatchEditCardValidatingEventArgs extends EventArgs {
+        readonly validationInfo: any;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewBatchEditConfirmShowingEventArgs extends CancelEventArgs {
+        readonly requestTriggerID: string;
+    }
+
+    interface CardViewBatchEditTemplateCellFocusedEventArgs extends EventArgs {
+        readonly column: BootstrapCardViewColumn;
+        handled: boolean;
+    }
+
+    interface CardViewBatchEditChangesSavingEventArgs extends CancelEventArgs {
+        readonly deletedValues: any;
+        readonly insertedValues: any;
+        readonly updatedValues: any;
+    }
+
+    interface CardViewBatchEditChangesCancelingEventArgs extends CancelEventArgs {
+        readonly deletedValues: any;
+        readonly insertedValues: any;
+        readonly updatedValues: any;
+    }
+
+    interface CardViewBatchEditCardInsertingEventArgs extends CancelEventArgs {
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewBatchEditCardDeletingEventArgs extends CancelEventArgs {
+        readonly cardValues: any;
+        readonly visibleIndex: number;
+    }
+
+    interface CardViewFocusedCellChangingEventArgs extends CancelEventArgs {
+        readonly cellInfo: BootstrapCardViewCellInfo;
+    }
+
+    class BootstrapCardView extends BootstrapGridBase {
+        readonly batchEditApi: BootstrapCardViewBatchEditApi | null;
+        addNewCard(): void;
+        applyFilter(filterExpression: string): void;
+        applySearchPanelFilter(value: string): void;
+        cancelEdit(): void;
+        clearFilter(): void;
+        closeFilterControl(): void;
+        deleteCard(visibleIndex: number): void;
+        deleteCardByKey(key: any): void;
+        focus(): void;
+        focusEditor(column: BootstrapCardViewColumn): void;
+        focusEditor(columnIndex: number): void; // tslint:disable-line:unified-signatures
+        focusEditor(columnFieldNameOrId: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        getCardKey(visibleIndex: number): string;
+        getColumn(columnIndex: number): BootstrapCardViewColumn | null;
+        getColumnByField(columnFieldName: string): BootstrapCardViewColumn | null;
+        getColumnById(columnId: string): BootstrapCardViewColumn | null;
+        getColumnCount(): number;
+        getEditValue(column: BootstrapCardViewColumn): string;
+        getEditValue(columnIndex: number): string; // tslint:disable-line:unified-signatures
+        getEditValue(columnFieldNameOrId: string): string; // tslint:disable-line:unified-signatures unified-signatures
+        getEditor(column: BootstrapCardViewColumn): BootstrapClientEdit;
+        getEditor(columnIndex: number): BootstrapClientEdit; // tslint:disable-line:unified-signatures
+        getEditor(columnFieldNameOrId: string): BootstrapClientEdit; // tslint:disable-line:unified-signatures unified-signatures
+        getFocusedCardIndex(): number;
+        getFocusedCell(): BootstrapCardViewCellInfo | null;
+        getPageCount(): number;
+        getPageIndex(): number;
+        getPopupEditForm(): BootstrapPopupControl | null;
+        getSelectedCardCount(): number;
+        getSelectedKeysOnPage(): any[];
+        getTopVisibleIndex(): number;
+        getVerticalScrollPosition(): number;
+        getVisibleCardsOnPage(): number;
+        gotoPage(pageIndex: number): void;
+        hideCustomizationWindow(): void;
+        isCardSelectedOnPage(visibleIndex: number): boolean;
+        isCustomizationWindowVisible(): boolean;
+        isEditing(): boolean;
+        isNewCardEditing(): boolean;
+        moveColumn(column: BootstrapCardViewColumn): void;
+        moveColumn(columnIndex: number): void; // tslint:disable-line:unified-signatures
+        moveColumn(columnFieldNameOrId: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        moveColumn(column: BootstrapCardViewColumn, moveToColumnVisibleIndex: number): void; // tslint:disable-line:unified-signatures
+        moveColumn(columnIndex: number, moveToColumnVisibleIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures
+        moveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        moveColumn(column: BootstrapCardViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean): void; // tslint:disable-line:unified-signatures
+        moveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean): void; // tslint:disable-line:unified-signatures unified-signatures
+        moveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        nextPage(): void;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        prevPage(): void;
+        refresh(): void;
+        selectAllCardsOnPage(): void;
+        selectCardOnPage(visibleIndex: number): void;
+        selectCardOnPage(visibleIndex: number, selected: boolean): void; // tslint:disable-line:unified-signatures
+        selectCards(): void;
+        selectCardsByKey(keys: any[]): void;
+        selectCardsByKey(key: any): void; // tslint:disable-line:unified-signatures
+        selectCardsByKey(keys: any[], selected: boolean): void; // tslint:disable-line:unified-signatures
+        selectCardsByKey(key: any, selected: boolean): void; // tslint:disable-line:unified-signatures unified-signatures
+        setEditValue(column: BootstrapCardViewColumn, value: string): void;
+        setEditValue(columnIndex: number, value: string): void; // tslint:disable-line:unified-signatures
+        setEditValue(columnFieldNameOrId: string, value: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        setFilterEnabled(isFilterEnabled: boolean): void;
+        setFocusedCardIndex(visibleIndex: number): void;
+        setFocusedCell(cardVisibleIndex: number, columnIndex: number): void;
+        setSearchPanelCustomEditor(editor: BootstrapClientEdit): void;
+        setVerticalScrollPosition(position: number): void;
+        showCustomizationWindow(): void;
+        showFilterControl(): void;
+        sortBy(column: BootstrapCardViewColumn): void;
+        sortBy(columnIndex: number): void; // tslint:disable-line:unified-signatures
+        sortBy(columnFieldNameOrId: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(column: BootstrapCardViewColumn, sortOrder: string): void; // tslint:disable-line:unified-signatures
+        sortBy(columnIndex: number, sortOrder: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(columnFieldNameOrId: string, sortOrder: string): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        sortBy(column: BootstrapCardViewColumn, sortOrder: string, reset: boolean): void; // tslint:disable-line:unified-signatures
+        sortBy(columnIndex: number, sortOrder: string, reset: boolean): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        sortBy(column: BootstrapCardViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void; // tslint:disable-line:unified-signatures
+        sortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        startEditCard(visibleIndex: number): void;
+        startEditCardByKey(key: any): void;
+        unselectAllCardsOnPage(): void;
+        unselectCardOnPage(visibleIndex: number): void;
+        unselectCards(): void;
+        unselectCardsByKey(keys: any[]): void;
+        unselectCardsByKey(key: any): void; // tslint:disable-line:unified-signatures
+        unselectFilteredCards(): void;
+        updateEdit(): void;
+        on<K extends keyof BootstrapCardViewEventMap>(eventName: K, callback: (this: BootstrapCardView, args?: BootstrapCardViewEventMap[K]) => void): this;
+        once<K extends keyof BootstrapCardViewEventMap>(eventName: K, callback: (this: BootstrapCardView, args?: BootstrapCardViewEventMap[K]) => void): this;
+        off<K extends keyof BootstrapCardViewEventMap>(eventName?: K, callback?: (this: BootstrapCardView, args?: BootstrapCardViewEventMap[K]) => void): this;
+    }
+    interface BootstrapCardViewEventMap extends BootstrapGridBaseEventMap {
+        "batchEditCardDeleting": CardViewBatchEditCardDeletingEventArgs;
+        "batchEditCardInserting": CardViewBatchEditCardInsertingEventArgs;
+        "batchEditCardValidating": CardViewBatchEditCardValidatingEventArgs;
+        "batchEditChangesCanceling": CardViewBatchEditChangesCancelingEventArgs;
+        "batchEditChangesSaving": CardViewBatchEditChangesSavingEventArgs;
+        "batchEditConfirmShowing": CardViewBatchEditConfirmShowingEventArgs;
+        "batchEditEndEditing": CardViewBatchEditEndEditingEventArgs;
+        "batchEditStartEditing": CardViewBatchEditStartEditingEventArgs;
+        "batchEditTemplateCellFocused": CardViewBatchEditTemplateCellFocusedEventArgs;
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "cardClick": CardViewCardClickEventArgs;
+        "cardDblClick": CardViewCardClickEventArgs;
+        "cardFocusing": CardViewCardFocusingEventArgs;
+        "columnSorting": CardViewColumnCancelEventArgs;
+        "customButtonClick": CardViewCustomButtonEventArgs;
+        "customizationWindowCloseUp": EventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "focusedCardChanged": CardViewFocusEventArgs;
+        "focusedCellChanging": CardViewFocusedCellChangingEventArgs;
+        "selectionChanged": CardViewSelectionEventArgs;
+    }
+
+    class BootstrapCardViewBatchEditApi {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        addNewCard(): void;
+        deleteCard(visibleIndex: number): void;
+        deleteCardByKey(key: any): void;
+        getCardVisibleIndices(includeDeleted: boolean): number[];
+        getDeletedCardIndices(): number[];
+        getInsertedCardIndices(): number[];
+        isDeletedCard(visibleIndex: number): boolean;
+        isNewCard(visibleIndex: number): boolean;
+        recoverCard(visibleIndex: number): void;
+        recoverCardByKey(key: any): void;
+        validateCard(visibleIndex: number): boolean;
+        validateCards(validateOnlyModified: boolean): boolean;
+    }
+
+    class BootstrapCardViewColumn {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+    }
+
+    class BootstrapCardViewCellInfo {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly cardVisibleIndex: number;
+        endEdit(): void;
+        getCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): any;
+        getCellValue(visibleIndex: number, columnFieldNameOrId: string, initial: boolean): any;
+        getColumnDisplayText(columnFieldNameOrId: string, value: any): string;
+        getEditCellInfo(): BootstrapCardViewCellInfo | null;
+        hasChanges(): boolean;
+        moveFocusBackward(): boolean;
+        moveFocusForward(): boolean;
+        resetChanges(visibleIndex: number): void;
+        resetChanges(visibleIndex: number, columnIndex: number): void; // tslint:disable-line:unified-signatures
+        setCellValue(visibleIndex: number, columnFieldNameOrId: string, value: any): void;
+        setCellValue(visibleIndex: number, columnFieldNameOrId: string, value: any, displayText: string, cancelCellHighlighting: boolean): void;
+        startEdit(visibleIndex: number, columnIndex: number): void;
+    }
+
+    interface BootstrapChartEventArgsBase extends EventArgs {
+        readonly component: any;
+        readonly element: any;
+    }
+
+    interface BootstrapChartErrorEventArgs extends BootstrapChartEventArgsBase {
+        readonly target: any;
+    }
+
+    interface BootstrapChartElementActionEventArgs extends BootstrapChartEventArgsBase {
+        readonly target: any;
+    }
+
+    interface BootstrapChartElementClickEventArgs extends BootstrapChartElementActionEventArgs {
+        readonly jQueryEvent: any;
+    }
+
+    interface BootstrapChartExportEventArgs extends BootstrapChartEventArgsBase {
+        cancel: boolean;
+        readonly data: any;
+        readonly fileName: string;
+        readonly format: string;
+    }
+
+    interface BootstrapChartOptionChangedEventArgs extends BootstrapChartEventArgsBase {
+        readonly fullName: string;
+        readonly name: string;
+        readonly previousValue: any;
+        readonly value: any;
+    }
+
+    interface BootstrapChartZoomEndEventArgs extends BootstrapChartEventArgsBase {
+        readonly rangeEnd: any;
+        readonly rangeStart: any;
+    }
+
+    class BootstrapChart extends Control {
+        exportTo(format: string, fileName: string): void;
+        getDataSource(): any;
+        getInstance(): any;
+        print(): void;
+        setDataSource(dataSource: any): void;
+        setOptions(options: any): void;
+        on<K extends keyof BootstrapChartEventMap>(eventName: K, callback: (this: BootstrapChart, args?: BootstrapChartEventMap[K]) => void): this;
+        once<K extends keyof BootstrapChartEventMap>(eventName: K, callback: (this: BootstrapChart, args?: BootstrapChartEventMap[K]) => void): this;
+        off<K extends keyof BootstrapChartEventMap>(eventName?: K, callback?: (this: BootstrapChart, args?: BootstrapChartEventMap[K]) => void): this;
+    }
+    interface BootstrapChartEventMap extends ControlEventMap {
+        "argumentAxisClick": BootstrapChartElementClickEventArgs;
+        "disposing": BootstrapChartEventArgsBase;
+        "done": BootstrapChartEventArgsBase;
+        "drawn": BootstrapChartEventArgsBase;
+        "exported": BootstrapChartEventArgsBase;
+        "exporting": BootstrapChartExportEventArgs;
+        "fileSaving": BootstrapChartExportEventArgs;
+        "incidentOccurred": BootstrapChartErrorEventArgs;
+        "init": BootstrapChartEventArgsBase;
+        "legendClick": BootstrapChartElementClickEventArgs;
+        "optionChanged": BootstrapChartOptionChangedEventArgs;
+        "pointClick": BootstrapChartElementClickEventArgs;
+        "pointHoverChanged": BootstrapChartElementActionEventArgs;
+        "pointSelectionChanged": BootstrapChartElementActionEventArgs;
+        "seriesClick": BootstrapChartElementClickEventArgs;
+        "seriesHoverChanged": BootstrapChartElementActionEventArgs;
+        "seriesSelectionChanged": BootstrapChartElementActionEventArgs;
+        "tooltipHidden": BootstrapChartElementActionEventArgs;
+        "tooltipShown": BootstrapChartElementActionEventArgs;
+        "zoomEnd": BootstrapChartZoomEndEventArgs;
+        "zoomStart": BootstrapChartEventArgsBase;
+    }
+
+    class BootstrapPolarChart extends Control {
+        exportTo(format: string, fileName: string): void;
+        getDataSource(): any;
+        getInstance(): any;
+        print(): void;
+        setDataSource(dataSource: any): void;
+        setOptions(options: any): void;
+        on<K extends keyof BootstrapPolarChartEventMap>(eventName: K, callback: (this: BootstrapPolarChart, args?: BootstrapPolarChartEventMap[K]) => void): this;
+        once<K extends keyof BootstrapPolarChartEventMap>(eventName: K, callback: (this: BootstrapPolarChart, args?: BootstrapPolarChartEventMap[K]) => void): this;
+        off<K extends keyof BootstrapPolarChartEventMap>(eventName?: K, callback?: (this: BootstrapPolarChart, args?: BootstrapPolarChartEventMap[K]) => void): this;
+    }
+    interface BootstrapPolarChartEventMap extends ControlEventMap {
+        "argumentAxisClick": BootstrapChartElementClickEventArgs;
+        "disposing": BootstrapChartEventArgsBase;
+        "done": BootstrapChartEventArgsBase;
+        "drawn": BootstrapChartEventArgsBase;
+        "exported": BootstrapChartEventArgsBase;
+        "exporting": BootstrapChartExportEventArgs;
+        "fileSaving": BootstrapChartExportEventArgs;
+        "incidentOccurred": BootstrapChartErrorEventArgs;
+        "init": BootstrapChartEventArgsBase;
+        "legendClick": BootstrapChartElementClickEventArgs;
+        "optionChanged": BootstrapChartOptionChangedEventArgs;
+        "pointClick": BootstrapChartElementClickEventArgs;
+        "pointHoverChanged": BootstrapChartElementActionEventArgs;
+        "pointSelectionChanged": BootstrapChartElementActionEventArgs;
+        "seriesClick": BootstrapChartElementClickEventArgs;
+        "seriesHoverChanged": BootstrapChartElementActionEventArgs;
+        "seriesSelectionChanged": BootstrapChartElementActionEventArgs;
+        "tooltipHidden": BootstrapChartElementActionEventArgs;
+        "tooltipShown": BootstrapChartElementActionEventArgs;
+    }
+
+    class BootstrapPieChart extends Control {
+        exportTo(format: string, fileName: string): void;
+        getDataSource(): any;
+        getInstance(): any;
+        print(): void;
+        setDataSource(dataSource: any): void;
+        setOptions(options: any): void;
+        on<K extends keyof BootstrapPieChartEventMap>(eventName: K, callback: (this: BootstrapPieChart, args?: BootstrapPieChartEventMap[K]) => void): this;
+        once<K extends keyof BootstrapPieChartEventMap>(eventName: K, callback: (this: BootstrapPieChart, args?: BootstrapPieChartEventMap[K]) => void): this;
+        off<K extends keyof BootstrapPieChartEventMap>(eventName?: K, callback?: (this: BootstrapPieChart, args?: BootstrapPieChartEventMap[K]) => void): this;
+    }
+    interface BootstrapPieChartEventMap extends ControlEventMap {
+        "disposing": BootstrapChartEventArgsBase;
+        "done": BootstrapChartEventArgsBase;
+        "drawn": BootstrapChartEventArgsBase;
+        "exported": BootstrapChartEventArgsBase;
+        "exporting": BootstrapChartExportEventArgs;
+        "fileSaving": BootstrapChartExportEventArgs;
+        "incidentOccurred": BootstrapChartErrorEventArgs;
+        "init": BootstrapChartEventArgsBase;
+        "legendClick": BootstrapChartElementClickEventArgs;
+        "optionChanged": BootstrapChartOptionChangedEventArgs;
+        "pointClick": BootstrapChartElementClickEventArgs;
+        "pointHoverChanged": BootstrapChartElementActionEventArgs;
+        "pointSelectionChanged": BootstrapChartElementActionEventArgs;
+        "tooltipHidden": BootstrapChartElementActionEventArgs;
+        "tooltipShown": BootstrapChartElementActionEventArgs;
+    }
+
+    class BootstrapCheckBox extends BootstrapClientEdit {
+        getCheckState(): string;
+        getChecked(): boolean;
+        getText(): string;
+        setCheckState(checkState: string): void;
+        setChecked(isChecked: boolean): void;
+        setText(text: string): void;
+        on<K extends keyof BootstrapCheckBoxEventMap>(eventName: K, callback: (this: BootstrapCheckBox, args?: BootstrapCheckBoxEventMap[K]) => void): this;
+        once<K extends keyof BootstrapCheckBoxEventMap>(eventName: K, callback: (this: BootstrapCheckBox, args?: BootstrapCheckBoxEventMap[K]) => void): this;
+        off<K extends keyof BootstrapCheckBoxEventMap>(eventName?: K, callback?: (this: BootstrapCheckBox, args?: BootstrapCheckBoxEventMap[K]) => void): this;
+    }
+    interface BootstrapCheckBoxEventMap extends BootstrapClientEditEventMap {
+        "checkedChanged": ProcessingModeEventArgs;
+    }
+
+    class BootstrapRadioButton extends BootstrapClientEdit {
+        getCheckState(): string;
+        getChecked(): boolean;
+        getText(): string;
+        setCheckState(checkState: string): void;
+        setChecked(isChecked: boolean): void;
+        setText(text: string): void;
+        on<K extends keyof BootstrapRadioButtonEventMap>(eventName: K, callback: (this: BootstrapRadioButton, args?: BootstrapRadioButtonEventMap[K]) => void): this;
+        once<K extends keyof BootstrapRadioButtonEventMap>(eventName: K, callback: (this: BootstrapRadioButton, args?: BootstrapRadioButtonEventMap[K]) => void): this;
+        off<K extends keyof BootstrapRadioButtonEventMap>(eventName?: K, callback?: (this: BootstrapRadioButton, args?: BootstrapRadioButtonEventMap[K]) => void): this;
+    }
+    interface BootstrapRadioButtonEventMap extends BootstrapClientEditEventMap {
+        "checkedChanged": ProcessingModeEventArgs;
+    }
+
+    class BootstrapComboBox extends BootstrapClientEdit {
+        addItem(texts: string[]): number;
+        addItem(text: string): number; // tslint:disable-line:unified-signatures
+        addItem(texts: string[], value: any): number; // tslint:disable-line:unified-signatures
+        addItem(text: string, value: any): number; // tslint:disable-line:unified-signatures unified-signatures
+        addItem(texts: string[], value: any, iconCssClass: string): number; // tslint:disable-line:unified-signatures
+        addItem(text: string, value: any, iconCssClass: string): number; // tslint:disable-line:unified-signatures unified-signatures
+        addItemCssClass(index: number, className: string): void;
+        addItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+        adjustDropDownWindow(): void;
+        beginUpdate(): void;
+        clearItems(): void;
+        endUpdate(): void;
+        ensureDropDownLoaded(callbackFunction: any): void;
+        findItemByText(text: string): BootstrapListBoxItem | null;
+        findItemByValue(value: any): BootstrapListBoxItem | null;
+        getButtonVisible(number: number): boolean;
+        getCaretPosition(): number;
+        getItem(index: number): BootstrapListBoxItem | null;
+        getItemBadgeIconCssClass(index: number): string;
+        getItemBadgeText(index: number): string;
+        getItemCount(): number;
+        getSelectedIndex(): number;
+        getSelectedItem(): BootstrapListBoxItem | null;
+        getText(): string;
+        hideDropDown(): void;
+        insertItem(index: number, texts: string[]): void;
+        insertItem(index: number, text: string): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, texts: string[], value: any): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, text: string, value: any): void; // tslint:disable-line:unified-signatures unified-signatures
+        insertItem(index: number, texts: string[], value: any, iconCssClass: string): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, text: string, value: any, iconCssClass: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        makeItemVisible(index: number): void;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        removeItem(index: number): void;
+        removeItemCssClass(index: number, className: string): void;
+        removeItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+        selectAll(): void;
+        setButtonVisible(number: number, value: boolean): void;
+        setCaretPosition(position: number): void;
+        setItemBadgeIconCssClass(index: number, cssClass: string): void;
+        setItemBadgeText(index: number, text: string): void;
+        setItemHtml(index: number, html: string): void;
+        setItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+        setItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+        setItemTooltip(index: number, tooltip: string): void;
+        setSelectedIndex(index: number): void;
+        setSelectedItem(item: BootstrapListBoxItem): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string, applyFilter: boolean): void;
+        showDropDown(): void;
+        on<K extends keyof BootstrapComboBoxEventMap>(eventName: K, callback: (this: BootstrapComboBox, args?: BootstrapComboBoxEventMap[K]) => void): this;
+        once<K extends keyof BootstrapComboBoxEventMap>(eventName: K, callback: (this: BootstrapComboBox, args?: BootstrapComboBoxEventMap[K]) => void): this;
+        off<K extends keyof BootstrapComboBoxEventMap>(eventName?: K, callback?: (this: BootstrapComboBox, args?: BootstrapComboBoxEventMap[K]) => void): this;
+    }
+    interface BootstrapComboBoxEventMap extends BootstrapClientEditEventMap {
+        "beginCallback": BeginCallbackEventArgs;
+        "buttonClick": ButtonEditClickEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "closeUp": EventArgs;
+        "customHighlighting": ListEditCustomHighlightingEventArgs;
+        "dropDown": EventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "itemFiltering": ListEditItemFilteringEventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "queryCloseUp": CancelEventArgs;
+        "selectedIndexChanged": ProcessingModeEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    interface ParseDateEventArgs extends EventArgs {
+        readonly date: Date;
+        readonly handled: boolean;
+        readonly value: string;
+    }
+
+    class BootstrapDateEdit extends BootstrapClientEdit {
+        adjustDropDownWindow(): void;
+        getButtonVisible(number: number): boolean;
+        getCalendar(): BootstrapCalendar | null;
+        getCaretPosition(): number;
+        getDate(): Date;
+        getMaxDate(): Date;
+        getMinDate(): Date;
+        getRangeDayCount(): number;
+        getText(): string;
+        getTimeEdit(): BootstrapTimeEdit | null;
+        hideDropDown(): void;
+        selectAll(): void;
+        setButtonVisible(number: number, value: boolean): void;
+        setCaretPosition(position: number): void;
+        setDate(date: Date): void;
+        setMaxDate(date: Date): void;
+        setMinDate(date: Date): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string): void;
+        showDropDown(): void;
+        on<K extends keyof BootstrapDateEditEventMap>(eventName: K, callback: (this: BootstrapDateEdit, args?: BootstrapDateEditEventMap[K]) => void): this;
+        once<K extends keyof BootstrapDateEditEventMap>(eventName: K, callback: (this: BootstrapDateEdit, args?: BootstrapDateEditEventMap[K]) => void): this;
+        off<K extends keyof BootstrapDateEditEventMap>(eventName?: K, callback?: (this: BootstrapDateEdit, args?: BootstrapDateEditEventMap[K]) => void): this;
+    }
+    interface BootstrapDateEditEventMap extends BootstrapClientEditEventMap {
+        "buttonClick": ButtonEditClickEventArgs;
+        "calendarCustomDisabledDate": CalendarCustomDisabledDateEventArgs;
+        "closeUp": EventArgs;
+        "dateChanged": ProcessingModeEventArgs;
+        "dropDown": EventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "parseDate": ParseDateEventArgs;
+        "queryCloseUp": CancelEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    class BootstrapDropDownEdit extends BootstrapClientEdit {
+        adjustDropDownWindow(): void;
+        getButtonVisible(number: number): boolean;
+        getCaretPosition(): number;
+        getKeyValue(): string;
+        getText(): string;
+        hideDropDown(): void;
+        selectAll(): void;
+        setButtonVisible(number: number, value: boolean): void;
+        setCaretPosition(position: number): void;
+        setKeyValue(keyValue: string): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string): void;
+        showDropDown(): void;
+        on<K extends keyof BootstrapDropDownEditEventMap>(eventName: K, callback: (this: BootstrapDropDownEdit, args?: BootstrapDropDownEditEventMap[K]) => void): this;
+        once<K extends keyof BootstrapDropDownEditEventMap>(eventName: K, callback: (this: BootstrapDropDownEdit, args?: BootstrapDropDownEditEventMap[K]) => void): this;
+        off<K extends keyof BootstrapDropDownEditEventMap>(eventName?: K, callback?: (this: BootstrapDropDownEdit, args?: BootstrapDropDownEditEventMap[K]) => void): this;
+    }
+    interface BootstrapDropDownEditEventMap extends BootstrapClientEditEventMap {
+        "buttonClick": ButtonEditClickEventArgs;
+        "closeUp": EventArgs;
+        "dropDown": EventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "queryCloseUp": CancelEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    class BootstrapFormLayout extends Control {
+        getItemByName(name: string): BootstrapFormLayoutItem | null;
+        on<K extends keyof BootstrapFormLayoutEventMap>(eventName: K, callback: (this: BootstrapFormLayout, args?: BootstrapFormLayoutEventMap[K]) => void): this;
+        once<K extends keyof BootstrapFormLayoutEventMap>(eventName: K, callback: (this: BootstrapFormLayout, args?: BootstrapFormLayoutEventMap[K]) => void): this;
+        off<K extends keyof BootstrapFormLayoutEventMap>(eventName?: K, callback?: (this: BootstrapFormLayout, args?: BootstrapFormLayoutEventMap[K]) => void): this;
+    }
+    interface BootstrapFormLayoutEventMap extends ControlEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    class BootstrapFormLayoutItem {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly formLayout: BootstrapFormLayout | null;
+        readonly name: string;
+        readonly parent: BootstrapFormLayoutItem | null;
+        getCaption(): string;
+        getItemByName(name: string): BootstrapFormLayoutItem | null;
+        getVisible(): boolean;
+        setCaption(caption: string): void;
+        setVisible(value: boolean): void;
+    }
+
+    interface GridViewColumnCancelEventArgs extends CancelEventArgs {
+        readonly column: BootstrapGridViewColumn;
+    }
+
+    interface GridViewColumnProcessingModeEventArgs extends ProcessingModeEventArgs {
+        readonly column: BootstrapGridViewColumn;
+    }
+
+    interface GridViewRowCancelEventArgs extends CancelEventArgs {
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewSelectionEventArgs extends ProcessingModeEventArgs {
+        readonly isAllRecordsOnPage: boolean;
+        readonly isChangedOnServer: boolean;
+        readonly isSelected: boolean;
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewFocusEventArgs extends ProcessingModeEventArgs {
+        readonly isChangedOnServer: boolean;
+    }
+
+    interface GridViewRowFocusingEventArgs extends GridViewRowCancelEventArgs {
+        readonly htmlEvent: any;
+    }
+
+    interface GridViewRowClickEventArgs extends GridViewRowCancelEventArgs {
+        readonly htmlEvent: any;
+    }
+
+    interface GridViewContextMenuEventArgs extends EventArgs {
+        readonly htmlEvent: any;
+        readonly index: number;
+        readonly menu: any;
+        readonly objectType: string;
+        showBrowserMenu: boolean;
+    }
+
+    interface GridViewContextMenuItemClickEventArgs extends ProcessingModeEventArgs {
+        readonly elementIndex: number;
+        handled: boolean;
+        readonly item: BootstrapMenuItem;
+        readonly objectType: string;
+        usePostBack: boolean;
+    }
+
+    interface GridViewCustomButtonEventArgs extends ProcessingModeEventArgs {
+        readonly buttonID: string;
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewColumnMovingEventArgs extends EventArgs {
+        allow: boolean;
+        readonly destinationColumn: BootstrapGridViewColumn;
+        readonly isDropBefore: boolean;
+        readonly isGroupPanel: boolean;
+        readonly sourceColumn: BootstrapGridViewColumn;
+    }
+
+    interface GridViewBatchEditConfirmShowingEventArgs extends CancelEventArgs {
+        readonly requestTriggerID: string;
+    }
+
+    interface GridViewBatchEditStartEditingEventArgs extends CancelEventArgs {
+        focusedColumn: BootstrapGridViewColumn;
+        readonly rowValues: any;
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewBatchEditEndEditingEventArgs extends CancelEventArgs {
+        readonly rowValues: any;
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewBatchEditRowValidatingEventArgs extends EventArgs {
+        readonly validationInfo: any;
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewBatchEditTemplateCellFocusedEventArgs extends EventArgs {
+        readonly column: BootstrapGridViewColumn;
+        handled: boolean;
+    }
+
+    interface GridViewBatchEditChangesSavingEventArgs extends CancelEventArgs {
+        readonly deletedValues: any;
+        readonly insertedValues: any;
+        readonly updatedValues: any;
+    }
+
+    interface GridViewBatchEditChangesCancelingEventArgs extends CancelEventArgs {
+        readonly deletedValues: any;
+        readonly insertedValues: any;
+        readonly updatedValues: any;
+    }
+
+    interface GridViewBatchEditRowInsertingEventArgs extends CancelEventArgs {
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewBatchEditRowDeletingEventArgs extends CancelEventArgs {
+        readonly rowValues: any;
+        readonly visibleIndex: number;
+    }
+
+    interface GridViewFocusedCellChangingEventArgs extends CancelEventArgs {
+        readonly cellInfo: BootstrapGridViewCellInfo;
+    }
+
+    class BootstrapGridView extends BootstrapGridBase {
+        readonly batchEditApi: BootstrapGridViewBatchEditApi | null;
+        addNewRow(): void;
+        applyFilter(filterExpression: string): void;
+        applyOnClickRowFilter(): void;
+        applySearchPanelFilter(value: string): void;
+        autoFilterByColumn(column: BootstrapGridViewColumn, val: string): void;
+        autoFilterByColumn(columnIndex: number, val: string): void; // tslint:disable-line:unified-signatures
+        autoFilterByColumn(columnFieldNameOrId: string, val: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        cancelEdit(): void;
+        clearFilter(): void;
+        closeFilterControl(): void;
+        collapseAll(): void;
+        collapseAllDetailRows(): void;
+        collapseDetailRow(visibleIndex: number): void;
+        collapseRow(visibleIndex: number): void;
+        collapseRow(visibleIndex: number, recursive: boolean): void; // tslint:disable-line:unified-signatures
+        deleteRow(visibleIndex: number): void;
+        deleteRowByKey(key: any): void;
+        expandAll(): void;
+        expandAllDetailRows(): void;
+        expandDetailRow(visibleIndex: number): void;
+        expandRow(visibleIndex: number): void;
+        expandRow(visibleIndex: number, recursive: boolean): void; // tslint:disable-line:unified-signatures
+        focus(): void;
+        focusEditor(column: BootstrapGridViewColumn): void;
+        focusEditor(columnIndex: number): void; // tslint:disable-line:unified-signatures
+        focusEditor(columnFieldNameOrId: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        getAutoFilterEditor(column: BootstrapGridViewColumn): any;
+        getAutoFilterEditor(columnIndex: number): any; // tslint:disable-line:unified-signatures
+        getAutoFilterEditor(columnFieldNameOrId: string): any; // tslint:disable-line:unified-signatures unified-signatures
+        getColumn(columnIndex: number): BootstrapGridViewColumn | null;
+        getColumnByField(columnFieldName: string): BootstrapGridViewColumn | null;
+        getColumnById(columnId: string): BootstrapGridViewColumn | null;
+        getColumnCount(): number;
+        getColumnLayout(): any;
+        getEditValue(column: BootstrapGridViewColumn): string;
+        getEditValue(columnIndex: number): string; // tslint:disable-line:unified-signatures
+        getEditValue(columnFieldNameOrId: string): string; // tslint:disable-line:unified-signatures unified-signatures
+        getEditor(column: BootstrapGridViewColumn): BootstrapClientEdit;
+        getEditor(columnIndex: number): BootstrapClientEdit; // tslint:disable-line:unified-signatures
+        getEditor(columnFieldNameOrId: string): BootstrapClientEdit; // tslint:disable-line:unified-signatures unified-signatures
+        getFocusedCell(): BootstrapGridViewCellInfo | null;
+        getFocusedRowIndex(): number;
+        getHorizontalScrollPosition(): number;
+        getPageCount(): number;
+        getPageIndex(): number;
+        getPopupEditForm(): BootstrapPopupControl | null;
+        getRowIndicesVisibleInViewPort(includePartiallyVisible: boolean): number[];
+        getRowKey(visibleIndex: number): string;
+        getSelectedKeysOnPage(): any[];
+        getSelectedRowCount(): number;
+        getTopVisibleIndex(): number;
+        getVerticalScrollPosition(): number;
+        getVisibleRowsOnPage(): number;
+        gotoPage(pageIndex: number): void;
+        groupBy(column: BootstrapGridViewColumn): void;
+        groupBy(columnIndex: number): void; // tslint:disable-line:unified-signatures
+        groupBy(columnFieldNameOrId: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        groupBy(column: BootstrapGridViewColumn, groupIndex: number): void; // tslint:disable-line:unified-signatures
+        groupBy(columnIndex: number, groupIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures
+        groupBy(columnFieldNameOrId: string, groupIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        groupBy(column: BootstrapGridViewColumn, groupIndex: number, sortOrder: string): void; // tslint:disable-line:unified-signatures
+        groupBy(columnIndex: number, groupIndex: number, sortOrder: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        groupBy(columnFieldNameOrId: string, groupIndex: number, sortOrder: string): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        hideCustomizationWindow(): void;
+        isCustomizationWindowVisible(): boolean;
+        isDataRow(visibleIndex: number): boolean;
+        isEditing(): boolean;
+        isGroupRow(visibleIndex: number): boolean;
+        isGroupRowExpanded(visibleIndex: number): boolean;
+        isNewRowEditing(): boolean;
+        isRowSelectedOnPage(visibleIndex: number): boolean;
+        makeRowVisible(visibleIndex: number): void;
+        nextPage(): void;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        prevPage(): void;
+        refresh(): void;
+        selectAllRowsOnPage(): void;
+        selectRowOnPage(visibleIndex: number): void;
+        selectRowOnPage(visibleIndex: number, selected: boolean): void; // tslint:disable-line:unified-signatures
+        selectRows(): void;
+        selectRowsByKey(keys: any[]): void;
+        selectRowsByKey(key: any): void; // tslint:disable-line:unified-signatures
+        selectRowsByKey(keys: any[], selected: boolean): void; // tslint:disable-line:unified-signatures
+        selectRowsByKey(key: any, selected: boolean): void; // tslint:disable-line:unified-signatures unified-signatures
+        setColumnLayout(columnLayout: any): void;
+        setEditValue(column: BootstrapGridViewColumn, value: string): void;
+        setEditValue(columnIndex: number, value: string): void; // tslint:disable-line:unified-signatures
+        setEditValue(columnFieldNameOrId: string, value: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        setFilterEnabled(isFilterEnabled: boolean): void;
+        setFixedColumnScrollableRows(scrollableRowSettings: any): void;
+        setFocusedCell(rowVisibleIndex: number, columnIndex: number): void;
+        setFocusedRowIndex(visibleIndex: number): void;
+        setHorizontalScrollPosition(position: number): void;
+        setSearchPanelCustomEditor(editor: BootstrapClientEdit): void;
+        setVerticalScrollPosition(position: number): void;
+        showCustomizationDialog(): void;
+        showCustomizationWindow(): void;
+        showFilterControl(): void;
+        sortBy(column: BootstrapGridViewColumn): void;
+        sortBy(columnIndex: number): void; // tslint:disable-line:unified-signatures
+        sortBy(columnFieldNameOrId: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(column: BootstrapGridViewColumn, sortOrder: string): void; // tslint:disable-line:unified-signatures
+        sortBy(columnIndex: number, sortOrder: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(columnFieldNameOrId: string, sortOrder: string): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        sortBy(column: BootstrapGridViewColumn, sortOrder: string, reset: boolean): void; // tslint:disable-line:unified-signatures
+        sortBy(columnIndex: number, sortOrder: string, reset: boolean): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        sortBy(column: BootstrapGridViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void; // tslint:disable-line:unified-signatures
+        sortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures
+        sortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void; // tslint:disable-line:unified-signatures unified-signatures unified-signatures
+        startEditRow(visibleIndex: number): void;
+        startEditRowByKey(key: any): void;
+        ungroup(column: BootstrapGridViewColumn): void;
+        ungroup(columnIndex: number): void; // tslint:disable-line:unified-signatures
+        ungroup(columnFieldNameOrId: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        unselectAllRowsOnPage(): void;
+        unselectFilteredRows(): void;
+        unselectRowOnPage(visibleIndex: number): void;
+        unselectRows(): void;
+        unselectRowsByKey(keys: any[]): void;
+        unselectRowsByKey(key: any): void; // tslint:disable-line:unified-signatures
+        updateEdit(): void;
+        on<K extends keyof BootstrapGridViewEventMap>(eventName: K, callback: (this: BootstrapGridView, args?: BootstrapGridViewEventMap[K]) => void): this;
+        once<K extends keyof BootstrapGridViewEventMap>(eventName: K, callback: (this: BootstrapGridView, args?: BootstrapGridViewEventMap[K]) => void): this;
+        off<K extends keyof BootstrapGridViewEventMap>(eventName?: K, callback?: (this: BootstrapGridView, args?: BootstrapGridViewEventMap[K]) => void): this;
+    }
+    interface BootstrapGridViewEventMap extends BootstrapGridBaseEventMap {
+        "batchEditChangesCanceling": GridViewBatchEditChangesCancelingEventArgs;
+        "batchEditChangesSaving": GridViewBatchEditChangesSavingEventArgs;
+        "batchEditConfirmShowing": GridViewBatchEditConfirmShowingEventArgs;
+        "batchEditEndEditing": GridViewBatchEditEndEditingEventArgs;
+        "batchEditRowDeleting": GridViewBatchEditRowDeletingEventArgs;
+        "batchEditRowInserting": GridViewBatchEditRowInsertingEventArgs;
+        "batchEditRowValidating": GridViewBatchEditRowValidatingEventArgs;
+        "batchEditStartEditing": GridViewBatchEditStartEditingEventArgs;
+        "batchEditTemplateCellFocused": GridViewBatchEditTemplateCellFocusedEventArgs;
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "columnGrouping": GridViewColumnCancelEventArgs;
+        "columnMoving": GridViewColumnMovingEventArgs;
+        "columnResized": GridViewColumnProcessingModeEventArgs;
+        "columnResizing": GridViewColumnCancelEventArgs;
+        "columnSorting": GridViewColumnCancelEventArgs;
+        "columnStartDragging": GridViewColumnCancelEventArgs;
+        "contextMenu": GridViewContextMenuEventArgs;
+        "contextMenuItemClick": GridViewContextMenuItemClickEventArgs;
+        "customButtonClick": GridViewCustomButtonEventArgs;
+        "customizationWindowCloseUp": EventArgs;
+        "detailRowCollapsing": GridViewRowCancelEventArgs;
+        "detailRowExpanding": GridViewRowCancelEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "focusedCellChanging": GridViewFocusedCellChangingEventArgs;
+        "focusedRowChanged": GridViewFocusEventArgs;
+        "rowClick": GridViewRowClickEventArgs;
+        "rowCollapsing": GridViewRowCancelEventArgs;
+        "rowDblClick": GridViewRowClickEventArgs;
+        "rowExpanding": GridViewRowCancelEventArgs;
+        "rowFocusing": GridViewRowFocusingEventArgs;
+        "selectionChanged": GridViewSelectionEventArgs;
+    }
+
+    class BootstrapGridViewBatchEditApi {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        addNewRow(): void;
+        deleteRow(visibleIndex: number): void;
+        deleteRowByKey(key: any): void;
+        endEdit(): void;
+        getCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): any;
+        getCellValue(visibleIndex: number, columnFieldNameOrId: string, initial: boolean): any;
+        getColumnDisplayText(columnFieldNameOrId: string, value: any): string;
+        getDeletedRowIndices(): number[];
+        getEditCellInfo(): BootstrapGridViewCellInfo | null;
+        getInsertedRowIndices(): number[];
+        getRowVisibleIndices(includeDeleted: boolean): number[];
+        hasChanges(): boolean;
+        isDeletedRow(visibleIndex: number): boolean;
+        isNewRow(visibleIndex: number): boolean;
+        moveFocusBackward(): boolean;
+        moveFocusForward(): boolean;
+        recoverRow(visibleIndex: number): void;
+        recoverRowByKey(key: any): void;
+        resetChanges(visibleIndex: number): void;
+        resetChanges(visibleIndex: number, columnIndex: number): void; // tslint:disable-line:unified-signatures
+        setCellValue(visibleIndex: number, columnFieldNameOrId: string, value: any): void;
+        setCellValue(visibleIndex: number, columnFieldNameOrId: string, value: any, displayText: string, cancelCellHighlighting: boolean): void;
+        startEdit(visibleIndex: number, columnIndex: number): void;
+        validateRow(visibleIndex: number): boolean;
+        validateRows(validateOnlyModified: boolean): boolean;
+    }
+
+    class BootstrapGridViewColumn {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly fieldName: string;
+        readonly index: number;
+        readonly name: string;
+        readonly visible: boolean;
+    }
+
+    class BootstrapGridViewCellInfo {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly rowVisibleIndex: number;
+    }
+
+    class BootstrapHyperLink extends Control {
+        getBadgeIconCssClass(): string;
+        getBadgeText(): string;
+        getCaption(): string;
+        getEnabled(): boolean;
+        getNavigateUrl(): string;
+        getText(): string;
+        getValue(): any;
+        setBadgeIconCssClass(cssClass: string): void;
+        setBadgeText(text: string): void;
+        setCaption(caption: string): void;
+        setEnabled(value: boolean): void;
+        setNavigateUrl(url: string): void;
+        setText(text: string): void;
+        setValue(value: any): void;
+        on<K extends keyof BootstrapHyperLinkEventMap>(eventName: K, callback: (this: BootstrapHyperLink, args?: BootstrapHyperLinkEventMap[K]) => void): this;
+        once<K extends keyof BootstrapHyperLinkEventMap>(eventName: K, callback: (this: BootstrapHyperLink, args?: BootstrapHyperLinkEventMap[K]) => void): this;
+        off<K extends keyof BootstrapHyperLinkEventMap>(eventName?: K, callback?: (this: BootstrapHyperLink, args?: BootstrapHyperLinkEventMap[K]) => void): this;
+    }
+    interface BootstrapHyperLinkEventMap extends ControlEventMap {
+        "click": EditClickEventArgs;
+    }
+
+    interface ListEditItemSelectedChangedEventArgs extends ProcessingModeEventArgs {
+        readonly index: number;
+        readonly isSelected: boolean;
+    }
+
+    interface ListEditCustomHighlightingEventArgs extends EventArgs {
+        readonly filter: string;
+        highlighting: any;
+    }
+
+    interface ListEditItemFilteringEventArgs extends EventArgs {
+        readonly filter: string;
+        isFit: boolean;
+        readonly item: BootstrapListBoxItem;
+    }
+
+    class BootstrapListBox extends BootstrapClientEdit {
+        addItem(texts: string[]): number;
+        addItem(text: string): number; // tslint:disable-line:unified-signatures
+        addItem(texts: string[], value: any): number; // tslint:disable-line:unified-signatures
+        addItem(text: string, value: any): number; // tslint:disable-line:unified-signatures unified-signatures
+        addItem(texts: string[], value: any, iconCssClass: string): number; // tslint:disable-line:unified-signatures
+        addItem(text: string, value: any, iconCssClass: string): number; // tslint:disable-line:unified-signatures unified-signatures
+        addItemCssClass(index: number, className: string): void;
+        addItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+        beginUpdate(): void;
+        clearItems(): void;
+        endUpdate(): void;
+        findItemByText(text: string): BootstrapListBoxItem | null;
+        findItemByValue(value: any): BootstrapListBoxItem | null;
+        getItem(index: number): BootstrapListBoxItem | null;
+        getItemBadgeIconCssClass(index: number): string;
+        getItemBadgeText(index: number): string;
+        getItemCount(): number;
+        getSelectedIndex(): number;
+        getSelectedIndices(): number[];
+        getSelectedItem(): BootstrapListBoxItem | null;
+        getSelectedItems(): BootstrapListBoxItem[];
+        getSelectedValues(): any[];
+        insertItem(index: number, texts: string[]): void;
+        insertItem(index: number, text: string): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, texts: string[], value: any): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, text: string, value: any): void; // tslint:disable-line:unified-signatures unified-signatures
+        insertItem(index: number, texts: string[], value: any, iconCssClass: string): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, text: string, value: any, iconCssClass: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        makeItemVisible(index: number): void;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        removeItem(index: number): void;
+        removeItemCssClass(index: number, className: string): void;
+        removeItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+        selectAll(): void;
+        selectIndices(indices: number[]): void;
+        selectItems(items: BootstrapListBoxItem[]): void;
+        selectValues(values: any[]): void;
+        setItemBadgeIconCssClass(index: number, cssClass: string): void;
+        setItemBadgeText(index: number, text: string): void;
+        setItemHtml(index: number, html: string): void;
+        setItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+        setItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+        setItemTooltip(index: number, tooltip: string): void;
+        setSelectedIndex(index: number): void;
+        setSelectedItem(item: BootstrapListBoxItem): void;
+        unselectAll(): void;
+        unselectIndices(indices: number[]): void;
+        unselectItems(items: BootstrapListBoxItem[]): void;
+        unselectValues(values: any[]): void;
+        on<K extends keyof BootstrapListBoxEventMap>(eventName: K, callback: (this: BootstrapListBox, args?: BootstrapListBoxEventMap[K]) => void): this;
+        once<K extends keyof BootstrapListBoxEventMap>(eventName: K, callback: (this: BootstrapListBox, args?: BootstrapListBoxEventMap[K]) => void): this;
+        off<K extends keyof BootstrapListBoxEventMap>(eventName?: K, callback?: (this: BootstrapListBox, args?: BootstrapListBoxEventMap[K]) => void): this;
+    }
+    interface BootstrapListBoxEventMap extends BootstrapClientEditEventMap {
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "customHighlighting": ListEditCustomHighlightingEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "itemDoubleClick": EventArgs;
+        "itemFiltering": ListEditItemFilteringEventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "selectedIndexChanged": ProcessingModeEventArgs;
+    }
+
+    class BootstrapListBoxItem {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly iconCssClass: string;
+        readonly imageUrl: string;
+        readonly index: number;
+        readonly listEditBase: BootstrapListBox | null;
+        readonly text: string;
+        readonly value: any;
+        getColumnText(columnIndex: number): string;
+        getColumnText(columnName: string): string; // tslint:disable-line:unified-signatures
+        getFieldText(fieldIndex: number): string;
+        getFieldText(fieldName: string): string; // tslint:disable-line:unified-signatures
+    }
+
+    class BootstrapCheckBoxList extends BootstrapListBox {
+        getItem(index: number): BootstrapListBoxItem | null;
+        getItemCount(): number;
+        getSelectedIndices(): number[];
+        getSelectedItems(): BootstrapListBoxItem[];
+        getSelectedValues(): any[];
+        selectAll(): void;
+        selectIndices(indices: number[]): void;
+        selectItems(items: BootstrapListBoxItem[]): void;
+        selectValues(values: any[]): void;
+        unselectAll(): void;
+        unselectIndices(indices: number[]): void;
+        unselectItems(items: BootstrapListBoxItem[]): void;
+        unselectValues(values: any[]): void;
+        on<K extends keyof BootstrapCheckBoxListEventMap>(eventName: K, callback: (this: BootstrapCheckBoxList, args?: BootstrapCheckBoxListEventMap[K]) => void): this;
+        once<K extends keyof BootstrapCheckBoxListEventMap>(eventName: K, callback: (this: BootstrapCheckBoxList, args?: BootstrapCheckBoxListEventMap[K]) => void): this;
+        off<K extends keyof BootstrapCheckBoxListEventMap>(eventName?: K, callback?: (this: BootstrapCheckBoxList, args?: BootstrapCheckBoxListEventMap[K]) => void): this;
+    }
+    interface BootstrapCheckBoxListEventMap extends BootstrapListBoxEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    class BootstrapRadioButtonList extends BootstrapListBox {
+        getItem(index: number): BootstrapListBoxItem | null;
+        getItemCount(): number;
+        on<K extends keyof BootstrapRadioButtonListEventMap>(eventName: K, callback: (this: BootstrapRadioButtonList, args?: BootstrapRadioButtonListEventMap[K]) => void): this;
+        once<K extends keyof BootstrapRadioButtonListEventMap>(eventName: K, callback: (this: BootstrapRadioButtonList, args?: BootstrapRadioButtonListEventMap[K]) => void): this;
+        off<K extends keyof BootstrapRadioButtonListEventMap>(eventName?: K, callback?: (this: BootstrapRadioButtonList, args?: BootstrapRadioButtonListEventMap[K]) => void): this;
+    }
+    interface BootstrapRadioButtonListEventMap extends BootstrapListBoxEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    interface MenuItemEventArgs extends EventArgs {
+        readonly item: BootstrapMenuItem;
+    }
+
+    interface MenuItemMouseEventArgs extends MenuItemEventArgs { // tslint:disable-line:no-empty-interface
+    }
+
+    interface MenuItemClickEventArgs extends ProcessingModeEventArgs {
+        readonly htmlElement: object;
+        readonly htmlEvent: object;
+        readonly item: BootstrapMenuItem;
+    }
+
+    class BootstrapMenu extends Control {
+        getItem(index: number): BootstrapMenuItem | null;
+        getItemByName(name: string): BootstrapMenuItem | null;
+        getItemCount(): number;
+        getOrientation(): string;
+        getRootItem(): BootstrapMenuItem | null;
+        getSelectedItem(): BootstrapMenuItem | null;
+        setOrientation(orientation: string): void;
+        setSelectedItem(item: BootstrapMenuItem): void;
+        on<K extends keyof BootstrapMenuEventMap>(eventName: K, callback: (this: BootstrapMenu, args?: BootstrapMenuEventMap[K]) => void): this;
+        once<K extends keyof BootstrapMenuEventMap>(eventName: K, callback: (this: BootstrapMenu, args?: BootstrapMenuEventMap[K]) => void): this;
+        off<K extends keyof BootstrapMenuEventMap>(eventName?: K, callback?: (this: BootstrapMenu, args?: BootstrapMenuEventMap[K]) => void): this;
+    }
+    interface BootstrapMenuEventMap extends ControlEventMap {
+        "closeUp": MenuItemEventArgs;
+        "itemClick": MenuItemClickEventArgs;
+        "itemMouseOut": MenuItemMouseEventArgs;
+        "itemMouseOver": MenuItemMouseEventArgs;
+        "popUp": MenuItemEventArgs;
+    }
+
+    class BootstrapMenuItem {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly index: number;
+        readonly indexPath: string;
+        readonly menu: BootstrapMenu | null;
+        readonly name: string;
+        readonly parent: BootstrapMenuItem | null;
+        getBadgeIconCssClass(): string;
+        getBadgeText(): string;
+        getChecked(): boolean;
+        getEnabled(): boolean;
+        getIconCssClass(): string;
+        getImageUrl(): string;
+        getItem(index: number): BootstrapMenuItem | null;
+        getItemByName(name: string): BootstrapMenuItem | null;
+        getItemCount(): number;
+        getNavigateUrl(): string;
+        getText(): string;
+        getVisible(): boolean;
+        setBadgeIconCssClass(cssClass: string): void;
+        setBadgeText(text: string): void;
+        setChecked(value: boolean): void;
+        setEnabled(value: boolean): void;
+        setIconCssClass(cssClass: string): void;
+        setImageUrl(value: string): void;
+        setNavigateUrl(value: string): void;
+        setText(value: string): void;
+        setVisible(value: boolean): void;
+    }
+
+    interface PopupWindowEventArgs extends EventArgs {
+        readonly window: BootstrapPopupWindow;
+    }
+
+    interface PopupWindowCloseUpEventArgs extends PopupWindowEventArgs {
+        readonly closeReason: BootstrapPopupControlCloseReason;
+    }
+
+    interface PopupWindowCancelEventArgs extends CancelEventArgs {
+        readonly closeReason: BootstrapPopupControlCloseReason;
+        readonly window: BootstrapPopupWindow;
+    }
+
+    interface PopupWindowPinnedChangedEventArgs extends PopupWindowEventArgs {
+        readonly pinned: boolean;
+    }
+
+    interface PopupWindowResizeEventArgs extends PopupWindowEventArgs {
+        readonly resizeState: number;
+    }
+
+    class BootstrapPopupControl extends Control {
+        adjustSize(): void;
+        bringToFront(): void;
+        bringWindowToFront(window: BootstrapPopupWindow): void;
+        getCollapsed(): boolean;
+        getContentHeight(): number;
+        getContentHtml(): string;
+        getContentIFrame(): any;
+        getContentIFrameWindow(): any;
+        getContentUrl(): string;
+        getContentWidth(): number;
+        getCurrentPopupElement(): any;
+        getCurrentPopupElementIndex(): number;
+        getFooterImageUrl(): string;
+        getFooterNavigateUrl(): string;
+        getFooterText(): string;
+        getHeaderImageUrl(): string;
+        getHeaderNavigateUrl(): string;
+        getHeaderText(): string;
+        getMainElement(): any;
+        getMaximized(): boolean;
+        getPinned(): boolean;
+        getPopUpReasonMouseEvent(): any;
+        getWindow(index: number): BootstrapPopupWindow | null;
+        getWindowByName(name: string): BootstrapPopupWindow | null;
+        getWindowCollapsed(window: BootstrapPopupWindow): boolean;
+        getWindowContentHeight(window: BootstrapPopupWindow): number;
+        getWindowContentHtml(window: BootstrapPopupWindow): string;
+        getWindowContentIFrame(window: BootstrapPopupWindow): any;
+        getWindowContentUrl(window: BootstrapPopupWindow): string;
+        getWindowContentWidth(window: BootstrapPopupWindow): number;
+        getWindowCount(): number;
+        getWindowCurrentPopupElement(window: BootstrapPopupWindow): any;
+        getWindowCurrentPopupElementIndex(window: BootstrapPopupWindow): number;
+        getWindowHeight(window: BootstrapPopupWindow): number;
+        getWindowMaximized(window: BootstrapPopupWindow): boolean;
+        getWindowPinned(window: BootstrapPopupWindow): boolean;
+        getWindowPopUpReasonMouseEvent(window: BootstrapPopupWindow): any;
+        getWindowWidth(window: BootstrapPopupWindow): number;
+        hide(): void;
+        hideWindow(window: BootstrapPopupWindow): void;
+        isVisible(): boolean;
+        isWindowVisible(window: BootstrapPopupWindow): boolean;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        refreshContentUrl(): void;
+        refreshPopupElementConnection(): void;
+        refreshWindowContentUrl(window: BootstrapPopupWindow): void;
+        setAdaptiveMaxHeight(maxHeight: number): void;
+        setAdaptiveMaxHeight(maxHeight: string): void; // tslint:disable-line:unified-signatures
+        setAdaptiveMaxWidth(maxWidth: number): void;
+        setAdaptiveMaxWidth(maxWidth: string): void; // tslint:disable-line:unified-signatures
+        setAdaptiveMinHeight(minHeight: number): void;
+        setAdaptiveMinHeight(minHeight: string): void; // tslint:disable-line:unified-signatures
+        setAdaptiveMinWidth(minWidth: number): void;
+        setAdaptiveMinWidth(minWidth: string): void; // tslint:disable-line:unified-signatures
+        setCollapsed(value: boolean): void;
+        setContentHtml(html: string): void;
+        setContentUrl(url: string): void;
+        setFooterImageUrl(value: string): void;
+        setFooterNavigateUrl(value: string): void;
+        setFooterText(value: string): void;
+        setHeaderImageUrl(value: string): void;
+        setHeaderNavigateUrl(value: string): void;
+        setHeaderText(value: string): void;
+        setMaximized(value: boolean): void;
+        setPinned(value: boolean): void;
+        setPopupElementCssSelector(selector: string): void;
+        setPopupElementID(popupElementId: string): void;
+        setSize(width: number, height: number): void;
+        setWindowAdaptiveMaxHeight(window: BootstrapPopupWindow, maxHeight: number): void;
+        setWindowAdaptiveMaxHeight(window: BootstrapPopupWindow, maxHeight: string): void; // tslint:disable-line:unified-signatures
+        setWindowAdaptiveMaxWidth(window: BootstrapPopupWindow, maxWidth: number): void;
+        setWindowAdaptiveMaxWidth(window: BootstrapPopupWindow, maxWidth: string): void; // tslint:disable-line:unified-signatures
+        setWindowAdaptiveMinHeight(window: BootstrapPopupWindow, minHeight: number): void;
+        setWindowAdaptiveMinHeight(window: BootstrapPopupWindow, minHeight: string): void; // tslint:disable-line:unified-signatures
+        setWindowAdaptiveMinWidth(window: BootstrapPopupWindow, minWidth: number): void;
+        setWindowAdaptiveMinWidth(window: BootstrapPopupWindow, minWidth: string): void; // tslint:disable-line:unified-signatures
+        setWindowCollapsed(window: BootstrapPopupWindow, value: boolean): void;
+        setWindowContentHtml(window: BootstrapPopupWindow, html: string): void;
+        setWindowContentUrl(window: BootstrapPopupWindow, url: string): void;
+        setWindowMaximized(window: BootstrapPopupWindow, value: boolean): void;
+        setWindowPinned(window: BootstrapPopupWindow, value: boolean): void;
+        setWindowPopupElementID(window: BootstrapPopupWindow, popupElementId: string): void;
+        setWindowSize(window: BootstrapPopupWindow, width: number, height: number): void;
+        show(): void;
+        showAtElement(htmlElement: any): void;
+        showAtElementByID(id: string): void;
+        showAtPos(x: number, y: number): void;
+        showWindow(window: BootstrapPopupWindow): void;
+        showWindow(window: BootstrapPopupWindow, popupElementIndex: number): void; // tslint:disable-line:unified-signatures
+        showWindowAtElement(window: BootstrapPopupWindow, htmlElement: any): void;
+        showWindowAtElementByID(window: BootstrapPopupWindow, id: string): void;
+        showWindowAtPos(window: BootstrapPopupWindow, x: number, y: number): void;
+        stretchVertically(): void;
+        updatePosition(): void;
+        updatePositionAtElement(htmlElement: any): void;
+        updateWindowPosition(window: BootstrapPopupWindow): void;
+        updateWindowPositionAtElement(window: BootstrapPopupWindow, htmlElement: any): void;
+        windowStretchVertically(window: BootstrapPopupWindow): void;
+        on<K extends keyof BootstrapPopupControlEventMap>(eventName: K, callback: (this: BootstrapPopupControl, args?: BootstrapPopupControlEventMap[K]) => void): this;
+        once<K extends keyof BootstrapPopupControlEventMap>(eventName: K, callback: (this: BootstrapPopupControl, args?: BootstrapPopupControlEventMap[K]) => void): this;
+        off<K extends keyof BootstrapPopupControlEventMap>(eventName?: K, callback?: (this: BootstrapPopupControl, args?: BootstrapPopupControlEventMap[K]) => void): this;
+    }
+    interface BootstrapPopupControlEventMap extends ControlEventMap {
+        "afterResizing": PopupWindowEventArgs;
+        "beforeResizing": PopupWindowEventArgs;
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "closeUp": PopupWindowCloseUpEventArgs;
+        "closing": PopupWindowCancelEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "pinnedChanged": PopupWindowPinnedChangedEventArgs;
+        "popUp": PopupWindowEventArgs;
+        "resize": PopupWindowResizeEventArgs;
+        "shown": PopupWindowEventArgs;
+    }
+
+    class BootstrapPopupWindow {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly index: number;
+        readonly name: string;
+        readonly popupControl: BootstrapPopupControl | null;
+        getFooterImageUrl(): string;
+        getFooterNavigateUrl(): string;
+        getFooterText(): string;
+        getHeaderImageUrl(): string;
+        getHeaderNavigateUrl(): string;
+        getHeaderText(): string;
+        setFooterImageUrl(value: string): void;
+        setFooterNavigateUrl(value: string): void;
+        setFooterText(value: string): void;
+        setHeaderImageUrl(value: string): void;
+        setHeaderNavigateUrl(value: string): void;
+        setHeaderText(value: string): void;
+    }
+
+    class BootstrapPopupMenu extends BootstrapMenu {
+        getCurrentPopupElement(): any;
+        getCurrentPopupElementIndex(): number;
+        getItem(index: number): BootstrapMenuItem | null;
+        getItemByName(name: string): BootstrapMenuItem | null;
+        getRootItem(): BootstrapMenuItem | null;
+        getSelectedItem(): BootstrapMenuItem | null;
+        hide(): void;
+        refreshPopupElementConnection(): void;
+        setPopupElementCssSelector(selector: string): void;
+        setPopupElementID(popupElementId: string): void;
+        setSelectedItem(item: BootstrapMenuItem): void;
+        show(): void;
+        showAtElement(htmlElement: any): void;
+        showAtElementByID(id: string): void;
+        showAtPos(x: number, y: number): void;
+        on<K extends keyof BootstrapPopupMenuEventMap>(eventName: K, callback: (this: BootstrapPopupMenu, args?: BootstrapPopupMenuEventMap[K]) => void): this;
+        once<K extends keyof BootstrapPopupMenuEventMap>(eventName: K, callback: (this: BootstrapPopupMenu, args?: BootstrapPopupMenuEventMap[K]) => void): this;
+        off<K extends keyof BootstrapPopupMenuEventMap>(eventName?: K, callback?: (this: BootstrapPopupMenu, args?: BootstrapPopupMenuEventMap[K]) => void): this;
+    }
+    interface BootstrapPopupMenuEventMap extends BootstrapMenuEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    class BootstrapProgressBar extends Control {
+        getCaption(): string;
+        getDisplayText(): string;
+        getEnabled(): boolean;
+        getMaximum(): number;
+        getMinimum(): number;
+        getPercent(): number;
+        getPosition(): number;
+        getValue(): any;
+        setCaption(caption: string): void;
+        setCustomDisplayFormat(text: string): void;
+        setEnabled(value: boolean): void;
+        setMaximum(max: number): void;
+        setMinMaxValues(minValue: number, maxValue: number): void;
+        setMinimum(min: number): void;
+        setPosition(position: number): void;
+        setValue(value: any): void;
+        on<K extends keyof BootstrapProgressBarEventMap>(eventName: K, callback: (this: BootstrapProgressBar, args?: BootstrapProgressBarEventMap[K]) => void): this;
+        once<K extends keyof BootstrapProgressBarEventMap>(eventName: K, callback: (this: BootstrapProgressBar, args?: BootstrapProgressBarEventMap[K]) => void): this;
+        off<K extends keyof BootstrapProgressBarEventMap>(eventName?: K, callback?: (this: BootstrapProgressBar, args?: BootstrapProgressBarEventMap[K]) => void): this;
+    }
+    interface BootstrapProgressBarEventMap extends ControlEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    interface ActiveViewChangingEventArgs extends EventArgs {
+        cancel: boolean;
+        readonly newView: BootstrapSchedulerViewType;
+        readonly oldView: BootstrapSchedulerViewType;
+    }
+
+    interface AppointmentClickEventArgs extends EventArgs {
+        readonly appointmentId: string;
+        readonly handled: boolean;
+        readonly htmlElement: object;
+    }
+
+    interface AppointmentDeletingEventArgs extends CancelEventArgs {
+        readonly appointmentIds: object[];
+    }
+
+    interface AppointmentDragEventArgs extends EventArgs {
+        allow: boolean;
+        readonly dragInformation: BootstrapSchedulerAppointmentDragInfo[];
+        readonly mouseEvent: any;
+    }
+
+    interface AppointmentDropEventArgs extends EventArgs {
+        readonly dragInformation: BootstrapSchedulerAppointmentDragInfo[];
+        handled: boolean;
+        readonly operation: BootstrapSchedulerAppointmentOperation;
+    }
+
+    interface AppointmentResizeEventArgs extends EventArgs {
+        readonly appointmentId: string;
+        handled: boolean;
+        readonly newInterval: BootstrapTimeInterval;
+        readonly oldInterval: BootstrapTimeInterval;
+        readonly operation: BootstrapSchedulerAppointmentOperation;
+    }
+
+    interface AppointmentResizingEventArgs extends EventArgs {
+        allow: boolean;
+        readonly appointmentId: string;
+        readonly mouseEvent: any;
+        readonly newInterval: BootstrapTimeInterval;
+        readonly oldInterval: BootstrapTimeInterval;
+    }
+
+    interface AppointmentToolTipShowingEventArgs extends CancelEventArgs {
+        readonly appointment: BootstrapSchedulerAppointment;
+    }
+
+    interface AppointmentsSelectionEventArgs extends EventArgs {
+        readonly appointmentIds: string[];
+    }
+
+    interface CellClickEventArgs extends EventArgs {
+        readonly htmlElement: object;
+        readonly interval: BootstrapTimeInterval;
+        readonly resource: string;
+    }
+
+    interface MenuItemClickedEventArgs extends EventArgs {
+        handled: boolean;
+        readonly itemName: string;
+    }
+
+    interface MoreButtonClickedEventArgs extends ProcessingModeEventArgs {
+        handled: boolean;
+        readonly interval: BootstrapTimeInterval;
+        readonly resource: string;
+        readonly targetDateTime: Date;
+    }
+
+    interface ShortcutEventArgs extends EventArgs {
+        readonly commandName: string;
+        readonly handled: boolean;
+        readonly htmlEvent: object;
+    }
+
+    class BootstrapScheduler extends Control {
+        appointmentFormCancel(): void;
+        appointmentFormDelete(): void;
+        appointmentFormSave(): void;
+        changeFormContainer(container: any): void;
+        changePopupMenuContainer(container: any): void;
+        changeTimeZoneId(timeZoneId: string): void;
+        changeToolTipContainer(container: any): void;
+        deleteAppointment(apt: BootstrapSchedulerAppointment): void;
+        deselectAppointmentById(aptId: any): void;
+        getActiveViewType(): BootstrapSchedulerViewType;
+        getAllDayAreaHeight(): number;
+        getAppointmentById(id: any): BootstrapSchedulerAppointment | null;
+        getAppointmentProperties(aptId: number, propertyNames: string[], onCallBack: any): string[];
+        getGroupType(): BootstrapSchedulerGroupType;
+        getResourceNavigatorVisible(): boolean;
+        getScrollAreaHeight(): number;
+        getSelectedAppointmentIds(): string[];
+        getSelectedInterval(): BootstrapTimeInterval | null;
+        getSelectedResource(): string;
+        getToolbarVisible(): boolean;
+        getTopRowTime(viewType: BootstrapSchedulerViewType): number;
+        getVisibleAppointments(): BootstrapSchedulerAppointment[];
+        getVisibleIntervals(): BootstrapTimeInterval[];
+        goToDateFormApply(): void;
+        goToDateFormCancel(): void;
+        gotoDate(date: Date): void;
+        gotoToday(): void;
+        hideLoadingPanel(): void;
+        inplaceEditFormCancel(): void;
+        inplaceEditFormSave(): void;
+        inplaceEditFormShowMore(): void;
+        insertAppointment(apt: BootstrapSchedulerAppointment): void;
+        navigateBackward(): void;
+        navigateForward(): void;
+        performCallback(parameter: string): void;
+        refresh(): void;
+        refreshClientAppointmentProperties(clientAppointment: BootstrapSchedulerAppointment, propertyNames: string[], onCallBack: any): void;
+        reminderFormCancel(): void;
+        reminderFormDismiss(): void;
+        reminderFormDismissAll(): void;
+        reminderFormSnooze(): void;
+        selectAppointmentById(aptId: any): void;
+        selectAppointmentById(aptId: any, scrollToSelection: boolean): void; // tslint:disable-line:unified-signatures
+        setActiveViewType(value: BootstrapSchedulerViewType): void;
+        setAllDayAreaHeight(height: number): void;
+        setGroupType(value: BootstrapSchedulerGroupType): void;
+        setHeight(height: number): void;
+        setResourceNavigatorVisible(visible: boolean): void;
+        setSelection(interval: BootstrapTimeInterval): void;
+        setSelection(interval: BootstrapTimeInterval, resourceId: string): void; // tslint:disable-line:unified-signatures
+        setSelection(interval: BootstrapTimeInterval, resourceId: string, scrollToSelection: boolean): void; // tslint:disable-line:unified-signatures
+        setToolbarVisible(visible: boolean): void;
+        setTopRowTime(duration: number): void;
+        setTopRowTime(duration: number, viewType: BootstrapSchedulerViewType): void; // tslint:disable-line:unified-signatures
+        setVisibleResources(resourceIds: string[]): void;
+        showAppointmentFormByClientId(aptClientId: string): void;
+        showAppointmentFormByServerId(aptServerId: string): void;
+        showInplaceEditor(start: Date, end: Date): void;
+        showInplaceEditor(start: Date, end: Date, resourceId: string): void; // tslint:disable-line:unified-signatures
+        showLoadingPanel(): void;
+        showSelectionToolTip(x: number, y: number): void;
+        updateAppointment(apt: BootstrapSchedulerAppointment): void;
+        on<K extends keyof BootstrapSchedulerEventMap>(eventName: K, callback: (this: BootstrapScheduler, args?: BootstrapSchedulerEventMap[K]) => void): this;
+        once<K extends keyof BootstrapSchedulerEventMap>(eventName: K, callback: (this: BootstrapScheduler, args?: BootstrapSchedulerEventMap[K]) => void): this;
+        off<K extends keyof BootstrapSchedulerEventMap>(eventName?: K, callback?: (this: BootstrapScheduler, args?: BootstrapSchedulerEventMap[K]) => void): this;
+    }
+    interface BootstrapSchedulerEventMap extends ControlEventMap {
+        "activeViewChanged": EventArgs;
+        "activeViewChanging": ActiveViewChangingEventArgs;
+        "appointmentClick": AppointmentClickEventArgs;
+        "appointmentDeleting": AppointmentDeletingEventArgs;
+        "appointmentDoubleClick": AppointmentClickEventArgs;
+        "appointmentDrag": AppointmentDragEventArgs;
+        "appointmentDrop": AppointmentDropEventArgs;
+        "appointmentResize": AppointmentResizeEventArgs;
+        "appointmentResizing": AppointmentResizingEventArgs;
+        "appointmentToolTipShowing": AppointmentToolTipShowingEventArgs;
+        "appointmentsSelectionChanged": AppointmentsSelectionEventArgs;
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "cellClick": CellClickEventArgs;
+        "cellDoubleClick": CellClickEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "menuItemClicked": MenuItemClickedEventArgs;
+        "moreButtonClicked": MoreButtonClickedEventArgs;
+        "selectionChanged": EventArgs;
+        "selectionChanging": EventArgs;
+        "shortcut": ShortcutEventArgs;
+        "visibleIntervalChanged": EventArgs;
+    }
+
+    class BootstrapTimeInterval {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        contains(interval: BootstrapTimeInterval): boolean;
+        equals(interval: BootstrapTimeInterval): boolean;
+        getAllDay(): boolean;
+        getDuration(): number;
+        getEnd(): Date;
+        getStart(): Date;
+        intersectsWith(interval: BootstrapTimeInterval): boolean;
+        intersectsWithExcludingBounds(interval: BootstrapTimeInterval): boolean;
+        setAllDay(allDayValue: boolean): void;
+        setDuration(value: number): void;
+        setEnd(value: Date): void;
+        setStart(value: Date): void;
+    }
+
+    class BootstrapSchedulerAppointment {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly appointmentId: string;
+        readonly appointmentType: BootstrapSchedulerAppointmentType;
+        readonly interval: BootstrapTimeInterval | null;
+        readonly labelIndex: number;
+        readonly resources: string[];
+        readonly statusIndex: number;
+        addResource(resourceId: object): void;
+        getAllDay(): boolean;
+        getAppointmentType(): BootstrapSchedulerAppointmentType;
+        getDescription(): string;
+        getDuration(): number;
+        getEnd(): Date;
+        getId(): any;
+        getLabelId(): number;
+        getLocation(): string;
+        getRecurrenceInfo(): BootstrapSchedulerRecurrenceInfo | null;
+        getRecurrencePattern(): BootstrapSchedulerAppointment | null;
+        getResource(index: number): any;
+        getStart(): Date;
+        getStatusId(): number;
+        getSubject(): string;
+        setAllDay(allDay: boolean): void;
+        setAppointmentType(type: BootstrapSchedulerAppointmentType): void;
+        setDescription(description: string): void;
+        setDuration(duration: number): void;
+        setEnd(end: Date): void;
+        setId(id: any): void;
+        setLabelId(statusId: number): void;
+        setLocation(location: string): void;
+        setRecurrenceInfo(recurrenceInfo: BootstrapSchedulerRecurrenceInfo): void;
+        setStart(start: Date): void;
+        setStatusId(statusId: number): void;
+        setSubject(subject: string): void;
+    }
+
+    class BootstrapSchedulerAppointmentDragInfo {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly appointmentId: string;
+        readonly newInterval: BootstrapTimeInterval | null;
+        readonly oldInterval: BootstrapTimeInterval | null;
+    }
+
+    class BootstrapSchedulerAppointmentOperation {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        apply(): void;
+        cancel(): void;
+    }
+
+    class BootstrapSchedulerRecurrenceInfo {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        getDayNumber(): number;
+        getDuration(): number;
+        getEnd(): Date;
+        getMonth(): number;
+        getOccurrenceCount(): number;
+        getPeriodicity(): number;
+        getRange(): BootstrapSchedulerRecurrenceRange;
+        getRecurrenceType(): BootstrapSchedulerRecurrenceType;
+        getStart(): Date;
+        getWeekDays(): WeekDays;
+        getWeekOfMonth(): WeekOfMonth;
+        setDayNumber(dayNumber: number): void;
+        setDuration(duration: number): void;
+        setEnd(end: Date): void;
+        setMonth(month: number): void;
+        setOccurrenceCount(occurrenceCount: number): void;
+        setPeriodicity(periodicity: number): void;
+        setRange(range: BootstrapSchedulerRecurrenceRange): void;
+        setRecurrenceType(type: BootstrapSchedulerRecurrenceType): void;
+        setStart(start: Date): void;
+        setWeekDays(weekDays: WeekDays): void;
+        setWeekOfMonth(weekOfMonth: WeekOfMonth): void;
+    }
+
+    class BootstrapSparkline extends Control {
+        exportTo(fileName: string, format: string): void;
+        getDataSource(): any;
+        getInstance(): any;
+        print(): void;
+        setDataSource(dataSource: any): void;
+        setOptions(options: any): void;
+        on<K extends keyof BootstrapSparklineEventMap>(eventName: K, callback: (this: BootstrapSparkline, args?: BootstrapSparklineEventMap[K]) => void): this;
+        once<K extends keyof BootstrapSparklineEventMap>(eventName: K, callback: (this: BootstrapSparkline, args?: BootstrapSparklineEventMap[K]) => void): this;
+        off<K extends keyof BootstrapSparklineEventMap>(eventName?: K, callback?: (this: BootstrapSparkline, args?: BootstrapSparklineEventMap[K]) => void): this;
+    }
+    interface BootstrapSparklineEventMap extends ControlEventMap {
+        "disposing": BootstrapChartEventArgsBase;
+        "drawn": BootstrapChartEventArgsBase;
+        "exported": BootstrapChartEventArgsBase;
+        "exporting": BootstrapChartExportEventArgs;
+        "fileSaving": BootstrapChartExportEventArgs;
+        "incidentOccurred": BootstrapChartErrorEventArgs;
+        "init": BootstrapChartEventArgsBase;
+        "optionChanged": BootstrapChartOptionChangedEventArgs;
+        "tooltipHidden": BootstrapChartEventArgsBase;
+        "tooltipShown": BootstrapChartEventArgsBase;
+    }
+
+    class BootstrapTimeEdit extends BootstrapClientEdit {
+        getButtonVisible(number: number): boolean;
+        getCaretPosition(): number;
+        getDate(): Date;
+        getText(): string;
+        selectAll(): void;
+        setButtonVisible(number: number, value: boolean): void;
+        setCaretPosition(position: number): void;
+        setDate(date: Date): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string): void;
+        on<K extends keyof BootstrapTimeEditEventMap>(eventName: K, callback: (this: BootstrapTimeEdit, args?: BootstrapTimeEditEventMap[K]) => void): this;
+        once<K extends keyof BootstrapTimeEditEventMap>(eventName: K, callback: (this: BootstrapTimeEdit, args?: BootstrapTimeEditEventMap[K]) => void): this;
+        off<K extends keyof BootstrapTimeEditEventMap>(eventName?: K, callback?: (this: BootstrapTimeEdit, args?: BootstrapTimeEditEventMap[K]) => void): this;
+    }
+    interface BootstrapTimeEditEventMap extends BootstrapClientEditEventMap {
+        "buttonClick": ButtonEditClickEventArgs;
+        "dateChanged": ProcessingModeEventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    class BootstrapSpinEdit extends BootstrapClientEdit {
+        getButtonVisible(number: number): boolean;
+        getCaretPosition(): number;
+        getMaxValue(): number;
+        getMinValue(): number;
+        getNumber(): number;
+        getText(): string;
+        selectAll(): void;
+        setButtonVisible(number: number, value: boolean): void;
+        setCaretPosition(position: number): void;
+        setMaxValue(value: number): void;
+        setMinValue(value: number): void;
+        setNumber(number: number): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string): void;
+        setValue(number: number): void;
+        on<K extends keyof BootstrapSpinEditEventMap>(eventName: K, callback: (this: BootstrapSpinEdit, args?: BootstrapSpinEditEventMap[K]) => void): this;
+        once<K extends keyof BootstrapSpinEditEventMap>(eventName: K, callback: (this: BootstrapSpinEdit, args?: BootstrapSpinEditEventMap[K]) => void): this;
+        off<K extends keyof BootstrapSpinEditEventMap>(eventName?: K, callback?: (this: BootstrapSpinEdit, args?: BootstrapSpinEditEventMap[K]) => void): this;
+    }
+    interface BootstrapSpinEditEventMap extends BootstrapClientEditEventMap {
+        "buttonClick": ButtonEditClickEventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "numberChanged": ProcessingModeEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    interface TabControlTabEventArgs extends EventArgs {
+        readonly tab: BootstrapTab;
+    }
+
+    interface TabControlTabCancelEventArgs extends ProcessingModeCancelEventArgs {
+        reloadContentOnCallback: boolean;
+        readonly tab: BootstrapTab;
+    }
+
+    interface TabControlTabClickEventArgs extends TabControlTabCancelEventArgs {
+        readonly htmlElement: object;
+        readonly htmlEvent: object;
+    }
+
+    class BootstrapTabControl extends Control {
+        adjustSize(): void;
+        getActiveTab(): BootstrapTab | null;
+        getActiveTabIndex(): number;
+        getTab(index: number): BootstrapTab | null;
+        getTabByName(name: string): BootstrapTab | null;
+        getTabCount(): number;
+        setActiveTab(tab: BootstrapTab): void;
+        setActiveTabIndex(index: number): void;
+        on<K extends keyof BootstrapTabControlEventMap>(eventName: K, callback: (this: BootstrapTabControl, args?: BootstrapTabControlEventMap[K]) => void): this;
+        once<K extends keyof BootstrapTabControlEventMap>(eventName: K, callback: (this: BootstrapTabControl, args?: BootstrapTabControlEventMap[K]) => void): this;
+        off<K extends keyof BootstrapTabControlEventMap>(eventName?: K, callback?: (this: BootstrapTabControl, args?: BootstrapTabControlEventMap[K]) => void): this;
+    }
+    interface BootstrapTabControlEventMap extends ControlEventMap {
+        "activeTabChanged": TabControlTabEventArgs;
+        "activeTabChanging": TabControlTabCancelEventArgs;
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "tabClick": TabControlTabClickEventArgs;
+    }
+
+    class BootstrapTab {
+        protected readonly instance: any;
+        protected constructor(instance: any);
+        readonly index: number;
+        readonly name: string;
+        readonly tabControl: BootstrapTabControl | null;
+        getActiveIconCssClass(): string;
+        getActiveImageUrl(): string;
+        getBadgeIconCssClass(): string;
+        getBadgeText(): string;
+        getEnabled(): boolean;
+        getIconCssClass(): string;
+        getImageUrl(): string;
+        getNavigateUrl(): string;
+        getText(): string;
+        getVisible(): boolean;
+        setActiveIconCssClass(cssClass: string): void;
+        setActiveImageUrl(value: string): void;
+        setBadgeIconCssClass(cssClass: string): void;
+        setBadgeText(text: string): void;
+        setEnabled(value: boolean): void;
+        setIconCssClass(cssClass: string): void;
+        setImageUrl(value: string): void;
+        setNavigateUrl(value: string): void;
+        setText(value: string): void;
+        setVisible(value: boolean): void;
+    }
+
+    class BootstrapPageControl extends BootstrapTabControl {
+        getActiveTab(): BootstrapTab | null;
+        getTab(index: number): BootstrapTab | null;
+        getTabByName(name: string): BootstrapTab | null;
+        getTabContentHTML(tab: BootstrapTab): string;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        setActiveTab(tab: BootstrapTab): void;
+        setTabContentHTML(tab: BootstrapTab, html: string): void;
+        on<K extends keyof BootstrapPageControlEventMap>(eventName: K, callback: (this: BootstrapPageControl, args?: BootstrapPageControlEventMap[K]) => void): this;
+        once<K extends keyof BootstrapPageControlEventMap>(eventName: K, callback: (this: BootstrapPageControl, args?: BootstrapPageControlEventMap[K]) => void): this;
+        off<K extends keyof BootstrapPageControlEventMap>(eventName?: K, callback?: (this: BootstrapPageControl, args?: BootstrapPageControlEventMap[K]) => void): this;
+    }
+    interface BootstrapPageControlEventMap extends BootstrapTabControlEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    class BootstrapTagBox extends BootstrapClientEdit {
+        addItem(texts: string[]): number;
+        addItem(text: string): number; // tslint:disable-line:unified-signatures
+        addItem(texts: string[], value: any): number; // tslint:disable-line:unified-signatures
+        addItem(text: string, value: any): number; // tslint:disable-line:unified-signatures unified-signatures
+        addItem(texts: string[], value: any, iconCssClass: string): number; // tslint:disable-line:unified-signatures
+        addItem(text: string, value: any, iconCssClass: string): number; // tslint:disable-line:unified-signatures unified-signatures
+        addItemCssClass(index: number, className: string): void;
+        addItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+        addTag(text: string): void;
+        adjustDropDownWindow(): void;
+        beginUpdate(): void;
+        clearItems(): void;
+        clearTagCollection(): void;
+        endUpdate(): void;
+        ensureDropDownLoaded(callbackFunction: any): void;
+        findItemByText(text: string): BootstrapListBoxItem | null;
+        findItemByValue(value: any): BootstrapListBoxItem | null;
+        getButtonVisible(number: number): boolean;
+        getCaretPosition(): number;
+        getItem(index: number): BootstrapListBoxItem | null;
+        getItemBadgeIconCssClass(index: number): string;
+        getItemBadgeText(index: number): string;
+        getItemCount(): number;
+        getSelectedIndex(): number;
+        getSelectedItem(): BootstrapListBoxItem | null;
+        getTagCollection(): string[];
+        getTagHtmlElement(index: number): any;
+        getTagIndexByText(text: string): number;
+        getTagRemoveButtonHtmlElement(index: number): any;
+        getTagTextHtmlElement(index: number): any;
+        getText(): string;
+        getValue(): string;
+        hideDropDown(): void;
+        insertItem(index: number, texts: string[]): void;
+        insertItem(index: number, text: string): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, texts: string[], value: any): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, text: string, value: any): void; // tslint:disable-line:unified-signatures unified-signatures
+        insertItem(index: number, texts: string[], value: any, iconCssClass: string): void; // tslint:disable-line:unified-signatures
+        insertItem(index: number, text: string, value: any, iconCssClass: string): void; // tslint:disable-line:unified-signatures unified-signatures
+        isCustomTag(text: string, caseSensitive: boolean): boolean;
+        makeItemVisible(index: number): void;
+        performCallback(data: any): Promise<void>;
+        performCallback(data: any, onSuccess: () => void): void;
+        removeItem(index: number): void;
+        removeItemCssClass(index: number, className: string): void;
+        removeItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+        removeTag(index: number): void;
+        removeTagByText(text: string): void;
+        selectAll(): void;
+        setButtonVisible(number: number, value: boolean): void;
+        setCaretPosition(position: number): void;
+        setItemBadgeIconCssClass(index: number, cssClass: string): void;
+        setItemBadgeText(index: number, text: string): void;
+        setItemHtml(index: number, html: string): void;
+        setItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+        setItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+        setItemTooltip(index: number, tooltip: string): void;
+        setSelectedIndex(index: number): void;
+        setSelectedItem(item: BootstrapListBoxItem): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setTagCollection(collection: string[]): void;
+        setText(text: string): void;
+        setValue(value: string): void;
+        showDropDown(): void;
+        on<K extends keyof BootstrapTagBoxEventMap>(eventName: K, callback: (this: BootstrapTagBox, args?: BootstrapTagBoxEventMap[K]) => void): this;
+        once<K extends keyof BootstrapTagBoxEventMap>(eventName: K, callback: (this: BootstrapTagBox, args?: BootstrapTagBoxEventMap[K]) => void): this;
+        off<K extends keyof BootstrapTagBoxEventMap>(eventName?: K, callback?: (this: BootstrapTagBox, args?: BootstrapTagBoxEventMap[K]) => void): this;
+    }
+    interface BootstrapTagBoxEventMap extends BootstrapClientEditEventMap {
+        "beginCallback": BeginCallbackEventArgs;
+        "buttonClick": ButtonEditClickEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "closeUp": EventArgs;
+        "customHighlighting": ListEditCustomHighlightingEventArgs;
+        "dropDown": EventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "itemFiltering": ListEditItemFilteringEventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "queryCloseUp": CancelEventArgs;
+        "selectedIndexChanged": ProcessingModeEventArgs;
+        "tagsChanged": EventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    interface ButtonEditClickEventArgs extends ProcessingModeEventArgs {
+        readonly buttonIndex: number;
+    }
+
+    class BootstrapButtonEdit extends BootstrapClientEdit {
+        getButtonVisible(number: number): boolean;
+        getCaretPosition(): number;
+        getText(): string;
+        selectAll(): void;
+        setButtonVisible(number: number, value: boolean): void;
+        setCaretPosition(position: number): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string): void;
+        on<K extends keyof BootstrapButtonEditEventMap>(eventName: K, callback: (this: BootstrapButtonEdit, args?: BootstrapButtonEditEventMap[K]) => void): this;
+        once<K extends keyof BootstrapButtonEditEventMap>(eventName: K, callback: (this: BootstrapButtonEdit, args?: BootstrapButtonEditEventMap[K]) => void): this;
+        off<K extends keyof BootstrapButtonEditEventMap>(eventName?: K, callback?: (this: BootstrapButtonEdit, args?: BootstrapButtonEditEventMap[K]) => void): this;
+    }
+    interface BootstrapButtonEditEventMap extends BootstrapClientEditEventMap {
+        "buttonClick": ButtonEditClickEventArgs;
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    class BootstrapMemo extends BootstrapClientEdit {
+        getCaretPosition(): number;
+        getText(): string;
+        selectAll(): void;
+        setCaretPosition(position: number): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string): void;
+        on<K extends keyof BootstrapMemoEventMap>(eventName: K, callback: (this: BootstrapMemo, args?: BootstrapMemoEventMap[K]) => void): this;
+        once<K extends keyof BootstrapMemoEventMap>(eventName: K, callback: (this: BootstrapMemo, args?: BootstrapMemoEventMap[K]) => void): this;
+        off<K extends keyof BootstrapMemoEventMap>(eventName?: K, callback?: (this: BootstrapMemo, args?: BootstrapMemoEventMap[K]) => void): this;
+    }
+    interface BootstrapMemoEventMap extends BootstrapClientEditEventMap {
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    class BootstrapTextBox extends BootstrapClientEdit {
+        getCaretPosition(): number;
+        getText(): string;
+        selectAll(): void;
+        setCaretPosition(position: number): void;
+        setSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+        setText(text: string): void;
+        on<K extends keyof BootstrapTextBoxEventMap>(eventName: K, callback: (this: BootstrapTextBox, args?: BootstrapTextBoxEventMap[K]) => void): this;
+        once<K extends keyof BootstrapTextBoxEventMap>(eventName: K, callback: (this: BootstrapTextBox, args?: BootstrapTextBoxEventMap[K]) => void): this;
+        off<K extends keyof BootstrapTextBoxEventMap>(eventName?: K, callback?: (this: BootstrapTextBox, args?: BootstrapTextBoxEventMap[K]) => void): this;
+    }
+    interface BootstrapTextBoxEventMap extends BootstrapClientEditEventMap {
+        "keyDown": EditKeyEventArgs;
+        "keyPress": EditKeyEventArgs;
+        "keyUp": EditKeyEventArgs;
+        "textChanged": ProcessingModeEventArgs;
+        "userInput": EventArgs;
+    }
+
+    class BootstrapToolbar extends BootstrapMenu {
+        on<K extends keyof BootstrapToolbarEventMap>(eventName: K, callback: (this: BootstrapToolbar, args?: BootstrapToolbarEventMap[K]) => void): this;
+        once<K extends keyof BootstrapToolbarEventMap>(eventName: K, callback: (this: BootstrapToolbar, args?: BootstrapToolbarEventMap[K]) => void): this;
+        off<K extends keyof BootstrapToolbarEventMap>(eventName?: K, callback?: (this: BootstrapToolbar, args?: BootstrapToolbarEventMap[K]) => void): this;
+    }
+    interface BootstrapToolbarEventMap extends BootstrapMenuEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    interface TreeViewNodeProcessingModeEventArgs extends ProcessingModeEventArgs {
+        readonly node: BootstrapTreeViewNode;
+    }
+
+    interface TreeViewNodeClickEventArgs extends TreeViewNodeProcessingModeEventArgs {
+        readonly htmlElement: any;
+        readonly htmlEvent: any;
+    }
+
+    interface TreeViewNodeEventArgs extends EventArgs {
+        readonly node: BootstrapTreeViewNode;
+    }
+
+    interface TreeViewNodeCancelEventArgs extends ProcessingModeCancelEventArgs {
+        readonly node: BootstrapTreeViewNode;
+    }
+
+    class BootstrapTreeView extends Control {
+        collapseAll(): void;
+        expandAll(): void;
+        getNode(index: number): BootstrapTreeViewNode | null;
+        getNodeByName(name: string): BootstrapTreeViewNode | null;
+        getNodeByText(text: string): BootstrapTreeViewNode | null;
+        getNodeCount(): number;
+        getRootNode(): BootstrapTreeViewNode | null;
+        getSelectedNode(): BootstrapTreeViewNode | null;
+        setSelectedNode(node: BootstrapTreeViewNode): void;
+        on<K extends keyof BootstrapTreeViewEventMap>(eventName: K, callback: (this: BootstrapTreeView, args?: BootstrapTreeViewEventMap[K]) => void): this;
+        once<K extends keyof BootstrapTreeViewEventMap>(eventName: K, callback: (this: BootstrapTreeView, args?: BootstrapTreeViewEventMap[K]) => void): this;
+        off<K extends keyof BootstrapTreeViewEventMap>(eventName?: K, callback?: (this: BootstrapTreeView, args?: BootstrapTreeViewEventMap[K]) => void): this;
+    }
+    interface BootstrapTreeViewEventMap extends ControlEventMap {
+        "beginCallback": BeginCallbackEventArgs;
+        "callbackError": CallbackErrorEventArgs;
+        "checkedChanged": TreeViewNodeProcessingModeEventArgs;
+        "endCallback": EndCallbackEventArgs;
+        "expandedChanged": TreeViewNodeEventArgs;
+        "expandedChanging": TreeViewNodeCancelEventArgs;
+        "nodeClick": TreeViewNodeClickEventArgs;
+    }
+
+    class BootstrapTreeViewNode extends Control {
+        readonly index: number;
+        readonly name: string;
+        readonly parent: BootstrapTreeViewNode | null;
+        readonly treeView: BootstrapTreeView | null;
+        getBadgeIconCssClass(): string;
+        getBadgeText(): string;
+        getCheckState(): string;
+        getChecked(): boolean;
+        getEnabled(): boolean;
+        getExpanded(): boolean;
+        getHtmlElement(): any;
+        getIconCssClass(): string;
+        getImageUrl(): string;
+        getNavigateUrl(): string;
+        getNode(index: number): BootstrapTreeViewNode | null;
+        getNodeByName(name: string): BootstrapTreeViewNode | null;
+        getNodeByText(text: string): BootstrapTreeViewNode | null;
+        getNodeCount(): number;
+        getText(): string;
+        getVisible(): boolean;
+        setBadgeIconCssClass(cssClass: string): void;
+        setBadgeText(text: string): void;
+        setChecked(value: boolean): void;
+        setEnabled(value: boolean): void;
+        setExpanded(value: boolean): void;
+        setIconCssClass(cssClass: string): void;
+        setImageUrl(value: string): void;
+        setNavigateUrl(value: string): void;
+        setText(value: string): void;
+        setVisible(value: boolean): void;
+        on<K extends keyof BootstrapTreeViewNodeEventMap>(eventName: K, callback: (this: BootstrapTreeViewNode, args?: BootstrapTreeViewNodeEventMap[K]) => void): this;
+        once<K extends keyof BootstrapTreeViewNodeEventMap>(eventName: K, callback: (this: BootstrapTreeViewNode, args?: BootstrapTreeViewNodeEventMap[K]) => void): this;
+        off<K extends keyof BootstrapTreeViewNodeEventMap>(eventName?: K, callback?: (this: BootstrapTreeViewNode, args?: BootstrapTreeViewNodeEventMap[K]) => void): this;
+    }
+    interface BootstrapTreeViewNodeEventMap extends ControlEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    interface UploadControlFilesUploadStartEventArgs extends EventArgs {
+        readonly cancel: boolean;
+    }
+
+    interface UploadControlFileUploadCompleteEventArgs extends EventArgs {
+        readonly callbackData: string;
+        readonly errorText: string;
+        readonly inputIndex: number;
+        readonly isValid: boolean;
+    }
+
+    interface UploadControlFilesUploadCompleteEventArgs extends EventArgs {
+        readonly callbackData: string;
+        readonly errorText: string;
+    }
+
+    interface UploadControlTextChangedEventArgs extends EventArgs {
+        readonly inputIndex: number;
+    }
+
+    interface UploadControlUploadingProgressChangedEventArgs extends EventArgs {
+        readonly currentFileContentLength: number;
+        readonly currentFileName: string;
+        readonly currentFileProgress: number;
+        readonly currentFileUploadedContentLength: number;
+        readonly fileCount: number;
+        readonly progress: number;
+        readonly totalContentLength: number;
+        readonly uploadedContentLength: number;
+    }
+
+    interface UploadControlValidationErrorOccurredEventArgs extends EventArgs {
+        errorText: string;
+        readonly invalidFiles: BootstrapUploadControlInvalidFileInfo[];
+        showAlert: boolean;
+        readonly validationSettings: BootstrapUploadControlValidationSettings;
+    }
+
+    interface UploadControlDropZoneEnterEventArgs extends EventArgs {
+        readonly dropZone: any;
+    }
+
+    interface UploadControlDropZoneLeaveEventArgs extends EventArgs {
+        readonly dropZone: any;
+    }
+
+    class BootstrapUploadControl extends Control {
+        addFileInput(): void;
+        cancel(): void;
+        clearText(): void;
+        getAddButtonText(): string;
+        getEnabled(): boolean;
+        getFileInputCount(): number;
+        getSelectedFiles(inputIndex: number): BootstrapUploadControlFile[];
+        getText(index: number): string;
+        getUploadButtonText(): string;
+        removeFileFromSelection(fileIndex: number): void;
+        removeFileFromSelection(file: BootstrapUploadControlFile): void; // tslint:disable-line:unified-signatures
+        removeFileInput(index: number): void;
+        setAddButtonText(text: string): void;
+        setDialogTriggerID(ids: string): void;
+        setEnabled(enabled: boolean): void;
+        setFileInputCount(count: number): void;
+        setUploadButtonText(text: string): void;
+        upload(): void;
+        on<K extends keyof BootstrapUploadControlEventMap>(eventName: K, callback: (this: BootstrapUploadControl, args?: BootstrapUploadControlEventMap[K]) => void): this;
+        once<K extends keyof BootstrapUploadControlEventMap>(eventName: K, callback: (this: BootstrapUploadControl, args?: BootstrapUploadControlEventMap[K]) => void): this;
+        off<K extends keyof BootstrapUploadControlEventMap>(eventName?: K, callback?: (this: BootstrapUploadControl, args?: BootstrapUploadControlEventMap[K]) => void): this;
+    }
+    interface BootstrapUploadControlEventMap extends ControlEventMap {
+        "dropZoneEnter": UploadControlDropZoneEnterEventArgs;
+        "dropZoneLeave": UploadControlDropZoneLeaveEventArgs;
+        "fileInputCountChanged": EventArgs;
+        "fileUploadComplete": UploadControlFileUploadCompleteEventArgs;
+        "filesUploadComplete": UploadControlFilesUploadCompleteEventArgs;
+        "filesUploadStart": UploadControlFilesUploadStartEventArgs;
+        "textChanged": UploadControlTextChangedEventArgs;
+        "uploadingProgressChanged": UploadControlUploadingProgressChangedEventArgs;
+        "validationErrorOccurred": UploadControlValidationErrorOccurredEventArgs;
+    }
+
+    class BootstrapUploadControlFile extends Control {
+        readonly name: string;
+        readonly size: number;
+        readonly sourceFileObject: any;
+        on<K extends keyof BootstrapUploadControlFileEventMap>(eventName: K, callback: (this: BootstrapUploadControlFile, args?: BootstrapUploadControlFileEventMap[K]) => void): this;
+        once<K extends keyof BootstrapUploadControlFileEventMap>(eventName: K, callback: (this: BootstrapUploadControlFile, args?: BootstrapUploadControlFileEventMap[K]) => void): this;
+        off<K extends keyof BootstrapUploadControlFileEventMap>(eventName?: K, callback?: (this: BootstrapUploadControlFile, args?: BootstrapUploadControlFileEventMap[K]) => void): this;
+    }
+    interface BootstrapUploadControlFileEventMap extends ControlEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    class BootstrapUploadControlInvalidFileInfo extends Control {
+        readonly fileName: string;
+        readonly fileSize: number;
+        on<K extends keyof BootstrapUploadControlInvalidFileInfoEventMap>(eventName: K, callback: (this: BootstrapUploadControlInvalidFileInfo, args?:
+             BootstrapUploadControlInvalidFileInfoEventMap[K]) => void): this;
+        once<K extends keyof BootstrapUploadControlInvalidFileInfoEventMap>(eventName: K, callback: (this: BootstrapUploadControlInvalidFileInfo,
+             args?: BootstrapUploadControlInvalidFileInfoEventMap[K]) => void): this;
+        off<K extends keyof BootstrapUploadControlInvalidFileInfoEventMap>(eventName?: K, callback?: (this: BootstrapUploadControlInvalidFileInfo,
+             args?: BootstrapUploadControlInvalidFileInfoEventMap[K]) => void): this;
+    }
+    interface BootstrapUploadControlInvalidFileInfoEventMap extends ControlEventMap { // tslint:disable-line:no-empty-interface
+    }
+
+    class BootstrapUploadControlValidationSettings extends Control {
+        readonly allowedFileExtensions: string[];
+        readonly invalidFileNameCharacters: string[];
+        readonly maxFileCount: number;
+        readonly maxFileSize: number;
+        on<K extends keyof BootstrapUploadControlValidationSettingsEventMap>(eventName: K, callback: (this: BootstrapUploadControlValidationSettings,
+             args?: BootstrapUploadControlValidationSettingsEventMap[K]) => void): this;
+        once<K extends keyof BootstrapUploadControlValidationSettingsEventMap>(eventName: K, callback: (this:
+             BootstrapUploadControlValidationSettings, args?: BootstrapUploadControlValidationSettingsEventMap[K]) => void): this;
+        off<K extends keyof BootstrapUploadControlValidationSettingsEventMap>(eventName?: K, callback?: (this:
+             BootstrapUploadControlValidationSettings, args?: BootstrapUploadControlValidationSettingsEventMap[K]) => void): this;
+    }
+    interface BootstrapUploadControlValidationSettingsEventMap extends ControlEventMap { // tslint:disable-line:no-empty-interface
+    }
+}
diff --git a/types/devexpress-aspnetcore-bootstrap/tsconfig.json b/types/devexpress-aspnetcore-bootstrap/tsconfig.json
new file mode 100644
index 0000000000..1131d37582
--- /dev/null
+++ b/types/devexpress-aspnetcore-bootstrap/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",
+        "devexpress-aspnetcore-bootstrap-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/devexpress-aspnetcore-bootstrap/tslint.json b/types/devexpress-aspnetcore-bootstrap/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/devexpress-aspnetcore-bootstrap/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

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 0165/1124] 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 0166/1124] 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 0167/1124] 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 0168/1124] 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 0169/1124] 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 b5d057481543d43e5fce7e33ff4f54d48d142194 Mon Sep 17 00:00:00 2001
From: l-jonas <l-jonas@users.noreply.github.com>
Date: Thu, 10 May 2018 21:42:12 +0200
Subject: [PATCH 0170/1124] Add types for in-app-purchase (#25651)

* Add types for in-app-purchase

* in-app-purchase: Change order of validateOnce overloads
---
 .../in-app-purchase/in-app-purchase-tests.ts  |  38 +++++++
 types/in-app-purchase/index.d.ts              | 107 ++++++++++++++++++
 types/in-app-purchase/tsconfig.json           |  23 ++++
 types/in-app-purchase/tslint.json             |   1 +
 4 files changed, 169 insertions(+)
 create mode 100644 types/in-app-purchase/in-app-purchase-tests.ts
 create mode 100644 types/in-app-purchase/index.d.ts
 create mode 100644 types/in-app-purchase/tsconfig.json
 create mode 100644 types/in-app-purchase/tslint.json

diff --git a/types/in-app-purchase/in-app-purchase-tests.ts b/types/in-app-purchase/in-app-purchase-tests.ts
new file mode 100644
index 0000000000..4e142e53e2
--- /dev/null
+++ b/types/in-app-purchase/in-app-purchase-tests.ts
@@ -0,0 +1,38 @@
+import * as iap from 'in-app-purchase';
+
+iap.config({
+	/* Configurations for Amazon Store */
+	amazonAPIVersion: 2, // tells the module to use API version 2
+	secret: 'abcdefghijklmnoporstuvwxyz', // this comes from Amazon
+
+	/* Configurations for Apple */
+	applePassword: 'abcdefg...', // this comes from iTunes Connect (You need this to valiate subscriptions)
+
+	/* Configurations for Google Play */
+	googlePublicKeyPath: 'path/to/public/key/directory/', // this is the path to the directory containing iap-sanbox/iap-live files
+	googleAccToken: 'abcdef...', // optional, for Google Play subscriptions
+	googleRefToken: 'dddd...', // optional, for Google Play subscritions
+	clientId: 'aaaa', // optional, for Google Play subscriptions
+	clientSecret: 'bbbb', // optional, for Google Play subscriptions
+	refreshToken: 'cccc', // optional, for Google Play subscriptions
+
+	/* Configurations for Roku */
+	rokuApiKey: 'aaaa...', // this comes from Roku Developer Dashboard
+
+	/* Configurations all platforms */
+	test: true, // For Apple and Googl Play to force Sandbox validation only
+	verbose: true // Output debug logs to stdout stream
+});
+iap.setup()
+  .then(() => iap.validate('abcdef'))
+  .then((validatedData) => {
+    const options = {
+  		ignoreCanceled: true, // Apple ONLY (for now...): purchaseData will NOT contain cancceled items
+  		ignoreExpired: true // purchaseData will NOT contain exipired subscription items
+  	};
+
+  	const purchaseData = iap.getPurchaseData(validatedData, options);
+  })
+  .catch((error) => {
+    // error...
+  });
diff --git a/types/in-app-purchase/index.d.ts b/types/in-app-purchase/index.d.ts
new file mode 100644
index 0000000000..b27daf2c20
--- /dev/null
+++ b/types/in-app-purchase/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for in-app-purchase 1.9
+// Project: https://github.com/voltrue2/in-app-purchase#readme
+// Definitions by: Jonas Lochmann <https://github.com/l-jonas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export const UNITY = 'unity';
+export const APPLE = 'apple';
+export const GOOGLE = 'google';
+export const WINDOWS = 'windows';
+export const AMAZON = 'amazon';
+export const ROKU = 'roku';
+
+export function config(params: Config): void;
+export function setup(): Promise<void>;
+export function setup(callback: (err: any) => void): void;
+export function getService(receipt: Receipt): Service;
+
+export function validate(receipt: Receipt): Promise<ValidationResponse>;
+export function validate(receipt: Receipt, callback: (err: any, res: ValidationResponse) => void): void;
+export function validate(service: Service, receipt: Receipt, callback: (err: any, res: ValidationResponse) => void): void;
+
+export function validateOnce(receipt: Receipt, secretOrPubKey: any): Promise<ValidationResponse>;
+export function validateOnce(receipt: Receipt, secretOrPubKey: any, callback: (err: any, res: ValidationResponse) => void): void;
+export function validateOnce(service: Service, secretOrPubKey: any, receipt: Receipt, callback: (err: any, res: ValidationResponse) => void): void;
+
+export function isValidated(response: ValidationResponse): boolean;
+export function isExpired(item: PurchasedItem): boolean;
+export function getPurchaseData(purchaseData?: ValidationResponse, options?: {
+  ignoreCanceled: boolean;
+  ignoreExpired: boolean;
+}): PurchasedItem[] | null;
+
+export function refreshGoogleToken(): Promise<void>;
+export function refreshGoogleToken(callback: (err: any) => void): void;
+
+// for test use only, resets the google setup
+export function reset(): void;
+
+export interface Config {
+  /* Configurations for Amazon Store */
+  amazonAPIVersion?: number;
+  secret?: string;
+
+  /* Configurations for Apple */
+
+  // this comes from iTunes Connect (You need this to valiate subscriptions)
+  applePassword?: string;
+
+  /* Configurations for Google Play */
+  // this is the path to the directory containing iap-sanbox/iap-live files
+  googlePublicKeyPath?: string;
+  // optional, for Google Play subscriptions
+  googleAccToken?: string;
+  // optional, for Google Play subscritions
+  googleRefToken?: string;
+  // optional, for Google Play subscriptions
+  clientId?: string;
+  // optional, for Google Play subscriptions
+  clientSecret?: string;
+  // optional, for Google Play subscriptions
+  refreshToken?: string;
+
+  /* Configurations for Roku */
+  // this comes from Roku Developer Dashboard
+  rokuApiKey?: string;
+
+  /* Configurations all platforms */
+  // For Apple and Googl Play to force Sandbox validation only
+  test?: boolean;
+  // Output debug logs to stdout stream
+  verbose?: boolean;
+}
+
+export type Service = typeof UNITY | typeof APPLE | typeof GOOGLE | typeof WINDOWS | typeof AMAZON | typeof ROKU;
+
+export type UnityReceipt = object | string;
+export type AppleReceipt = string;
+export type GoogleReceipt = {
+  date: string;
+  signature: string;
+} | string;
+export type WindowsReceipt = string;
+export type AmazonReceipt = object | string;
+export type RokuReceipt = string;
+
+export type Receipt = UnityReceipt | AppleReceipt | GoogleReceipt | WindowsReceipt | AmazonReceipt | RokuReceipt;
+
+export interface ValidationResponse {
+  service: Service;
+  status: number;
+  // there are more fields depending on the used service
+}
+
+export interface PurchasedItem {
+  bundleId?: string;  // only Apple
+  orderId?: string; // only Google
+  transactionId: string;
+  productId: string;
+  purchaseDate: number;
+  // iTunes, windows and amazon subscription only
+  // Google subscriptions only with google play store api info
+  expirationDate?: number;
+  quantity: number;
+  // this was created based on the source code of in-app-purchase
+  // eventually there are more fields
+}
diff --git a/types/in-app-purchase/tsconfig.json b/types/in-app-purchase/tsconfig.json
new file mode 100644
index 0000000000..7752182f8a
--- /dev/null
+++ b/types/in-app-purchase/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",
+        "in-app-purchase-tests.ts"
+    ]
+}
diff --git a/types/in-app-purchase/tslint.json b/types/in-app-purchase/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/in-app-purchase/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b5591375e35240eb4fc2b33580ee5104a3409f24 Mon Sep 17 00:00:00 2001
From: Jip Sterk <17934897+JipSterk@users.noreply.github.com>
Date: Thu, 10 May 2018 21:46:04 +0200
Subject: [PATCH 0171/1124] Added dom-to-image typings (#25650)

* Added dom-to-image typings

* changed string to blob

* blob is now in the right place

* updated to reflect new changes
---
 types/dom-to-image/index.d.ts                 | 42 +++++++++++++++++++
 .../test/dom-to-image-global-tests.ts         | 38 +++++++++++++++++
 .../test/dom-to-image-import-default-tests.ts | 40 ++++++++++++++++++
 .../test/dom-to-image-module-tests.ts         | 40 ++++++++++++++++++
 types/dom-to-image/tsconfig.json              | 27 ++++++++++++
 types/dom-to-image/tslint.json                |  3 ++
 6 files changed, 190 insertions(+)
 create mode 100644 types/dom-to-image/index.d.ts
 create mode 100644 types/dom-to-image/test/dom-to-image-global-tests.ts
 create mode 100644 types/dom-to-image/test/dom-to-image-import-default-tests.ts
 create mode 100644 types/dom-to-image/test/dom-to-image-module-tests.ts
 create mode 100644 types/dom-to-image/tsconfig.json
 create mode 100644 types/dom-to-image/tslint.json

diff --git a/types/dom-to-image/index.d.ts b/types/dom-to-image/index.d.ts
new file mode 100644
index 0000000000..b6e186f53b
--- /dev/null
+++ b/types/dom-to-image/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for dom-to-image 2.6
+// Project: https://github.com/tsayen/dom-to-image
+// Definitions by: Jip Sterk <https://github.com/JipSterk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+export interface DomToImage {
+  toSvg(node: Node, options?: Options): Promise<string>;
+  toPng(node: Node, options?: Options): Promise<string>;
+  toJpeg(node: Node, options?: Options): Promise<string>;
+  toBlob(node: Node, options?: Options): Promise<Blob>;
+  toPixelData(node: Node, options?: Options): Promise<string>;
+}
+
+export interface Options {
+  filter?: (node: Node) => boolean;
+  bgcolor?: string;
+  width?: number;
+  height?: number;
+  style?: {};
+  quality?: number;
+  imagePlaceholder?: string;
+  cachebust?: boolean;
+}
+
+export const DomToImage: DomToImage;
+
+type DomToImage_ = DomToImage;
+type Options_ = Options;
+
+export default DomToImage;
+
+declare global {
+  namespace DomToImage {
+    type Options = Options_;
+    type DomToImage = DomToImage_;
+  }
+
+  const DomToImage: DomToImage.DomToImage;
+}
diff --git a/types/dom-to-image/test/dom-to-image-global-tests.ts b/types/dom-to-image/test/dom-to-image-global-tests.ts
new file mode 100644
index 0000000000..a21be8bd01
--- /dev/null
+++ b/types/dom-to-image/test/dom-to-image-global-tests.ts
@@ -0,0 +1,38 @@
+const node = new Node();
+
+const options: DomToImage.Options = {
+    filter,
+    bgcolor: '#24292e',
+    style: {
+        width: '100px'
+    },
+    width: 100,
+    height: 100,
+    quality: 0.1,
+    imagePlaceholder: 'data:image/gif;base64,R0lGODlhAQABAIAAAP',
+    cachebust: true
+};
+
+function filter(node: Node): boolean {
+    return true;
+}
+
+async function testToSvg() {
+    const svg = await DomToImage.toSvg(node, { filter });
+}
+
+async function testToPng() {
+    const png = await DomToImage.toPng(node, { bgcolor: '#24292e', style: { width: '100px' } });
+}
+
+async function testToJpeg() {
+    const jpeg = await DomToImage.toJpeg(node, { width: 100, height: 100 });
+}
+
+async function testToBlob() {
+    const blob = await DomToImage.toBlob(node, { quality: 0.1, });
+}
+
+async function testToPixelData() {
+    const pixelData = await DomToImage.toPixelData(node, { imagePlaceholder: 'data:image/gif;base64,R0lGODlhAQABAIAAAP', cachebust: true });
+}
diff --git a/types/dom-to-image/test/dom-to-image-import-default-tests.ts b/types/dom-to-image/test/dom-to-image-import-default-tests.ts
new file mode 100644
index 0000000000..0f300ffa38
--- /dev/null
+++ b/types/dom-to-image/test/dom-to-image-import-default-tests.ts
@@ -0,0 +1,40 @@
+import domToImage, { Options } from 'dom-to-image';
+
+const node = new Node();
+
+const options: Options = {
+    filter,
+    bgcolor: '#24292e',
+    style: {
+        width: '100px'
+    },
+    width: 100,
+    height: 100,
+    quality: 0.1,
+    imagePlaceholder: 'data:image/gif;base64,R0lGODlhAQABAIAAAP',
+    cachebust: true
+};
+
+function filter(node: Node): boolean {
+    return true;
+}
+
+async function testToSvg() {
+    const svg = await domToImage.toSvg(node, { filter });
+}
+
+async function testToPng() {
+    const png = await domToImage.toPng(node, { bgcolor: '#24292e', style: { width: '100px' } });
+}
+
+async function testToJpeg() {
+    const jpeg = await domToImage.toJpeg(node, { width: 100, height: 100 });
+}
+
+async function testToBlob() {
+    const blob = await domToImage.toBlob(node, { quality: 0.1, });
+}
+
+async function testToPixelData() {
+    const pixelData = await domToImage.toPixelData(node, { imagePlaceholder: 'data:image/gif;base64,R0lGODlhAQABAIAAAP', cachebust: true });
+}
diff --git a/types/dom-to-image/test/dom-to-image-module-tests.ts b/types/dom-to-image/test/dom-to-image-module-tests.ts
new file mode 100644
index 0000000000..571a28f5b6
--- /dev/null
+++ b/types/dom-to-image/test/dom-to-image-module-tests.ts
@@ -0,0 +1,40 @@
+import { Options, DomToImage } from 'dom-to-image';
+
+const node = new Node();
+
+const options: Options = {
+    filter,
+    bgcolor: '#24292e',
+    style: {
+        width: '100px'
+    },
+    width: 100,
+    height: 100,
+    quality: 0.1,
+    imagePlaceholder: 'data:image/gif;base64,R0lGODlhAQABAIAAAP',
+    cachebust: true
+};
+
+function filter(node: Node): boolean {
+    return true;
+}
+
+async function testToSvg() {
+    const svg = await DomToImage.toSvg(node, { filter });
+}
+
+async function testToPng() {
+    const png = await DomToImage.toPng(node, { bgcolor: '#24292e', style: { width: '100px' } });
+}
+
+async function testToJpeg() {
+    const jpeg = await DomToImage.toJpeg(node, { width: 100, height: 100 });
+}
+
+async function testToBlob() {
+    const blob = await DomToImage.toBlob(node, { quality: 0.1, });
+}
+
+async function testToPixelData() {
+    const pixelData = await DomToImage.toPixelData(node, { imagePlaceholder: 'data:image/gif;base64,R0lGODlhAQABAIAAAP', cachebust: true });
+}
diff --git a/types/dom-to-image/tsconfig.json b/types/dom-to-image/tsconfig.json
new file mode 100644
index 0000000000..10fc769913
--- /dev/null
+++ b/types/dom-to-image/tsconfig.json
@@ -0,0 +1,27 @@
+
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/dom-to-image-module-tests.ts",
+        "test/dom-to-image-global-tests.ts",
+        "test/dom-to-image-import-default-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/dom-to-image/tslint.json b/types/dom-to-image/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/dom-to-image/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 2404865eb1428336013ddc773ff16c5d9349d166 Mon Sep 17 00:00:00 2001
From: Sindre <sseppola@users.noreply.github.com>
Date: Thu, 10 May 2018 21:55:12 +0200
Subject: [PATCH 0172/1124] Yup: allow options object in string().matches()
 function (#25634)

* overloads string().matches() to add options object

* Yup: fix lint feedback
---
 types/yup/index.d.ts | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 93a60450e7..699d1893bf 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for yup 0.24
 // Project: https://github.com/jquense/yup
-// Definitions by: Dominik Hardtke <https://github.com/dhardtke>, Vladyslav Tserman <https://github.com/vtserman>, Moreton Bay Regional Council <https://github.com/MoretonBayRC>
+// Definitions by: Dominik Hardtke <https://github.com/dhardtke>,
+//                 Vladyslav Tserman <https://github.com/vtserman>,
+//                 Moreton Bay Regional Council <https://github.com/MoretonBayRC>,
+//                 Sindre Seppola <https://github.com/sseppola>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -34,8 +37,8 @@ export interface Schema<T> {
     meta(): any;
     describe(): SchemaDescription;
     concat(schema: this): this;
-    validate(value: T, options?: ValidateOptions): Promise<ValidationError|T>;
-    validateSync(value: T, options?: ValidateOptions): ValidationError|T;
+    validate(value: T, options?: ValidateOptions): Promise<ValidationError | T>;
+    validateSync(value: T, options?: ValidateOptions): ValidationError | T;
     isValid(value: T, options?: any): Promise<boolean>;
     isValidSync(value: T, options?: any): boolean;
     cast(value: any, options?: any): T;
@@ -57,8 +60,8 @@ export interface Schema<T> {
 }
 
 export interface MixedSchemaConstructor {
-  (): MixedSchema;
-  new(options?: { type?: string, [key: string]: any }): MixedSchema;
+    (): MixedSchema;
+    new(options?: { type?: string, [key: string]: any }): MixedSchema;
 }
 
 // tslint:disable-next-line:no-empty-interface
@@ -73,7 +76,7 @@ export interface StringSchemaConstructor {
 export interface StringSchema extends Schema<string> {
     min(limit: number | Ref, message?: string): StringSchema;
     max(limit: number | Ref, message?: string): StringSchema;
-    matches(regex: RegExp, message?: string): StringSchema;
+    matches(regex: RegExp, messageOrOptions?: string | { message?: string; excludeEmptyString?: boolean }): StringSchema;
     email(message?: string): StringSchema;
     url(message?: string): StringSchema;
     ensure(): StringSchema;
@@ -133,7 +136,7 @@ export interface ArraySchema<T> extends Schema<T[]> {
 
 export interface ObjectSchemaConstructor {
     <T>(fields?: { [field in keyof T]: Schema<T[field]> }): ObjectSchema<T>;
-    new (): ObjectSchema<{}>;
+    new(): ObjectSchema<{}>;
 }
 
 export interface ObjectSchema<T> extends Schema<T> {
@@ -155,8 +158,8 @@ export interface WhenOptionsBuilder<T> {
 }
 
 export type WhenOptions<T> = WhenOptionsBuilder<T>
-| { is: boolean | ((value: any) => boolean), then: any, otherwise: any }
-| object;
+    | { is: boolean | ((value: any) => boolean), then: any, otherwise: any }
+    | object;
 
 export interface ValidateOptions {
     /**
@@ -245,12 +248,12 @@ export interface Lazy extends Schema<any> {
 }
 
 export interface LocaleObject {
-  mixed?: { [key in keyof MixedSchema]?: string };
-  string?: { [key in keyof StringSchema]?: string };
-  number?: { [key in keyof NumberSchema]?: string };
-  boolean?: { [key in keyof BooleanSchema]?: string };
-  bool?: { [key in keyof BooleanSchema]?: string };
-  date?: { [key in keyof DateSchema]?: string };
-  array?: { [key in keyof ArraySchema<any>]?: string };
-  object?: { [key in keyof ObjectSchema<any>]?: string };
+    mixed?: { [key in keyof MixedSchema]?: string };
+    string?: { [key in keyof StringSchema]?: string };
+    number?: { [key in keyof NumberSchema]?: string };
+    boolean?: { [key in keyof BooleanSchema]?: string };
+    bool?: { [key in keyof BooleanSchema]?: string };
+    date?: { [key in keyof DateSchema]?: string };
+    array?: { [key in keyof ArraySchema<any>]?: string };
+    object?: { [key in keyof ObjectSchema<any>]?: string };
 }

From 8c67ace1b8dfbf86eb649573807418ccdc9925d7 Mon Sep 17 00:00:00 2001
From: Camila Rondinini <crondinini@gmail.com>
Date: Thu, 10 May 2018 15:55:42 -0400
Subject: [PATCH 0173/1124] Event Stream: Make split argument optional (#25657)

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

diff --git a/types/event-stream/index.d.ts b/types/event-stream/index.d.ts
index f7b10b34a2..35fb2c8b4c 100644
--- a/types/event-stream/index.d.ts
+++ b/types/event-stream/index.d.ts
@@ -36,7 +36,7 @@ export declare function mapSync(syncFunction: Function):  MapStream;
  * 
  * @param matcher
  */
-export declare function split(matcher: string | RegExp):  MapStream;
+export declare function split(matcher?: string | RegExp):  MapStream;
 
 /**
  * Create a through stream that emits separator between each chunk, just like Array#join

From b1ae5471b09e6530b4f1c4c3f1b5dd997e598f53 Mon Sep 17 00:00:00 2001
From: Sherman Chen <shamenchens@users.noreply.github.com>
Date: Fri, 11 May 2018 04:56:51 +0900
Subject: [PATCH 0174/1124] @types/node-forge: Add forge.pki.certificateFromPem
 (#25672)

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

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index 2784d95fa3..703c78aa9b 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -48,6 +48,7 @@ declare module "node-forge" {
         function publicKeyFromPem(pem: PEM): Key;
         function privateKeyFromPem(pem: PEM): Key;
         function certificateToPem(cert: Certificate, maxline?: number): PEM;
+        function certificateFromPem(pem: PEM, computeHash?: boolean, strict?: boolean): Certificate;
 
         interface oids {
             [key: string]: string;
diff --git a/types/node-forge/node-forge-tests.ts b/types/node-forge/node-forge-tests.ts
index 29b8267714..1bb8dff08c 100644
--- a/types/node-forge/node-forge-tests.ts
+++ b/types/node-forge/node-forge-tests.ts
@@ -8,6 +8,7 @@ let x: string = forge.ssh.privateKeyToOpenSSH(key);
 let pemKey: forge.pki.PEM = publicKeyPem;
 let publicKeyRsa = forge.pki.publicKeyFromPem(pemKey);
 let privateKeyRsa = forge.pki.privateKeyFromPem(privateKeyPem);
+let certPem = forge.pki.certificateFromPem(pemKey);
 let cert = forge.pki.createCertificate();
 
 {

From f8cac97960ce5dc31c3568d44b7cfb58dcb4238e Mon Sep 17 00:00:00 2001
From: Braden MacDonald <mail@bradenm.com>
Date: Thu, 10 May 2018 12:58:03 -0700
Subject: [PATCH 0175/1124] Expand google-map-react options spec to cover all
 valid options (#25665)

---
 .../google-map-react-tests.tsx                | 15 +++++-
 types/google-map-react/index.d.ts             | 47 ++++++++++++++++---
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/types/google-map-react/google-map-react-tests.tsx b/types/google-map-react/google-map-react-tests.tsx
index 464f840658..552e75d362 100644
--- a/types/google-map-react/google-map-react-tests.tsx
+++ b/types/google-map-react/google-map-react-tests.tsx
@@ -1,9 +1,20 @@
-import GoogleMapReact, { BootstrapURLKeys } from 'google-map-react';
+import GoogleMapReact, { BootstrapURLKeys, MapOptions } from 'google-map-react';
 import * as React from 'react';
 
 const center = { lat: 0, lng: 0 };
 
 const key: BootstrapURLKeys = { key: 'my-google-maps-key' };
 const client: BootstrapURLKeys = { client: 'my-client-identifier', v: '3.28' , language: 'en' };
+const options: MapOptions = {
+    zoomControl: false,
+    gestureHandling: 'cooperative',
+    styles: [
+        {
+            featureType: "administrative",
+            elementType: "all",
+            stylers: [ {saturation: "-100"} ]
+        }
+    ],
+};
 
-<GoogleMapReact center={center} zoom={3} bootstrapURLKeys={client}/>;
+<GoogleMapReact center={center} zoom={3} bootstrapURLKeys={client} options={options} />;
diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index 7f34a68cc4..ca5348323a 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -8,15 +8,48 @@ import * as React from 'react';
 
 export type BootstrapURLKeys = ({ key: string; } | { client: string; v: string; }) & { language?: string };
 
-export interface Options {
-  styles?: any[];
-  scrollwheel?: boolean;
-  panControl?: boolean;
+export interface MapTypeStyle {
+  elementType: string;
+  featureType: string;
+  stylers: any[];
+}
+
+export interface MapOptions {
+  // Any options from https://developers.google.com/maps/documentation/javascript/reference/3/#MapOptions
+  // excluding 'zoom' and 'center' which get set via props.
+  backgroundColor?: string;
+  clickableIcons?: boolean;
+  disableDefaultUI?: boolean;
+  disableDoubleClickZoom?: boolean;
+  draggable?: boolean;
+  draggableCursor?: string;
+  draggingCursor?: string;
+  fullscreenControl?: boolean;
+  fullscreenControlOptions?: {position: number};
+  gestureHandling?: string;
+  heading?: number;
+  keyboardShortcuts?: boolean;
   mapTypeControl?: boolean;
-  minZoomOverride?: boolean;
+  mapTypeControlOptions?: any;
+  mapTypeId?: string;
   minZoom?: number;
   maxZoom?: number;
-  gestureHandling?: string;
+  noClear?: boolean;
+  panControl?: boolean;
+  panControlOptions?: {position: number};
+  rotateControl?: boolean;
+  rotateControlOptions?: {position: number};
+  scaleControl?: boolean;
+  scaleControlOptions?: any;
+  scrollwheel?: boolean;
+  streetView?: any;
+  streetViewControl?: boolean;
+  streetViewControlOptions?: {position: number};
+  styles?: MapTypeStyle[];
+  tilt?: number;
+  zoomControl?: boolean;
+  zoomControlOptions?: {position: number};
+  minZoomOverride?: boolean; // Not a standard option; specific to google-map-react: https://github.com/google-map-react/google-map-react/pull/154
 }
 
 export interface Maps {
@@ -87,7 +120,7 @@ export interface Props {
   defaultZoom?: number;
   zoom?: number;
   hoverDistance?: number;
-  options?: Options | ((maps: Maps) => Options);
+  options?: MapOptions | ((maps: Maps) => MapOptions);
   margin?: any[];
   debounced?: boolean;
   draggable?: boolean;

From 7aa84a641783f1af2e6156bf7ff53665504aeb99 Mon Sep 17 00:00:00 2001
From: Brad Zacher <brad.zacher@gmail.com>
Date: Fri, 11 May 2018 05:58:19 +1000
Subject: [PATCH 0176/1124] [@types/graphql] Switch void for more correct
 `undefined | null` typing (#25639)

* [@types/graphql] Switch void for more correct `undefined | null` typing

* Moved Maybe.d.ts to a better place

* Moved and fixed up Maybe imports
---
 types/graphql/error/GraphQLError.d.ts         |  13 +-
 types/graphql/execution/execute.d.ts          |  23 ++--
 types/graphql/execution/values.d.ts           |   5 +-
 types/graphql/graphql.d.ts                    |  19 +--
 types/graphql/index.d.ts                      |   1 +
 types/graphql/language/visitor.d.ts           |   3 +-
 types/graphql/subscription/subscribe.d.ts     |  21 +--
 types/graphql/tsconfig.json                   |   4 +-
 types/graphql/tsutils/Maybe.d.ts              |   4 +
 types/graphql/type/definition.d.ts            | 129 +++++++++---------
 types/graphql/type/directives.d.ts            |  11 +-
 types/graphql/type/schema.d.ts                |  27 ++--
 types/graphql/utilities/TypeInfo.d.ts         |  20 +--
 types/graphql/utilities/astFromValue.d.ts     |   3 +-
 types/graphql/utilities/buildASTSchema.d.ts   |   5 +-
 types/graphql/utilities/getOperationAST.d.ts  |   5 +-
 .../graphql/utilities/introspectionQuery.d.ts |  31 +++--
 types/graphql/utilities/valueFromAST.d.ts     |   5 +-
 .../utilities/valueFromASTUntyped.d.ts        |   3 +-
 .../graphql/validation/ValidationContext.d.ts |  23 ++--
 .../rules/NoUndefinedVariables.d.ts           |   3 +-
 .../validation/rules/NoUnusedVariables.d.ts   |   3 +-
 .../rules/SingleFieldSubscriptions.d.ts       |   3 +-
 23 files changed, 197 insertions(+), 167 deletions(-)
 create mode 100644 types/graphql/tsutils/Maybe.d.ts

diff --git a/types/graphql/error/GraphQLError.d.ts b/types/graphql/error/GraphQLError.d.ts
index 0be931bee0..ce31564fb1 100644
--- a/types/graphql/error/GraphQLError.d.ts
+++ b/types/graphql/error/GraphQLError.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { getLocation } from "../language";
 import { ASTNode } from "../language/ast";
 import { Source } from "../language/source";
@@ -58,7 +59,7 @@ export class GraphQLError extends Error {
     /**
      * The original error thrown from a field resolver during execution.
      */
-    readonly originalError: Error | void;
+    readonly originalError: Maybe<Error>;
 
     /**
      * Extension fields to add to the formatted error.
@@ -68,10 +69,10 @@ export class GraphQLError extends Error {
     constructor(
         message: string,
         nodes?: ReadonlyArray<ASTNode> | ASTNode | undefined,
-        source?: Source | void,
-        positions?: ReadonlyArray<number> | void,
-        path?: ReadonlyArray<string | number> | void,
-        originalError?: Error | void,
-        extensions?: { [key: string]: any } | void
+        source?: Maybe<Source>,
+        positions?: Maybe<ReadonlyArray<number>>,
+        path?: Maybe<ReadonlyArray<string | number>>,
+        originalError?: Maybe<Error>,
+        extensions?: Maybe<{ [key: string]: any }>
     );
 }
diff --git a/types/graphql/execution/execute.d.ts b/types/graphql/execution/execute.d.ts
index 424bb62b5a..7ef4d5ce63 100644
--- a/types/graphql/execution/execute.d.ts
+++ b/types/graphql/execution/execute.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLError, locatedError } from "../error";
 import { GraphQLSchema } from "../type/schema";
 import {
@@ -51,9 +52,9 @@ export type ExecutionArgs = {
     document: DocumentNode;
     rootValue?: any;
     contextValue?: any;
-    variableValues?: { [key: string]: any } | void;
-    operationName?: string | void;
-    fieldResolver?: GraphQLFieldResolver<any, any> | void;
+    variableValues?: Maybe<{ [key: string]: any }>;
+    operationName?: Maybe<string>;
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
 };
 
 /**
@@ -74,9 +75,9 @@ export function execute(
     document: DocumentNode,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: { [key: string]: any } | void,
-    operationName?: string | void,
-    fieldResolver?: GraphQLFieldResolver<any, any> | void
+    variableValues?: Maybe<{ [key: string]: any }>,
+    operationName?: Maybe<string>,
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
 ): MaybePromise<ExecutionResult>;
 
 /**
@@ -101,7 +102,7 @@ export function addPath(
 export function assertValidExecutionArguments(
     schema: GraphQLSchema,
     document: DocumentNode,
-    rawVariableValues: { [key: string]: any } | void
+    rawVariableValues: Maybe<{ [key: string]: any }>
 ): void;
 
 /**
@@ -115,9 +116,9 @@ export function buildExecutionContext(
     document: DocumentNode,
     rootValue: any,
     contextValue: any,
-    rawVariableValues: { [key: string]: any } | void,
-    operationName: string | void,
-    fieldResolver: GraphQLFieldResolver<any, any> | void
+    rawVariableValues: Maybe<{ [key: string]: any }>,
+    operationName: Maybe<string>,
+    fieldResolver: Maybe<GraphQLFieldResolver<any, any>>
 ): ReadonlyArray<GraphQLError> | ExecutionContext;
 
 /**
@@ -181,4 +182,4 @@ export function getFieldDef(
     schema: GraphQLSchema,
     parentType: GraphQLObjectType,
     fieldName: string
-): GraphQLField<any, any> | void;
+): Maybe<GraphQLField<any, any>>;
diff --git a/types/graphql/execution/values.d.ts b/types/graphql/execution/values.d.ts
index fb629325e8..e3cb7eb4bc 100644
--- a/types/graphql/execution/values.d.ts
+++ b/types/graphql/execution/values.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLError } from "../error";
 import { GraphQLInputType, GraphQLField, GraphQLArgument } from "../type/definition";
 import { GraphQLDirective } from "../type/directives";
@@ -35,7 +36,7 @@ export function getVariableValues(
 export function getArgumentValues(
     def: GraphQLField<any, any> | GraphQLDirective,
     node: FieldNode | DirectiveNode,
-    variableValues?: { [key: string]: any } | void
+    variableValues?: Maybe<{ [key: string]: any }>
 ): { [key: string]: any };
 
 /**
@@ -54,5 +55,5 @@ export function getDirectiveValues(
     node: {
         readonly directives?: ReadonlyArray<DirectiveNode>;
     },
-    variableValues?: { [key: string]: any } | void
+    variableValues?: Maybe<{ [key: string]: any }>
 ): undefined | { [key: string]: any };
diff --git a/types/graphql/graphql.d.ts b/types/graphql/graphql.d.ts
index 7282ea80f2..59dc3918f1 100644
--- a/types/graphql/graphql.d.ts
+++ b/types/graphql/graphql.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "./tsutils/Maybe";
 import { Source } from "./language/source";
 import { GraphQLFieldResolver } from "./type/definition";
 import { GraphQLSchema } from "./type/schema";
@@ -38,9 +39,9 @@ export interface GraphQLArgs {
     source: Source | string;
     rootValue?: any;
     contextValue?: any;
-    variableValues?: { [key: string]: any } | void;
-    operationName?: string | void;
-    fieldResolver?: GraphQLFieldResolver<any, any> | void;
+    variableValues?: Maybe<{ [key: string]: any }>;
+    operationName?: Maybe<string>;
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
 }
 
 export function graphql(args: GraphQLArgs): Promise<ExecutionResult>;
@@ -49,9 +50,9 @@ export function graphql(
     source: Source | string,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: { [key: string]: any } | void,
-    operationName?: string | void,
-    fieldResolver?: GraphQLFieldResolver<any, any> | void
+    variableValues?: Maybe<{ [key: string]: any }>,
+    operationName?: Maybe<string>,
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
 ): Promise<ExecutionResult>;
 
 /**
@@ -66,7 +67,7 @@ export function graphqlSync(
     source: Source | string,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: { [key: string]: any } | void,
-    operationName?: string | void,
-    fieldResolver?: GraphQLFieldResolver<any, any> | void
+    variableValues?: Maybe<{ [key: string]: any }>,
+    operationName?: Maybe<string>,
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
 ): ExecutionResult;
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index 68e04d104d..ba9213b7c4 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -13,6 +13,7 @@
 //                 Dylan Stewart <https://github.com/dyst5422>
 //                 Alessio Dionisi <https://github.com/adnsio>
 //                 Divyendu Singh <https://github.com/divyenduz>
+//                 Brad Zacher <https://github.com/bradzacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/graphql/language/visitor.d.ts b/types/graphql/language/visitor.d.ts
index a137fa318e..be50e6e02e 100644
--- a/types/graphql/language/visitor.d.ts
+++ b/types/graphql/language/visitor.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { ASTNode, ASTKindToNode } from "./ast";
 import { TypeInfo } from "../utilities/TypeInfo";
 
@@ -157,4 +158,4 @@ export function visitWithTypeInfo(typeInfo: TypeInfo, visitor: Visitor<ASTKindTo
  * Given a visitor instance, if it is leaving or not, and a node kind, return
  * the function the visitor runtime should call.
  */
-export function getVisitFn(visitor: Visitor<any>, kind: string, isLeaving: boolean): VisitFn<any> | void;
+export function getVisitFn(visitor: Visitor<any>, kind: string, isLeaving: boolean): Maybe<VisitFn<any>>;
diff --git a/types/graphql/subscription/subscribe.d.ts b/types/graphql/subscription/subscribe.d.ts
index a9fe6b565e..f5b29ebbb8 100644
--- a/types/graphql/subscription/subscribe.d.ts
+++ b/types/graphql/subscription/subscribe.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLSchema } from "../type/schema";
 import { DocumentNode } from "../language/ast";
 import { GraphQLFieldResolver } from "../type/definition";
@@ -28,10 +29,10 @@ export function subscribe(args: {
     document: DocumentNode;
     rootValue?: any;
     contextValue?: any;
-    variableValues?: { [key: string]: any } | void;
-    operationName?: string | void;
-    fieldResolver?: GraphQLFieldResolver<any, any> | void;
-    subscribeFieldResolver?: GraphQLFieldResolver<any, any> | void;
+    variableValues?: Maybe<{ [key: string]: any }>;
+    operationName?: Maybe<string>;
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
+    subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
 }): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
 
 export function subscribe(
@@ -39,10 +40,10 @@ export function subscribe(
     document: DocumentNode,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: { [key: string]: any } | void,
-    operationName?: string | void,
-    fieldResolver?: GraphQLFieldResolver<any, any> | void,
-    subscribeFieldResolver?: GraphQLFieldResolver<any, any> | void
+    variableValues?: Maybe<{ [key: string]: any }>,
+    operationName?: Maybe<string>,
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
+    subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
 ): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
 
 /**
@@ -69,6 +70,6 @@ export function createSourceEventStream(
     rootValue?: any,
     contextValue?: any,
     variableValues?: { [key: string]: any },
-    operationName?: string | void,
-    fieldResolver?: GraphQLFieldResolver<any, any> | void
+    operationName?: Maybe<string>,
+    fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
 ): Promise<AsyncIterable<any> | ExecutionResult>;
diff --git a/types/graphql/tsconfig.json b/types/graphql/tsconfig.json
index 72f0de0665..3bc66f8bea 100644
--- a/types/graphql/tsconfig.json
+++ b/types/graphql/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "graphql-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/graphql/tsutils/Maybe.d.ts b/types/graphql/tsutils/Maybe.d.ts
new file mode 100644
index 0000000000..7ad0bc85a4
--- /dev/null
+++ b/types/graphql/tsutils/Maybe.d.ts
@@ -0,0 +1,4 @@
+// Conveniently represents flow's "Maybe" type https://flow.org/en/docs/types/maybe/
+type Maybe<T> = null | undefined | T
+
+export default Maybe
diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index ed87af50ad..b078acccb1 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { MaybePromise } from "../jsutils/MaybePromise";
 import {
     ScalarTypeDefinitionNode,
@@ -254,8 +255,8 @@ export type Thunk<T> = (() => T) | T;
  */
 export class GraphQLScalarType {
     name: string;
-    description: string | void;
-    astNode?: ScalarTypeDefinitionNode | void;
+    description: Maybe<string>;
+    astNode?: Maybe<ScalarTypeDefinitionNode>;
     constructor(config: GraphQLScalarTypeConfig<any, any>);
 
     // Serializes an internal value to include in a response.
@@ -265,7 +266,7 @@ export class GraphQLScalarType {
     parseValue(value: any): any;
 
     // Parses an externally provided literal value to use as an input.
-    parseLiteral(valueNode: ValueNode, variables?: { [key: string]: any } | void): any;
+    parseLiteral(valueNode: ValueNode, variables?: Maybe<{ [key: string]: any }>): any;
 
     toString(): string;
     toJSON(): string;
@@ -274,11 +275,11 @@ export class GraphQLScalarType {
 
 export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
     name: string;
-    description?: string | void;
-    astNode?: ScalarTypeDefinitionNode | void;
-    serialize(value: any): TExternal | void;
-    parseValue?(value: any): TInternal | void;
-    parseLiteral?(valueNode: ValueNode, variables: { [key: string]: any } | void): TInternal | void;
+    description?: Maybe<string>;
+    astNode?: Maybe<ScalarTypeDefinitionNode>;
+    serialize(value: any): Maybe<TExternal>;
+    parseValue?(value: any): Maybe<TInternal>;
+    parseLiteral?(valueNode: ValueNode, variables: Maybe<{ [key: string]: any }>): Maybe<TInternal>;
 }
 
 /**
@@ -320,10 +321,10 @@ export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
  */
 export class GraphQLObjectType {
     name: string;
-    description: string | void;
-    astNode: ObjectTypeDefinitionNode | void;
-    extensionASTNodes: ReadonlyArray<ObjectTypeExtensionNode> | void;
-    isTypeOf: GraphQLIsTypeOfFn<any, any> | void;
+    description: Maybe<string>;
+    astNode: Maybe<ObjectTypeDefinitionNode>;
+    extensionASTNodes: Maybe<ReadonlyArray<ObjectTypeExtensionNode>>;
+    isTypeOf: Maybe<GraphQLIsTypeOfFn<any, any>>;
 
     constructor(config: GraphQLObjectTypeConfig<any, any>);
     getFields(): GraphQLFieldMap<any, any>;
@@ -335,19 +336,19 @@ export class GraphQLObjectType {
 
 export interface GraphQLObjectTypeConfig<TSource, TContext> {
     name: string;
-    interfaces?: Thunk<GraphQLInterfaceType[] | void>;
+    interfaces?: Thunk<Maybe<GraphQLInterfaceType[]>>;
     fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
-    isTypeOf?: GraphQLIsTypeOfFn<TSource, TContext> | void;
-    description?: string | void;
-    astNode?: ObjectTypeDefinitionNode | void;
-    extensionASTNodes?: ReadonlyArray<ObjectTypeExtensionNode> | void;
+    isTypeOf?: Maybe<GraphQLIsTypeOfFn<TSource, TContext>>;
+    description?: Maybe<string>;
+    astNode?: Maybe<ObjectTypeDefinitionNode>;
+    extensionASTNodes?: Maybe<ReadonlyArray<ObjectTypeExtensionNode>>;
 }
 
 export type GraphQLTypeResolver<TSource, TContext> = (
     value: TSource,
     context: TContext,
     info: GraphQLResolveInfo
-) => MaybePromise<GraphQLObjectType | string | void>;
+) => MaybePromise<Maybe<GraphQLObjectType | string>>;
 
 export type GraphQLIsTypeOfFn<TSource, TContext> = (
     source: TSource,
@@ -385,9 +386,9 @@ export interface GraphQLFieldConfig<TSource, TContext, TArgs = { [argName: strin
     args?: GraphQLFieldConfigArgumentMap;
     resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-    deprecationReason?: string | void;
-    description?: string | void;
-    astNode?: FieldDefinitionNode | void;
+    deprecationReason?: Maybe<string>;
+    description?: Maybe<string>;
+    astNode?: Maybe<FieldDefinitionNode>;
 }
 
 export type GraphQLFieldConfigArgumentMap = { [key: string]: GraphQLArgumentConfig };
@@ -395,8 +396,8 @@ export type GraphQLFieldConfigArgumentMap = { [key: string]: GraphQLArgumentConf
 export interface GraphQLArgumentConfig {
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string | void;
-    astNode?: InputValueDefinitionNode | void;
+    description?: Maybe<string>;
+    astNode?: Maybe<InputValueDefinitionNode>;
 }
 
 export type GraphQLFieldConfigMap<TSource, TContext> = {
@@ -405,22 +406,22 @@ export type GraphQLFieldConfigMap<TSource, TContext> = {
 
 export interface GraphQLField<TSource, TContext, TArgs = { [key: string]: any }> {
     name: string;
-    description: string | void;
+    description: Maybe<string>;
     type: GraphQLOutputType;
     args: GraphQLArgument[];
     resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     isDeprecated?: boolean;
-    deprecationReason?: string | void;
-    astNode?: FieldDefinitionNode | void;
+    deprecationReason?: Maybe<string>;
+    astNode?: Maybe<FieldDefinitionNode>;
 }
 
 export interface GraphQLArgument {
     name: string;
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string | void;
-    astNode?: InputValueDefinitionNode | void;
+    description?: Maybe<string>;
+    astNode?: Maybe<InputValueDefinitionNode>;
 }
 
 export type GraphQLFieldMap<TSource, TContext> = {
@@ -447,10 +448,10 @@ export type GraphQLFieldMap<TSource, TContext> = {
  */
 export class GraphQLInterfaceType {
     name: string;
-    description: string | void;
-    astNode?: InterfaceTypeDefinitionNode | void;
-    extensionASTNodes: ReadonlyArray<InterfaceTypeExtensionNode> | void;
-    resolveType: GraphQLTypeResolver<any, any> | void;
+    description: Maybe<string>;
+    astNode?: Maybe<InterfaceTypeDefinitionNode>;
+    extensionASTNodes: Maybe<ReadonlyArray<InterfaceTypeExtensionNode>>;
+    resolveType: Maybe<GraphQLTypeResolver<any, any>>;
 
     constructor(config: GraphQLInterfaceTypeConfig<any, any>);
 
@@ -469,10 +470,10 @@ export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
      * the default implementation will call `isTypeOf` on each implementing
      * Object type.
      */
-    resolveType?: GraphQLTypeResolver<TSource, TContext> | void;
-    description?: string | void;
-    astNode?: InterfaceTypeDefinitionNode | void;
-    extensionASTNodes?: ReadonlyArray<InterfaceTypeExtensionNode> | void;
+    resolveType?: Maybe<GraphQLTypeResolver<TSource, TContext>>;
+    description?: Maybe<string>;
+    astNode?: Maybe<InterfaceTypeDefinitionNode>;
+    extensionASTNodes?: Maybe<ReadonlyArray<InterfaceTypeExtensionNode>>;
 }
 
 /**
@@ -500,9 +501,9 @@ export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
  */
 export class GraphQLUnionType {
     name: string;
-    description: string | void;
-    astNode?: UnionTypeDefinitionNode | void;
-    resolveType: GraphQLTypeResolver<any, any> | void;
+    description: Maybe<string>;
+    astNode?: Maybe<UnionTypeDefinitionNode>;
+    resolveType: Maybe<GraphQLTypeResolver<any, any>>;
 
     constructor(config: GraphQLUnionTypeConfig<any, any>);
 
@@ -521,9 +522,9 @@ export interface GraphQLUnionTypeConfig<TSource, TContext> {
      * the default implementation will call `isTypeOf` on each implementing
      * Object type.
      */
-    resolveType?: GraphQLTypeResolver<TSource, TContext> | void;
-    description?: string | void;
-    astNode?: UnionTypeDefinitionNode | void;
+    resolveType?: Maybe<GraphQLTypeResolver<TSource, TContext>>;
+    description?: Maybe<string>;
+    astNode?: Maybe<UnionTypeDefinitionNode>;
 }
 
 /**
@@ -549,15 +550,15 @@ export interface GraphQLUnionTypeConfig<TSource, TContext> {
  */
 export class GraphQLEnumType {
     name: string;
-    description: string | void;
-    astNode: EnumTypeDefinitionNode | void;
+    description: Maybe<string>;
+    astNode: Maybe<EnumTypeDefinitionNode>;
 
     constructor(config: GraphQLEnumTypeConfig);
     getValues(): GraphQLEnumValue[];
-    getValue(name: string): GraphQLEnumValue | void;
-    serialize(value: any): string | void;
-    parseValue(value: any): any;
-    parseLiteral(valueNode: ValueNode, _variables: { [key: string]: any } | void): any;
+    getValue(name: string): Maybe<GraphQLEnumValue>;
+    serialize(value: any): Maybe<string>;
+    parseValue(value: any): Maybe<any>;
+    parseLiteral(valueNode: ValueNode, _variables: Maybe<{ [key: string]: any }>): Maybe<any>;
     toString(): string;
     toJSON(): string;
     inspect(): string;
@@ -566,25 +567,25 @@ export class GraphQLEnumType {
 export interface GraphQLEnumTypeConfig {
     name: string;
     values: GraphQLEnumValueConfigMap;
-    description?: string | void;
-    astNode?: EnumTypeDefinitionNode | void;
+    description?: Maybe<string>;
+    astNode?: Maybe<EnumTypeDefinitionNode>;
 }
 
 export type GraphQLEnumValueConfigMap = { [key: string]: GraphQLEnumValueConfig };
 
 export interface GraphQLEnumValueConfig {
     value?: any;
-    deprecationReason?: string | void;
-    description?: string | void;
-    astNode?: EnumValueDefinitionNode | void;
+    deprecationReason?: Maybe<string>;
+    description?: Maybe<string>;
+    astNode?: Maybe<EnumValueDefinitionNode>;
 }
 
 export interface GraphQLEnumValue {
     name: string;
-    description: string | void;
+    description: Maybe<string>;
     isDeprecated?: boolean;
-    deprecationReason: string | void;
-    astNode?: EnumValueDefinitionNode | void;
+    deprecationReason: Maybe<string>;
+    astNode?: Maybe<EnumValueDefinitionNode>;
     value: any;
 }
 
@@ -610,8 +611,8 @@ export interface GraphQLEnumValue {
  */
 export class GraphQLInputObjectType {
     name: string;
-    description: string | void;
-    astNode: InputObjectTypeDefinitionNode | void;
+    description: Maybe<string>;
+    astNode: Maybe<InputObjectTypeDefinitionNode>;
     constructor(config: GraphQLInputObjectTypeConfig);
     getFields(): GraphQLInputFieldMap;
     toString(): string;
@@ -622,15 +623,15 @@ export class GraphQLInputObjectType {
 export interface GraphQLInputObjectTypeConfig {
     name: string;
     fields: Thunk<GraphQLInputFieldConfigMap>;
-    description?: string | void;
-    astNode?: InputObjectTypeDefinitionNode | void;
+    description?: Maybe<string>;
+    astNode?: Maybe<InputObjectTypeDefinitionNode>;
 }
 
 export interface GraphQLInputFieldConfig {
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string | void;
-    astNode?: InputValueDefinitionNode | void;
+    description?: Maybe<string>;
+    astNode?: Maybe<InputValueDefinitionNode>;
 }
 
 export type GraphQLInputFieldConfigMap = {
@@ -641,8 +642,8 @@ export interface GraphQLInputField {
     name: string;
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string | void;
-    astNode?: InputValueDefinitionNode | void;
+    description?: Maybe<string>;
+    astNode?: Maybe<InputValueDefinitionNode>;
 }
 
 export type GraphQLInputFieldMap = { [key: string]: GraphQLInputField };
diff --git a/types/graphql/type/directives.d.ts b/types/graphql/type/directives.d.ts
index f6e19f674d..ca9e947640 100644
--- a/types/graphql/type/directives.d.ts
+++ b/types/graphql/type/directives.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLFieldConfigArgumentMap, GraphQLArgument } from "./definition";
 import { DirectiveDefinitionNode } from "../language/ast";
 import { DirectiveLocationEnum } from "../language/directiveLocation";
@@ -13,20 +14,20 @@ export function isDirective(directive: any): directive is GraphQLDirective;
  */
 export class GraphQLDirective {
     name: string;
-    description: string | void;
+    description: Maybe<string>;
     locations: DirectiveLocationEnum[];
     args: GraphQLArgument[];
-    astNode: DirectiveDefinitionNode | void;
+    astNode: Maybe<DirectiveDefinitionNode>;
 
     constructor(config: GraphQLDirectiveConfig);
 }
 
 export interface GraphQLDirectiveConfig {
     name: string;
-    description?: string | void;
+    description?: Maybe<string>;
     locations: DirectiveLocationEnum[];
-    args?: GraphQLFieldConfigArgumentMap | void;
-    astNode?: DirectiveDefinitionNode | void;
+    args?: Maybe<GraphQLFieldConfigArgumentMap>;
+    astNode?: Maybe<DirectiveDefinitionNode>;
 }
 
 /**
diff --git a/types/graphql/type/schema.d.ts b/types/graphql/type/schema.d.ts
index a7bb94f5c5..b5ddc9d8d4 100644
--- a/types/graphql/type/schema.d.ts
+++ b/types/graphql/type/schema.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLObjectType } from "./definition";
 import { GraphQLType, GraphQLNamedType, GraphQLAbstractType } from "./definition";
 import { SchemaDefinitionNode } from "../language/ast";
@@ -35,21 +36,21 @@ export function isSchema(schema: any): schema is GraphQLSchema;
  *
  */
 export class GraphQLSchema {
-    astNode: SchemaDefinitionNode | void;
+    astNode: Maybe<SchemaDefinitionNode>;
 
     constructor(config: GraphQLSchemaConfig);
 
-    getQueryType(): GraphQLObjectType | void;
-    getMutationType(): GraphQLObjectType | void;
-    getSubscriptionType(): GraphQLObjectType | void;
+    getQueryType(): Maybe<GraphQLObjectType>;
+    getMutationType(): Maybe<GraphQLObjectType>;
+    getSubscriptionType(): Maybe<GraphQLObjectType>;
     getTypeMap(): TypeMap;
-    getType(name: string): GraphQLNamedType | void;
+    getType(name: string): Maybe<GraphQLNamedType>;
     getPossibleTypes(abstractType: GraphQLAbstractType): ReadonlyArray<GraphQLObjectType>;
 
     isPossibleType(abstractType: GraphQLAbstractType, possibleType: GraphQLObjectType): boolean;
 
     getDirectives(): ReadonlyArray<GraphQLDirective>;
-    getDirective(name: string): GraphQLDirective | void;
+    getDirective(name: string): Maybe<GraphQLDirective>;
 }
 
 type TypeMap = { [key: string]: GraphQLNamedType };
@@ -72,14 +73,14 @@ export interface GraphQLSchemaValidationOptions {
      * This option is provided to ease adoption and may be removed in a future
      * major release.
      */
-    allowedLegacyNames?: ReadonlyArray<string> | void;
+    allowedLegacyNames?: Maybe<ReadonlyArray<string>>;
 }
 
 export interface GraphQLSchemaConfig extends GraphQLSchemaValidationOptions {
-    query: GraphQLObjectType | void;
-    mutation?: GraphQLObjectType | void;
-    subscription?: GraphQLObjectType | void;
-    types?: GraphQLNamedType[] | void;
-    directives?: GraphQLDirective[] | void;
-    astNode?: SchemaDefinitionNode | void;
+    query: Maybe<GraphQLObjectType>;
+    mutation?: Maybe<GraphQLObjectType>;
+    subscription?: Maybe<GraphQLObjectType>;
+    types?: Maybe<GraphQLNamedType[]>;
+    directives?: Maybe<GraphQLDirective[]>;
+    astNode?: Maybe<SchemaDefinitionNode>;
 }
diff --git a/types/graphql/utilities/TypeInfo.d.ts b/types/graphql/utilities/TypeInfo.d.ts
index 1c2f139642..826704a52b 100644
--- a/types/graphql/utilities/TypeInfo.d.ts
+++ b/types/graphql/utilities/TypeInfo.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLSchema } from "../type/schema";
 import {
     GraphQLOutputType,
@@ -28,14 +29,15 @@ export class TypeInfo {
         initialType?: GraphQLType
     );
 
-    getType(): GraphQLOutputType | void;
-    getParentType(): GraphQLCompositeType | void;
-    getInputType(): GraphQLInputType | void;
-    getParentInputType(): GraphQLInputType | void;
-    getFieldDef(): GraphQLField<any, any> | void;
-    getDirective(): GraphQLDirective | void;
-    getArgument(): GraphQLArgument | void;
-    getEnumValue(): GraphQLEnumValue | void;
+    getType(): Maybe<GraphQLOutputType>;
+    getParentType(): Maybe<GraphQLCompositeType>;
+    getInputType(): Maybe<GraphQLInputType>;
+    getParentInputType(): Maybe<GraphQLInputType>;
+    getFieldDef(): GraphQLField<any, Maybe<any>>;
+    getDefaultValue(): Maybe<any>;
+    getDirective(): Maybe<GraphQLDirective>;
+    getArgument(): Maybe<GraphQLArgument>;
+    getEnumValue(): Maybe<GraphQLEnumValue>;
     enter(node: ASTNode): any;
     leave(node: ASTNode): any;
 }
@@ -44,4 +46,4 @@ type getFieldDef = (
     schema: GraphQLSchema,
     parentType: GraphQLType,
     fieldNode: FieldNode
-) => GraphQLField<any, any> | void;
+) => Maybe<GraphQLField<any, any>>;
diff --git a/types/graphql/utilities/astFromValue.d.ts b/types/graphql/utilities/astFromValue.d.ts
index 9c2198e6d6..e6c9f1ba6c 100644
--- a/types/graphql/utilities/astFromValue.d.ts
+++ b/types/graphql/utilities/astFromValue.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { ValueNode } from "../language/ast";
 import { GraphQLInputType } from "../type/definition";
 
@@ -18,4 +19,4 @@ import { GraphQLInputType } from "../type/definition";
  * | null          | NullValue            |
  *
  */
-export function astFromValue(value: any, type: GraphQLInputType): ValueNode | void;
+export function astFromValue(value: any, type: GraphQLInputType): Maybe<ValueNode>;
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index ebff50b4f7..e2406c7ee1 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import {
     DocumentNode,
     Location,
@@ -47,7 +48,7 @@ type TypeDefinitionsMap = { [key: string]: TypeDefinitionNode };
 type TypeResolver = (typeRef: NamedTypeNode) => GraphQLNamedType;
 
 export class ASTDefinitionBuilder {
-    constructor(typeDefinitionsMap: TypeDefinitionsMap, options: BuildSchemaOptions | void, resolveType: TypeResolver);
+    constructor(typeDefinitionsMap: TypeDefinitionsMap, options: Maybe<BuildSchemaOptions>, resolveType: TypeResolver);
 
     buildTypes(nodes: ReadonlyArray<NamedTypeNode | TypeDefinitionNode>): Array<GraphQLNamedType>;
 
@@ -69,7 +70,7 @@ export class ASTDefinitionBuilder {
  */
 export function getDescription(
     node: { readonly description?: StringValueNode; readonly loc?: Location },
-    options: BuildSchemaOptions | void
+    options: Maybe<BuildSchemaOptions>
 ): string | undefined;
 
 /**
diff --git a/types/graphql/utilities/getOperationAST.d.ts b/types/graphql/utilities/getOperationAST.d.ts
index 81e9bd4cbe..a36cfa139c 100644
--- a/types/graphql/utilities/getOperationAST.d.ts
+++ b/types/graphql/utilities/getOperationAST.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { DocumentNode, OperationDefinitionNode } from "../language/ast";
 
 /**
@@ -7,5 +8,5 @@ import { DocumentNode, OperationDefinitionNode } from "../language/ast";
  */
 export function getOperationAST(
     documentAST: DocumentNode,
-    operationName: string | void
-): OperationDefinitionNode | void;
+    operationName: Maybe<string>
+): Maybe<OperationDefinitionNode>;
diff --git a/types/graphql/utilities/introspectionQuery.d.ts b/types/graphql/utilities/introspectionQuery.d.ts
index 750fe0d99c..f2172595f8 100644
--- a/types/graphql/utilities/introspectionQuery.d.ts
+++ b/types/graphql/utilities/introspectionQuery.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { DirectiveLocationEnum } from "../language/directiveLocation";
 
 export interface IntrospectionOptions {
@@ -16,8 +17,8 @@ export interface IntrospectionQuery {
 
 export interface IntrospectionSchema {
     readonly queryType: IntrospectionNamedTypeRef<IntrospectionObjectType>;
-    readonly mutationType: IntrospectionNamedTypeRef<IntrospectionObjectType> | void;
-    readonly subscriptionType: IntrospectionNamedTypeRef<IntrospectionObjectType> | void;
+    readonly mutationType: Maybe<IntrospectionNamedTypeRef<IntrospectionObjectType>>;
+    readonly subscriptionType: Maybe<IntrospectionNamedTypeRef<IntrospectionObjectType>>;
     readonly types: ReadonlyArray<IntrospectionType>;
     readonly directives: ReadonlyArray<IntrospectionDirective>;
 }
@@ -42,13 +43,13 @@ export type IntrospectionInputType = IntrospectionScalarType | IntrospectionEnum
 export interface IntrospectionScalarType {
     readonly kind: "SCALAR";
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
 }
 
 export interface IntrospectionObjectType {
     readonly kind: "OBJECT";
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly fields: ReadonlyArray<IntrospectionField>;
     readonly interfaces: ReadonlyArray<IntrospectionNamedTypeRef<IntrospectionInterfaceType>>;
 }
@@ -56,7 +57,7 @@ export interface IntrospectionObjectType {
 export interface IntrospectionInterfaceType {
     readonly kind: "INTERFACE";
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly fields: ReadonlyArray<IntrospectionField>;
     readonly possibleTypes: ReadonlyArray<IntrospectionNamedTypeRef<IntrospectionObjectType>>;
 }
@@ -64,21 +65,21 @@ export interface IntrospectionInterfaceType {
 export interface IntrospectionUnionType {
     readonly kind: "UNION";
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly possibleTypes: ReadonlyArray<IntrospectionNamedTypeRef<IntrospectionObjectType>>;
 }
 
 export interface IntrospectionEnumType {
     readonly kind: "ENUM";
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly enumValues: ReadonlyArray<IntrospectionEnumValue>;
 }
 
 export interface IntrospectionInputObjectType {
     readonly kind: "INPUT_OBJECT";
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly inputFields: ReadonlyArray<IntrospectionInputValue>;
 }
 
@@ -114,30 +115,30 @@ export interface IntrospectionNamedTypeRef<T extends IntrospectionType = Introsp
 
 export interface IntrospectionField {
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly args: ReadonlyArray<IntrospectionInputValue>;
     readonly type: IntrospectionOutputTypeRef;
     readonly isDeprecated: boolean;
-    readonly deprecationReason?: string | void;
+    readonly deprecationReason?: Maybe<string>;
 }
 
 export interface IntrospectionInputValue {
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly type: IntrospectionInputTypeRef;
-    readonly defaultValue?: string | void;
+    readonly defaultValue?: Maybe<string>;
 }
 
 export interface IntrospectionEnumValue {
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly isDeprecated: boolean;
-    readonly deprecationReason?: string | void;
+    readonly deprecationReason?: Maybe<string>;
 }
 
 export interface IntrospectionDirective {
     readonly name: string;
-    readonly description?: string | void;
+    readonly description?: Maybe<string>;
     readonly locations: ReadonlyArray<DirectiveLocationEnum>;
     readonly args: ReadonlyArray<IntrospectionInputValue>;
 }
diff --git a/types/graphql/utilities/valueFromAST.d.ts b/types/graphql/utilities/valueFromAST.d.ts
index cd67108aad..c95eca9002 100644
--- a/types/graphql/utilities/valueFromAST.d.ts
+++ b/types/graphql/utilities/valueFromAST.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLInputType } from "../type/definition";
 import { ValueNode, VariableNode, ListValueNode, ObjectValueNode } from "../language/ast";
 
@@ -22,7 +23,7 @@ import { ValueNode, VariableNode, ListValueNode, ObjectValueNode } from "../lang
  *
  */
 export function valueFromAST(
-    valueNode: ValueNode | void,
+    valueNode: Maybe<ValueNode>,
     type: GraphQLInputType,
-    variables?: { [key: string]: any } | void
+    variables?: Maybe<{ [key: string]: any }>
 ): any;
diff --git a/types/graphql/utilities/valueFromASTUntyped.d.ts b/types/graphql/utilities/valueFromASTUntyped.d.ts
index 98d3137694..4ca58ca867 100644
--- a/types/graphql/utilities/valueFromASTUntyped.d.ts
+++ b/types/graphql/utilities/valueFromASTUntyped.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { ValueNode } from "../language/ast";
 
 /**
@@ -16,4 +17,4 @@ import { ValueNode } from "../language/ast";
  * | Null                 | null             |
  *
  */
-export function valueFromASTUntyped(valueNode: ValueNode, variables?: { [key: string]: any } | void): any;
+export function valueFromASTUntyped(valueNode: ValueNode, variables?: Maybe<{ [key: string]: any }>): any;
diff --git a/types/graphql/validation/ValidationContext.d.ts b/types/graphql/validation/ValidationContext.d.ts
index 0f8a4ea8f7..24049decdf 100644
--- a/types/graphql/validation/ValidationContext.d.ts
+++ b/types/graphql/validation/ValidationContext.d.ts
@@ -1,3 +1,4 @@
+import Maybe from "../tsutils/Maybe";
 import { GraphQLError } from "../error";
 import {
     DocumentNode,
@@ -19,7 +20,11 @@ import { GraphQLDirective } from "../type/directives";
 import { TypeInfo } from "../utilities/TypeInfo";
 
 type NodeWithSelectionSet = OperationDefinitionNode | FragmentDefinitionNode;
-type VariableUsage = { node: VariableNode; type: GraphQLInputType | void };
+type VariableUsage = {
+    readonly node: VariableNode;
+    readonly type: Maybe<GraphQLInputType>;
+    readonly defaultValue: Maybe<any>;
+};
 
 /**
  * An instance of this class is passed as the "this" context to all validators,
@@ -37,7 +42,7 @@ export default class ValidationContext {
 
     getDocument(): DocumentNode;
 
-    getFragment(name: string): FragmentDefinitionNode | void;
+    getFragment(name: string): Maybe<FragmentDefinitionNode>;
 
     getFragmentSpreads(node: SelectionSetNode): ReadonlyArray<FragmentSpreadNode>;
 
@@ -47,17 +52,17 @@ export default class ValidationContext {
 
     getRecursiveVariableUsages(operation: OperationDefinitionNode): ReadonlyArray<VariableUsage>;
 
-    getType(): GraphQLOutputType | void;
+    getType(): Maybe<GraphQLOutputType>;
 
-    getParentType(): GraphQLCompositeType | void;
+    getParentType(): Maybe<GraphQLCompositeType>;
 
-    getInputType(): GraphQLInputType | void;
+    getInputType(): Maybe<GraphQLInputType>;
 
-    getParentInputType(): GraphQLInputType | void;
+    getParentInputType(): Maybe<GraphQLInputType>;
 
-    getFieldDef(): GraphQLField<any, any> | void;
+    getFieldDef(): Maybe<GraphQLField<any, any>>;
 
-    getDirective(): GraphQLDirective | void;
+    getDirective(): Maybe<GraphQLDirective>;
 
-    getArgument(): GraphQLArgument | void;
+    getArgument(): Maybe<GraphQLArgument>;
 }
diff --git a/types/graphql/validation/rules/NoUndefinedVariables.d.ts b/types/graphql/validation/rules/NoUndefinedVariables.d.ts
index 611ad01a9b..f340b41ad8 100644
--- a/types/graphql/validation/rules/NoUndefinedVariables.d.ts
+++ b/types/graphql/validation/rules/NoUndefinedVariables.d.ts
@@ -1,7 +1,8 @@
+import Maybe from "../../tsutils/Maybe";
 import ValidationContext from "../ValidationContext";
 import { ASTVisitor } from "../../language/visitor";
 
-export function undefinedVarMessage(varName: string, opName: string | void): string;
+export function undefinedVarMessage(varName: string, opName: Maybe<string>): string;
 
 /**
  * No undefined variables
diff --git a/types/graphql/validation/rules/NoUnusedVariables.d.ts b/types/graphql/validation/rules/NoUnusedVariables.d.ts
index 10282cdacd..1846995a1f 100644
--- a/types/graphql/validation/rules/NoUnusedVariables.d.ts
+++ b/types/graphql/validation/rules/NoUnusedVariables.d.ts
@@ -1,7 +1,8 @@
+import Maybe from "../../tsutils/Maybe";
 import ValidationContext from "../ValidationContext";
 import { ASTVisitor } from "../../language/visitor";
 
-export function unusedVariableMessage(varName: string, opName: string | void): string;
+export function unusedVariableMessage(varName: string, opName: Maybe<string>): string;
 
 /**
  * No unused variables
diff --git a/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts b/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
index fef0869710..54b1fec36a 100644
--- a/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
+++ b/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
@@ -1,7 +1,8 @@
+import Maybe from "../../tsutils/Maybe";
 import ValidationContext from "../ValidationContext";
 import { ASTVisitor } from "../../language/visitor";
 
-export function singleFieldOnlyMessage(name: string | void): string;
+export function singleFieldOnlyMessage(name: Maybe<string>): string;
 
 /**
  * Subscriptions must only include one field.

From 6280a2d5e928cc9318ed39fa972e411a9dad713e Mon Sep 17 00:00:00 2001
From: Patrick Simmelbauer <patrick.simmelbauer@gmail.com>
Date: Thu, 10 May 2018 21:59:07 +0200
Subject: [PATCH 0177/1124] Add missing parameter to findWrapping (#25678)

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

diff --git a/types/prosemirror-transform/index.d.ts b/types/prosemirror-transform/index.d.ts
index e74fd9c094..88f97ff9e4 100644
--- a/types/prosemirror-transform/index.d.ts
+++ b/types/prosemirror-transform/index.d.ts
@@ -509,12 +509,15 @@ export function liftTarget(range: NodeRange): number | null | undefined;
  * Try to find a valid way to wrap the content in the given range in a
  * node of the given type. May introduce extra nodes around and inside
  * the wrapper node, if necessary. Returns null if no valid wrapping
- * could be found.
+ * could be found. When `innerRange` is given, that range's content is
+ * used as the content to fit into the wrapping, instead of the
+ * content of range.
  */
 export function findWrapping<S extends Schema = any>(
   range: NodeRange<S>,
   nodeType: NodeType<S>,
-  attrs?: { [key: string]: any }
+  attrs?: { [key: string]: any },
+  innerRange?: NodeRange<S>
 ): Array<{ type: NodeType<S>; attrs?: { [key: string]: any } | null }> | null | undefined;
 /**
  * Check whether splitting at the given position is allowed.

From ef4570ef0ab345157cbd8adfd9eeb2bb9ff00480 Mon Sep 17 00:00:00 2001
From: Daniel van der Merwe <danieljmerwe@gmail.com>
Date: Thu, 10 May 2018 15:59:44 -0400
Subject: [PATCH 0178/1124] SingleScreenApp can take an appStyle param (#25562)

This is undocumented but works
---
 types/react-native-navigation/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 75c0d51be0..86b94bff44 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -64,6 +64,11 @@ export interface SingleScreenApp {
     drawer?: Drawer;
     passProps?: object;
     animationType?: 'none' | 'slide-down' | 'fade';
+    appStyle?: {
+        orientation?: 'auto' | 'landscape' | 'portrait';
+        backButtonImage?: any;
+        hideBackButtonTitle?: boolean;
+    };
 }
 
 export interface Screen {

From 44252be6abe6d293f75af624d8a478313db666f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93lavur=20Debes=20Joensen?= <olavur.debes@gmail.com>
Date: Thu, 10 May 2018 22:00:01 +0200
Subject: [PATCH 0179/1124] Fix typo fullWdith -> fullWidth (#25676)

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

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 90f6de10a7..04d2e182ee 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -221,7 +221,7 @@ declare namespace Chart {
     interface ChartTitleOptions {
         display?: boolean;
         position?: PositionType;
-        fullWdith?: boolean;
+        fullWidth?: boolean;
         fontSize?: number;
         fontFamily?: string;
         fontColor?: ChartColor;

From 7531e4e98e9751f20ceb80f8a25d5d8312cb4d41 Mon Sep 17 00:00:00 2001
From: Brian Crowell <brian@fluggo.com>
Date: Thu, 10 May 2018 15:01:14 -0500
Subject: [PATCH 0180/1124] [natural-sort] Make definitions and tests match
 module (#25670)

The module is a function that takes options and returns a sort function.
It is not the sort function itself. The sort function also works on any
mixture of numbers and strings, as the module's own usage examples show.

The tests are just the usage examples verbatim.
---
 types/natural-sort/index.d.ts            | 11 ++++++++++-
 types/natural-sort/natural-sort-tests.ts |  7 +++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/types/natural-sort/index.d.ts b/types/natural-sort/index.d.ts
index 4e929d4edc..3a88919a25 100644
--- a/types/natural-sort/index.d.ts
+++ b/types/natural-sort/index.d.ts
@@ -1,9 +1,18 @@
 // Type definitions for NaturalSort
 // Project: https://github.com/studio-b12/natural-sort
 // Definitions by: Antonio Morales <https://github.com/a-morales>
+//                 Brian Crowell <https://github.com/fluggo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace naturalSort;
 
-declare function naturalSort<T>(a: T, b: T): number;
+interface Options {
+    /** Set to true to make the sort case-sensitive. */
+    caseSensitive?: boolean;
+
+    /** Set to 'desc' to sort in reverse. */
+    direction?: 'desc'
+}
+
+declare function naturalSort(options?: Options): (a: string | number, b: string | number) => number;
 export = naturalSort;
diff --git a/types/natural-sort/natural-sort-tests.ts b/types/natural-sort/natural-sort-tests.ts
index b336542520..6218f4e796 100644
--- a/types/natural-sort/natural-sort-tests.ts
+++ b/types/natural-sort/natural-sort-tests.ts
@@ -1,5 +1,8 @@
 
 import naturalSort = require("natural-sort");
 
-[5, 3, 2, 4, 1].sort(naturalSort);
-["a", "c", "b", "z", "w", "l"].sort(naturalSort);
+['10. tenth', 'odd', 1, '', '2. second'].sort(naturalSort());
+[3, 4, 1, 5, 2].sort(naturalSort({direction: 'desc'}));
+
+['a', 'B'].sort(naturalSort());
+['a', 'B'].sort(naturalSort({caseSensitive: true}));

From 63b0e8b632fcd6c7eecb2debcb432a9580e4d213 Mon Sep 17 00:00:00 2001
From: Sinziana Nicolae <sinzianna.nicolae@gmail.com>
Date: Thu, 10 May 2018 23:04:01 +0300
Subject: [PATCH 0181/1124] [react-dates] Add types in
 DayPickerRangeControllerShape (#25619)

* Add types for daySize and verticalBorderSpacing in DayPickerRangeControllerShape

* Change order of types
---
 types/react-dates/index.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index f9444c1b7c..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,18 +242,20 @@ declare namespace ReactDates {
         renderCalendarInfo?: () => (string | JSX.Element),
         onOutsideClick?: (e: any) => void,
         keepOpenOnDateSelect?: boolean,
+        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,
-        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 d19c85c26e9cc95bb1153bf47bd7bd7b08be73d3 Mon Sep 17 00:00:00 2001
From: Vasily Nesterov <vasily.s.nesterov@gmail.com>
Date: Fri, 11 May 2018 01:15:04 +0500
Subject: [PATCH 0182/1124] [react-google-maps-loader] Create type definitions
 (#25662)

---
 types/react-google-maps-loader/index.d.ts     | 28 +++++++++++++++++++
 .../react-google-maps-loader-tests.tsx        | 23 +++++++++++++++
 types/react-google-maps-loader/tsconfig.json  | 25 +++++++++++++++++
 types/react-google-maps-loader/tslint.json    |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/react-google-maps-loader/index.d.ts
 create mode 100644 types/react-google-maps-loader/react-google-maps-loader-tests.tsx
 create mode 100644 types/react-google-maps-loader/tsconfig.json
 create mode 100644 types/react-google-maps-loader/tslint.json

diff --git a/types/react-google-maps-loader/index.d.ts b/types/react-google-maps-loader/index.d.ts
new file mode 100644
index 0000000000..1bea9e2a9c
--- /dev/null
+++ b/types/react-google-maps-loader/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for react-google-maps-loader 4.2
+// Project: https://github.com/xuopled/react-google-maps-loader
+// Definitions by: Vasily Nesterov <https://github.com/vasilysn>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="googlemaps" />
+import { Component, ReactNode } from "react";
+
+export default ReactGoogleMapsLoader;
+
+declare class ReactGoogleMapsLoader extends Component<
+    ReactGoogleMapsLoader.Props
+> {}
+
+declare namespace ReactGoogleMapsLoader {
+    type GoogleMaps = typeof google.maps;
+
+    interface Params {
+        key: string;
+        libraries?: string;
+    }
+
+    interface Props {
+        params: Params;
+        render: (googleMaps: GoogleMaps, error?: string | null) => ReactNode;
+    }
+}
diff --git a/types/react-google-maps-loader/react-google-maps-loader-tests.tsx b/types/react-google-maps-loader/react-google-maps-loader-tests.tsx
new file mode 100644
index 0000000000..e82c3f6038
--- /dev/null
+++ b/types/react-google-maps-loader/react-google-maps-loader-tests.tsx
@@ -0,0 +1,23 @@
+import * as React from "react";
+import ReactGoogleMapsLoader from "react-google-maps-loader";
+
+const ReactGoogleMapsLoaderTest: React.SFC = () => (
+    <ReactGoogleMapsLoader
+        params={{ key: "secret-key" }}
+        render={googleMaps => <div />}
+    />
+);
+
+const ReactGoogleMapsLoaderWithLibrariesTest: React.SFC = () => (
+    <ReactGoogleMapsLoader
+        params={{ key: "secret-key", libraries: "places" }}
+        render={googleMaps => <div />}
+    />
+);
+
+const ReactGoogleMapsLoaderWithErrorHandlerTest: React.SFC = () => (
+    <ReactGoogleMapsLoader
+        params={{ key: "secret-key", libraries: "places" }}
+        render={(googleMaps, error) => <div>{error}</div>}
+    />
+);
diff --git a/types/react-google-maps-loader/tsconfig.json b/types/react-google-maps-loader/tsconfig.json
new file mode 100644
index 0000000000..98ee7f63aa
--- /dev/null
+++ b/types/react-google-maps-loader/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-google-maps-loader-tests.tsx"
+    ]
+}
diff --git a/types/react-google-maps-loader/tslint.json b/types/react-google-maps-loader/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-google-maps-loader/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5e47df0e65904edba6958ebabc852e90fecbf951 Mon Sep 17 00:00:00 2001
From: ryym <ryym.64@gmail.com>
Date: Fri, 11 May 2018 05:16:28 +0900
Subject: [PATCH 0183/1124] Add a link about major version update in 'Make a
 pull request' section (#25663)

---
 README.es.md | 1 +
 README.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.es.md b/README.es.md
index ce94bb0298..c3cff967db 100644
--- a/README.es.md
+++ b/README.es.md
@@ -87,6 +87,7 @@ Primero, haz un [fork](https://guides.github.com/activities/forking/) en este re
 
 * `cd types/my-package-to-edit`
 * Haz cambios. Recuerda editar las pruebas.
+  Si realiza cambios importantes, no olvide [actualizar una versión principal](#quiero-actualizar-un-paquete-a-una-nueva-versión-principal).
 * También puede que quieras añadirte la sección "Definitions by" en el encabezado del paquete.
   - Esto hará que seas notificado (a través de tu nombre de usuario en GitHub) cada vez que alguien haga un pull request o issue sobre el paquete.
   - Haz esto añadiendo tu nombre al final de la línea, así como en `// Definitions by: Alice <https://github.com/alice>, Bob <https://github.com/bob>`.
diff --git a/README.md b/README.md
index 7c58fe8901..554316e52a 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ First, [fork](https://guides.github.com/activities/forking/) this repository, in
 
 * `cd types/my-package-to-edit`
 * Make changes. Remember to edit tests.
+  If you make breaking changes, do not forget to [update a major version](#i-want-to-update-a-package-to-a-new-major-version).
 * You may also want to add yourself to "Definitions by" section of the package header.
   - This will cause you to be notified (via your GitHub username) whenever someone makes a pull request or issue about the package.
   - Do this by adding your name to the end of the line, as in `// Definitions by: Alice <https://github.com/alice>, Bob <https://github.com/bob>`.

From f0b4609d77ac319a9cf98f2805df39d98b07c63a Mon Sep 17 00:00:00 2001
From: Inaki Arroyo <inaki.arroyonebreda@gmail.com>
Date: Thu, 10 May 2018 21:19:38 +0100
Subject: [PATCH 0184/1124] deline types (#25666)

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

diff --git a/types/deline/deline-tests.ts b/types/deline/deline-tests.ts
new file mode 100644
index 0000000000..35f1696484
--- /dev/null
+++ b/types/deline/deline-tests.ts
@@ -0,0 +1,13 @@
+import * as dl from "deline";
+
+const moduleName = "deline";
+
+dl.deline(`deline`); // $ExpectType string
+dl.deline(`module name: ${moduleName}`); // $ExpectType string
+dl.deline`deline`; // $ExpectType string
+dl.deline`tagged template: ${moduleName}`; // $ExpectType string
+dl.deline`
+tagged template:
+
+${moduleName}
+`;
diff --git a/types/deline/index.d.ts b/types/deline/index.d.ts
new file mode 100644
index 0000000000..b65cd80d5e
--- /dev/null
+++ b/types/deline/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for deline 1.0
+// Project: https://github.com/airbnb/deline#readme
+// Definitions by: Inaki Arroyo <https://github.com/iarroyo5>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function deline(strings: string | TemplateStringsArray, ...values: any[]): string;
diff --git a/types/deline/tsconfig.json b/types/deline/tsconfig.json
new file mode 100644
index 0000000000..ae8ad2e876
--- /dev/null
+++ b/types/deline/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",
+        "deline-tests.ts"
+    ]
+}
diff --git a/types/deline/tslint.json b/types/deline/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/deline/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 478994240a2e2bd5580ccb5d10e18146b39340f3 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Thu, 10 May 2018 13:24:02 -0700
Subject: [PATCH 0185/1124] Revert "Used a conditional type for Sinon's stub
 class typings  (#25656)" (#25686)

This reverts commit 49ecfa4536c9f5102cea2db42f750994c70b0a44.
---
 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              | 12 +++---------
 types/sinon/sinon-tests.ts          |  9 ---------
 12 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/types/karma-chai-sinon/index.d.ts b/types/karma-chai-sinon/index.d.ts
index 1ce2672b23..76ee313a40 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.8
+// TypeScript Version: 2.3
 
 /// <reference types="chai" />
 import Sinon = require("sinon");
diff --git a/types/mochaccino/index.d.ts b/types/mochaccino/index.d.ts
index 3f0a2e9688..b230218ee9 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.8
+// TypeScript Version: 2.3
 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 467d217aa9..25233c1c61 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.8
+// TypeScript Version: 2.3
 
 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 49e9b29bd3..097e13a1a0 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.8
+// TypeScript Version: 2.3
 
 import * as s from "sinon";
 
diff --git a/types/sinon-chai/index.d.ts b/types/sinon-chai/index.d.ts
index cff6d0b3a2..8c6d7eb2d0 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.8
+// TypeScript Version: 2.3
 
 /// <reference types="chai" />
 /// <reference types="sinon" />
diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index 9776b0bb30..263135e060 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.8
+// TypeScript Version: 2.4
 
 /// <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 f3974fc005..10c8ef824d 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.8
+// TypeScript Version: 2.3
 
 import {
     SinonStub,
diff --git a/types/sinon-mongoose/index.d.ts b/types/sinon-mongoose/index.d.ts
index 86109b4917..2d9099a060 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.8
+// TypeScript Version: 2.3
 
 import * as s from "sinon";
 
diff --git a/types/sinon-stub-promise/index.d.ts b/types/sinon-stub-promise/index.d.ts
index d817113cf7..6de3b17b2a 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.8
+// TypeScript Version: 2.3
 
 /// <reference types="sinon"/>
 
diff --git a/types/sinon-test/index.d.ts b/types/sinon-test/index.d.ts
index 902064a7cb..4cda8702a6 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.8
+// TypeScript Version: 2.3
 
 import * as Sinon from 'sinon';
 
diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index 0bc7d112fc..2395ee2ed2 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -5,9 +5,8 @@
 //                 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.8
+// TypeScript Version: 2.3
 
 // sinon uses DOM dependencies which are absent in browser-less environment like node.js
 // to avoid compiler errors this monkey patch is used
@@ -567,20 +566,15 @@ declare namespace Sinon {
     }
 
     /**
-     * An instance of a stubbed object type with functions replaced by stubs.
+     * An instance of a stubbed object type with members 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]: SinonStubbedMember<TType[P]>;
+        [P in keyof TType]: SinonStub;
     };
-
-    /**
-     * Replaces a type with a Sinon stub if it's a function.
-     */
-    type SinonStubbedMember<T> = T extends Function ? SinonStub : T;
 }
 
 declare const Sinon: Sinon.SinonStatic;
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index c6ffc7a51e..17e8cc6084 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -154,15 +154,6 @@ function testSandbox() {
     sandbox.createStubInstance<TestCreateStubInstance>(TestCreateStubInstance).someTestMethod('some argument');
 }
 
-class OneFunctionOneNumber {
-    memberFunction() { }
-    memberNumber: number;
-}
-
-const stubInstance = sinon.createStubInstance<OneFunctionOneNumber>(OneFunctionOneNumber);
-const memberFunction: sinon.SinonStub = stubInstance.memberFunction;
-const memberNumber: number = stubInstance.memberNumber;
-
 function testPromises() {
     let resolveStub = sinon.stub().resolves();
     resolveStub = sinon.stub().resolves(10);

From 9cd7841a2631f28b1ec2ba59ad66be009870925c Mon Sep 17 00:00:00 2001
From: Rong Shen <rong.shen@gmail.com>
Date: Fri, 11 May 2018 04:34:27 +0800
Subject: [PATCH 0186/1124] add types for jsonic (#25671)

---
 types/jsonic/index.d.ts      | 19 +++++++++++++++++++
 types/jsonic/jsonic-tests.ts |  7 +++++++
 types/jsonic/tsconfig.json   | 16 ++++++++++++++++
 types/jsonic/tslint.json     |  1 +
 4 files changed, 43 insertions(+)
 create mode 100644 types/jsonic/index.d.ts
 create mode 100644 types/jsonic/jsonic-tests.ts
 create mode 100644 types/jsonic/tsconfig.json
 create mode 100644 types/jsonic/tslint.json

diff --git a/types/jsonic/index.d.ts b/types/jsonic/index.d.ts
new file mode 100644
index 0000000000..610101b136
--- /dev/null
+++ b/types/jsonic/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for jsonic 0.3
+// Project: https://github.com/rjrodger/jsonic
+// Definitions by: Rong SHen <https://github.com/jacobbubu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function jsonic(text: string): any;
+declare namespace jsonic {
+    interface Options {
+        depth?: number;
+        maxitems?: number;
+        maxchars?: number;
+        omit?: string[];
+        exclude?: string[];
+    }
+
+    function stringify(val: any, opts?: Options): string;
+}
+
+export = jsonic;
diff --git a/types/jsonic/jsonic-tests.ts b/types/jsonic/jsonic-tests.ts
new file mode 100644
index 0000000000..fb0df5dd95
--- /dev/null
+++ b/types/jsonic/jsonic-tests.ts
@@ -0,0 +1,7 @@
+import * as jsonic from "jsonic";
+
+jsonic("a:x, b:y z");
+jsonic.stringify(
+    { a: "a", b: "b", c: { c1: "c1" } },
+    { depth: 1, omit: ["a"], exclude: ["b"] }
+);
diff --git a/types/jsonic/tsconfig.json b/types/jsonic/tsconfig.json
new file mode 100644
index 0000000000..88bfd64ef6
--- /dev/null
+++ b/types/jsonic/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", "jsonic-tests.ts"]
+}
diff --git a/types/jsonic/tslint.json b/types/jsonic/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsonic/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fd28954b0722e6711a3ff6aacef979a2ff26cb73 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 10 May 2018 13:36:32 -0700
Subject: [PATCH 0187/1124] Add declarations for cli-progress package (#25661)

* Add declarations for cli-progress package

* Add missing property

* Close comment

* Fix lint failure
---
 types/cli-progress/cli-progress-tests.ts |  92 ++++++++++++++++++
 types/cli-progress/index.d.ts            | 114 +++++++++++++++++++++++
 types/cli-progress/tsconfig.json         |  23 +++++
 types/cli-progress/tslint.json           |   1 +
 4 files changed, 230 insertions(+)
 create mode 100644 types/cli-progress/cli-progress-tests.ts
 create mode 100644 types/cli-progress/index.d.ts
 create mode 100644 types/cli-progress/tsconfig.json
 create mode 100644 types/cli-progress/tslint.json

diff --git a/types/cli-progress/cli-progress-tests.ts b/types/cli-progress/cli-progress-tests.ts
new file mode 100644
index 0000000000..b9fa6d5057
--- /dev/null
+++ b/types/cli-progress/cli-progress-tests.ts
@@ -0,0 +1,92 @@
+import progress = require('cli-progress');
+
+function test0() {
+    // Usage
+    // Multiple examples are available e.g.example.js - just try it $ node example.js
+
+    const _cliProgress = require('cli-progress');
+
+    // create a new progress bar instance and use shades_classic theme
+    const bar1 = new _cliProgress.Bar({}, _cliProgress.Presets.shades_classic);
+
+    // start the progress bar with a total value of 200 and start value of 0
+    bar1.start(200, 0);
+
+    // update the current value in your application..
+    bar1.update(100);
+
+    // stop the progress bar
+    bar1.stop();
+}
+
+function test1() {
+    // Examples
+    // Example 1 - Set Options
+
+    // change the progress characters
+    // set fps limit to 5
+    // change the output stream and barsize
+    const bar = new progress.Bar({
+        barCompleteChar: '#',
+        barIncompleteChar: '.',
+        fps: 5,
+        stream: process.stdout,
+        barsize: 65
+    });
+}
+
+function test2() {
+    // Example 2 - Change Styles defined by Preset
+    // uee shades preset
+    // change the barsize
+    const bar = new progress.Bar({
+        barsize: 65
+    }, progress.Presets.shades_grey);
+}
+
+function test3() {
+    // Example 3 - Custom Payload
+    // create new progress bar with custom token "speed"
+    const bar = new progress.Bar({
+        format: 'progress [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} | Speed: {speed} kbit'
+    });
+
+    // initialize the bar - set payload token "speed" with the default value "N/A"
+    bar.start(200, 0, {
+        speed: "N/A"
+    });
+
+    // some code/update loop
+    // ...
+
+    // update bar value. set custom token "speed" to 125
+    bar.update(5, {
+        speed: '125'
+    });
+
+    // process finished
+    bar.stop();
+}
+
+function test4() {
+    // Example 4 - Custom Presets
+    // File mypreset.js
+
+    const _colors = require('colors');
+
+    module.exports = {
+        format: _colors.red(' {bar}') + ' {percentage}% | ETA: {eta}s | {value}/{total} | Speed: {speed} kbit',
+        barCompleteChar: '\u2588',
+        barIncompleteChar: '\u2591'
+    };
+}
+
+function test5() {
+    // Application
+
+    const _mypreset = require('./mypreset.js');
+
+    const bar = new progress.Bar({
+        barsize: 65
+    }, _mypreset);
+}
diff --git a/types/cli-progress/index.d.ts b/types/cli-progress/index.d.ts
new file mode 100644
index 0000000000..3ac9dfe8a3
--- /dev/null
+++ b/types/cli-progress/index.d.ts
@@ -0,0 +1,114 @@
+// Type definitions for cli-progress 1.8
+// Project: https://github.com/AndiDittrich/Node.CLI-Progress
+// Definitions by: My Self <https://github.com/mhegazy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+export interface Options {
+    /**
+     * progress bar output format.
+     * The progressbar can be customized by using the following build-in placeholders. They can be combined in any order.
+     *   {bar} - the progress bar, customizable by the options barsize, barCompleteString and barIncompleteString
+     *   {percentage} - the current progress in percent (0-100)
+     *   {total} - the end value
+     *   {value} - the current value set by last update() call
+     *   {eta} - expected time of accomplishment in seconds
+     *   {duration} - elapsed time in seconds
+     *   {eta_formatted} - expected time of accomplishment formatted into appropriate units
+     *   {duration_formatted} - elapsed time formatted into appropriate units
+     *
+     * Example:
+     *      progress [{bar}] {percentage}% | ETA: {eta}s | {value}/{total}
+     *    is rendered as
+     *      progress [========================================] 100% | ETA: 0s | 200/200
+     */
+    format?: string;
+
+    /** the maximum update rate (default: 10) */
+    fps?: number;
+
+    /** output stream to use (default: process.stderr) */
+    stream?: NodeJS.WritableStream;
+
+    /**  automatically call stop() when the value reaches the total (default: false) */
+    stopOnComplete?: boolean;
+
+    /** clear the progress bar on complete / stop() call (default: false) */
+    clearOnComplete?: boolean;
+
+    /** the length of the progress bar in chars (default: 40) */
+    barsize?: number;
+
+    /** character to use as "complete" indicator in the bar (default: "=") */
+    barCompleteString?: string;
+
+    /** character to use as "incomplete" indicator in the bar (default: "-") */
+    barIncompleteString?: string;
+
+    /** character to use as "complete" indicator in the bar (default: "=") */
+    barCompleteChar?: string;
+
+    /** character to use as "incomplete" indicator in the bar (default: "-") */
+    barIncompleteChar?: string;
+
+    /** hide the cursor during progress operation; restored on complete (default: false) */
+    hideCursor?: boolean;
+
+    /** number of updates with which to calculate the eta; higher numbers give a more stable eta (default: 10) */
+    etaBuffer?: number;
+
+    /** disable line wrapping (default: false) - pass null to keep terminal settings; pass true to trim the output to terminal width */
+    linewrap?: boolean | null;
+}
+
+export interface Preset {
+    barCompleteChar: string;
+    barIncompleteChar: string;
+    format: string;
+}
+
+export class Bar {
+    /** Initialize a new Progress bar. An instance can be used multiple times! it's not required to re-create it! */
+    constructor(opt: Options, preset?: Preset);
+
+    calculateETA(): void;
+
+    formatTime(t: any, roundToMultipleOf: any): any;
+
+    getTotal(): any;
+
+    /** Increases the current progress value by a specified amount (default +1). Update payload optionally */
+    increment(step: number, payload?: object): void;
+
+    render(): void;
+
+    /** Sets the total progress value while progressbar is active. Especially useful handling dynamic tasks. */
+    setTotal(total: number): void;
+
+    /** Starts the progress bar and set the total and initial value */
+    start(total: number, startValue: number, payload?: object): void;
+
+    /** Stops the progress bar and go to next line */
+    stop(): void;
+
+    stopTimer(): void;
+
+    /** Sets the current progress value and optionally the payload with values of custom tokens as a second parameter */
+    update(current: number, payload?: object): void;
+}
+
+export const Presets: {
+    /** Styles as of cli-progress v1.3.0 */
+    legacy: Preset;
+
+    /** Unicode Rectangles */
+    rect: Preset;
+
+    /** Unicode background shades are used for the bar */
+    shades_classic: Preset;
+
+    /** Unicode background shades with grey bar */
+    shades_grey: Preset;
+};
diff --git a/types/cli-progress/tsconfig.json b/types/cli-progress/tsconfig.json
new file mode 100644
index 0000000000..be8771c6c5
--- /dev/null
+++ b/types/cli-progress/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "cli-progress-tests.ts"
+    ]
+}
diff --git a/types/cli-progress/tslint.json b/types/cli-progress/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cli-progress/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8cd6bba3b37232c14c4f111c1c95f406fda6895e Mon Sep 17 00:00:00 2001
From: Bryan Hughes <accounts@nebri.us>
Date: Thu, 10 May 2018 15:40:37 -0700
Subject: [PATCH 0188/1124] Updated Node.js dgram.send() signature with recent
 changes in Node.js API (#25664)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Updated “send” signature with recent changse

* Fixed some other issues with send() signature and added Node 10
---
 types/node/index.d.ts    | 4 ++--
 types/node/v8/index.d.ts | 4 ++--
 types/node/v9/index.d.ts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index d7ebab4fd0..d228742629 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2940,8 +2940,8 @@ declare module "dgram" {
     export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
 
     export class Socket extends events.EventEmitter {
-        send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
-        send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array | any[], port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array, offset: number, length: number, port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
         bind(port?: number, address?: string, callback?: () => void): void;
         bind(port?: number, callback?: () => void): void;
         bind(callback?: () => void): void;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 5271a8d06a..45f1c85b64 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -2851,8 +2851,8 @@ declare module "dgram" {
     export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
 
     export class Socket extends events.EventEmitter {
-        send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
-        send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array | any[], port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array, offset: number, length: number, port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
         bind(port?: number, address?: string, callback?: () => void): void;
         bind(port?: number, callback?: () => void): void;
         bind(callback?: () => void): void;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 5063a1ee81..5a76e4cc45 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -2932,8 +2932,8 @@ declare module "dgram" {
     export function createSocket(options: SocketOptions, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket;
 
     export class Socket extends events.EventEmitter {
-        send(msg: Buffer | String | any[], port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
-        send(msg: Buffer | String | any[], offset: number, length: number, port: number, address: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array | any[], port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
+        send(msg: Buffer | string | Uint8Array, offset: number, length: number, port: number, address?: string, callback?: (error: Error | null, bytes: number) => void): void;
         bind(port?: number, address?: string, callback?: () => void): void;
         bind(port?: number, callback?: () => void): void;
         bind(callback?: () => void): void;

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 0189/1124] 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 e0695202ae2dca81d5fbecacc07ee2eab7ea9d1d Mon Sep 17 00:00:00 2001
From: Felipe Vaz <felipevnunes@gmail.com>
Date: Thu, 10 May 2018 20:20:54 -0500
Subject: [PATCH 0190/1124] Adding 2 missing props on GridProps: rowActionsCell
 and selectAllRenderer

---
 types/react-data-grid/index.d.ts              | 10 ++++++
 .../react-data-grid/react-data-grid-tests.tsx | 31 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index af6edce257..f66aad2e41 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -203,6 +203,16 @@ declare namespace AdazzleReactDataGrid {
                 isSelectedKey?: string;
             }
         }
+        /**
+         * A custom formatter for the select all checkbox cell
+         * @default react-data-grid/src/formatters/SelectAll.js
+         */
+        selectAllRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>;
+        /**
+         * A custom formatter for select row column
+         * @default AdazzleReactDataGridPlugins.Editors.CheckboxEditor
+         */
+        rowActionsCell?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>;
         /**
          * An event function called when a row is clicked.
          * Clicking the header row will trigger a call with -1 for the rowIdx.
diff --git a/types/react-data-grid/react-data-grid-tests.tsx b/types/react-data-grid/react-data-grid-tests.tsx
index 827e20c820..8c0feb8f64 100644
--- a/types/react-data-grid/react-data-grid-tests.tsx
+++ b/types/react-data-grid/react-data-grid-tests.tsx
@@ -31,6 +31,35 @@ class CustomFilterHeaderCell extends React.Component<any, any> {
    }
 }
 
+class CustomRowSelectorCell extends ReactDataGridPlugins.Editors.CheckboxEditor {
+    render(){
+        return super.render();
+    }
+}
+
+export interface ICustomSelectAllProps {
+    onChange: any;
+    inputRef: any;
+}
+
+class CustomSelectAll extends React.Component<ICustomSelectAllProps> {
+    render() {
+        return (
+            <div className='react-grid-checkbox-container checkbox-align'>
+                <input
+                    className='react-grid-checkbox'
+                    type='checkbox'
+                    name='select-all-checkbox'
+                    id='select-all-checkbox'
+                    ref={this.props.inputRef}
+                    onChange={this.props.onChange}
+                />
+                <label htmlFor='select-all-checkbox' className='react-grid-checkbox-label'></label>
+            </div>
+        );
+    }
+}
+
 faker.locale = 'en_GB';
 
 function createFakeRowObjectData(index:number):Object {
@@ -327,6 +356,8 @@ class Example extends React.Component<any, any> {
                         keys: {rowKey: 'id', values: selectedRows}
                     }
                 }}
+                rowActionsCell={CustomRowSelectorCell}
+                selectAllRenderer={CustomSelectAll}
                 onRowClick={this.onRowClick}
             />
 

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 0191/1124] 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 0192/1124] 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 0193/1124] 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 0194/1124] 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 0195/1124] 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 0196/1124] 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 0197/1124] 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 0198/1124] 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 0199/1124] 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 0200/1124] 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 473658826f852bd5051e4b30dc1879e2c0c24f2d Mon Sep 17 00:00:00 2001
From: Felipe Nunes Vaz <f.vaz@hippocmms.com>
Date: Fri, 11 May 2018 08:25:59 -0500
Subject: [PATCH 0201/1124] Fixed PR comments

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

diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index f66aad2e41..82070c673c 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -207,12 +207,12 @@ declare namespace AdazzleReactDataGrid {
          * A custom formatter for the select all checkbox cell
          * @default react-data-grid/src/formatters/SelectAll.js
          */
-        selectAllRenderer?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>;
+        selectAllRenderer?: React.ComponentClass<any> | React.StatelessComponent<any>;
         /**
          * A custom formatter for select row column
          * @default AdazzleReactDataGridPlugins.Editors.CheckboxEditor
          */
-        rowActionsCell?: React.ReactElement<any> | React.ComponentClass<any> | React.StatelessComponent<any>;
+        rowActionsCell?: React.ComponentClass<any> | React.StatelessComponent<any>;
         /**
          * An event function called when a row is clicked.
          * Clicking the header row will trigger a call with -1 for the rowIdx.

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 0202/1124] 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 0203/1124] 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 7a45c8a4d65ae1c344952deacde9d0e9927dc6fe Mon Sep 17 00:00:00 2001
From: "Jon.Hallander" <jon.hallander@polarisalpha.com>
Date: Fri, 11 May 2018 12:50:39 -0400
Subject: [PATCH 0204/1124] Replaced introduced tabs

Replace tabs with spaces in my introduced methods as well as interface ObjectPEM which I did not define.
---
 types/node-forge/index.d.ts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index dafed52047..016b9b7b1a 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -16,22 +16,22 @@ declare module "node-forge" {
 
     namespace pem {
 
-		interface EncodeOptions {
-			maxline?: number;
-		}
+        interface EncodeOptions {
+            maxline?: number;
+        }
 
-		interface ObjectPEM {
-			type: string;
-			body: Bytes;
-			procType?: any;
-			contentDomain?: any;
-			dekInfo?: any;
-			headers?: any[];
-		}
+        interface ObjectPEM {
+            type: string;
+            body: Bytes;
+            procType?: any;
+            contentDomain?: any;
+            dekInfo?: any;
+            headers?: any[];
+        }
 
-		function encode(msg: ObjectPEM, options?: EncodeOptions): string;
-		function decode(str: string): ObjectPEM[];
-	}
+        function encode(msg: ObjectPEM, options?: EncodeOptions): string;
+        function decode(str: string): ObjectPEM[];
+    }
 
     namespace pki {
 
@@ -43,9 +43,9 @@ declare module "node-forge" {
             privateKey: Key;
         }
 
-		function pemToDer(pem: PEM): util.ByteStringBuffer;
+        function pemToDer(pem: PEM): util.ByteStringBuffer;
         function privateKeyToPem(key: Key, maxline?: number): PEM;
-		function privateKeyInfoToPem(key: Key, maxline?: number): PEM;
+        function privateKeyInfoToPem(key: Key, maxline?: number): PEM;
         function publicKeyToPem(key: Key, maxline?: number): PEM;
         function publicKeyFromPem(pem: PEM): Key;
         function privateKeyFromPem(pem: PEM): Key;

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 0205/1124] 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 0206/1124] 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 0207/1124] 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 32375d7c44e6c850b670a20443bb14592c4c9cd9 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Sat, 12 May 2018 03:11:33 +0800
Subject: [PATCH 0208/1124] fix(prettier): printer.embed is optional (#25697)

* fix(prettier): printer.embed is optional

* fix: FastPath#getName() could be number

* fix: add missing FastPath#stack

* fix: printDocToString return type
---
 types/prettier/index.d.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 0daaa14cca..dbc358bfc9 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -9,7 +9,8 @@ export type Doc = doc.builders.Doc;
 
 // https://github.com/prettier/prettier/blob/master/src/common/fast-path.js
 export interface FastPath {
-    getName(): string | null;
+    stack: any[];
+    getName(): null | number | string;
     getValue(): any;
     getNode(count?: number): any;
     getParentNode(count?: number): any;
@@ -131,12 +132,12 @@ export interface Printer {
         options: ParserOptions,
         print: (path: FastPath) => Doc,
     ): Doc;
-    embed(
+    embed?: (
         path: FastPath,
         print: (path: FastPath) => Doc,
         textToDoc: (text: string, options: Options) => Doc,
         options: ParserOptions,
-    ): Doc | null;
+    ) => Doc | null;
     insertPragma?: (text: string) => string;
     /**
      * @returns `null` if you want to remove this node
@@ -405,7 +406,11 @@ export namespace doc {
         function printDocToDebug(doc: Doc): string;
     }
     namespace printer {
-        function printDocToString(doc: Doc, options: Options): string;
+        function printDocToString(doc: Doc, options: Options): {
+            formatted: string;
+            cursorNodeStart?: number;
+            cursorNodeText?: string;
+        };
         interface Options {
             /**
              * Specify the line length that the printer will wrap on.

From 2718a5e3eecff2f1d67197ac8ee444b8cf400350 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Fri, 11 May 2018 12:16:27 -0700
Subject: [PATCH 0209/1124] [jss] Export named type for the options argument to
 createStyleSheet (#25692)

---
 types/jss/index.d.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 0b40c82f8f..27c8d779a6 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -112,19 +112,20 @@ export declare class SheetsRegistry {
     remove(sheet: StyleSheet): void;
     toString(options?: ToCssOptions): string;
 }
+export type CreateStyleSheetOptions<Name extends string = any> = Partial<{
+	media: string;
+	meta: string;
+	link: boolean;
+	element: HTMLStyleElement;
+	index: number;
+	generateClassName: GenerateClassName<Name>;
+	classNamePrefix: string;
+}>;
 declare class JSS {
 	constructor(options?: Partial<JSSOptions>);
 	createStyleSheet<Name extends string>(
 		styles: Partial<Styles<Name>>,
-		options?: Partial<{
-			media: string;
-			meta: string;
-			link: boolean;
-			element: HTMLStyleElement;
-			index: number;
-			generateClassName: GenerateClassName<Name>;
-			classNamePrefix: string;
-		}>,
+		options?: CreateStyleSheetOptions<Name>,
 	): StyleSheet<Name>;
 	removeStyleSheet(sheet: StyleSheet): this;
 	setup(options?: Partial<JSSOptions>): this;

From d222093d1d20db41b0a3cbd1678800137492172e Mon Sep 17 00:00:00 2001
From: Michael Zlatkovsky <Zlatkovsky@users.noreply.github.com>
Date: Fri, 11 May 2018 12:17:44 -0700
Subject: [PATCH 0210/1124] Massive office.js update: ExcelApi 1.7, additions
 to Word and OneNote codegen (#25689)

* Update to ExcelApi 1.7 and with latest Word d.ts codegen

* Remove other IPromise dependencies, making everything be just regular Promises

* Annotate with TS 2.4 requirement in the header

* Use "namespace" instead of "module"

* add "Office.Preview.startCustomFunctions()"

* Apply auto-formatting

* Fix 1 typo and clean up trailing statements
---
 types/office-js/index.d.ts         | 26295 +++++++++++++++++++++++----
 types/office-js/office-js-tests.ts |    59 +-
 2 files changed, 23111 insertions(+), 3243 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 629ccacb21..d0eaf593c5 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://dev.office.com
 // Definitions by: OfficeDev <https://github.com/OfficeDev>, Lance Austin <https://github.com/LanceEA>, Michael Zlatkovsky <https://github.com/Zlatkovsky>, Kim Brandl <https://github.com/kbrandl>, Ricky Kirkham <https://github.com/Rick-Kirkham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 /*
 office-js
@@ -14,19 +15,24 @@ Copyright (c) Microsoft Corporation
 ////////////////////////////////////////////////////////////////
 
 declare namespace Office {
+    export var Preview: {
+        startCustomFunctions(): Promise<void>;
+    }
+
+    export var Promise: PromiseConstructor;
     export 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;
-	/**
+    /**
     * 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 }>;
+    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
@@ -1573,7 +1579,7 @@ declare namespace Office {
 ////////////////////////////////////////////////////////////////
 
 declare namespace Office {
-    export module MailboxEnums {
+    namespace MailboxEnums {
         export enum AttachmentType {
             /**
              * The attachment is a file
@@ -2597,6 +2603,23 @@ declare namespace OfficeExtension {
         top?: number;
         skip?: number;
     }
+    export interface UpdateOptions {
+        /**
+         * Throw an error if the passed-in property list includes read-only properties (default = true).
+         */
+        throwOnReadOnly?: boolean
+    }
+
+    /** Contains debug information about the request context. */
+    export interface RequestContextDebugInfo {
+        /**
+         * The statements to be executed in the host.
+         *
+         * These statements may not match the code exactly as written, but will be a close approximation.
+         */
+        pendingStatements: string[];
+    }
+
     /** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
     class ClientRequestContext {
         constructor(url?: string);
@@ -2610,21 +2633,24 @@ declare namespace OfficeExtension {
         /** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
         load(object: ClientObject, option?: string | string[] | LoadOption): void;
 
-		/**
-		* Queues up a command to recursively load the specified properties of the object and its navigation properties.
-		* You must call "context.sync()" before reading the properties.
-		*
-		* @param object The object to be loaded.
-		* @param options The key-value pairing of load options for the types, such as { "Workbook": "worksheets,tables",  "Worksheet": "tables",  "Tables": "name" }
-		* @param maxDepth The maximum recursive depth.
-		*/
+        /**
+        * Queues up a command to recursively load the specified properties of the object and its navigation properties.
+        * You must call "context.sync()" before reading the properties.
+        *
+        * @param object The object to be loaded.
+        * @param options The key-value pairing of load options for the types, such as { "Workbook": "worksheets,tables",  "Worksheet": "tables",  "Tables": "name" }
+        * @param maxDepth The maximum recursive depth.
+        */
         loadRecursive(object: ClientObject, options: { [typeName: string]: string | string[] | LoadOption }, maxDepth?: number): void;
 
         /** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
         trace(message: string): void;
 
         /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code.�This method returns a promise, which is resolved when the synchronization is complete. */
-        sync<T>(passThroughValue?: T): IPromise<T>;
+        sync<T>(passThroughValue?: T): Promise<T>;
+
+        /** Debug information */
+        readonly debugInfo: RequestContextDebugInfo;
     }
 
     export interface EmbeddedOptions {
@@ -2638,10 +2664,9 @@ declare namespace OfficeExtension {
 
     class EmbeddedSession {
         constructor(url: string, options?: EmbeddedOptions);
-        public init(): IPromise<any>;
+        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> {
@@ -2649,7 +2674,21 @@ declare namespace OfficeExtension {
         value: T;
     }
 }
+
 declare namespace OfficeExtension {
+    /** Configuration */
+    export var config: {
+        /**
+         * Determines whether to log additional error information upon failure.
+         *
+         * When this property is set to true, the error object will include a "debugInfo.fullStatements" property that lists all statements in the batch request, including all statements that precede and follow the point of failure.
+         *
+         * Setting this property to true will negatively impact performance and will log all statements in the batch request, including any statements that may contain potentially-sensitive data.
+         * It is recommended that you only set this property to true during debugging and that you never log the value of error.debugInfo.fullStatements to an external database or analytics service.
+         */
+        extendedErrorLogging: boolean;
+    };
+
     export interface DebugInfo {
         /** Error code string, such as "InvalidArgument". */
         code: string;
@@ -2659,7 +2698,28 @@ declare namespace OfficeExtension {
         innerError?: DebugInfo | string;
 
         /** The object type and property or method name (or similar information), if available. */
-        errorLocation?: string
+        errorLocation?: string;
+
+        /**
+         * The statement that caused the error, if available.
+         *
+         * This statement will never contain any potentially-sensitive data and may not match the code exactly as written, but will be a close approximation.
+         */
+        statements?: string;
+
+        /**
+         * The statements that closely precede and follow the statement that caused the error, if available.
+         *
+         * These statements will never contain any potentially-sensitive data and may not match the code exactly as written, but will be a close approximation.
+         */
+        surroundingStatements?: string[];
+
+        /**
+         * All statements in the batch request (including any potentially-sensitive information that was specified in the request), if available.
+         *
+         * These statements may not match the code exactly as written, but will be a close approximation.
+         */
+        fullStatements?: string[];
     }
 
     /** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
@@ -2697,177 +2757,10 @@ declare namespace OfficeExtension {
     }
 }
 declare namespace OfficeExtension {
-    /** An IPromise object that represents a deferred interaction with the host Office application. */
-    interface IPromise<R> {
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
-
-
-		/**
-		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-		 * @param onRejected function to be called if or when the promise rejects.
-		 */
-        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-		/**
-		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-		 * @param onRejected function to be called if or when the promise rejects.
-		 */
-        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
-
-		/**
-		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-		 * @param onRejected function to be called if or when the promise rejects.
-		 */
-        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
-    }
-
     /** An Promise object that represents a deferred interaction with the host Office application. The publically-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a "native" Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
-    export class Promise<R> implements IPromise<R>
-    {
-		/**
-		 * Creates a new promise based on a function that accepts resolve and reject handlers.
-		 */
-        constructor(func: (resolve: (value?: R | IPromise<R>) => void, reject: (error?: any) => void) => void);
+    export const Promise: PromiseConstructor;
 
-		/**
-		 * Creates a promise that resolves when all of the child promises resolve.
-		 */
-        static all<U>(promises: OfficeExtension.IPromise<U>[]): IPromise<U[]>;
-
-		/**
-		 * Creates a promise that is resolved.
-		 */
-        static resolve<U>(value: U): IPromise<U>;
-
-		/**
-		 * Creates a promise that is rejected.
-		 */
-        static reject<U>(error: any): IPromise<U>;
-
-		/* This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
-
-		/**
-		 * This method will be called once the previous promise has been resolved.
-		 * Both the onFulfilled on onRejected callbacks are optional.
-		 * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-		 * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-		 */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
-
-
-		/**
-		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-		 * @param onRejected function to be called if or when the promise rejects.
-		 */
-        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-		/**
-		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-		 * @param onRejected function to be called if or when the promise rejects.
-		 */
-        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
-
-		/**
-		 * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-		 * @param onRejected function to be called if or when the promise rejects.
-		 */
-        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
-    }
+    export type IPromise<T> = Promise<T>;
 }
 
 declare namespace OfficeExtension {
@@ -2887,25 +2780,27 @@ declare namespace OfficeExtension {
 declare namespace OfficeExtension {
     export class EventHandlers<T> {
         constructor(context: ClientRequestContext, parentObject: ClientObject, name: string, eventInfo: EventInfo<T>);
-        add(handler: (args: T) => IPromise<any>): EventHandlerResult<T>;
-        remove(handler: (args: T) => IPromise<any>): void;
+        add(handler: (args: T) => Promise<any>): EventHandlerResult<T>;
+        remove(handler: (args: T) => Promise<any>): void;
     }
 
     export class EventHandlerResult<T> {
-        constructor(context: ClientRequestContext, handlers: EventHandlers<T>, handler: (args: T) => IPromise<any>);
+        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> {
-        registerFunc: (callback: (args: any) => void) => IPromise<any>;
-        unregisterFunc: (callback: (args: any) => void) => IPromise<any>;
-        eventArgsTransformFunc: (args: any) => IPromise<T>;
+        registerFunc: (callback: (args: any) => void) => Promise<any>;
+        unregisterFunc: (callback: (args: any) => void) => Promise<any>;
+        eventArgsTransformFunc: (args: any) => Promise<T>;
     }
 }
 declare namespace OfficeExtension {
-	/**
-	* Request URL and headers
-	*/
+    /**
+    * Request URL and headers
+    */
     interface RequestUrlAndHeaderInfo {
         /** Request URL */
         url: string;
@@ -2930,74 +2825,9 @@ declare namespace OfficeExtension {
 ////////////////////////////////////////////////////////////////
 
 
-declare namespace OfficeCore {
-    /**
-     * [Api set: Experiment 1.1 (PREVIEW)]
-     */
-    class FlightingService extends OfficeExtension.ClientObject {
-        getFeature(featureName: string, type: string, defaultValue: number | boolean | string, possibleValues?: Array<number> | Array<string> | Array<boolean> | Array<ScopedValue>): OfficeCore.ABType;
-        getFeatureGate(featureName: string, scope?: string): OfficeCore.ABType;
-        resetOverride(featureName: string): void;
-        setOverride(featureName: string, type: string, value: number | boolean | string): void;
-        /**
-         * Create a new instance of OfficeCore.FlightingService object
-         */
-        static newObject(context: OfficeExtension.ClientRequestContext): OfficeCore.FlightingService;
-        toJSON(): {};
-    }
-    /**
-     *
-     * Provides information about the scoped value.
-     *
-     * [Api set: Experiment 1.1 (PREVIEW)]
-     */
-    interface ScopedValue {
-        /**
-         *
-         * Gets the scope.
-         *
-         * [Api set: Experiment 1.1 (PREVIEW)]
-         */
-        scope: string;
-        /**
-         *
-         * Gets the value.
-         *
-         * [Api set: Experiment 1.1 (PREVIEW)]
-         */
-        value: string | number | boolean;
-    }
-    /**
-     * [Api set: Experiment 1.1 (PREVIEW)]
-     */
-    class ABType extends OfficeExtension.ClientObject {
-        readonly value: string | number | boolean;
-        /**
-         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
-         */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OfficeCore.ABType;
-        toJSON(): {
-            "value": string | number | boolean;
-        };
-    }
-    /**
-     * [Api set: Experiment 1.1 (PREVIEW)]
-     */
-    namespace FeatureType {
-        var boolean: string;
-        var integer: string;
-        var string: string;
-    }
-    namespace ExperimentErrorCodes {
-        var generalException: string;
-    }
-    module Interfaces {
-    }
-}
 declare namespace OfficeCore {
     class RequestContext extends OfficeExtension.ClientRequestContext {
         constructor(url?: string | OfficeExtension.RequestUrlAndHeaderInfo | any);
-        readonly flightingService: FlightingService;
     }
 }
 
@@ -3187,7 +3017,7 @@ declare namespace Excel {
         /**
          * Close the session.
          */
-        close(): OfficeExtension.IPromise<void>;
+        close(): Promise<void>;
     }
     /**
      * The RequestContext object facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
@@ -3196,44 +3026,51 @@ declare namespace Excel {
         constructor(url?: string | Session);
         readonly workbook: Workbook;
         readonly application: Application;
+        readonly runtime: Runtime;
     }
     /**
      * Executes a batch script that performs actions on the Excel object model, using a new RequestContext. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
-    function run<T>(batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Excel object model, using a new remote RequestContext. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
-    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
+    /**
+     * Executes a batch script that performs actions on the Excel object model, using the RequestContext of a previously-created object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param contextObject - A previously-created object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
+     */
+    function run<T>(contextObject: OfficeExtension.ClientRequestContext, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Excel object model, using the RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param object - A previously-created API object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
-    function run<T>(object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Excel object model, using the remote RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
      * @param object - A previously-created API object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
-    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Excel object model, using the RequestContext of previously-created API objects.
      * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
-    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Excel object model, using the remote RequestContext of previously-created API objects.
      * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
      * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
-    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      *
      * Provides information about the binding that raised the SelectionChanged event.
@@ -3322,6 +3159,312 @@ declare namespace Excel {
          */
         settings: Excel.SettingCollection;
     }
+    /**
+     *
+     * Provides information about the worksheet that raised the Changed event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface WorksheetChangedEventArgs {
+        /**
+         *
+         * Gets the range address that represents the changed area of a specific worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        address: string;
+        /**
+         *
+         * Gets the change type that represents how the Changed event is triggered. See Excel.DataChangeType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        changeType: Excel.DataChangeType | "Unknown" | "RangeEdited" | "RowInserted" | "RowDeleted" | "ColumnInserted" | "ColumnDeleted" | "CellInserted" | "CellDeleted";
+        /**
+         *
+         * Gets the source of the event. See Excel.EventSource for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        source: Excel.EventSource | "Local" | "Remote";
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "WorksheetChanged";
+        /**
+         *
+         * Gets the id of the worksheet in which the data changed.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+        /**
+         *
+         * Gets the range that represents the changed area of a specific worksheet.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         */
+        getRange(ctx: Excel.RequestContext): Excel.Range;
+        /**
+         *
+         * Gets the range that represents the changed area of a specific worksheet. It might return null object.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         */
+        getRangeOrNullObject(ctx: Excel.RequestContext): Excel.Range;
+    }
+    /**
+     *
+     * Provides information about the table that raised the Changed event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface TableChangedEventArgs {
+        /**
+         *
+         * Gets the address that represents the changed area of a table on a specific worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        address: string;
+        /**
+         *
+         * Gets the change type that represents how the Changed event is triggered. See Excel.DataChangeType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        changeType: Excel.DataChangeType | "Unknown" | "RangeEdited" | "RowInserted" | "RowDeleted" | "ColumnInserted" | "ColumnDeleted" | "CellInserted" | "CellDeleted";
+        /**
+         *
+         * Gets the source of the event. See Excel.EventSource for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        source: Excel.EventSource | "Local" | "Remote";
+        /**
+         *
+         * Gets the id of the table in which the data changed.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        tableId: string;
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "TableChanged";
+        /**
+         *
+         * Gets the id of the worksheet in which the data changed.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+        /**
+         *
+         * Gets the range that represents the changed area of a table on a specific worksheet.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         */
+        getRange(ctx: Excel.RequestContext): Excel.Range;
+        /**
+         *
+         * Gets the range that represents the changed area of a table on a specific worksheet. It might return null object.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         */
+        getRangeOrNullObject(ctx: Excel.RequestContext): Excel.Range;
+    }
+    /**
+     *
+     * Provides information about the worksheet that raised the Activated event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface WorksheetActivatedEventArgs {
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "WorksheetActivated";
+        /**
+         *
+         * Gets the id of the worksheet that is activated.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+    }
+    /**
+     *
+     * Provides information about the worksheet that raised the Deactivated event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface WorksheetDeactivatedEventArgs {
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "WorksheetDeactivated";
+        /**
+         *
+         * Gets the id of the worksheet that is deactivated.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+    }
+    /**
+     *
+     * Provides information about the worksheet that raised the SelectionChanged event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface WorksheetSelectionChangedEventArgs {
+        /**
+         *
+         * Gets the range address that represents the selected area of a specific worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        address: string;
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "WorksheetSelectionChanged";
+        /**
+         *
+         * Gets the id of the worksheet in which the selection changed.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+    }
+    /**
+     *
+     * Provides information about the table that raised the SelectionChanged event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface TableSelectionChangedEventArgs {
+        /**
+         *
+         * Gets the range address that represents the selected area of the table on a specific worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        address: string;
+        /**
+         *
+         * Indicates if the selection is inside a table, address will be useless if IsInsideTable is false.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        isInsideTable: boolean;
+        /**
+         *
+         * Gets the id of the table in which the selection changed.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        tableId: string;
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "TableSelectionChanged";
+        /**
+         *
+         * Gets the id of the worksheet in which the selection changed.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+    }
+    /**
+     *
+     * Provides information about the worksheet that raised the Added event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface WorksheetAddedEventArgs {
+        /**
+         *
+         * Gets the source of the event. See Excel.EventSource for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        source: Excel.EventSource | "Local" | "Remote";
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "WorksheetAdded";
+        /**
+         *
+         * Gets the id of the worksheet that is added to the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+    }
+    /**
+     *
+     * Provides information about the worksheet that raised the Deleted event.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface WorksheetDeletedEventArgs {
+        /**
+         *
+         * Gets the source of the event. See Excel.EventSource for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        source: Excel.EventSource | "Local" | "Remote";
+        /**
+         *
+         * Gets the type of the event. See Excel.EventType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: "WorksheetDeleted";
+        /**
+         *
+         * Gets the id of the worksheet that is deleted from the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        worksheetId: string;
+    }
+    /**
+     *
+     * Represents the Excel Runtime class.
+     *
+     * [Api set: ExcelApi 1.5]
+     */
+    class Runtime extends OfficeExtension.ClientObject {
+        toJSON(): {
+            [key: string]: string;
+        };
+    }
     /**
      *
      * Represents the Excel application that manages the workbook.
@@ -3331,11 +3474,15 @@ declare namespace Excel {
     class Application extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details. Read-only.
+         * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
          *
-         * [Api set: ExcelApi 1.1]
+         * [Api set: ExcelApi 1.1 for get, 1.8 for set]
          */
-        readonly calculationMode: string;
+        calculationMode: Excel.CalculationMode | "Automatic" | "AutomaticExceptTables" | "Manual";
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ApplicationUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Application): void;
         /**
          *
          * Recalculate all currently opened workbooks in Excel.
@@ -3344,21 +3491,33 @@ declare namespace Excel {
          *
          * @param calculationType Specifies the calculation type to use. See Excel.CalculationType for details.
          */
-        calculate(calculationType: string): void;
+        calculate(calculationType: Excel.CalculationType): void;
+        /**
+         *
+         * Recalculate all currently opened workbooks in Excel.
+         *
+         * [Api set: ExcelApi 1.1]
+         *
+         * @param calculationType Specifies the calculation type to use. See Excel.CalculationType for details.
+         */
+        calculate(calculationType: "Recalculate" | "Full" | "FullRebuild"): void;
         /**
          *
          * Suspends calculation until the next "context.sync()" is called. Once set, it is the developer's responsibility to re-calc the workbook, to ensure that any dependencies are propagated.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         suspendApiCalculationUntilNextSync(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Application;
-        toJSON(): {
-            "calculationMode": string;
-        };
+        load(option?: Excel.Interfaces.ApplicationLoadOptions): Excel.Application;
+        load(option?: string | string[]): Excel.Application;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Application;
+        toJSON(): Excel.Interfaces.ApplicationData;
     }
     /**
      *
@@ -3369,67 +3528,113 @@ declare namespace Excel {
     class Workbook extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents Excel application instance that contains this workbook. Read-only.
+         * Represents the Excel application instance that contains this workbook.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly application: Excel.Application;
         /**
          *
-         * Represents a collection of bindings that are part of the workbook. Read-only.
+         * Represents a collection of bindings that are part of the workbook.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly bindings: Excel.BindingCollection;
         /**
          *
-         * Represents the collection of custom XML parts contained by this workbook. Read-only.
+         * Represents the collection of custom XML parts contained by this workbook.
          *
          * [Api set: ExcelApi 1.5]
          */
         readonly customXmlParts: Excel.CustomXmlPartCollection;
         /**
          *
-         * Represents Excel application instance that contains this workbook. Read-only.
+         * Represents all data connections in the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly dataConnections: Excel.DataConnectionCollection;
+        /**
+         *
+         * Represents a collection of worksheet functions that can be used for computation.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly functions: Excel.Functions;
         /**
          *
-         * Represents a collection of workbook scoped named items (named ranges and constants). Read-only.
+         * Represents a collection of workbook scoped named items (named ranges and constants).
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly names: Excel.NamedItemCollection;
         /**
          *
-         * Represents a collection of PivotTables associated with the workbook. Read-only.
+         * Represents a collection of PivotTables associated with the workbook.
          *
          * [Api set: ExcelApi 1.3]
          */
         readonly pivotTables: Excel.PivotTableCollection;
         /**
          *
-         * Represents a collection of Settings associated with the workbook. Read-only.
+         * Gets the workbook properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly properties: Excel.DocumentProperties;
+        /**
+         *
+         * Returns workbook protection object for a workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly protection: Excel.WorkbookProtection;
+        /**
+         *
+         * Represents a collection of Settings associated with the workbook.
          *
          * [Api set: ExcelApi 1.4]
          */
         readonly settings: Excel.SettingCollection;
         /**
          *
-         * Represents a collection of tables associated with the workbook. Read-only.
+         * Represents a collection of styles associated with the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly styles: Excel.StyleCollection;
+        /**
+         *
+         * Represents a collection of tables associated with the workbook.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly tables: Excel.TableCollection;
         /**
          *
-         * Represents a collection of worksheets associated with the workbook. Read-only.
+         * Represents a collection of worksheets associated with the workbook.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly worksheets: Excel.WorksheetCollection;
+        /**
+         *
+         * Gets the workbook name.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly name: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.WorkbookUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Workbook): void;
+        /**
+         *
+         * Gets the currently active cell from the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getActiveCell(): Excel.Range;
         /**
          *
          * Gets the currently selected range from the workbook.
@@ -3440,7 +3645,12 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Workbook;
+        load(option?: Excel.Interfaces.WorkbookLoadOptions): Excel.Workbook;
+        load(option?: string | string[]): Excel.Workbook;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Workbook;
         /**
          *
          * Occurs when the selection in the document is changed.
@@ -3448,7 +3658,36 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.SelectionChangedEventArgs>;
-        toJSON(): {};
+        toJSON(): Excel.Interfaces.WorkbookData;
+    }
+    /**
+     *
+     * Represents the protection of a workbook object.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class WorkbookProtection extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Protects a workbook. Fails if the workbook has been protected.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param password workbook protection password.
+         */
+        protect(password?: string): void;
+        /**
+         *
+         * Unprotects a workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param password workbook protection password.
+         */
+        unprotect(password?: string): void;
+        toJSON(): {
+            [key: string]: string;
+        };
     }
     /**
      *
@@ -3459,21 +3698,28 @@ declare namespace Excel {
     class Worksheet extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns collection of charts that are part of the worksheet. Read-only.
+         * Returns collection of charts that are part of the worksheet.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly charts: Excel.ChartCollection;
         /**
          *
-         * Collection of names scoped to the current worksheet. Read-only.
+         * Gets an object that can be used to manipulate frozen panes on the worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly freezePanes: Excel.WorksheetFreezePanes;
+        /**
+         *
+         * Collection of names scoped to the current worksheet.
          *
          * [Api set: ExcelApi 1.4]
          */
         readonly names: Excel.NamedItemCollection;
         /**
          *
-         * Collection of PivotTables that are part of the worksheet. Read-only.
+         * Collection of PivotTables that are part of the worksheet.
          *
          * [Api set: ExcelApi 1.3]
          */
@@ -3487,7 +3733,7 @@ declare namespace Excel {
         readonly protection: Excel.WorksheetProtection;
         /**
          *
-         * Collection of tables that are part of the worksheet. Read-only.
+         * Collection of tables that are part of the worksheet.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -3513,20 +3759,39 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         position: number;
+        /**
+         *
+         * Returns the standard (default) height of all the rows in the worksheet, in points. Read-only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly standardHeight: number;
+        /**
+         *
+         * Returns or sets the standard (default) width of all the columns in the worksheet.
+            One unit of column width is equal to the width of one character in the Normal style. For proportional fonts, the width of the character 0 (zero) is used.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        standardWidth: number;
+        /**
+         *
+         * Gets or sets the worksheet tab color.
+            When retrieving the tab color, if the worksheet is invisible, the value will be null. If the worksheet is visible but the tab color is set to auto, an empty string will be returned. Otherwise, the property will be set to a color, in the form "#123456"
+            When setting the color, use an empty-string to set an "auto" color, or a real color otherwise.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        tabColor: string;
         /**
          *
          * The Visibility of the worksheet.
          *
          * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
          */
-        visibility: string;
+        visibility: Excel.SheetVisibility | "Visible" | "Hidden" | "VeryHidden";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.WorksheetUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.WorksheetUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Worksheet): void;
         /**
@@ -3540,9 +3805,23 @@ declare namespace Excel {
          *
          * Calculates all cells on a worksheet.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         calculate(markAllDirty: boolean): void;
+        /**
+         *
+         * Copy a worksheet and place it at the specified position. Return the copied worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        copy(positionType?: Excel.WorksheetPositionType, relativeTo?: Excel.Worksheet): Excel.Worksheet;
+        /**
+         *
+         * Copy a worksheet and place it at the specified position. Return the copied worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        copy(positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Excel.Worksheet): Excel.Worksheet;
         /**
          *
          * Deletes the worksheet from the workbook.
@@ -3605,6 +3884,18 @@ declare namespace Excel {
          * @param address The address or the name of the range. If not specified, the entire worksheet range is returned.
          */
         getRange(address?: string): Excel.Range;
+        /**
+         *
+         * Gets the range object beginning at a particular row index and column index, and spanning a certain number of rows and columns.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param startRow Start row (zero-indexed).
+         * @param startColumn Start column (zero-indexed).
+         * @param rowCount Number of rows to include in the range.
+         * @param columnCount Number of columns to include in the range.
+         */
+        getRangeByIndexes(startRow: number, startColumn: number, rowCount: number, columnCount: number): Excel.Range;
         /**
          *
          * The used range is the smallest range that encompasses any cells that have a value or formatting assigned to them. If the entire worksheet is blank, this function will return the top left cell (i.e.,: it will *not* throw an error).
@@ -3626,14 +3917,41 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Worksheet;
-        toJSON(): {
-            "id": string;
-            "name": string;
-            "position": number;
-            "protection": WorksheetProtection;
-            "visibility": string;
-        };
+        load(option?: Excel.Interfaces.WorksheetLoadOptions): Excel.Worksheet;
+        load(option?: string | string[]): Excel.Worksheet;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Worksheet;
+        /**
+         *
+         * Occurs when the worksheet is activated.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onActivated: OfficeExtension.EventHandlers<Excel.WorksheetActivatedEventArgs>;
+        /**
+         *
+         * Occurs when data changed on a specific worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onChanged: OfficeExtension.EventHandlers<Excel.WorksheetChangedEventArgs>;
+        /**
+         *
+         * Occurs when the worksheet is deactivated.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onDeactivated: OfficeExtension.EventHandlers<Excel.WorksheetDeactivatedEventArgs>;
+        /**
+         *
+         * Occurs when the selection changed on a specific worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.WorksheetSelectionChangedEventArgs>;
+        toJSON(): Excel.Interfaces.WorksheetData;
     }
     /**
      *
@@ -3643,7 +3961,7 @@ declare namespace Excel {
      */
     class WorksheetCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.Worksheet>;
+        readonly items: Excel.Worksheet[];
         /**
          *
          * Adds a new worksheet to the workbook. The worksheet will be added at the end of existing worksheets. If you wish to activate the newly added worksheet, call ".activate() on it.
@@ -3704,8 +4022,38 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetCollection;
-        toJSON(): {};
+        load(option?: Excel.Interfaces.WorksheetCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.WorksheetCollection;
+        load(option?: string | string[]): Excel.WorksheetCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.WorksheetCollection;
+        /**
+         *
+         * Occurs when any worksheet in the workbook is activated.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onActivated: OfficeExtension.EventHandlers<Excel.WorksheetActivatedEventArgs>;
+        /**
+         *
+         * Occurs when a new worksheet is added to the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onAdded: OfficeExtension.EventHandlers<Excel.WorksheetAddedEventArgs>;
+        /**
+         *
+         * Occurs when any worksheet in the workbook is deactivated.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onDeactivated: OfficeExtension.EventHandlers<Excel.WorksheetDeactivatedEventArgs>;
+        /**
+         *
+         * Occurs when a worksheet is deleted from the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onDeleted: OfficeExtension.EventHandlers<Excel.WorksheetDeletedEventArgs>;
+        toJSON(): Excel.Interfaces.WorksheetCollectionData;
     }
     /**
      *
@@ -3716,7 +4064,7 @@ declare namespace Excel {
     class WorksheetProtection extends OfficeExtension.ClientObject {
         /**
          *
-         * Sheet protection options. Read-Only.
+         * Sheet protection options.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -3730,28 +4078,33 @@ declare namespace Excel {
         readonly protected: boolean;
         /**
          *
-         * Protects a worksheet. Fails if the worksheet has been protected.
+         * Protects a worksheet. Fails if the worksheet has already been protected.
          *
-         * [Api set: ExcelApi 1.2]
+         * [Api set: ExcelApi 1.2 for options; 1.7 for password]
          *
          * @param options sheet protection options.
+         * @param password sheet protection password.
          */
-        protect(options?: Excel.WorksheetProtectionOptions): void;
+        protect(options?: Excel.WorksheetProtectionOptions, password?: string): void;
         /**
          *
          * Unprotects a worksheet.
          *
-         * [Api set: ExcelApi 1.2]
+         * [Api set: ExcelApi 1.7 for password]
+         *
+         * @param password sheet protection password.
          */
-        unprotect(): void;
+        unprotect(password?: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetProtection;
-        toJSON(): {
-            "options": WorksheetProtectionOptions;
-            "protected": boolean;
-        };
+        load(option?: Excel.Interfaces.WorksheetProtectionLoadOptions): Excel.WorksheetProtection;
+        load(option?: string | string[]): Excel.WorksheetProtection;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.WorksheetProtection;
+        toJSON(): Excel.Interfaces.WorksheetProtectionData;
     }
     /**
      *
@@ -3781,6 +4134,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          */
         allowDeleteRows?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing editing objects.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        allowEditObjects?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of allowing editing scenarios.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        allowEditScenarios?: boolean;
         /**
          *
          * Represents the worksheet protection option of allowing formatting cells.
@@ -3837,6 +4204,73 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          */
         allowSort?: boolean;
+        /**
+         *
+         * Represents the worksheet protection option of selection mode.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        selectionMode?: Excel.ProtectionSelectionMode | "Normal" | "Unlocked" | "None";
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    class WorksheetFreezePanes extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Sets the frozen cells in the active worksheet view.
+            The range provided corresponds to cells that will be frozen in the top- and left-most pane.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param frozenRange A range that represents the cells to be frozen, or null to remove all frozen panes.
+         */
+        freezeAt(frozenRange: Excel.Range | string): void;
+        /**
+         *
+         * Freeze the first column(s) of the worksheet in place.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param count Optional number of columns to freeze, or zero to unfreeze all columns
+         */
+        freezeColumns(count?: number): void;
+        /**
+         *
+         * Freeze the top row(s) of the worksheet in place.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param count Optional number of rows to freeze, or zero to unfreeze all rows
+         */
+        freezeRows(count?: number): void;
+        /**
+         *
+         * Gets a range that describes the frozen cells in the active worksheet view.
+            The frozen range is corresponds to cells that are frozen in the top- and left-most pane.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getLocation(): Excel.Range;
+        /**
+         *
+         * Gets a range that describes the frozen cells in the active worksheet view.
+            The frozen range is corresponds to cells that are frozen in the top- and left-most pane.
+            If there is no frozen pane, returns a null object.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getLocationOrNullObject(): Excel.Range;
+        /**
+         *
+         * Removes all frozen panes in the worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        unfreeze(): void;
+        toJSON(): {
+            [key: string]: string;
+        };
     }
     /**
      *
@@ -3847,9 +4281,9 @@ declare namespace Excel {
     class Range extends OfficeExtension.ClientObject {
         /**
          *
-         * Collection of ConditionalFormats that intersect the range. Read-only.
+         * Collection of ConditionalFormats that intersect the range.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly conditionalFormats: Excel.ConditionalFormatCollection;
         /**
@@ -3868,7 +4302,7 @@ declare namespace Excel {
         readonly sort: Excel.RangeSort;
         /**
          *
-         * The worksheet containing the current range. Read-only.
+         * The worksheet containing the current range.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -3918,24 +4352,27 @@ declare namespace Excel {
         /**
          *
          * Represents the formula in A1-style notation.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
          *
          * [Api set: ExcelApi 1.1]
          */
-        formulas: Array<Array<any>>;
+        formulas: any[][];
         /**
          *
          * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
          *
          * [Api set: ExcelApi 1.1]
          */
-        formulasLocal: Array<Array<any>>;
+        formulasLocal: any[][];
         /**
          *
          * Represents the formula in R1C1-style notation.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
          *
          * [Api set: ExcelApi 1.2]
          */
-        formulasR1C1: Array<Array<any>>;
+        formulasR1C1: any[][];
         /**
          *
          * Represents if all cells of the current range are hidden.
@@ -3945,11 +4382,41 @@ declare namespace Excel {
         readonly hidden: boolean;
         /**
          *
-         * Represents Excel's number format code for the given cell.
+         * Represents the hyperlink for the current range.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        hyperlink: Excel.RangeHyperlink;
+        /**
+         *
+         * Represents if the current range is an entire column.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly isEntireColumn: boolean;
+        /**
+         *
+         * Represents if the current range is an entire row.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly isEntireRow: boolean;
+        /**
+         *
+         * Represents Excel's number format code for the given range.
+            When setting number format to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
          *
          * [Api set: ExcelApi 1.1]
          */
-        numberFormat: Array<Array<any>>;
+        numberFormat: any[][];
+        /**
+         *
+         * Represents Excel's number format code for the given range as a string in the language of the user.
+            When setting number format local to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        numberFormatLocal: any[][];
         /**
          *
          * Returns the total number of rows in the range. Read-only.
@@ -3971,41 +4438,46 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         readonly rowIndex: number;
+        /**
+         *
+         * Represents the style of the current range.
+            If the styles of the cells are inconsistent, null will be returned.
+            For custom styles, the style name will be returned. For built-in styles, a string representing a value in the BuiltInStyle enum will be returned.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        style: string;
         /**
          *
          * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
-        readonly text: Array<Array<any>>;
+        readonly text: string[][];
         /**
          *
          * Represents the type of data of each cell. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
-        readonly valueTypes: Array<Array<string>>;
+        readonly valueTypes: Excel.RangeValueType[][];
         /**
          *
          * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+            When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
          *
          * [Api set: ExcelApi 1.1]
          */
-        values: Array<Array<any>>;
+        values: any[][];
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.RangeUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.RangeUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Range): void;
         /**
          *
          * Calculates a range of cells on a worksheet.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         calculate(): void;
         /**
@@ -4016,7 +4488,16 @@ declare namespace Excel {
          *
          * @param applyTo Determines the type of clear action. See Excel.ClearApplyTo for details.
          */
-        clear(applyTo?: string): void;
+        clear(applyTo?: Excel.ClearApplyTo): void;
+        /**
+         *
+         * Clear range values, format, fill, border, etc.
+         *
+         * [Api set: ExcelApi 1.1]
+         *
+         * @param applyTo Determines the type of clear action. See Excel.ClearApplyTo for details.
+         */
+        clear(applyTo?: "All" | "Formats" | "Contents" | "Hyperlinks" | "RemoveHyperlinks"): void;
         /**
          *
          * Deletes the cells associated with the range.
@@ -4025,7 +4506,26 @@ declare namespace Excel {
          *
          * @param shift Specifies which way to shift the cells. See Excel.DeleteShiftDirection for details.
          */
-        delete(shift: string): void;
+        delete(shift: Excel.DeleteShiftDirection): void;
+        /**
+         *
+         * Deletes the cells associated with the range.
+         *
+         * [Api set: ExcelApi 1.1]
+         *
+         * @param shift Specifies which way to shift the cells. See Excel.DeleteShiftDirection for details.
+         */
+        delete(shift: "Up" | "Left"): void;
+        /**
+         *
+         * Gets a Range object with the same top-left cell as the current Range object, but with the specified numbers of rows and columns.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param numRows The number of rows of the new range size.
+         * @param numColumns The number of columns of the new range size.
+         */
+        getAbsoluteResizedRange(numRows: number, numColumns: number): Excel.Range;
         /**
          *
          * Gets the smallest range object that encompasses the given ranges. For example, the GetBoundingRect of "B2:C5" and "D10:E15" is "B2:E16".
@@ -4086,6 +4586,13 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         getEntireRow(): Excel.Range;
+        /**
+         *
+         * Renders the range as a base64-encoded png image.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getImage(): OfficeExtension.ClientResult<string>;
         /**
          *
          * Gets the range object that represents the rectangular intersection of the given ranges.
@@ -4172,6 +4679,13 @@ declare namespace Excel {
          * @param count The number of rows to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
          */
         getRowsBelow(count?: number): Excel.Range;
+        /**
+         *
+         * Returns a Range object that represents the surrounding region for the top-left cell in this range. A surrounding region is a range bounded by any combination of blank rows and blank columns relative to this range.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getSurroundingRegion(): Excel.Range;
         /**
          *
          * Returns the used range of the given range object. If there are no used cells within the range, this function will throw an ItemNotFound error.
@@ -4205,7 +4719,16 @@ declare namespace Excel {
          *
          * @param shift Specifies which way to shift the cells. See Excel.InsertShiftDirection for details.
          */
-        insert(shift: string): Excel.Range;
+        insert(shift: Excel.InsertShiftDirection): Excel.Range;
+        /**
+         *
+         * Inserts a cell or a range of cells into the worksheet in place of this range, and shifts the other cells to make space. Returns a new Range object at the now blank space.
+         *
+         * [Api set: ExcelApi 1.1]
+         *
+         * @param shift Specifies which way to shift the cells. See Excel.InsertShiftDirection for details.
+         */
+        insert(shift: "Down" | "Right"): Excel.Range;
         /**
          *
          * Merge the range cells into one region in the worksheet.
@@ -4218,10 +4741,18 @@ declare namespace Excel {
         /**
          *
          * Selects the specified range in the Excel UI.
+            If multiple selection is not supported on the platform and the range has multiple areas, the "InvalidReference" error will be returned.
          *
          * [Api set: ExcelApi 1.1]
          */
         select(): void;
+        /**
+         *
+         * Displays the card for an active cell if it has rich value content.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showCard(): void;
         /**
          *
          * Unmerge the range cells into separate cells.
@@ -4232,7 +4763,12 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Range;
+        load(option?: Excel.Interfaces.RangeLoadOptions): Excel.Range;
+        load(option?: string | string[]): Excel.Range;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Range;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -4241,26 +4777,7 @@ declare namespace Excel {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Excel.Range;
-        toJSON(): {
-            "address": string;
-            "addressLocal": string;
-            "cellCount": number;
-            "columnCount": number;
-            "columnHidden": boolean;
-            "columnIndex": number;
-            "format": RangeFormat;
-            "formulas": any[][];
-            "formulasLocal": any[][];
-            "formulasR1C1": any[][];
-            "hidden": boolean;
-            "numberFormat": any[][];
-            "rowCount": number;
-            "rowHidden": boolean;
-            "rowIndex": number;
-            "text": any[][];
-            "values": any[][];
-            "valueTypes": string[][];
-        };
+        toJSON(): Excel.Interfaces.RangeData;
     }
     /**
      *
@@ -4271,6 +4788,42 @@ declare namespace Excel {
     interface RangeReference {
         address: string;
     }
+    /**
+     *
+     * Represents the necessary strings to get/set a hyperlink (XHL) object.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    interface RangeHyperlink {
+        /**
+         *
+         * Represents the url target for the hyperlink.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        address?: string;
+        /**
+         *
+         * Represents the document reference target for the hyperlink.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        documentReference?: string;
+        /**
+         *
+         * Represents the string displayed when hovering over the hyperlink.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        screenTip?: string;
+        /**
+         *
+         * Represents the string that is displayed in the top left most cell in the range.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        textToDisplay?: string;
+    }
     /**
      *
      * RangeView represents a set of visible cells of the parent range.
@@ -4280,7 +4833,7 @@ declare namespace Excel {
     class RangeView extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents a collection of range views associated with the range. Read-only.
+         * Represents a collection of range views associated with the range.
          *
          * [Api set: ExcelApi 1.3]
          */
@@ -4291,7 +4844,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.3]
          */
-        readonly cellAddresses: Array<Array<any>>;
+        readonly cellAddresses: any[][];
         /**
          *
          * Returns the number of visible columns. Read-only.
@@ -4305,21 +4858,21 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.3]
          */
-        formulas: Array<Array<any>>;
+        formulas: any[][];
         /**
          *
          * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
          *
          * [Api set: ExcelApi 1.3]
          */
-        formulasLocal: Array<Array<any>>;
+        formulasLocal: any[][];
         /**
          *
          * Represents the formula in R1C1-style notation.
          *
          * [Api set: ExcelApi 1.3]
          */
-        formulasR1C1: Array<Array<any>>;
+        formulasR1C1: any[][];
         /**
          *
          * Returns a value that represents the index of the RangeView. Read-only.
@@ -4333,7 +4886,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.3]
          */
-        numberFormat: Array<Array<any>>;
+        numberFormat: any[][];
         /**
          *
          * Returns the number of visible rows. Read-only.
@@ -4347,28 +4900,23 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.3]
          */
-        readonly text: Array<Array<any>>;
+        readonly text: string[][];
         /**
          *
          * Represents the type of data of each cell. Read-only.
          *
          * [Api set: ExcelApi 1.3]
          */
-        readonly valueTypes: Array<Array<string>>;
+        readonly valueTypes: Excel.RangeValueType[][];
         /**
          *
          * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
          *
          * [Api set: ExcelApi 1.3]
          */
-        values: Array<Array<any>>;
+        values: any[][];
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.RangeViewUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.RangeViewUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: RangeView): void;
         /**
@@ -4381,20 +4929,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeView;
-        toJSON(): {
-            "cellAddresses": any[][];
-            "columnCount": number;
-            "formulas": any[][];
-            "formulasLocal": any[][];
-            "formulasR1C1": any[][];
-            "index": number;
-            "numberFormat": any[][];
-            "rowCount": number;
-            "text": any[][];
-            "values": any[][];
-            "valueTypes": string[][];
-        };
+        load(option?: Excel.Interfaces.RangeViewLoadOptions): Excel.RangeView;
+        load(option?: string | string[]): Excel.RangeView;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.RangeView;
+        toJSON(): Excel.Interfaces.RangeViewData;
     }
     /**
      *
@@ -4404,7 +4945,7 @@ declare namespace Excel {
      */
     class RangeViewCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.RangeView>;
+        readonly items: Excel.RangeView[];
         /**
          *
          * Gets the number of RangeView objects in the collection.
@@ -4424,8 +4965,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeViewCollection;
-        toJSON(): {};
+        load(option?: Excel.Interfaces.RangeViewCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.RangeViewCollection;
+        load(option?: string | string[]): Excel.RangeViewCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.RangeViewCollection;
+        toJSON(): Excel.Interfaces.RangeViewCollectionData;
     }
     /**
      *
@@ -4435,7 +4978,7 @@ declare namespace Excel {
      */
     class SettingCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.Setting>;
+        readonly items: Excel.Setting[];
         /**
          *
          * Sets or adds the specified setting to the workbook.
@@ -4445,7 +4988,7 @@ declare namespace Excel {
          * @param key The Key of the new setting.
          * @param value The Value for the new setting.
          */
-        add(key: string, value: string | number | boolean | Array<any> | any): Excel.Setting;
+        add(key: string, value: string | number | boolean | Date | Array<any> | any): Excel.Setting;
         /**
          *
          * Gets the number of Settings in the collection.
@@ -4474,7 +5017,9 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.SettingCollection;
+        load(option?: Excel.Interfaces.SettingCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.SettingCollection;
+        load(option?: string | string[]): Excel.SettingCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.SettingCollection;
         /**
          *
          * Occurs when the Settings in the document are changed.
@@ -4482,7 +5027,7 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.4]
          */
         readonly onSettingsChanged: OfficeExtension.EventHandlers<Excel.SettingsChangedEventArgs>;
-        toJSON(): {};
+        toJSON(): Excel.Interfaces.SettingCollectionData;
     }
     /**
      *
@@ -4509,12 +5054,7 @@ declare namespace Excel {
          */
         value: any;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.SettingUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.SettingUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Setting): void;
         /**
@@ -4527,11 +5067,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Setting;
-        toJSON(): {
-            "key": string;
-            "value": any;
-        };
+        load(option?: Excel.Interfaces.SettingLoadOptions): Excel.Setting;
+        load(option?: string | string[]): Excel.Setting;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Setting;
+        toJSON(): Excel.Interfaces.SettingData;
     }
     /**
      *
@@ -4541,7 +5083,7 @@ declare namespace Excel {
      */
     class NamedItemCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.NamedItem>;
+        readonly items: Excel.NamedItem[];
         /**
          *
          * Adds a new name to the collection of the given scope.
@@ -4594,8 +5136,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItemCollection;
-        toJSON(): {};
+        load(option?: Excel.Interfaces.NamedItemCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.NamedItemCollection;
+        load(option?: string | string[]): Excel.NamedItemCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.NamedItemCollection;
+        toJSON(): Excel.Interfaces.NamedItemCollectionData;
     }
     /**
      *
@@ -4604,6 +5148,13 @@ declare namespace Excel {
      * [Api set: ExcelApi 1.1]
      */
     class NamedItem extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Returns an object containing values and types of the named item.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly arrayValues: Excel.NamedItemArrayValues;
         /**
          *
          * Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
@@ -4625,6 +5176,13 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.4]
          */
         comment: string;
+        /**
+         *
+         * Gets or sets the formula of the named item.  Formula always starts with a '=' sign.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        formula: any;
         /**
          *
          * The name of the object. Read-only.
@@ -4638,14 +5196,14 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.4]
          */
-        readonly scope: string;
+        readonly scope: Excel.NamedItemScope | "Worksheet" | "Workbook";
         /**
          *
          * Indicates the type of the value returned by the name's formula. See Excel.NamedItemType for details. Read-only.
          *
-         * [Api set: ExcelApi 1.1]
+         * [Api set: ExcelApi 1.1 for String,Integer,Double,Boolean,Range,Error; 1.7 for Array]
          */
-        readonly type: string;
+        readonly type: Excel.NamedItemType | "String" | "Integer" | "Double" | "Boolean" | "Range" | "Error" | "Array";
         /**
          *
          * Represents the value computed by the name's formula. For a named range, will return the range address. Read-only.
@@ -4661,12 +5219,7 @@ declare namespace Excel {
          */
         visible: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.NamedItemUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.NamedItemUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: NamedItem): void;
         /**
@@ -4693,15 +5246,45 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItem;
-        toJSON(): {
-            "comment": string;
-            "name": string;
-            "scope": string;
-            "type": string;
-            "value": any;
-            "visible": boolean;
-        };
+        load(option?: Excel.Interfaces.NamedItemLoadOptions): Excel.NamedItem;
+        load(option?: string | string[]): Excel.NamedItem;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.NamedItem;
+        toJSON(): Excel.Interfaces.NamedItemData;
+    }
+    /**
+     *
+     * Represents an object containing values and types of a named item.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class NamedItemArrayValues extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents the types for each item in the named item array
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly types: Excel.RangeValueType[][];
+        /**
+         *
+         * Represents the values of each item in the named item array.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly values: any[][];
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.NamedItemArrayValuesLoadOptions): Excel.NamedItemArrayValues;
+        load(option?: string | string[]): Excel.NamedItemArrayValues;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.NamedItemArrayValues;
+        toJSON(): Excel.Interfaces.NamedItemArrayValuesData;
     }
     /**
      *
@@ -4723,7 +5306,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        readonly type: string;
+        readonly type: Excel.BindingType | "Range" | "Table" | "Text";
         /**
          *
          * Deletes the binding.
@@ -4755,7 +5338,12 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Binding;
+        load(option?: Excel.Interfaces.BindingLoadOptions): Excel.Binding;
+        load(option?: string | string[]): Excel.Binding;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Binding;
         /**
          *
          * Occurs when data or formatting within the binding is changed.
@@ -4770,10 +5358,7 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.BindingSelectionChangedEventArgs>;
-        toJSON(): {
-            "id": string;
-            "type": string;
-        };
+        toJSON(): Excel.Interfaces.BindingData;
     }
     /**
      *
@@ -4783,7 +5368,7 @@ declare namespace Excel {
      */
     class BindingCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.Binding>;
+        readonly items: Excel.Binding[];
         /**
          *
          * Returns the number of bindings in the collection. Read-only.
@@ -4801,10 +5386,22 @@ declare namespace Excel {
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          */
-        add(range: Excel.Range | string, bindingType: string, id: string): Excel.Binding;
+        add(range: Excel.Range | string, bindingType: Excel.BindingType, id: string): Excel.Binding;
+        /**
+         *
+         * Add a new binding to a particular Range.
+         *
+         * [Api set: ExcelApi 1.3]
+         *
+         * @param range Range to bind the binding to. May be an Excel Range object, or a string. If string, must contain the full address, including the sheet name
+         * @param bindingType Type of binding. See Excel.BindingType.
+         * @param id Name of binding.
+         */
+        add(range: Excel.Range | string, bindingType: "Range" | "Table" | "Text", id: string): Excel.Binding;
         /**
          *
          * Add a new binding based on a named item in the workbook.
+            If the named item references to multiple areas, the "InvalidReference" error will be returned.
          *
          * [Api set: ExcelApi 1.3]
          *
@@ -4812,17 +5409,41 @@ declare namespace Excel {
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          */
-        addFromNamedItem(name: string, bindingType: string, id: string): Excel.Binding;
+        addFromNamedItem(name: string, bindingType: Excel.BindingType, id: string): Excel.Binding;
+        /**
+         *
+         * Add a new binding based on a named item in the workbook.
+            If the named item references to multiple areas, the "InvalidReference" error will be returned.
+         *
+         * [Api set: ExcelApi 1.3]
+         *
+         * @param name Name from which to create binding.
+         * @param bindingType Type of binding. See Excel.BindingType.
+         * @param id Name of binding.
+         */
+        addFromNamedItem(name: string, bindingType: "Range" | "Table" | "Text", id: string): Excel.Binding;
         /**
          *
          * Add a new binding based on the current selection.
+            If the selection has multiple areas, the "InvalidReference" error will be returned.
          *
          * [Api set: ExcelApi 1.3]
          *
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          */
-        addFromSelection(bindingType: string, id: string): Excel.Binding;
+        addFromSelection(bindingType: Excel.BindingType, id: string): Excel.Binding;
+        /**
+         *
+         * Add a new binding based on the current selection.
+            If the selection has multiple areas, the "InvalidReference" error will be returned.
+         *
+         * [Api set: ExcelApi 1.3]
+         *
+         * @param bindingType Type of binding. See Excel.BindingType.
+         * @param id Name of binding.
+         */
+        addFromSelection(bindingType: "Range" | "Table" | "Text", id: string): Excel.Binding;
         /**
          *
          * Gets the number of bindings in the collection.
@@ -4860,10 +5481,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.BindingCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.BindingCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.BindingCollection;
+        load(option?: string | string[]): Excel.BindingCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.BindingCollection;
+        toJSON(): Excel.Interfaces.BindingCollectionData;
     }
     /**
      *
@@ -4873,7 +5494,7 @@ declare namespace Excel {
      */
     class TableCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.Table>;
+        readonly items: Excel.Table[];
         /**
          *
          * Returns the number of tables in the workbook. Read-only.
@@ -4906,7 +5527,7 @@ declare namespace Excel {
          *
          * @param key Name or ID of the table to be retrieved.
          */
-        getItem(key: number | string): Excel.Table;
+        getItem(key: string): Excel.Table;
         /**
          *
          * Gets a table based on its position in the collection.
@@ -4924,14 +5545,21 @@ declare namespace Excel {
          *
          * @param key Name or ID of the table to be retrieved.
          */
-        getItemOrNullObject(key: number | string): Excel.Table;
+        getItemOrNullObject(key: string): Excel.Table;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.TableCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TableCollection;
+        load(option?: string | string[]): Excel.TableCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.TableCollection;
+        /**
+         *
+         * Occurs when data changed on any table in a workbook, or a worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onChanged: OfficeExtension.EventHandlers<Excel.TableChangedEventArgs>;
+        toJSON(): Excel.Interfaces.TableCollectionData;
     }
     /**
      *
@@ -4942,14 +5570,14 @@ declare namespace Excel {
     class Table extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents a collection of all the columns in the table. Read-only.
+         * Represents a collection of all the columns in the table.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly columns: Excel.TableColumnCollection;
         /**
          *
-         * Represents a collection of all the rows in the table. Read-only.
+         * Represents a collection of all the rows in the table.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -4963,7 +5591,7 @@ declare namespace Excel {
         readonly sort: Excel.TableSort;
         /**
          *
-         * The worksheet containing the current table. Read-only.
+         * The worksheet containing the current table.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -4988,7 +5616,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        readonly id: number;
+        readonly id: string;
         /**
          *
          * Name of the table.
@@ -5039,12 +5667,7 @@ declare namespace Excel {
          */
         style: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TableUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Table): void;
         /**
@@ -5106,19 +5729,27 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Table;
-        toJSON(): {
-            "highlightFirstColumn": boolean;
-            "highlightLastColumn": boolean;
-            "id": number;
-            "name": string;
-            "showBandedColumns": boolean;
-            "showBandedRows": boolean;
-            "showFilterButton": boolean;
-            "showHeaders": boolean;
-            "showTotals": boolean;
-            "style": string;
-        };
+        load(option?: Excel.Interfaces.TableLoadOptions): Excel.Table;
+        load(option?: string | string[]): Excel.Table;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Table;
+        /**
+         *
+         * Occurs when data changed on a specific table.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onChanged: OfficeExtension.EventHandlers<Excel.TableChangedEventArgs>;
+        /**
+         *
+         * Occurs when the selection changed on a specific table.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.TableSelectionChangedEventArgs>;
+        toJSON(): Excel.Interfaces.TableData;
     }
     /**
      *
@@ -5128,7 +5759,7 @@ declare namespace Excel {
      */
     class TableColumnCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.TableColumn>;
+        readonly items: Excel.TableColumn[];
         /**
          *
          * Returns the number of columns in the table. Read-only.
@@ -5184,10 +5815,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumnCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.TableColumnCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TableColumnCollection;
+        load(option?: string | string[]): Excel.TableColumnCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.TableColumnCollection;
+        toJSON(): Excel.Interfaces.TableColumnCollectionData;
     }
     /**
      *
@@ -5230,14 +5861,9 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        values: Array<Array<any>>;
+        values: any[][];
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableColumnUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TableColumnUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: TableColumn): void;
         /**
@@ -5278,13 +5904,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumn;
-        toJSON(): {
-            "id": number;
-            "index": number;
-            "name": string;
-            "values": any[][];
-        };
+        load(option?: Excel.Interfaces.TableColumnLoadOptions): Excel.TableColumn;
+        load(option?: string | string[]): Excel.TableColumn;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.TableColumn;
+        toJSON(): Excel.Interfaces.TableColumnData;
     }
     /**
      *
@@ -5299,7 +5925,7 @@ declare namespace Excel {
      */
     class TableRowCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.TableRow>;
+        readonly items: Excel.TableRow[];
         /**
          *
          * Returns the number of rows in the table. Read-only.
@@ -5346,10 +5972,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRowCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.TableRowCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TableRowCollection;
+        load(option?: string | string[]): Excel.TableRowCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.TableRowCollection;
+        toJSON(): Excel.Interfaces.TableRowCollectionData;
     }
     /**
      *
@@ -5376,14 +6002,9 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        values: Array<Array<any>>;
+        values: any[][];
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableRowUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TableRowUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: TableRow): void;
         /**
@@ -5403,11 +6024,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRow;
-        toJSON(): {
-            "index": number;
-            "values": any[][];
-        };
+        load(option?: Excel.Interfaces.TableRowLoadOptions): Excel.TableRow;
+        load(option?: string | string[]): Excel.TableRow;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.TableRow;
+        toJSON(): Excel.Interfaces.TableRowData;
     }
     /**
      *
@@ -5418,21 +6041,21 @@ declare namespace Excel {
     class RangeFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Collection of border objects that apply to the overall range. Read-only.
+         * Collection of border objects that apply to the overall range.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly borders: Excel.RangeBorderCollection;
         /**
          *
-         * Returns the fill object defined on the overall range. Read-only.
+         * Returns the fill object defined on the overall range.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.RangeFill;
         /**
          *
-         * Returns the font object defined on the overall range. Read-only.
+         * Returns the font object defined on the overall range.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -5457,21 +6080,50 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        horizontalAlignment: string;
+        horizontalAlignment: Excel.HorizontalAlignment | "General" | "Left" | "Center" | "Right" | "Fill" | "Justify" | "CenterAcrossSelection" | "Distributed";
         /**
          *
-         * Gets or sets the height of all rows in the range. If the row heights are not uniform null will be returned.
+         * Gets or sets the height of all rows in the range. If the row heights are not uniform, null will be returned.
          *
          * [Api set: ExcelApi 1.2]
          */
         rowHeight: number;
+        /**
+         *
+         * Gets or sets the text orientation of all the cells within the range.
+            The text orientation should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+            If the orientation within a range are not uniform, then null will be returned.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        textOrientation: number;
+        /**
+         *
+         * Determines if the row height of the Range object equals the standard height of the sheet.
+            Returns True if the row height of the Range object equals the standard height of the sheet.
+            Returns Null if the range contains more than one row and the rows aren't all the same height.
+            Returns False otherwise.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        useStandardHeight: boolean;
+        /**
+         *
+         * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
+            Returns True if the column width of the Range object equals the standard width of the sheet.
+            Returns Null if the range contains more than one column and the columns aren't all the same height.
+            Returns False otherwise.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        useStandardWidth: boolean;
         /**
          *
          * Represents the vertical alignment for the specified object. See Excel.VerticalAlignment for details.
          *
          * [Api set: ExcelApi 1.1]
          */
-        verticalAlignment: string;
+        verticalAlignment: Excel.VerticalAlignment | "Top" | "Center" | "Bottom" | "Justify" | "Distributed";
         /**
          *
          * Indicates if Excel wraps the text in the object. A null value indicates that the entire range doesn't have uniform wrap setting
@@ -5480,12 +6132,7 @@ declare namespace Excel {
          */
         wrapText: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.RangeFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.RangeFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: RangeFormat): void;
         /**
@@ -5505,17 +6152,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFormat;
-        toJSON(): {
-            "columnWidth": number;
-            "fill": RangeFill;
-            "font": RangeFont;
-            "horizontalAlignment": string;
-            "protection": FormatProtection;
-            "rowHeight": number;
-            "verticalAlignment": string;
-            "wrapText": boolean;
-        };
+        load(option?: Excel.Interfaces.RangeFormatLoadOptions): Excel.RangeFormat;
+        load(option?: string | string[]): Excel.RangeFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.RangeFormat;
+        toJSON(): Excel.Interfaces.RangeFormatData;
     }
     /**
      *
@@ -5539,22 +6182,19 @@ declare namespace Excel {
          */
         locked: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.FormatProtectionUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.FormatProtectionUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: FormatProtection): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.FormatProtection;
-        toJSON(): {
-            "formulaHidden": boolean;
-            "locked": boolean;
-        };
+        load(option?: Excel.Interfaces.FormatProtectionLoadOptions): Excel.FormatProtection;
+        load(option?: string | string[]): Excel.FormatProtection;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.FormatProtection;
+        toJSON(): Excel.Interfaces.FormatProtectionData;
     }
     /**
      *
@@ -5571,12 +6211,7 @@ declare namespace Excel {
          */
         color: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.RangeFillUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.RangeFillUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: RangeFill): void;
         /**
@@ -5589,10 +6224,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFill;
-        toJSON(): {
-            "color": string;
-        };
+        load(option?: Excel.Interfaces.RangeFillLoadOptions): Excel.RangeFill;
+        load(option?: string | string[]): Excel.RangeFill;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.RangeFill;
+        toJSON(): Excel.Interfaces.RangeFillData;
     }
     /**
      *
@@ -5614,40 +6252,35 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        readonly sideIndex: string;
+        readonly sideIndex: Excel.BorderIndex | "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight" | "InsideVertical" | "InsideHorizontal" | "DiagonalDown" | "DiagonalUp";
         /**
          *
          * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
          *
          * [Api set: ExcelApi 1.1]
          */
-        style: string;
+        style: Excel.BorderLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Double" | "SlantDashDot";
         /**
          *
          * Specifies the weight of the border around a range. See Excel.BorderWeight for details.
          *
          * [Api set: ExcelApi 1.1]
          */
-        weight: string;
+        weight: Excel.BorderWeight | "Hairline" | "Thin" | "Medium" | "Thick";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.RangeBorderUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.RangeBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: RangeBorder): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorder;
-        toJSON(): {
-            "color": string;
-            "sideIndex": string;
-            "style": string;
-            "weight": string;
-        };
+        load(option?: Excel.Interfaces.RangeBorderLoadOptions): Excel.RangeBorder;
+        load(option?: string | string[]): Excel.RangeBorder;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.RangeBorder;
+        toJSON(): Excel.Interfaces.RangeBorderData;
     }
     /**
      *
@@ -5657,7 +6290,7 @@ declare namespace Excel {
      */
     class RangeBorderCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.RangeBorder>;
+        readonly items: Excel.RangeBorder[];
         /**
          *
          * Number of border objects in the collection. Read-only.
@@ -5673,7 +6306,16 @@ declare namespace Excel {
          *
          * @param index Index value of the border object to be retrieved. See Excel.BorderIndex for details.
          */
-        getItem(index: string): Excel.RangeBorder;
+        getItem(index: Excel.BorderIndex): Excel.RangeBorder;
+        /**
+         *
+         * Gets a border object using its name
+         *
+         * [Api set: ExcelApi 1.1]
+         *
+         * @param index Index value of the border object to be retrieved. See Excel.BorderIndex for details.
+         */
+        getItem(index: "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight" | "InsideVertical" | "InsideHorizontal" | "DiagonalDown" | "DiagonalUp"): Excel.RangeBorder;
         /**
          *
          * Gets a border object using its index
@@ -5686,10 +6328,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorderCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.RangeBorderCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.RangeBorderCollection;
+        load(option?: string | string[]): Excel.RangeBorderCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.RangeBorderCollection;
+        toJSON(): Excel.Interfaces.RangeBorderCollectionData;
     }
     /**
      *
@@ -5739,28 +6381,21 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        underline: string;
+        underline: Excel.RangeUnderlineStyle | "None" | "Single" | "Double" | "SingleAccountant" | "DoubleAccountant";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.RangeFontUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.RangeFontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: RangeFont): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFont;
-        toJSON(): {
-            "bold": boolean;
-            "color": string;
-            "italic": boolean;
-            "name": string;
-            "size": number;
-            "underline": string;
-        };
+        load(option?: Excel.Interfaces.RangeFontLoadOptions): Excel.RangeFont;
+        load(option?: string | string[]): Excel.RangeFont;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.RangeFont;
+        toJSON(): Excel.Interfaces.RangeFontData;
     }
     /**
      *
@@ -5770,7 +6405,7 @@ declare namespace Excel {
      */
     class ChartCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.Chart>;
+        readonly items: Excel.Chart[];
         /**
          *
          * Returns the number of charts in the worksheet. Read-only.
@@ -5785,10 +6420,21 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          *
          * @param type Represents the type of a chart. See Excel.ChartType for details.
-         * @param sourceData The Range object corresponding to the source data.
+         * @param sourceData The range corresponding to the source data.
          * @param seriesBy Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
          */
-        add(type: string, sourceData: Excel.Range, seriesBy?: string): Excel.Chart;
+        add(type: Excel.ChartType, sourceData: Excel.Range | string, seriesBy?: Excel.ChartSeriesBy): Excel.Chart;
+        /**
+         *
+         * Creates a new chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         *
+         * @param type Represents the type of a chart. See Excel.ChartType for details.
+         * @param sourceData The range corresponding to the source data.
+         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
+         */
+        add(type: "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar", sourceData: Excel.Range | string, seriesBy?: "Auto" | "Columns" | "Rows"): Excel.Chart;
         /**
          *
          * Returns the number of charts in the worksheet.
@@ -5827,10 +6473,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.ChartCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartCollection;
+        load(option?: string | string[]): Excel.ChartCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.ChartCollection;
+        toJSON(): Excel.Interfaces.ChartCollectionData;
     }
     /**
      *
@@ -5841,14 +6487,14 @@ declare namespace Excel {
     class Chart extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents chart axes. Read-only.
+         * Represents chart axes.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly axes: Excel.ChartAxes;
         /**
          *
-         * Represents the datalabels on the chart. Read-only.
+         * Represents the datalabels on the chart.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -5862,32 +6508,39 @@ declare namespace Excel {
         readonly format: Excel.ChartAreaFormat;
         /**
          *
-         * Represents the legend for the chart. Read-only.
+         * Represents the legend for the chart.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly legend: Excel.ChartLegend;
         /**
          *
-         * Represents either a single series or collection of series in the chart. Read-only.
+         * Represents either a single series or collection of series in the chart.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly series: Excel.ChartSeriesCollection;
         /**
          *
-         * Represents the title of the specified chart, including the text, visibility, position and formating of the title. Read-only.
+         * Represents the title of the specified chart, including the text, visibility, position and formating of the title.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly title: Excel.ChartTitle;
         /**
          *
-         * The worksheet containing the current chart. Read-only.
+         * The worksheet containing the current chart.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly worksheet: Excel.Worksheet;
+        /**
+         *
+         * Represents the type of the chart. See Excel.ChartType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        chartType: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
         /**
          *
          * Represents the height, in points, of the chart object.
@@ -5895,6 +6548,13 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         height: number;
+        /**
+         *
+         * The unique id of chart. Read-only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly id: string;
         /**
          *
          * The distance, in points, from the left side of the chart to the worksheet origin.
@@ -5909,6 +6569,13 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         name: string;
+        /**
+         *
+         * Represents whether to display all field buttons on a PivotChart.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showAllFieldButtons: boolean;
         /**
          *
          * Represents the distance, in points, from the top edge of the object to the top of row 1 (on a worksheet) or the top of the chart area (on a chart).
@@ -5924,12 +6591,7 @@ declare namespace Excel {
          */
         width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Chart): void;
         /**
@@ -5950,17 +6612,39 @@ declare namespace Excel {
          * @param width (Optional) The desired width of the resulting image.
          * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set)."
          */
-        getImage(width?: number, height?: number, fittingMode?: string): OfficeExtension.ClientResult<string>;
+        getImage(width?: number, height?: number, fittingMode?: Excel.ImageFittingMode): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Renders the chart as a base64-encoded image by scaling the chart to fit the specified dimensions.
+            The aspect ratio is preserved as part of the resizing.
+         *
+         * [Api set: ExcelApi 1.2]
+         *
+         * @param height (Optional) The desired height of the resulting image.
+         * @param width (Optional) The desired width of the resulting image.
+         * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set)."
+         */
+        getImage(width?: number, height?: number, fittingMode?: "Fit" | "FitAndCenter" | "Fill"): OfficeExtension.ClientResult<string>;
         /**
          *
          * Resets the source data for the chart.
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param sourceData The Range object corresponding to the source data.
+         * @param sourceData The range corresponding to the source data.
          * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, Columns. See Excel.ChartSeriesBy for details.
          */
-        setData(sourceData: Excel.Range, seriesBy?: string): void;
+        setData(sourceData: Excel.Range | string, seriesBy?: Excel.ChartSeriesBy): void;
+        /**
+         *
+         * Resets the source data for the chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         *
+         * @param sourceData The range corresponding to the source data.
+         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, Columns. See Excel.ChartSeriesBy for details.
+         */
+        setData(sourceData: Excel.Range | string, seriesBy?: "Auto" | "Columns" | "Rows"): void;
         /**
          *
          * Positions the chart relative to cells on the worksheet.
@@ -5974,19 +6658,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Chart;
-        toJSON(): {
-            "axes": ChartAxes;
-            "dataLabels": ChartDataLabels;
-            "format": ChartAreaFormat;
-            "height": number;
-            "left": number;
-            "legend": ChartLegend;
-            "name": string;
-            "title": ChartTitle;
-            "top": number;
-            "width": number;
-        };
+        load(option?: Excel.Interfaces.ChartLoadOptions): Excel.Chart;
+        load(option?: string | string[]): Excel.Chart;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Chart;
+        toJSON(): Excel.Interfaces.ChartData;
     }
     /**
      *
@@ -5997,35 +6675,39 @@ declare namespace Excel {
     class ChartAreaFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of an object, which includes background formatting information. Read-only.
+         * Represents the border format of chart area, which includes color, linestyle and weight.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly border: Excel.ChartBorder;
+        /**
+         *
+         * Represents the fill format of an object, which includes background formatting information.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for the current object. Read-only.
+         * Represents the font attributes (font name, font size, color, etc.) for the current object.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartAreaFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartAreaFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartAreaFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAreaFormat;
-        toJSON(): {
-            "fill": ChartFill;
-            "font": ChartFont;
-        };
+        load(option?: Excel.Interfaces.ChartAreaFormatLoadOptions): Excel.ChartAreaFormat;
+        load(option?: string | string[]): Excel.ChartAreaFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartAreaFormat;
+        toJSON(): Excel.Interfaces.ChartAreaFormatData;
     }
     /**
      *
@@ -6035,7 +6717,7 @@ declare namespace Excel {
      */
     class ChartSeriesCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.ChartSeries>;
+        readonly items: Excel.ChartSeries[];
         /**
          *
          * Returns the number of series in the collection. Read-only.
@@ -6043,6 +6725,16 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         readonly count: number;
+        /**
+         *
+         * Add a new series to the collection. The new added series is not visible until set values/x axis values/bubble sizes for it (depending on chart type).
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param name Name of the series.
+         * @param index Index value of the series to be added. Zero-indexed.
+         */
+        add(name?: string, index?: number): Excel.ChartSeries;
         /**
          *
          * Returns the number of series in the collection.
@@ -6052,7 +6744,7 @@ declare namespace Excel {
         getCount(): OfficeExtension.ClientResult<number>;
         /**
          *
-         * Retrieves a series based on its position in the collection
+         * Retrieves a series based on its position in the collection.
          *
          * [Api set: ExcelApi 1.1]
          *
@@ -6062,10 +6754,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.ChartSeriesCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartSeriesCollection;
+        load(option?: string | string[]): Excel.ChartSeriesCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.ChartSeriesCollection;
+        toJSON(): Excel.Interfaces.ChartSeriesCollectionData;
     }
     /**
      *
@@ -6076,18 +6768,90 @@ declare namespace Excel {
     class ChartSeries extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart series, which includes fill and line formatting. Read-only.
+         * Represents the formatting of a chart series, which includes fill and line formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartSeriesFormat;
         /**
          *
-         * Represents a collection of all points in the series. Read-only.
+         * Represents a collection of all points in the series.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly points: Excel.ChartPointsCollection;
+        /**
+         *
+         * Represents a collection of trendlines in the series.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly trendlines: Excel.ChartTrendlineCollection;
+        /**
+         *
+         * Represents the chart type of a series. See Excel.ChartType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        chartType: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+        /**
+         *
+         * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
+            Throws an invalid argument exception on invalid charts.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        doughnutHoleSize: number;
+        /**
+         *
+         * Boolean value representing if the series is filtered or not. Not applicable for surface charts.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        filtered: boolean;
+        /**
+         *
+         * Represents the gap width of a chart series.  Only valid on bar and column charts, as well as
+            specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        gapWidth: number;
+        /**
+         *
+         * Boolean value representing if the series has data labels or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        hasDataLabels: boolean;
+        /**
+         *
+         * Represents markers background color of a chart series.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerBackgroundColor: string;
+        /**
+         *
+         * Represents markers foreground color of a chart series.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerForegroundColor: string;
+        /**
+         *
+         * Represents marker size of a chart series.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerSize: number;
+        /**
+         *
+         * Represents marker style of a chart series. See Excel.ChartMarkerStyle for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerStyle: Excel.ChartMarkerStyle | "Invalid" | "Automatic" | "None" | "Square" | "Diamond" | "Triangle" | "X" | "Star" | "Dot" | "Dash" | "Circle" | "Plus" | "Picture";
         /**
          *
          * Represents the name of a series in a chart.
@@ -6095,23 +6859,75 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         name: string;
+        /**
+         *
+         * Represents the plot order of a chart series within the chart group.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        plotOrder: number;
+        /**
+         *
+         * Boolean value representing if the series has a shadow or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showShadow: boolean;
+        /**
+         *
+         * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        smooth: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartSeriesUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartSeriesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartSeries): void;
+        /**
+         *
+         * Deletes the chart series.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        delete(): void;
+        /**
+         *
+         * Set bubble sizes for a chart series. Only works for bubble charts.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param sourceData The Range object corresponding to the source data.
+         */
+        setBubbleSizes(sourceData: Excel.Range): void;
+        /**
+         *
+         * Set values for a chart series. For scatter chart, it means Y axis values.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param sourceData The Range object corresponding to the source data.
+         */
+        setValues(sourceData: Excel.Range): void;
+        /**
+         *
+         * Set values of X axis for a chart series. Only works for scatter charts.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param sourceData The Range object corresponding to the source data.
+         */
+        setXAxisValues(sourceData: Excel.Range): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeries;
-        toJSON(): {
-            "format": ChartSeriesFormat;
-            "name": string;
-        };
+        load(option?: Excel.Interfaces.ChartSeriesLoadOptions): Excel.ChartSeries;
+        load(option?: string | string[]): Excel.ChartSeries;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartSeries;
+        toJSON(): Excel.Interfaces.ChartSeriesData;
     }
     /**
      *
@@ -6122,35 +6938,32 @@ declare namespace Excel {
     class ChartSeriesFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of a chart series, which includes background formating information. Read-only.
+         * Represents the fill format of a chart series, which includes background formating information.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents line formatting. Read-only.
+         * Represents line formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly line: Excel.ChartLineFormat;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartSeriesFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartSeriesFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartSeriesFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesFormat;
-        toJSON(): {
-            "fill": ChartFill;
-            "line": ChartLineFormat;
-        };
+        load(option?: Excel.Interfaces.ChartSeriesFormatLoadOptions): Excel.ChartSeriesFormat;
+        load(option?: string | string[]): Excel.ChartSeriesFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartSeriesFormat;
+        toJSON(): Excel.Interfaces.ChartSeriesFormatData;
     }
     /**
      *
@@ -6160,7 +6973,7 @@ declare namespace Excel {
      */
     class ChartPointsCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.ChartPoint>;
+        readonly items: Excel.ChartPoint[];
         /**
          *
          * Returns the number of chart points in the series. Read-only.
@@ -6187,10 +7000,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointsCollection;
-        toJSON(): {
-            "count": number;
-        };
+        load(option?: Excel.Interfaces.ChartPointsCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartPointsCollection;
+        load(option?: string | string[]): Excel.ChartPointsCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.ChartPointsCollection;
+        toJSON(): Excel.Interfaces.ChartPointsCollectionData;
     }
     /**
      *
@@ -6199,6 +7012,13 @@ declare namespace Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartPoint extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Returns the data label of a chart point.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly dataLabel: Excel.ChartDataLabel;
         /**
          *
          * Encapsulates the format properties chart point. Read-only.
@@ -6206,6 +7026,41 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartPointFormat;
+        /**
+         *
+         * Represents whether a data point has datalabel. Not applicable for surface charts.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        hasDataLabel: boolean;
+        /**
+         *
+         * HTML color code representation of the marker background color of data point. E.g. #FF0000 represents Red.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerBackgroundColor: string;
+        /**
+         *
+         * HTML color code representation of the marker foreground color of data point. E.g. #FF0000 represents Red.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerForegroundColor: string;
+        /**
+         *
+         * Represents marker size of data point.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerSize: number;
+        /**
+         *
+         * Represents marker style of a chart data point. See Excel.ChartMarkerStyle for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        markerStyle: Excel.ChartMarkerStyle | "Invalid" | "Automatic" | "None" | "Square" | "Diamond" | "Triangle" | "X" | "Star" | "Dot" | "Dash" | "Circle" | "Plus" | "Picture";
         /**
          *
          * Returns the value of a chart point. Read-only.
@@ -6213,14 +7068,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         readonly value: any;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartPointUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartPoint): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPoint;
-        toJSON(): {
-            "format": ChartPointFormat;
-            "value": any;
-        };
+        load(option?: Excel.Interfaces.ChartPointLoadOptions): Excel.ChartPoint;
+        load(option?: string | string[]): Excel.ChartPoint;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartPoint;
+        toJSON(): Excel.Interfaces.ChartPointData;
     }
     /**
      *
@@ -6231,18 +7092,32 @@ declare namespace Excel {
     class ChartPointFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of a chart, which includes background formating information. Read-only.
+         * Represents the border format of a chart data point, which includes color, style and weight information.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly border: Excel.ChartBorder;
+        /**
+         *
+         * Represents the fill format of a chart, which includes background formating information.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartPointFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartPointFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointFormat;
-        toJSON(): {
-            "fill": ChartFill;
-        };
+        load(option?: Excel.Interfaces.ChartPointFormatLoadOptions): Excel.ChartPointFormat;
+        load(option?: string | string[]): Excel.ChartPointFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartPointFormat;
+        toJSON(): Excel.Interfaces.ChartPointFormatData;
     }
     /**
      *
@@ -6253,43 +7128,59 @@ declare namespace Excel {
     class ChartAxes extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the category axis in a chart. Read-only.
+         * Represents the category axis in a chart.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly categoryAxis: Excel.ChartAxis;
         /**
          *
-         * Represents the series axis of a 3-dimensional chart. Read-only.
+         * Represents the series axis of a 3-dimensional chart.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly seriesAxis: Excel.ChartAxis;
         /**
          *
-         * Represents the value axis in an axis. Read-only.
+         * Represents the value axis in an axis.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly valueAxis: Excel.ChartAxis;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartAxesUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartAxesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartAxes): void;
+        /**
+         *
+         * Returns the specific axis identified by type and group.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param type Specifies the axis type. See Excel.ChartAxis for details.
+         * @param group Specifies the axis group. See Excel.ChartAxis for details.
+         */
+        getItem(type: Excel.ChartAxisType, group?: Excel.ChartAxisGroup): Excel.ChartAxis;
+        /**
+         *
+         * Returns the specific axis identified by type and group.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param type Specifies the axis type. See Excel.ChartAxis for details.
+         * @param group Specifies the axis group. See Excel.ChartAxis for details.
+         */
+        getItem(type: "Invalid" | "Category" | "Value" | "Series", group?: "Primary" | "Secondary"): Excel.ChartAxis;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxes;
-        toJSON(): {
-            "categoryAxis": ChartAxis;
-            "seriesAxis": ChartAxis;
-            "valueAxis": ChartAxis;
-        };
+        load(option?: Excel.Interfaces.ChartAxesLoadOptions): Excel.ChartAxes;
+        load(option?: string | string[]): Excel.ChartAxes;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartAxes;
+        toJSON(): Excel.Interfaces.ChartAxesData;
     }
     /**
      *
@@ -6300,32 +7191,102 @@ declare namespace Excel {
     class ChartAxis extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart object, which includes line and font formatting. Read-only.
+         * Represents the formatting of a chart object, which includes line and font formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartAxisFormat;
         /**
          *
-         * Returns a gridlines object that represents the major gridlines for the specified axis. Read-only.
+         * Returns a gridlines object that represents the major gridlines for the specified axis.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly majorGridlines: Excel.ChartGridlines;
         /**
          *
-         * Returns a Gridlines object that represents the minor gridlines for the specified axis. Read-only.
+         * Returns a Gridlines object that represents the minor gridlines for the specified axis.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly minorGridlines: Excel.ChartGridlines;
         /**
          *
-         * Represents the axis title. Read-only.
+         * Represents the axis title.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly title: Excel.ChartAxisTitle;
+        /**
+         *
+         * Represents the group for the specified axis. See Excel.ChartAxisGroup for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly axisGroup: Excel.ChartAxisGroup | "Primary" | "Secondary";
+        /**
+         *
+         * Returns or sets the base unit for the specified category axis.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        baseTimeUnit: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
+        /**
+         *
+         * Returns or sets the category axis type.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        categoryType: Excel.ChartAxisCategoryType | "Automatic" | "TextAxis" | "DateAxis";
+        /**
+         *
+         * Represents the custom axis display unit value. Read Only. To set this property, please use the SetCustomDisplayUnit(double) method.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly customDisplayUnit: number;
+        /**
+         *
+         * Represents the axis display unit. See Excel.ChartAxisDisplayUnit for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        displayUnit: Excel.ChartAxisDisplayUnit | "None" | "Hundreds" | "Thousands" | "TenThousands" | "HundredThousands" | "Millions" | "TenMillions" | "HundredMillions" | "Billions" | "Trillions" | "Custom";
+        /**
+         *
+         * Represents the height, in points, of the chart axis. Null if the axis's not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly height: number;
+        /**
+         *
+         * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis's not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly left: number;
+        /**
+         *
+         * Represents the base of the logarithm when using logarithmic scales.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        logBase: number;
+        /**
+         *
+         * Represents the type of major tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        majorTickMark: Excel.ChartAxisTickMark | "None" | "Cross" | "Inside" | "Outside";
+        /**
+         *
+         * Returns or sets the major unit scale value for the category axis when the CategoryType property is set to TimeScale.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        majorTimeUnitScale: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
         /**
          *
          * Represents the interval between two major tick marks. Can be set to a numeric value or an empty string.  The returned value is always a number.
@@ -6347,6 +7308,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         minimum: any;
+        /**
+         *
+         * Represents the type of minor tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        minorTickMark: Excel.ChartAxisTickMark | "None" | "Cross" | "Inside" | "Outside";
+        /**
+         *
+         * Returns or sets the minor unit scale value for the category axis when the CategoryType property is set to TimeScale.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        minorTimeUnitScale: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
         /**
          *
          * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
@@ -6354,29 +7329,108 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         minorUnit: any;
+        /**
+         *
+         * Represents whether Microsoft Excel plots data points from last to first.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        reversePlotOrder: boolean;
+        /**
+         *
+         * Represents the value axis scale type. See Excel.ChartAxisScaleType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        scaleType: Excel.ChartAxisScaleType | "Linear" | "Logarithmic";
+        /**
+         *
+         * Represents whether the axis display unit label is visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showDisplayUnitLabel: boolean;
+        /**
+         *
+         * Represents the position of tick-mark labels on the specified axis. See Excel.ChartAxisTickLabelPosition for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        tickLabelPosition: Excel.ChartAxisTickLabelPosition | "NextToAxis" | "High" | "Low" | "None";
+        /**
+         *
+         * Represents the number of categories or series between tick-mark labels. Can be a value from 1 through 31999 or an empty string for automatic setting. The returned value is always a number.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        tickLabelSpacing: any;
+        /**
+         *
+         * Represents the number of categories or series between tick marks.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        tickMarkSpacing: number;
+        /**
+         *
+         * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis's not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly top: number;
+        /**
+         *
+         * Represents the axis type. See Excel.ChartAxisType for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly type: Excel.ChartAxisType | "Invalid" | "Category" | "Value" | "Series";
+        /**
+         *
+         * A boolean value represents the visibility of the axis.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        visible: boolean;
+        /**
+         *
+         * Represents the width, in points, of the chart axis. Null if the axis's not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartAxisUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartAxisUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartAxis): void;
+        /**
+         *
+         * Sets all the category names for the specified axis.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param sourceData The Range object corresponding to the source data.
+         */
+        setCategoryNames(sourceData: Excel.Range): void;
+        /**
+         *
+         * Sets the axis display unit to a custom value.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param value Custom value of the display unit
+         */
+        setCustomDisplayUnit(value: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxis;
-        toJSON(): {
-            "format": ChartAxisFormat;
-            "majorGridlines": ChartGridlines;
-            "majorUnit": any;
-            "maximum": any;
-            "minimum": any;
-            "minorGridlines": ChartGridlines;
-            "minorUnit": any;
-            "title": ChartAxisTitle;
-        };
+        load(option?: Excel.Interfaces.ChartAxisLoadOptions): Excel.ChartAxis;
+        load(option?: string | string[]): Excel.ChartAxis;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartAxis;
+        toJSON(): Excel.Interfaces.ChartAxisData;
     }
     /**
      *
@@ -6387,35 +7441,32 @@ declare namespace Excel {
     class ChartAxisFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for a chart axis element. Read-only.
+         * Represents the font attributes (font name, font size, color, etc.) for a chart axis element.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
         /**
          *
-         * Represents chart line formatting. Read-only.
+         * Represents chart line formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly line: Excel.ChartLineFormat;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartAxisFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartAxisFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartAxisFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisFormat;
-        toJSON(): {
-            "font": ChartFont;
-            "line": ChartLineFormat;
-        };
+        load(option?: Excel.Interfaces.ChartAxisFormatLoadOptions): Excel.ChartAxisFormat;
+        load(option?: string | string[]): Excel.ChartAxisFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartAxisFormat;
+        toJSON(): Excel.Interfaces.ChartAxisFormatData;
     }
     /**
      *
@@ -6426,7 +7477,7 @@ declare namespace Excel {
     class ChartAxisTitle extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of chart axis title. Read-only.
+         * Represents the formatting of chart axis title.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -6446,23 +7497,19 @@ declare namespace Excel {
          */
         visible: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartAxisTitleUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartAxisTitleUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartAxisTitle): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitle;
-        toJSON(): {
-            "format": ChartAxisTitleFormat;
-            "text": string;
-            "visible": boolean;
-        };
+        load(option?: Excel.Interfaces.ChartAxisTitleLoadOptions): Excel.ChartAxisTitle;
+        load(option?: string | string[]): Excel.ChartAxisTitle;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartAxisTitle;
+        toJSON(): Excel.Interfaces.ChartAxisTitleData;
     }
     /**
      *
@@ -6473,27 +7520,25 @@ declare namespace Excel {
     class ChartAxisTitleFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object. Read-only.
+         * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartAxisTitleFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartAxisTitleFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartAxisTitleFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitleFormat;
-        toJSON(): {
-            "font": ChartFont;
-        };
+        load(option?: Excel.Interfaces.ChartAxisTitleFormatLoadOptions): Excel.ChartAxisTitleFormat;
+        load(option?: string | string[]): Excel.ChartAxisTitleFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartAxisTitleFormat;
+        toJSON(): Excel.Interfaces.ChartAxisTitleFormatData;
     }
     /**
      *
@@ -6504,7 +7549,7 @@ declare namespace Excel {
     class ChartDataLabels extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the format of chart data labels, which includes fill and font formatting. Read-only.
+         * Represents the format of chart data labels, which includes fill and font formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -6515,7 +7560,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        position: string;
+        position: Excel.ChartDataLabelPosition | "Invalid" | "None" | "Center" | "InsideEnd" | "InsideBase" | "OutsideEnd" | "Left" | "Right" | "Top" | "Bottom" | "BestFit" | "Callout";
         /**
          *
          * String representing the separator used for the data labels on a chart.
@@ -6566,29 +7611,97 @@ declare namespace Excel {
          */
         showValue: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartDataLabelsUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartDataLabelsUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartDataLabels): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabels;
-        toJSON(): {
-            "format": ChartDataLabelFormat;
-            "position": string;
-            "separator": string;
-            "showBubbleSize": boolean;
-            "showCategoryName": boolean;
-            "showLegendKey": boolean;
-            "showPercentage": boolean;
-            "showSeriesName": boolean;
-            "showValue": boolean;
-        };
+        load(option?: Excel.Interfaces.ChartDataLabelsLoadOptions): Excel.ChartDataLabels;
+        load(option?: string | string[]): Excel.ChartDataLabels;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartDataLabels;
+        toJSON(): Excel.Interfaces.ChartDataLabelsData;
+    }
+    /**
+     *
+     * Represents the data label of a chart point.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartDataLabel extends OfficeExtension.ClientObject {
+        /**
+         *
+         * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        position: Excel.ChartDataLabelPosition | "Invalid" | "None" | "Center" | "InsideEnd" | "InsideBase" | "OutsideEnd" | "Left" | "Right" | "Top" | "Bottom" | "BestFit" | "Callout";
+        /**
+         *
+         * String representing the separator used for the data label on a chart.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        separator: string;
+        /**
+         *
+         * Boolean value representing if the data label bubble size is visible or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showBubbleSize: boolean;
+        /**
+         *
+         * Boolean value representing if the data label category name is visible or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showCategoryName: boolean;
+        /**
+         *
+         * Boolean value representing if the data label legend key is visible or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showLegendKey: boolean;
+        /**
+         *
+         * Boolean value representing if the data label percentage is visible or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showPercentage: boolean;
+        /**
+         *
+         * Boolean value representing if the data label series name is visible or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showSeriesName: boolean;
+        /**
+         *
+         * Boolean value representing if the data label value is visible or not.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showValue: boolean;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartDataLabelUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartDataLabel): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartDataLabelLoadOptions): Excel.ChartDataLabel;
+        load(option?: string | string[]): Excel.ChartDataLabel;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartDataLabel;
+        toJSON(): Excel.Interfaces.ChartDataLabelData;
     }
     /**
      *
@@ -6599,35 +7712,32 @@ declare namespace Excel {
     class ChartDataLabelFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of the current chart data label. Read-only.
+         * Represents the fill format of the current chart data label.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for a chart data label. Read-only.
+         * Represents the font attributes (font name, font size, color, etc.) for a chart data label.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartDataLabelFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartDataLabelFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartDataLabelFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabelFormat;
-        toJSON(): {
-            "fill": ChartFill;
-            "font": ChartFont;
-        };
+        load(option?: Excel.Interfaces.ChartDataLabelFormatLoadOptions): Excel.ChartDataLabelFormat;
+        load(option?: string | string[]): Excel.ChartDataLabelFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartDataLabelFormat;
+        toJSON(): Excel.Interfaces.ChartDataLabelFormatData;
     }
     /**
      *
@@ -6638,7 +7748,7 @@ declare namespace Excel {
     class ChartGridlines extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of chart gridlines. Read-only.
+         * Represents the formatting of chart gridlines.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -6651,22 +7761,19 @@ declare namespace Excel {
          */
         visible: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartGridlinesUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartGridlinesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartGridlines): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlines;
-        toJSON(): {
-            "format": ChartGridlinesFormat;
-            "visible": boolean;
-        };
+        load(option?: Excel.Interfaces.ChartGridlinesLoadOptions): Excel.ChartGridlines;
+        load(option?: string | string[]): Excel.ChartGridlines;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartGridlines;
+        toJSON(): Excel.Interfaces.ChartGridlinesData;
     }
     /**
      *
@@ -6677,27 +7784,25 @@ declare namespace Excel {
     class ChartGridlinesFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents chart line formatting. Read-only.
+         * Represents chart line formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly line: Excel.ChartLineFormat;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartGridlinesFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartGridlinesFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartGridlinesFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlinesFormat;
-        toJSON(): {
-            "line": ChartLineFormat;
-        };
+        load(option?: Excel.Interfaces.ChartGridlinesFormatLoadOptions): Excel.ChartGridlinesFormat;
+        load(option?: string | string[]): Excel.ChartGridlinesFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartGridlinesFormat;
+        toJSON(): Excel.Interfaces.ChartGridlinesFormatData;
     }
     /**
      *
@@ -6708,11 +7813,32 @@ declare namespace Excel {
     class ChartLegend extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart legend, which includes fill and font formatting. Read-only.
+         * Represents the formatting of a chart legend, which includes fill and font formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartLegendFormat;
+        /**
+         *
+         * Represents a collection of legendEntries in the legend.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly legendEntries: Excel.ChartLegendEntryCollection;
+        /**
+         *
+         * Represents the height, in points, of the legend on the chart. Null if legend is not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        height: number;
+        /**
+         *
+         * Represents the left, in points, of a chart legend. Null if legend is not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        left: number;
         /**
          *
          * Boolean value for whether the chart legend should overlap with the main body of the chart.
@@ -6726,7 +7852,21 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        position: string;
+        position: Excel.ChartLegendPosition | "Invalid" | "Top" | "Bottom" | "Left" | "Right" | "Corner" | "Custom";
+        /**
+         *
+         * Represents if the legend has a shadow on the chart.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showShadow: boolean;
+        /**
+         *
+         * Represents the top of a chart legend.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        top: number;
         /**
          *
          * A boolean value the represents the visibility of a ChartLegend object.
@@ -6734,25 +7874,89 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         visible: boolean;
+        /**
+         *
+         * Represents the width, in points, of the legend on the chart. Null if legend is not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartLegendUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartLegendUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartLegend): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegend;
-        toJSON(): {
-            "format": ChartLegendFormat;
-            "overlay": boolean;
-            "position": string;
-            "visible": boolean;
-        };
+        load(option?: Excel.Interfaces.ChartLegendLoadOptions): Excel.ChartLegend;
+        load(option?: string | string[]): Excel.ChartLegend;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartLegend;
+        toJSON(): Excel.Interfaces.ChartLegendData;
+    }
+    /**
+     *
+     * Represents the legendEntry in legendEntryCollection.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartLegendEntry extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents the visible of a chart legend entry.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        visible: boolean;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartLegendEntryUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartLegendEntry): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartLegendEntryLoadOptions): Excel.ChartLegendEntry;
+        load(option?: string | string[]): Excel.ChartLegendEntry;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartLegendEntry;
+        toJSON(): Excel.Interfaces.ChartLegendEntryData;
+    }
+    /**
+     *
+     * Represents a collection of legendEntries.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartLegendEntryCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.ChartLegendEntry[];
+        /**
+         *
+         * Returns the number of legendEntry in the collection.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Returns a legendEntry at the given index.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param index Index of the legendEntry to be retrieved.
+         */
+        getItemAt(index: number): Excel.ChartLegendEntry;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartLegendEntryCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartLegendEntryCollection;
+        load(option?: string | string[]): Excel.ChartLegendEntryCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.ChartLegendEntryCollection;
+        toJSON(): Excel.Interfaces.ChartLegendEntryCollectionData;
     }
     /**
      *
@@ -6763,35 +7967,32 @@ declare namespace Excel {
     class ChartLegendFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of an object, which includes background formating information. Read-only.
+         * Represents the fill format of an object, which includes background formating information.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes such as font name, font size, color, etc. of a chart legend. Read-only.
+         * Represents the font attributes such as font name, font size, color, etc. of a chart legend.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartLegendFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartLegendFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartLegendFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegendFormat;
-        toJSON(): {
-            "fill": ChartFill;
-            "font": ChartFont;
-        };
+        load(option?: Excel.Interfaces.ChartLegendFormatLoadOptions): Excel.ChartLegendFormat;
+        load(option?: string | string[]): Excel.ChartLegendFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartLegendFormat;
+        toJSON(): Excel.Interfaces.ChartLegendFormatData;
     }
     /**
      *
@@ -6802,11 +8003,32 @@ declare namespace Excel {
     class ChartTitle extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart title, which includes fill and font formatting. Read-only.
+         * Represents the formatting of a chart title, which includes fill and font formatting.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartTitleFormat;
+        /**
+         *
+         * Returns the height, in points, of the chart title. Read-only. Null if chart title is not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly height: number;
+        /**
+         *
+         * Represents the horizontal alignment for chart title.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        horizontalAlignment: Excel.ChartTextHorizontalAlignment | "Center" | "Left" | "Right" | "Justify" | "Distributed";
+        /**
+         *
+         * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        left: number;
         /**
          *
          * Boolean value representing if the chart title will overlay the chart or not.
@@ -6814,6 +8036,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         overlay: boolean;
+        /**
+         *
+         * Represents the position of chart title. See Excel.ChartTitlePosition for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        position: Excel.ChartTitlePosition | "Automatic" | "Top" | "Bottom" | "Left" | "Right";
+        /**
+         *
+         * Represents a boolean value that determines if the chart title has a shadow.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        showShadow: boolean;
         /**
          *
          * Represents the title text of a chart.
@@ -6821,6 +8057,27 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         text: string;
+        /**
+         *
+         * Represents the text orientation of chart title. The value should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        textOrientation: number;
+        /**
+         *
+         * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        top: number;
+        /**
+         *
+         * Represents the vertical alignment of chart title. See Excel.ChartTextVerticalAlignment for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        verticalAlignment: Excel.ChartTextVerticalAlignment | "Center" | "Bottom" | "Top" | "Justify" | "Distributed";
         /**
          *
          * A boolean value the represents the visibility of a chart title object.
@@ -6828,25 +8085,75 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         visible: boolean;
+        /**
+         *
+         * Returns the width, in points, of the chart title. Read-only. Null if chart title is not visible.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartTitleUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartTitleUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartTitle): void;
+        /**
+         *
+         * Get the substring of a chart title. Line break '\n' also counts one charater.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param start Start position of substring to be retrieved. Position start with 0.
+         * @param length Length of substring to be retrieved.
+         */
+        getSubstring(start: number, length: number): Excel.ChartFormatString;
+        /**
+         *
+         * Sets a string value that represents the formula of chart title using A1-style notation.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param formula a string that present the formula to set
+         */
+        setFormula(formula: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitle;
-        toJSON(): {
-            "format": ChartTitleFormat;
-            "overlay": boolean;
-            "text": string;
-            "visible": boolean;
-        };
+        load(option?: Excel.Interfaces.ChartTitleLoadOptions): Excel.ChartTitle;
+        load(option?: string | string[]): Excel.ChartTitle;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartTitle;
+        toJSON(): Excel.Interfaces.ChartTitleData;
+    }
+    /**
+     *
+     * Represents the substring in chart related objects that contains text, like ChartTitle object, ChartAxisTitle object, etc.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartFormatString extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents the font attributes, such as font name, font size, color, etc. of chart characters object.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly font: Excel.ChartFont;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartFormatStringUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartFormatString): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartFormatStringLoadOptions): Excel.ChartFormatString;
+        load(option?: string | string[]): Excel.ChartFormatString;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartFormatString;
+        toJSON(): Excel.Interfaces.ChartFormatStringData;
     }
     /**
      *
@@ -6857,35 +8164,39 @@ declare namespace Excel {
     class ChartTitleFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of an object, which includes background formating information. Read-only.
+         * Represents the border format of chart title, which includes color, linestyle and weight.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly border: Excel.ChartBorder;
+        /**
+         *
+         * Represents the fill format of an object, which includes background formating information.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for an object. Read-only.
+         * Represents the font attributes (font name, font size, color, etc.) for an object.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartTitleFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartTitleFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartTitleFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitleFormat;
-        toJSON(): {
-            "fill": ChartFill;
-            "font": ChartFont;
-        };
+        load(option?: Excel.Interfaces.ChartTitleFormatLoadOptions): Excel.ChartTitleFormat;
+        load(option?: string | string[]): Excel.ChartTitleFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartTitleFormat;
+        toJSON(): Excel.Interfaces.ChartTitleFormatData;
     }
     /**
      *
@@ -6914,7 +8225,52 @@ declare namespace Excel {
          * @param color HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
          */
         setSolidColor(color: string): void;
-        toJSON(): {};
+        toJSON(): {
+            [key: string]: string;
+        };
+    }
+    /**
+     *
+     * Represents the border formatting of a chart element.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartBorder extends OfficeExtension.ClientObject {
+        /**
+         *
+         * HTML color code representing the color of borders in the chart.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        color: string;
+        /**
+         *
+         * Represents the line style of the border. See Excel.ChartLineStyle for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        lineStyle: Excel.ChartLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Grey25" | "Grey50" | "Grey75" | "Automatic" | "RoundDot";
+        /**
+         *
+         * Represents weight of the border, in points.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        weight: number;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartBorder): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartBorderLoadOptions): Excel.ChartBorder;
+        load(option?: string | string[]): Excel.ChartBorder;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartBorder;
+        toJSON(): Excel.Interfaces.ChartBorderData;
     }
     /**
      *
@@ -6930,13 +8286,22 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         color: string;
+        /**
+         *
+         * Represents the line style. See Excel.ChartLineStyle for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        lineStyle: Excel.ChartLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Grey25" | "Grey50" | "Grey75" | "Automatic" | "RoundDot";
+        /**
+         *
+         * Represents weight of the line, in points.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        weight: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartLineFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartLineFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartLineFormat): void;
         /**
@@ -6949,10 +8314,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLineFormat;
-        toJSON(): {
-            "color": string;
-        };
+        load(option?: Excel.Interfaces.ChartLineFormatLoadOptions): Excel.ChartLineFormat;
+        load(option?: string | string[]): Excel.ChartLineFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartLineFormat;
+        toJSON(): Excel.Interfaces.ChartLineFormatData;
     }
     /**
      *
@@ -7002,28 +8370,172 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          */
-        underline: string;
+        underline: Excel.ChartUnderlineStyle | "None" | "Single";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ChartFontUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ChartFontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ChartFont): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartFont;
-        toJSON(): {
-            "bold": boolean;
-            "color": string;
-            "italic": boolean;
-            "name": string;
-            "size": number;
-            "underline": string;
-        };
+        load(option?: Excel.Interfaces.ChartFontLoadOptions): Excel.ChartFont;
+        load(option?: string | string[]): Excel.ChartFont;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartFont;
+        toJSON(): Excel.Interfaces.ChartFontData;
+    }
+    /**
+     *
+     * This object represents the attributes for a chart trendline object.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartTrendline extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents the formatting of a chart trendline.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly format: Excel.ChartTrendlineFormat;
+        /**
+         *
+         * Represents the intercept value of the trendline. Can be set to a numeric value or an empty string (for automatic values). The returned value is always a number.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        intercept: any;
+        /**
+         *
+         * Represents the period of a chart trendline. Only applicable for trendline with MovingAverage type.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        movingAveragePeriod: number;
+        /**
+         *
+         * Represents the name of the trendline. Can be set to a string value, or can be set to null value represents automatic values. The returned value is always a string
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        name: string;
+        /**
+         *
+         * Represents the order of a chart trendline. Only applicable for trendline with Polynomial type.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        polynomialOrder: number;
+        /**
+         *
+         * Represents the type of a chart trendline.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        type: Excel.ChartTrendlineType | "Linear" | "Exponential" | "Logarithmic" | "MovingAverage" | "Polynomial" | "Power";
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartTrendlineUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartTrendline): void;
+        /**
+         *
+         * Delete the trendline object.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        delete(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartTrendlineLoadOptions): Excel.ChartTrendline;
+        load(option?: string | string[]): Excel.ChartTrendline;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartTrendline;
+        toJSON(): Excel.Interfaces.ChartTrendlineData;
+    }
+    /**
+     *
+     * Represents a collection of Chart Trendlines.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartTrendlineCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.ChartTrendline[];
+        /**
+         *
+         * Adds a new trendline to trendline collection.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param type Specifies the trendline type. The default value is "Linear". See Excel.ChartTrendline for details.
+         */
+        add(type?: Excel.ChartTrendlineType): Excel.ChartTrendline;
+        /**
+         *
+         * Adds a new trendline to trendline collection.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param type Specifies the trendline type. The default value is "Linear". See Excel.ChartTrendline for details.
+         */
+        add(type?: "Linear" | "Exponential" | "Logarithmic" | "MovingAverage" | "Polynomial" | "Power"): Excel.ChartTrendline;
+        /**
+         *
+         * Returns the number of trendlines in the collection.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Get trendline object by index, which is the insertion order in items array.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param index Represents the insertion order in items array.
+         */
+        getItem(index: number): Excel.ChartTrendline;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartTrendlineCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartTrendlineCollection;
+        load(option?: string | string[]): Excel.ChartTrendlineCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.ChartTrendlineCollection;
+        toJSON(): Excel.Interfaces.ChartTrendlineCollectionData;
+    }
+    /**
+     *
+     * Represents the format properties for chart trendline.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class ChartTrendlineFormat extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents chart line formatting.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly line: Excel.ChartLineFormat;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ChartTrendlineFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: ChartTrendlineFormat): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.ChartTrendlineFormatLoadOptions): Excel.ChartTrendlineFormat;
+        load(option?: string | string[]): Excel.ChartTrendlineFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ChartTrendlineFormat;
+        toJSON(): Excel.Interfaces.ChartTrendlineFormatData;
     }
     /**
      *
@@ -7044,8 +8556,23 @@ declare namespace Excel {
          * @param orientation Whether the operation is sorting rows or columns.
          * @param method The ordering method used for Chinese characters.
          */
-        apply(fields: Array<Excel.SortField>, matchCase?: boolean, hasHeaders?: boolean, orientation?: string, method?: string): void;
-        toJSON(): {};
+        apply(fields: Excel.SortField[], matchCase?: boolean, hasHeaders?: boolean, orientation?: Excel.SortOrientation, method?: Excel.SortMethod): void;
+        /**
+         *
+         * Perform a sort operation.
+         *
+         * [Api set: ExcelApi 1.2]
+         *
+         * @param fields The list of conditions to sort on.
+         * @param matchCase Whether to have the casing impact string ordering.
+         * @param hasHeaders Whether the range has a header.
+         * @param orientation Whether the operation is sorting rows or columns.
+         * @param method The ordering method used for Chinese characters.
+         */
+        apply(fields: Excel.SortField[], matchCase?: boolean, hasHeaders?: boolean, orientation?: "Rows" | "Columns", method?: "PinYin" | "StrokeCount"): void;
+        toJSON(): {
+            [key: string]: string;
+        };
     }
     /**
      *
@@ -7060,7 +8587,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        readonly fields: Array<Excel.SortField>;
+        readonly fields: Excel.SortField[];
         /**
          *
          * Represents whether the casing impacted the last sort of the table.
@@ -7074,7 +8601,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        readonly method: string;
+        readonly method: Excel.SortMethod | "PinYin" | "StrokeCount";
         /**
          *
          * Perform a sort operation.
@@ -7085,7 +8612,18 @@ declare namespace Excel {
          * @param matchCase Whether to have the casing impact string ordering.
          * @param method The ordering method used for Chinese characters.
          */
-        apply(fields: Array<Excel.SortField>, matchCase?: boolean, method?: string): void;
+        apply(fields: Excel.SortField[], matchCase?: boolean, method?: Excel.SortMethod): void;
+        /**
+         *
+         * Perform a sort operation.
+         *
+         * [Api set: ExcelApi 1.2]
+         *
+         * @param fields The list of conditions to sort on.
+         * @param matchCase Whether to have the casing impact string ordering.
+         * @param method The ordering method used for Chinese characters.
+         */
+        apply(fields: Excel.SortField[], matchCase?: boolean, method?: "PinYin" | "StrokeCount"): void;
         /**
          *
          * Clears the sorting that is currently on the table. While this doesn't modify the table's ordering, it clears the state of the header buttons.
@@ -7103,12 +8641,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableSort;
-        toJSON(): {
-            "fields": SortField[];
-            "matchCase": boolean;
-            "method": string;
-        };
+        load(option?: Excel.Interfaces.TableSortLoadOptions): Excel.TableSort;
+        load(option?: string | string[]): Excel.TableSort;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.TableSort;
+        toJSON(): Excel.Interfaces.TableSortData;
     }
     /**
      *
@@ -7137,7 +8676,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        dataOption?: string;
+        dataOption?: Excel.SortDataOption | "Normal" | "TextAsNumber";
         /**
          *
          * Represents the icon that is the target of the condition if the sorting is on the cell's icon.
@@ -7158,7 +8697,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        sortOn?: string;
+        sortOn?: Excel.SortOn | "Value" | "CellColor" | "FontColor" | "Icon";
     }
     /**
      *
@@ -7220,7 +8759,18 @@ declare namespace Excel {
          * @param criteria2 The second criteria string.
          * @param oper The operator that describes how the two criteria are joined.
          */
-        applyCustomFilter(criteria1: string, criteria2?: string, oper?: string): void;
+        applyCustomFilter(criteria1: string, criteria2?: string, oper?: Excel.FilterOperator): void;
+        /**
+         *
+         * Apply a "Icon" filter to the column for the given criteria strings.
+         *
+         * [Api set: ExcelApi 1.2]
+         *
+         * @param criteria1 The first criteria string.
+         * @param criteria2 The second criteria string.
+         * @param oper The operator that describes how the two criteria are joined.
+         */
+        applyCustomFilter(criteria1: string, criteria2?: string, oper?: "And" | "Or"): void;
         /**
          *
          * Apply a "Dynamic" filter to the column.
@@ -7229,7 +8779,16 @@ declare namespace Excel {
          *
          * @param criteria The dynamic criteria to apply.
          */
-        applyDynamicFilter(criteria: string): void;
+        applyDynamicFilter(criteria: Excel.DynamicFilterCriteria): void;
+        /**
+         *
+         * Apply a "Dynamic" filter to the column.
+         *
+         * [Api set: ExcelApi 1.2]
+         *
+         * @param criteria The dynamic criteria to apply.
+         */
+        applyDynamicFilter(criteria: "Unknown" | "AboveAverage" | "AllDatesInPeriodApril" | "AllDatesInPeriodAugust" | "AllDatesInPeriodDecember" | "AllDatesInPeriodFebruray" | "AllDatesInPeriodJanuary" | "AllDatesInPeriodJuly" | "AllDatesInPeriodJune" | "AllDatesInPeriodMarch" | "AllDatesInPeriodMay" | "AllDatesInPeriodNovember" | "AllDatesInPeriodOctober" | "AllDatesInPeriodQuarter1" | "AllDatesInPeriodQuarter2" | "AllDatesInPeriodQuarter3" | "AllDatesInPeriodQuarter4" | "AllDatesInPeriodSeptember" | "BelowAverage" | "LastMonth" | "LastQuarter" | "LastWeek" | "LastYear" | "NextMonth" | "NextQuarter" | "NextWeek" | "NextYear" | "ThisMonth" | "ThisQuarter" | "ThisWeek" | "ThisYear" | "Today" | "Tomorrow" | "YearToDate" | "Yesterday"): void;
         /**
          *
          * Apply a "Font Color" filter to the column for the given color.
@@ -7285,10 +8844,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Filter;
-        toJSON(): {
-            "criteria": FilterCriteria;
-        };
+        load(option?: Excel.Interfaces.FilterLoadOptions): Excel.Filter;
+        load(option?: string | string[]): Excel.Filter;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Filter;
+        toJSON(): Excel.Interfaces.FilterData;
     }
     /**
      *
@@ -7327,14 +8889,14 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        dynamicCriteria?: string;
+        dynamicCriteria?: Excel.DynamicFilterCriteria | "Unknown" | "AboveAverage" | "AllDatesInPeriodApril" | "AllDatesInPeriodAugust" | "AllDatesInPeriodDecember" | "AllDatesInPeriodFebruray" | "AllDatesInPeriodJanuary" | "AllDatesInPeriodJuly" | "AllDatesInPeriodJune" | "AllDatesInPeriodMarch" | "AllDatesInPeriodMay" | "AllDatesInPeriodNovember" | "AllDatesInPeriodOctober" | "AllDatesInPeriodQuarter1" | "AllDatesInPeriodQuarter2" | "AllDatesInPeriodQuarter3" | "AllDatesInPeriodQuarter4" | "AllDatesInPeriodSeptember" | "BelowAverage" | "LastMonth" | "LastQuarter" | "LastWeek" | "LastYear" | "NextMonth" | "NextQuarter" | "NextWeek" | "NextYear" | "ThisMonth" | "ThisQuarter" | "ThisWeek" | "ThisYear" | "Today" | "Tomorrow" | "YearToDate" | "Yesterday";
         /**
          *
          * The property used by the filter to determine whether the values should stay visible.
          *
          * [Api set: ExcelApi 1.2]
          */
-        filterOn: string;
+        filterOn: Excel.FilterOn | "BottomItems" | "BottomPercent" | "CellColor" | "Dynamic" | "FontColor" | "Values" | "TopItems" | "TopPercent" | "Icon" | "Custom";
         /**
          *
          * The icon used to filter cells. Used with "icon" filtering.
@@ -7348,7 +8910,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        operator?: string;
+        operator?: Excel.FilterOperator | "And" | "Or";
         /**
          *
          * The set of values to be used as part of "values" filtering.
@@ -7377,7 +8939,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        specificity: string;
+        specificity: Excel.FilterDatetimeSpecificity | "Year" | "Month" | "Day" | "Hour" | "Minute" | "Second";
     }
     /**
      *
@@ -7399,7 +8961,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        set: string;
+        set: Excel.IconSet | "Invalid" | "ThreeArrows" | "ThreeArrowsGray" | "ThreeFlags" | "ThreeTrafficLights1" | "ThreeTrafficLights2" | "ThreeSigns" | "ThreeSymbols" | "ThreeSymbols2" | "FourArrows" | "FourArrowsGray" | "FourRedToBlack" | "FourRating" | "FourTrafficLights" | "FiveArrows" | "FiveArrowsGray" | "FiveRating" | "FiveQuarters" | "ThreeStars" | "ThreeTriangles" | "FiveBoxes";
     }
     /**
      *
@@ -7411,7 +8973,7 @@ declare namespace Excel {
      */
     class CustomXmlPartScopedCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.CustomXmlPart>;
+        readonly items: Excel.CustomXmlPart[];
         /**
          *
          * Gets the number of CustomXML parts in this collection.
@@ -7457,8 +9019,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.CustomXmlPartScopedCollection;
-        toJSON(): {};
+        load(option?: Excel.Interfaces.CustomXmlPartScopedCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.CustomXmlPartScopedCollection;
+        load(option?: string | string[]): Excel.CustomXmlPartScopedCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.CustomXmlPartScopedCollection;
+        toJSON(): Excel.Interfaces.CustomXmlPartScopedCollectionData;
     }
     /**
      *
@@ -7468,7 +9032,7 @@ declare namespace Excel {
      */
     class CustomXmlPartCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.CustomXmlPart>;
+        readonly items: Excel.CustomXmlPart[];
         /**
          *
          * Adds a new custom XML part to the workbook.
@@ -7516,8 +9080,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.CustomXmlPartCollection;
-        toJSON(): {};
+        load(option?: Excel.Interfaces.CustomXmlPartCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.CustomXmlPartCollection;
+        load(option?: string | string[]): Excel.CustomXmlPartCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.CustomXmlPartCollection;
+        toJSON(): Excel.Interfaces.CustomXmlPartCollectionData;
     }
     /**
      *
@@ -7566,11 +9132,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.CustomXmlPart;
-        toJSON(): {
-            "id": string;
-            "namespaceUri": string;
-        };
+        load(option?: Excel.Interfaces.CustomXmlPartLoadOptions): Excel.CustomXmlPart;
+        load(option?: string | string[]): Excel.CustomXmlPart;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.CustomXmlPart;
+        toJSON(): Excel.Interfaces.CustomXmlPartData;
     }
     /**
      *
@@ -7580,7 +9148,7 @@ declare namespace Excel {
      */
     class PivotTableCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.PivotTable>;
+        readonly items: Excel.PivotTable[];
         /**
          *
          * Gets the number of pivot tables in the collection.
@@ -7616,8 +9184,10 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.PivotTableCollection;
-        toJSON(): {};
+        load(option?: Excel.Interfaces.PivotTableCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.PivotTableCollection;
+        load(option?: string | string[]): Excel.PivotTableCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.PivotTableCollection;
+        toJSON(): Excel.Interfaces.PivotTableCollectionData;
     }
     /**
      *
@@ -7628,7 +9198,7 @@ declare namespace Excel {
     class PivotTable extends OfficeExtension.ClientObject {
         /**
          *
-         * The worksheet containing the current PivotTable. Read-only.
+         * The worksheet containing the current PivotTable.
          *
          * [Api set: ExcelApi 1.3]
          */
@@ -7648,12 +9218,7 @@ declare namespace Excel {
          */
         name: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.PivotTableUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.PivotTableUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: PivotTable): void;
         /**
@@ -7666,49 +9231,285 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.PivotTable;
-        toJSON(): {
-            "id": string;
-            "name": string;
-        };
+        load(option?: Excel.Interfaces.PivotTableLoadOptions): Excel.PivotTable;
+        load(option?: string | string[]): Excel.PivotTable;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.PivotTable;
+        toJSON(): Excel.Interfaces.PivotTableData;
+    }
+    /**
+     *
+     * Represents workbook properties.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class DocumentProperties extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Gets the collection of custom properties of the workbook. Read only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly custom: Excel.CustomPropertyCollection;
+        /**
+         *
+         * Gets or sets the author of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        author: string;
+        /**
+         *
+         * Gets or sets the category of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        category: string;
+        /**
+         *
+         * Gets or sets the comments of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        comments: string;
+        /**
+         *
+         * Gets or sets the company of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        company: string;
+        /**
+         *
+         * Gets the creation date of the workbook. Read only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly creationDate: Date;
+        /**
+         *
+         * Gets or sets the keywords of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        keywords: string;
+        /**
+         *
+         * Gets the last author of the workbook. Read only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly lastAuthor: string;
+        /**
+         *
+         * Gets or sets the manager of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        manager: string;
+        /**
+         *
+         * Gets the revision number of the workbook. Read only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        revisionNumber: number;
+        /**
+         *
+         * Gets or sets the subject of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        subject: string;
+        /**
+         *
+         * Gets or sets the title of the workbook.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        title: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.DocumentPropertiesUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: DocumentProperties): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.DocumentPropertiesLoadOptions): Excel.DocumentProperties;
+        load(option?: string | string[]): Excel.DocumentProperties;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.DocumentProperties;
+        toJSON(): Excel.Interfaces.DocumentPropertiesData;
+    }
+    /**
+     *
+     * Represents a custom property.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class CustomProperty extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Gets the key of the custom property. Read only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly key: string;
+        /**
+         *
+         * Gets the value type of the custom property. Read only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly type: Excel.DocumentPropertyType | "Number" | "Boolean" | "Date" | "String" | "Float";
+        /**
+         *
+         * Gets or sets the value of the custom property.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        value: any;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.CustomPropertyUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: CustomProperty): void;
+        /**
+         *
+         * Deletes the custom property.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        delete(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.CustomPropertyLoadOptions): Excel.CustomProperty;
+        load(option?: string | string[]): Excel.CustomProperty;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.CustomProperty;
+        toJSON(): Excel.Interfaces.CustomPropertyData;
+    }
+    /**
+     *
+     * Contains the collection of customProperty objects.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class CustomPropertyCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.CustomProperty[];
+        /**
+         *
+         * Creates a new or sets an existing custom property.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param key Required. The custom property's key, which is case-insensitive.
+         * @param value Required. The custom property's value.
+         */
+        add(key: string, value: any): Excel.CustomProperty;
+        /**
+         *
+         * Deletes all custom properties in this collection.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        deleteAll(): void;
+        /**
+         *
+         * Gets the count of custom properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets a custom property object by its key, which is case-insensitive. Throws if the custom property does not exist.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param key The key that identifies the custom property object.
+         */
+        getItem(key: string): Excel.CustomProperty;
+        /**
+         *
+         * Gets a custom property object by its key, which is case-insensitive. Returns a null object if the custom property does not exist.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param key Required. The key that identifies the custom property object.
+         */
+        getItemOrNullObject(key: string): Excel.CustomProperty;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.CustomPropertyCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.CustomPropertyCollection;
+        load(option?: string | string[]): Excel.CustomPropertyCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.CustomPropertyCollection;
+        toJSON(): Excel.Interfaces.CustomPropertyCollectionData;
     }
     /**
      *
      * Represents a collection of all the conditional formats that are overlap the range.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalFormatCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.ConditionalFormat>;
+        readonly items: Excel.ConditionalFormat[];
         /**
          *
          * Adds a new conditional format to the collection at the first/top priority.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          *
          * @param type The type of conditional format being added. See Excel.ConditionalFormatType for details.
          */
-        add(type: string): Excel.ConditionalFormat;
+        add(type: Excel.ConditionalFormatType): Excel.ConditionalFormat;
+        /**
+         *
+         * Adds a new conditional format to the collection at the first/top priority.
+         *
+         * [Api set: ExcelApi 1.6]
+         *
+         * @param type The type of conditional format being added. See Excel.ConditionalFormatType for details.
+         */
+        add(type: "Custom" | "DataBar" | "ColorScale" | "IconSet" | "TopBottom" | "PresetCriteria" | "ContainsText" | "CellValue"): Excel.ConditionalFormat;
         /**
          *
          * Clears all conditional formats active on the current specified range.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         clearAll(): void;
         /**
          *
          * Returns the number of conditional formats in the workbook. Read-only.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Returns a conditional format for the given ID.
+         *
+         * [Api set: ExcelApi 1.6]
+         *
+         * @param id The id of the conditional format.
+         * @returns Conditional Format object.
+         */
+        getItem(id: string): Excel.ConditionalFormat;
         /**
          *
          * Returns a conditional format at the given index.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          *
          * @param index Index of the conditional formats to be retrieved.
          */
@@ -7716,14 +9517,16 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalFormatCollection;
-        toJSON(): {};
+        load(option?: Excel.Interfaces.ConditionalFormatCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ConditionalFormatCollection;
+        load(option?: string | string[]): Excel.ConditionalFormatCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.ConditionalFormatCollection;
+        toJSON(): Excel.Interfaces.ConditionalFormatCollectionData;
     }
     /**
      *
      * An object encapsulating a conditional format's range, format, rule, and other properties.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalFormat extends OfficeExtension.ClientObject {
         /**
@@ -7731,7 +9534,7 @@ declare namespace Excel {
          * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
             For example to format all cells between 5 and 10.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly cellValue: Excel.CellValueConditionalFormat;
         /**
@@ -7739,77 +9542,77 @@ declare namespace Excel {
          * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
             For example to format all cells between 5 and 10.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly cellValueOrNullObject: Excel.CellValueConditionalFormat;
         /**
          *
          * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly colorScale: Excel.ColorScaleConditionalFormat;
         /**
          *
          * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly colorScaleOrNullObject: Excel.ColorScaleConditionalFormat;
         /**
          *
          * Returns the custom conditional format properties if the current conditional format is a custom type.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly custom: Excel.CustomConditionalFormat;
         /**
          *
          * Returns the custom conditional format properties if the current conditional format is a custom type.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly customOrNullObject: Excel.CustomConditionalFormat;
         /**
          *
          * Returns the data bar properties if the current conditional format is a data bar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly dataBar: Excel.DataBarConditionalFormat;
         /**
          *
          * Returns the data bar properties if the current conditional format is a data bar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly dataBarOrNullObject: Excel.DataBarConditionalFormat;
         /**
          *
          * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly iconSet: Excel.IconSetConditionalFormat;
         /**
          *
          * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly iconSetOrNullObject: Excel.IconSetConditionalFormat;
         /**
          *
          * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly preset: Excel.PresetCriteriaConditionalFormat;
         /**
          *
          * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly presetOrNullObject: Excel.PresetCriteriaConditionalFormat;
         /**
@@ -7817,7 +9620,7 @@ declare namespace Excel {
          * Returns the specific text conditional format properties if the current conditional format is a text type.
             For example to format cells matching the word "Text".
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly textComparison: Excel.TextConditionalFormat;
         /**
@@ -7825,7 +9628,7 @@ declare namespace Excel {
          * Returns the specific text conditional format properties if the current conditional format is a text type.
             For example to format cells matching the word "Text".
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly textComparisonOrNullObject: Excel.TextConditionalFormat;
         /**
@@ -7833,7 +9636,7 @@ declare namespace Excel {
          * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
             For example to format the top 10% or bottom 10 items.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly topBottom: Excel.TopBottomConditionalFormat;
         /**
@@ -7841,17 +9644,25 @@ declare namespace Excel {
          * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
             For example to format the top 10% or bottom 10 items.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly topBottomOrNullObject: Excel.TopBottomConditionalFormat;
+        /**
+         *
+         * The Priority of the Conditional Format within the current ConditionalFormatCollection.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        readonly id: string;
         /**
          *
          * The priority (or index) within the conditional format collection that this conditional format currently exists in. Changing this also
             changes other conditional formats' priorities, to allow for a contiguous priority order.
             Use a negative priority to begin from the back.
             Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         priority: number;
         /**
@@ -7859,91 +9670,71 @@ declare namespace Excel {
          * If the conditions of this conditional format are met, no lower-priority formats shall take effect on that cell.
             Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         stopIfTrue: boolean;
         /**
          *
          * A type of conditional format. Only one can be set at a time. Read-Only.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        readonly type: string;
+        readonly type: Excel.ConditionalFormatType | "Custom" | "DataBar" | "ColorScale" | "IconSet" | "TopBottom" | "PresetCriteria" | "ContainsText" | "CellValue";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalFormat): void;
         /**
          *
          * Deletes this conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         delete(): void;
         /**
          *
          * Returns the range the conditonal format is applied to or a null object if the range is discontiguous. Read-only.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         getRange(): Excel.Range;
         /**
          *
          * Returns the range the conditonal format is applied to or a null object if the range is discontiguous. Read-only.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         getRangeOrNullObject(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalFormat;
-        toJSON(): {
-            "cellValue": CellValueConditionalFormat;
-            "cellValueOrNullObject": CellValueConditionalFormat;
-            "colorScale": ColorScaleConditionalFormat;
-            "colorScaleOrNullObject": ColorScaleConditionalFormat;
-            "custom": CustomConditionalFormat;
-            "customOrNullObject": CustomConditionalFormat;
-            "dataBar": DataBarConditionalFormat;
-            "dataBarOrNullObject": DataBarConditionalFormat;
-            "iconSet": IconSetConditionalFormat;
-            "iconSetOrNullObject": IconSetConditionalFormat;
-            "preset": PresetCriteriaConditionalFormat;
-            "presetOrNullObject": PresetCriteriaConditionalFormat;
-            "priority": number;
-            "stopIfTrue": boolean;
-            "textComparison": TextConditionalFormat;
-            "textComparisonOrNullObject": TextConditionalFormat;
-            "topBottom": TopBottomConditionalFormat;
-            "topBottomOrNullObject": TopBottomConditionalFormat;
-            "type": string;
-        };
+        load(option?: Excel.Interfaces.ConditionalFormatLoadOptions): Excel.ConditionalFormat;
+        load(option?: string | string[]): Excel.ConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalFormat;
+        toJSON(): Excel.Interfaces.ConditionalFormatData;
     }
     /**
      *
      * Represents an Excel Conditional Data Bar Type.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class DataBarConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
          * Representation of all values to the left of the axis in an Excel data bar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly negativeFormat: Excel.ConditionalDataBarNegativeFormat;
         /**
          *
          * Representation of all values to the right of the axis in an Excel data bar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly positiveFormat: Excel.ConditionalDataBarPositiveFormat;
         /**
@@ -7951,73 +9742,64 @@ declare namespace Excel {
          * HTML color code representing the color of the Axis line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
             "" (empty string) if no axis is present or set.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         axisColor: string;
         /**
          *
          * Representation of how the axis is determined for an Excel data bar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        axisFormat: string;
+        axisFormat: Excel.ConditionalDataBarAxisFormat | "Automatic" | "None" | "CellMidPoint";
         /**
          *
          * Represents the direction that the data bar graphic should be based on.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        barDirection: string;
+        barDirection: Excel.ConditionalDataBarDirection | "Context" | "LeftToRight" | "RightToLeft";
         /**
          *
          * The rule for what consistutes the lower bound (and how to calculate it, if applicable) for a data bar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         lowerBoundRule: Excel.ConditionalDataBarRule;
         /**
          *
          * If true, hides the values from the cells where the data bar is applied.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         showDataBarOnly: boolean;
         /**
          *
          * The rule for what constitutes the upper bound (and how to calculate it, if applicable) for a data bar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         upperBoundRule: Excel.ConditionalDataBarRule;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.DataBarConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.DataBarConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: DataBarConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.DataBarConditionalFormat;
-        toJSON(): {
-            "axisColor": string;
-            "axisFormat": string;
-            "barDirection": string;
-            "lowerBoundRule": ConditionalDataBarRule;
-            "negativeFormat": ConditionalDataBarNegativeFormat;
-            "positiveFormat": ConditionalDataBarPositiveFormat;
-            "showDataBarOnly": boolean;
-            "upperBoundRule": ConditionalDataBarRule;
-        };
+        load(option?: Excel.Interfaces.DataBarConditionalFormatLoadOptions): Excel.DataBarConditionalFormat;
+        load(option?: string | string[]): Excel.DataBarConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.DataBarConditionalFormat;
+        toJSON(): Excel.Interfaces.DataBarConditionalFormatData;
     }
     /**
      *
      * Represents a conditional format DataBar Format for the positive side of the data bar.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalDataBarPositiveFormat extends OfficeExtension.ClientObject {
         /**
@@ -8025,47 +9807,43 @@ declare namespace Excel {
          * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
             "" (empty string) if no border is present or set.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         borderColor: string;
         /**
          *
          * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         fillColor: string;
         /**
          *
          * Boolean representation of whether or not the DataBar has a gradient.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         gradientFill: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalDataBarPositiveFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalDataBarPositiveFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalDataBarPositiveFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalDataBarPositiveFormat;
-        toJSON(): {
-            "borderColor": string;
-            "fillColor": string;
-            "gradientFill": boolean;
-        };
+        load(option?: Excel.Interfaces.ConditionalDataBarPositiveFormatLoadOptions): Excel.ConditionalDataBarPositiveFormat;
+        load(option?: string | string[]): Excel.ConditionalDataBarPositiveFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalDataBarPositiveFormat;
+        toJSON(): Excel.Interfaces.ConditionalDataBarPositiveFormatData;
     }
     /**
      *
      * Represents a conditional format DataBar Format for the negative side of the data bar.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalDataBarNegativeFormat extends OfficeExtension.ClientObject {
         /**
@@ -8073,314 +9851,294 @@ declare namespace Excel {
          * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
             "Empty String" if no border is present or set.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         borderColor: string;
         /**
          *
          * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         fillColor: string;
         /**
          *
          * Boolean representation of whether or not the negative DataBar has the same border color as the positive DataBar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         matchPositiveBorderColor: boolean;
         /**
          *
          * Boolean representation of whether or not the negative DataBar has the same fill color as the positive DataBar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         matchPositiveFillColor: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalDataBarNegativeFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalDataBarNegativeFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalDataBarNegativeFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalDataBarNegativeFormat;
-        toJSON(): {
-            "borderColor": string;
-            "fillColor": string;
-            "matchPositiveBorderColor": boolean;
-            "matchPositiveFillColor": boolean;
-        };
+        load(option?: Excel.Interfaces.ConditionalDataBarNegativeFormatLoadOptions): Excel.ConditionalDataBarNegativeFormat;
+        load(option?: string | string[]): Excel.ConditionalDataBarNegativeFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalDataBarNegativeFormat;
+        toJSON(): Excel.Interfaces.ConditionalDataBarNegativeFormatData;
     }
     /**
      *
      * Represents a rule-type for a Data Bar.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalDataBarRule {
         /**
          *
          * The formula, if required, to evaluate the databar rule on.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formula?: string;
         /**
          *
          * The type of rule for the databar.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        type: string;
+        type: Excel.ConditionalFormatRuleType | "Invalid" | "Automatic" | "LowestValue" | "HighestValue" | "Number" | "Percent" | "Formula" | "Percentile";
     }
     /**
      *
      * Represents a custom conditional format type.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class CustomConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly format: Excel.ConditionalRangeFormat;
         /**
          *
          * Represents the Rule object on this conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly rule: Excel.ConditionalFormatRule;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.CustomConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.CustomConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: CustomConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.CustomConditionalFormat;
-        toJSON(): {
-            "format": ConditionalRangeFormat;
-            "rule": ConditionalFormatRule;
-        };
+        load(option?: Excel.Interfaces.CustomConditionalFormatLoadOptions): Excel.CustomConditionalFormat;
+        load(option?: string | string[]): Excel.CustomConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.CustomConditionalFormat;
+        toJSON(): Excel.Interfaces.CustomConditionalFormatData;
     }
     /**
      *
      * Represents a rule, for all traditional rule/format pairings.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalFormatRule extends OfficeExtension.ClientObject {
         /**
          *
          * The formula, if required, to evaluate the conditional format rule on.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formula: string;
         /**
          *
          * The formula, if required, to evaluate the conditional format rule on in the user's language.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formulaLocal: string;
         /**
          *
          * The formula, if required, to evaluate the conditional format rule on in R1C1-style notation.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formulaR1C1: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalFormatRuleUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalFormatRuleUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalFormatRule): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalFormatRule;
-        toJSON(): {
-            "formula": string;
-            "formulaLocal": string;
-            "formulaR1C1": string;
-        };
+        load(option?: Excel.Interfaces.ConditionalFormatRuleLoadOptions): Excel.ConditionalFormatRule;
+        load(option?: string | string[]): Excel.ConditionalFormatRule;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalFormatRule;
+        toJSON(): Excel.Interfaces.ConditionalFormatRuleData;
     }
     /**
      *
      * Represents an IconSet criteria for conditional formatting.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class IconSetConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
          * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        criteria: Array<Excel.ConditionalIconCriterion>;
+        criteria: Excel.ConditionalIconCriterion[];
         /**
          *
          * If true, reverses the icon orders for the IconSet. Note that this cannot be set if custom icons are used.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         reverseIconOrder: boolean;
         /**
          *
          * If true, hides the values and only shows icons.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         showIconOnly: boolean;
         /**
          *
          * If set, displays the IconSet option for the conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        style: string;
+        style: Excel.IconSet | "Invalid" | "ThreeArrows" | "ThreeArrowsGray" | "ThreeFlags" | "ThreeTrafficLights1" | "ThreeTrafficLights2" | "ThreeSigns" | "ThreeSymbols" | "ThreeSymbols2" | "FourArrows" | "FourArrowsGray" | "FourRedToBlack" | "FourRating" | "FourTrafficLights" | "FiveArrows" | "FiveArrowsGray" | "FiveRating" | "FiveQuarters" | "ThreeStars" | "ThreeTriangles" | "FiveBoxes";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.IconSetConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.IconSetConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: IconSetConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.IconSetConditionalFormat;
-        toJSON(): {
-            "criteria": ConditionalIconCriterion[];
-            "reverseIconOrder": boolean;
-            "showIconOnly": boolean;
-            "style": string;
-        };
+        load(option?: Excel.Interfaces.IconSetConditionalFormatLoadOptions): Excel.IconSetConditionalFormat;
+        load(option?: string | string[]): Excel.IconSetConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.IconSetConditionalFormat;
+        toJSON(): Excel.Interfaces.IconSetConditionalFormatData;
     }
     /**
      *
      * Represents an Icon Criterion which contains a type, value, an Operator, and an optional custom icon, if not using an iconset.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalIconCriterion {
         /**
          *
          * The custom icon for the current criterion if different from the default IconSet, else null will be returned.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         customIcon?: Excel.Icon;
         /**
          *
          * A number or a formula depending on the type.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formula: string;
         /**
          *
          * GreaterThan or GreaterThanOrEqual for each of the rule type for the Icon conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        operator: string;
+        operator: Excel.ConditionalIconCriterionOperator | "Invalid" | "GreaterThan" | "GreaterThanOrEqual";
         /**
          *
          * What the icon conditional formula should be based on.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        type: string;
+        type: Excel.ConditionalFormatIconRuleType | "Invalid" | "Number" | "Percent" | "Formula" | "Percentile";
     }
     /**
      *
      * Represents an IconSet criteria for conditional formatting.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ColorScaleConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
          * The criteria of the color scale. Midpoint is optional when using a two point color scale.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         criteria: Excel.ConditionalColorScaleCriteria;
         /**
          *
          * If true the color scale will have three points (minimum, midpoint, maximum), otherwise it will have two (minimum, maximum).
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly threeColorScale: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ColorScaleConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ColorScaleConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ColorScaleConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ColorScaleConditionalFormat;
-        toJSON(): {
-            "criteria": ConditionalColorScaleCriteria;
-            "threeColorScale": boolean;
-        };
+        load(option?: Excel.Interfaces.ColorScaleConditionalFormatLoadOptions): Excel.ColorScaleConditionalFormat;
+        load(option?: string | string[]): Excel.ColorScaleConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ColorScaleConditionalFormat;
+        toJSON(): Excel.Interfaces.ColorScaleConditionalFormatData;
     }
     /**
      *
      * Represents the criteria of the color scale.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalColorScaleCriteria {
         /**
          *
          * The maximum point Color Scale Criterion.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         maximum: Excel.ConditionalColorScaleCriterion;
         /**
          *
          * The midpoint Color Scale Criterion if the color scale is a 3-color scale.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         midpoint?: Excel.ConditionalColorScaleCriterion;
         /**
          *
          * The minimum point Color Scale Criterion.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         minimum: Excel.ConditionalColorScaleCriterion;
     }
@@ -8388,204 +10146,195 @@ declare namespace Excel {
      *
      * Represents a Color Scale Criterion which contains a type, value and a color.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalColorScaleCriterion {
         /**
          *
          * HTML color code representation of the color scale color. E.g. #FF0000 represents Red.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         color?: string;
         /**
          *
          * A number, a formula, or null (if Type is LowestValue).
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formula?: string;
         /**
          *
          * What the icon conditional formula should be based on.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        type: string;
+        type: Excel.ConditionalFormatColorCriterionType | "Invalid" | "LowestValue" | "HighestValue" | "Number" | "Percent" | "Formula" | "Percentile";
     }
     /**
      *
      * Represents a Top/Bottom conditional format.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class TopBottomConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly format: Excel.ConditionalRangeFormat;
         /**
          *
          * The criteria of the Top/Bottom conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalTopBottomRule;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TopBottomConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TopBottomConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: TopBottomConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TopBottomConditionalFormat;
-        toJSON(): {
-            "format": ConditionalRangeFormat;
-            "rule": ConditionalTopBottomRule;
-        };
+        load(option?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions): Excel.TopBottomConditionalFormat;
+        load(option?: string | string[]): Excel.TopBottomConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.TopBottomConditionalFormat;
+        toJSON(): Excel.Interfaces.TopBottomConditionalFormatData;
     }
     /**
      *
      * Represents the rule of the top/bottom conditional format.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalTopBottomRule {
         /**
          *
          * The rank between 1 and 1000 for numeric ranks or 1 and 100 for percent ranks.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         rank: number;
         /**
          *
          * Format values based on the top or bottom rank.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        type: string;
+        type: Excel.ConditionalTopBottomCriterionType | "Invalid" | "TopItems" | "TopPercent" | "BottomItems" | "BottomPercent";
     }
     /**
      *
      * Represents the the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class PresetCriteriaConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly format: Excel.ConditionalRangeFormat;
         /**
          *
          * The rule of the conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalPresetCriteriaRule;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.PresetCriteriaConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.PresetCriteriaConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: PresetCriteriaConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.PresetCriteriaConditionalFormat;
-        toJSON(): {
-            "format": ConditionalRangeFormat;
-            "rule": ConditionalPresetCriteriaRule;
-        };
+        load(option?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions): Excel.PresetCriteriaConditionalFormat;
+        load(option?: string | string[]): Excel.PresetCriteriaConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.PresetCriteriaConditionalFormat;
+        toJSON(): Excel.Interfaces.PresetCriteriaConditionalFormatData;
     }
     /**
      *
      * Represents the Preset Criteria Conditional Format Rule
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalPresetCriteriaRule {
         /**
          *
          * The criterion of the conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        criterion: string;
+        criterion: Excel.ConditionalFormatPresetCriterion | "Invalid" | "Blanks" | "NonBlanks" | "Errors" | "NonErrors" | "Yesterday" | "Today" | "Tomorrow" | "LastSevenDays" | "LastWeek" | "ThisWeek" | "NextWeek" | "LastMonth" | "ThisMonth" | "NextMonth" | "AboveAverage" | "BelowAverage" | "EqualOrAboveAverage" | "EqualOrBelowAverage" | "OneStdDevAboveAverage" | "OneStdDevBelowAverage" | "TwoStdDevAboveAverage" | "TwoStdDevBelowAverage" | "ThreeStdDevAboveAverage" | "ThreeStdDevBelowAverage" | "UniqueValues" | "DuplicateValues";
     }
     /**
      *
      * Represents a specific text conditional format.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class TextConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly format: Excel.ConditionalRangeFormat;
         /**
          *
          * The rule of the conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalTextComparisonRule;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TextConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TextConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: TextConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TextConditionalFormat;
-        toJSON(): {
-            "format": ConditionalRangeFormat;
-            "rule": ConditionalTextComparisonRule;
-        };
+        load(option?: Excel.Interfaces.TextConditionalFormatLoadOptions): Excel.TextConditionalFormat;
+        load(option?: string | string[]): Excel.TextConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.TextConditionalFormat;
+        toJSON(): Excel.Interfaces.TextConditionalFormatData;
     }
     /**
      *
      * Represents a Cell Value Conditional Format Rule
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalTextComparisonRule {
         /**
          *
          * The operator of the text conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        operator: string;
+        operator: Excel.ConditionalTextOperator | "Invalid" | "Contains" | "NotContains" | "BeginsWith" | "EndsWith";
         /**
          *
          * The Text value of conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         text: string;
     }
@@ -8593,335 +10342,327 @@ declare namespace Excel {
      *
      * Represents a cell value conditional format.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class CellValueConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly format: Excel.ConditionalRangeFormat;
         /**
          *
          * Represents the Rule object on this conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalCellValueRule;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.CellValueConditionalFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.CellValueConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: CellValueConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.CellValueConditionalFormat;
-        toJSON(): {
-            "format": ConditionalRangeFormat;
-            "rule": ConditionalCellValueRule;
-        };
+        load(option?: Excel.Interfaces.CellValueConditionalFormatLoadOptions): Excel.CellValueConditionalFormat;
+        load(option?: string | string[]): Excel.CellValueConditionalFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.CellValueConditionalFormat;
+        toJSON(): Excel.Interfaces.CellValueConditionalFormatData;
     }
     /**
      *
      * Represents a Cell Value Conditional Format Rule
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     interface ConditionalCellValueRule {
         /**
          *
          * The formula, if required, to evaluate the conditional format rule on.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formula1: string;
         /**
          *
          * The formula, if required, to evaluate the conditional format rule on.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         formula2?: string;
         /**
          *
          * The operator of the text conditional format.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        operator: string;
+        operator: Excel.ConditionalCellValueOperator | "Invalid" | "Between" | "NotBetween" | "EqualTo" | "NotEqualTo" | "GreaterThan" | "LessThan" | "GreaterThanOrEqual" | "LessThanOrEqual";
     }
     /**
      *
      * A format object encapsulating the conditional formats range's font, fill, borders, and other properties.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalRangeFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Collection of border objects that apply to the overall conditional format range. Read-only.
+         * Collection of border objects that apply to the overall conditional format range.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly borders: Excel.ConditionalRangeBorderCollection;
         /**
          *
-         * Returns the fill object defined on the overall conditional format range. Read-only.
+         * Returns the fill object defined on the overall conditional format range.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly fill: Excel.ConditionalRangeFill;
         /**
          *
-         * Returns the font object defined on the overall conditional format range. Read-only.
+         * Returns the font object defined on the overall conditional format range.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly font: Excel.ConditionalRangeFont;
         /**
          *
          * Represents Excel's number format code for the given range. Cleared if null is passed in.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         numberFormat: any;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalRangeFormatUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalRangeFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalRangeFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalRangeFormat;
-        toJSON(): {
-            "numberFormat": any;
-        };
+        load(option?: Excel.Interfaces.ConditionalRangeFormatLoadOptions): Excel.ConditionalRangeFormat;
+        load(option?: string | string[]): Excel.ConditionalRangeFormat;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalRangeFormat;
+        toJSON(): Excel.Interfaces.ConditionalRangeFormatData;
     }
     /**
      *
      * This object represents the font attributes (font style,, color, etc.) for an object.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalRangeFont extends OfficeExtension.ClientObject {
         /**
          *
          * Represents the bold status of font.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         bold: boolean;
         /**
          *
          * HTML color code representation of the text color. E.g. #FF0000 represents Red.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         color: string;
         /**
          *
          * Represents the italic status of the font.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         italic: boolean;
         /**
          *
          * Represents the strikethrough status of the font.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         strikethrough: boolean;
         /**
          *
          * Type of underline applied to the font. See Excel.ConditionalRangeFontUnderlineStyle for details.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        underline: string;
+        underline: Excel.ConditionalRangeFontUnderlineStyle | "None" | "Single" | "Double";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalRangeFontUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalRangeFontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalRangeFont): void;
         /**
          *
          * Resets the font formats.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalRangeFont;
-        toJSON(): {
-            "bold": boolean;
-            "color": string;
-            "italic": boolean;
-            "strikethrough": boolean;
-            "underline": string;
-        };
+        load(option?: Excel.Interfaces.ConditionalRangeFontLoadOptions): Excel.ConditionalRangeFont;
+        load(option?: string | string[]): Excel.ConditionalRangeFont;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalRangeFont;
+        toJSON(): Excel.Interfaces.ConditionalRangeFontData;
     }
     /**
      *
      * Represents the background of a conditional range object.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalRangeFill extends OfficeExtension.ClientObject {
         /**
          *
          * HTML color code representing the color of the fill, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         color: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalRangeFillUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalRangeFillUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalRangeFill): void;
         /**
          *
          * Resets the fill.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalRangeFill;
-        toJSON(): {
-            "color": string;
-        };
+        load(option?: Excel.Interfaces.ConditionalRangeFillLoadOptions): Excel.ConditionalRangeFill;
+        load(option?: string | string[]): Excel.ConditionalRangeFill;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalRangeFill;
+        toJSON(): Excel.Interfaces.ConditionalRangeFillData;
     }
     /**
      *
      * Represents the border of an object.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalRangeBorder extends OfficeExtension.ClientObject {
         /**
          *
          * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         color: string;
         /**
          *
          * Constant value that indicates the specific side of the border. See Excel.ConditionalRangeBorderIndex for details. Read-only.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        readonly sideIndex: string;
+        readonly sideIndex: Excel.ConditionalRangeBorderIndex | "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight";
         /**
          *
          * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
-        style: string;
+        style: Excel.ConditionalRangeBorderLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ConditionalRangeBorderUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ConditionalRangeBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ConditionalRangeBorder): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalRangeBorder;
-        toJSON(): {
-            "color": string;
-            "sideIndex": string;
-            "style": string;
-        };
+        load(option?: Excel.Interfaces.ConditionalRangeBorderLoadOptions): Excel.ConditionalRangeBorder;
+        load(option?: string | string[]): Excel.ConditionalRangeBorder;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.ConditionalRangeBorder;
+        toJSON(): Excel.Interfaces.ConditionalRangeBorderData;
     }
     /**
      *
      * Represents the border objects that make up range border.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
     class ConditionalRangeBorderCollection extends OfficeExtension.ClientObject {
         /**
          *
          * Gets the top border
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly bottom: Excel.ConditionalRangeBorder;
         /**
          *
          * Gets the top border
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly left: Excel.ConditionalRangeBorder;
         /**
          *
          * Gets the top border
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly right: Excel.ConditionalRangeBorder;
         /**
          *
          * Gets the top border
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly top: Excel.ConditionalRangeBorder;
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Excel.ConditionalRangeBorder>;
+        readonly items: Excel.ConditionalRangeBorder[];
         /**
          *
          * Number of border objects in the collection. Read-only.
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          */
         readonly count: number;
         /**
          *
          * Gets a border object using its name
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          *
          * @param index Index value of the border object to be retrieved. See Excel.ConditionalRangeBorderIndex for details.
          */
-        getItem(index: string): Excel.ConditionalRangeBorder;
+        getItem(index: Excel.ConditionalRangeBorderIndex): Excel.ConditionalRangeBorder;
+        /**
+         *
+         * Gets a border object using its name
+         *
+         * [Api set: ExcelApi 1.6]
+         *
+         * @param index Index value of the border object to be retrieved. See Excel.ConditionalRangeBorderIndex for details.
+         */
+        getItem(index: "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight"): Excel.ConditionalRangeBorder;
         /**
          *
          * Gets a border object using its index
          *
-         * [Api set: ExcelApi 1.6 (PREVIEW)]
+         * [Api set: ExcelApi 1.6]
          *
          * @param index Index value of the object to be retrieved. Zero-indexed.
          */
@@ -8929,122 +10670,488 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ConditionalRangeBorderCollection;
+        load(option?: Excel.Interfaces.ConditionalRangeBorderCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ConditionalRangeBorderCollection;
+        load(option?: string | string[]): Excel.ConditionalRangeBorderCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.ConditionalRangeBorderCollection;
+        toJSON(): Excel.Interfaces.ConditionalRangeBorderCollectionData;
+    }
+    /**
+     *
+     * An object encapsulating a style's format and other properties.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class Style extends OfficeExtension.ClientObject {
+        /**
+         *
+         * A Border collection of four Border objects that represent the style of the four borders.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly borders: Excel.RangeBorderCollection;
+        /**
+         *
+         * The Fill of the style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly fill: Excel.RangeFill;
+        /**
+         *
+         * A Font object that represents the font of the style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly font: Excel.RangeFont;
+        /**
+         *
+         * Indicates if the style is a built-in style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly builtIn: boolean;
+        /**
+         *
+         * Indicates if the formula will be hidden when the worksheet is protected.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        formulaHidden: boolean;
+        /**
+         *
+         * Represents the horizontal alignment for the style. See Excel.HorizontalAlignment for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        horizontalAlignment: Excel.HorizontalAlignment | "General" | "Left" | "Center" | "Right" | "Fill" | "Justify" | "CenterAcrossSelection" | "Distributed";
+        /**
+         *
+         * Indicates if the style includes the AutoIndent, HorizontalAlignment, VerticalAlignment, WrapText, IndentLevel, and TextOrientation properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        includeAlignment: boolean;
+        /**
+         *
+         * Indicates if the style includes the Color, ColorIndex, LineStyle, and Weight border properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        includeBorder: boolean;
+        /**
+         *
+         * Indicates if the style includes the Background, Bold, Color, ColorIndex, FontStyle, Italic, Name, Size, Strikethrough, Subscript, Superscript, and Underline font properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        includeFont: boolean;
+        /**
+         *
+         * Indicates if the style includes the NumberFormat property.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        includeNumber: boolean;
+        /**
+         *
+         * Indicates if the style includes the Color, ColorIndex, InvertIfNegative, Pattern, PatternColor, and PatternColorIndex interior properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        includePatterns: boolean;
+        /**
+         *
+         * Indicates if the style includes the FormulaHidden and Locked protection properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        includeProtection: boolean;
+        /**
+         *
+         * An integer from 0 to 250 that indicates the indent level for the style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        indentLevel: number;
+        /**
+         *
+         * Indicates if the object is locked when the worksheet is protected.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        locked: boolean;
+        /**
+         *
+         * The name of the style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly name: string;
+        /**
+         *
+         * The format code of the number format for the style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        numberFormat: string;
+        /**
+         *
+         * The localized format code of the number format for the style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        numberFormatLocal: string;
+        /**
+         *
+         * The reading order for the style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readingOrder: Excel.ReadingOrder | "Context" | "LeftToRight" | "RightToLeft";
+        /**
+         *
+         * Indicates if text automatically shrinks to fit in the available column width.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        shrinkToFit: boolean;
+        /**
+         *
+         * Represents the vertical alignment for the style. See Excel.VerticalAlignment for details.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        verticalAlignment: Excel.VerticalAlignment | "Top" | "Center" | "Bottom" | "Justify" | "Distributed";
+        /**
+         *
+         * Indicates if Microsoft Excel wraps the text in the object.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        wrapText: boolean;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.StyleUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Style): void;
+        /**
+         *
+         * Deletes this style.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        delete(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.StyleLoadOptions): Excel.Style;
+        load(option?: string | string[]): Excel.Style;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.Style;
+        toJSON(): Excel.Interfaces.StyleData;
+    }
+    /**
+     *
+     * Represents a collection of all the styles.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class StyleCollection extends OfficeExtension.ClientObject {
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.Style[];
+        /**
+         *
+         * Adds a new style to the collection.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param name Name of the style to be added.
+         */
+        add(name: string): void;
+        /**
+         *
+         * Gets a style by name.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param name Name of the style to be retrieved.
+         */
+        getItem(name: string): Excel.Style;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Excel.Interfaces.StyleCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.StyleCollection;
+        load(option?: string | string[]): Excel.StyleCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.StyleCollection;
+        toJSON(): Excel.Interfaces.StyleCollectionData;
+    }
+    /**
+     *
+     * Represents a collection of all the Data Connections that are part of the workbook or worksheet.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    class DataConnectionCollection extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Refreshes all the Data Connections in the collection.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        refreshAll(): void;
         toJSON(): {
-            "count": number;
+            [key: string]: string;
         };
     }
     /**
-     * [Api set: ExcelApi 1.1]
+     * [Api set: ExcelApi 1.7]
      */
-    namespace BindingType {
-        var range: string;
-        var table: string;
-        var text: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace BorderIndex {
-        var edgeTop: string;
-        var edgeBottom: string;
-        var edgeLeft: string;
-        var edgeRight: string;
-        var insideVertical: string;
-        var insideHorizontal: string;
-        var diagonalDown: string;
-        var diagonalUp: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace BorderLineStyle {
-        var none: string;
-        var continuous: string;
-        var dash: string;
-        var dashDot: string;
-        var dashDotDot: string;
-        var dot: string;
-        var double: string;
-        var slantDashDot: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace BorderWeight {
-        var hairline: string;
-        var thin: string;
-        var medium: string;
-        var thick: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace CalculationMode {
-        var automatic: string;
-        var automaticExceptTables: string;
-        var manual: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace CalculationType {
+    enum ChartAxisType {
+        invalid = "Invalid",
         /**
          *
-         * Recalculates all cells that Excel has marked as dirty, that is, dependents of volatile or changed data, and cells programmatically marked as dirty.
+         * Axis displays categories.
          *
          */
-        var recalculate: string;
+        category = "Category",
         /**
          *
-         * This will mark all cells as dirty and then recalculate them.
+         * Axis displays values.
          *
          */
-        var full: string;
+        value = "Value",
         /**
          *
-         * This will rebuild the full dependency chain, mark all cells as dirty and then recalculate them.
+         * Axis displays data series.
          *
          */
-        var fullRebuild: string;
+        series = "Series",
     }
     /**
-     * [Api set: ExcelApi 1.1 for All/Formats/Contents, 1.7 for Hyperlinks.]
+     * [Api set: ExcelApi 1.7]
      */
-    namespace ClearApplyTo {
-        var all: string;
-        var formats: string;
-        var contents: string;
-        var hyperlinks: string;
+    enum ChartAxisGroup {
+        primary = "Primary",
+        secondary = "Secondary",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartAxisScaleType {
+        linear = "Linear",
+        logarithmic = "Logarithmic",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartAxisPosition {
+        automatic = "Automatic",
+        maximum = "Maximum",
+        minimum = "Minimum",
+        custom = "Custom",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartAxisTickMark {
+        none = "None",
+        cross = "Cross",
+        inside = "Inside",
+        outside = "Outside",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartAxisTickLabelPosition {
+        nextToAxis = "NextToAxis",
+        high = "High",
+        low = "Low",
+        none = "None",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartAxisDisplayUnit {
+        /**
+         *
+         * Default option. This will reset display unit to the axis, and set unit label invisible.
+         *
+         */
+        none = "None",
+        /**
+         *
+         * This will set the axis in units of hundreds.
+         *
+         */
+        hundreds = "Hundreds",
+        /**
+         *
+         * This will set the axis in units of thousands.
+         *
+         */
+        thousands = "Thousands",
+        /**
+         *
+         * This will set the axis in units of tens of thousands.
+         *
+         */
+        tenThousands = "TenThousands",
+        /**
+         *
+         * This will set the axis in units of hundreds of thousands.
+         *
+         */
+        hundredThousands = "HundredThousands",
+        /**
+         *
+         * This will set the axis in units of millions.
+         *
+         */
+        millions = "Millions",
+        /**
+         *
+         * This will set the axis in units of tens of millions.
+         *
+         */
+        tenMillions = "TenMillions",
+        /**
+         *
+         * This will set the axis in units of hundreds of millions.
+         *
+         */
+        hundredMillions = "HundredMillions",
+        /**
+         *
+         * This will set the axis in units of billions.
+         *
+         */
+        billions = "Billions",
+        /**
+         *
+         * This will set the axis in units of trillions.
+         *
+         */
+        trillions = "Trillions",
+        /**
+         *
+         * This will set the axis in units of custom value.
+         *
+         */
+        custom = "Custom",
+    }
+    /**
+     *
+     * Specifies the unit of time for chart axes and data series.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartAxisTimeUnit {
+        days = "Days",
+        months = "Months",
+        years = "Years",
+    }
+    /**
+     *
+     * Specifies the type of the category axis.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartAxisCategoryType {
+        /**
+         *
+         * Excel controls the axis type.
+         *
+         */
+        automatic = "Automatic",
+        /**
+         *
+         * Axis groups data by an arbitrary set of categories.
+         *
+         */
+        textAxis = "TextAxis",
+        /**
+         *
+         * Axis groups data on a time scale.
+         *
+         */
+        dateAxis = "DateAxis",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartLineStyle {
+        none = "None",
+        continuous = "Continuous",
+        dash = "Dash",
+        dashDot = "DashDot",
+        dashDotDot = "DashDotDot",
+        dot = "Dot",
+        grey25 = "Grey25",
+        grey50 = "Grey50",
+        grey75 = "Grey75",
+        automatic = "Automatic",
+        roundDot = "RoundDot",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace ChartDataLabelPosition {
-        var invalid: string;
-        var none: string;
-        var center: string;
-        var insideEnd: string;
-        var insideBase: string;
-        var outsideEnd: string;
-        var left: string;
-        var right: string;
-        var top: string;
-        var bottom: string;
-        var bestFit: string;
-        var callout: string;
+    enum ChartDataLabelPosition {
+        invalid = "Invalid",
+        none = "None",
+        center = "Center",
+        insideEnd = "InsideEnd",
+        insideBase = "InsideBase",
+        outsideEnd = "OutsideEnd",
+        left = "Left",
+        right = "Right",
+        top = "Top",
+        bottom = "Bottom",
+        bestFit = "BestFit",
+        callout = "Callout",
+    }
+    /**
+     *
+     * Represents the position of chart title.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartTitlePosition {
+        automatic = "Automatic",
+        top = "Top",
+        bottom = "Bottom",
+        left = "Left",
+        right = "Right",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace ChartLegendPosition {
-        var invalid: string;
-        var top: string;
-        var bottom: string;
-        var left: string;
-        var right: string;
-        var corner: string;
-        var custom: string;
+    enum ChartLegendPosition {
+        invalid = "Invalid",
+        top = "Top",
+        bottom = "Bottom",
+        left = "Left",
+        right = "Right",
+        corner = "Corner",
+        custom = "Custom",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartMarkerStyle {
+        invalid = "Invalid",
+        automatic = "Automatic",
+        none = "None",
+        square = "Square",
+        diamond = "Diamond",
+        triangle = "Triangle",
+        x = "X",
+        star = "Star",
+        dot = "Dot",
+        dash = "Dash",
+        circle = "Circle",
+        plus = "Plus",
+        picture = "Picture",
     }
     /**
      *
@@ -9052,529 +11159,1040 @@ declare namespace Excel {
      *
      * [Api set: ExcelApi 1.1]
      */
-    namespace ChartSeriesBy {
+    enum ChartSeriesBy {
         /**
          *
          * On Desktop, the "auto" option will inspect the source data shape to automatically guess whether the data is by rows or columns; on Excel Online, "auto" will simply default to "columns".
          *
          */
-        var auto: string;
-        var columns: string;
-        var rows: string;
+        auto = "Auto",
+        columns = "Columns",
+        rows = "Rows",
+    }
+    /**
+     *
+     * Represents the horizontal alignment for the specified object.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartTextHorizontalAlignment {
+        center = "Center",
+        left = "Left",
+        right = "Right",
+        justify = "Justify",
+        distributed = "Distributed",
+    }
+    /**
+     *
+     * Represents the vertical alignment for the specified object.
+     *
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartTextVerticalAlignment {
+        center = "Center",
+        bottom = "Bottom",
+        top = "Top",
+        justify = "Justify",
+        distributed = "Distributed",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace ChartType {
-        var invalid: string;
-        var columnClustered: string;
-        var columnStacked: string;
-        var columnStacked100: string;
-        var _3DColumnClustered: string;
-        var _3DColumnStacked: string;
-        var _3DColumnStacked100: string;
-        var barClustered: string;
-        var barStacked: string;
-        var barStacked100: string;
-        var _3DBarClustered: string;
-        var _3DBarStacked: string;
-        var _3DBarStacked100: string;
-        var lineStacked: string;
-        var lineStacked100: string;
-        var lineMarkers: string;
-        var lineMarkersStacked: string;
-        var lineMarkersStacked100: string;
-        var pieOfPie: string;
-        var pieExploded: string;
-        var _3DPieExploded: string;
-        var barOfPie: string;
-        var xyscatterSmooth: string;
-        var xyscatterSmoothNoMarkers: string;
-        var xyscatterLines: string;
-        var xyscatterLinesNoMarkers: string;
-        var areaStacked: string;
-        var areaStacked100: string;
-        var _3DAreaStacked: string;
-        var _3DAreaStacked100: string;
-        var doughnutExploded: string;
-        var radarMarkers: string;
-        var radarFilled: string;
-        var surface: string;
-        var surfaceWireframe: string;
-        var surfaceTopView: string;
-        var surfaceTopViewWireframe: string;
-        var bubble: string;
-        var bubble3DEffect: string;
-        var stockHLC: string;
-        var stockOHLC: string;
-        var stockVHLC: string;
-        var stockVOHLC: string;
-        var cylinderColClustered: string;
-        var cylinderColStacked: string;
-        var cylinderColStacked100: string;
-        var cylinderBarClustered: string;
-        var cylinderBarStacked: string;
-        var cylinderBarStacked100: string;
-        var cylinderCol: string;
-        var coneColClustered: string;
-        var coneColStacked: string;
-        var coneColStacked100: string;
-        var coneBarClustered: string;
-        var coneBarStacked: string;
-        var coneBarStacked100: string;
-        var coneCol: string;
-        var pyramidColClustered: string;
-        var pyramidColStacked: string;
-        var pyramidColStacked100: string;
-        var pyramidBarClustered: string;
-        var pyramidBarStacked: string;
-        var pyramidBarStacked100: string;
-        var pyramidCol: string;
-        var _3DColumn: string;
-        var line: string;
-        var _3DLine: string;
-        var _3DPie: string;
-        var pie: string;
-        var xyscatter: string;
-        var _3DArea: string;
-        var area: string;
-        var doughnut: string;
-        var radar: string;
+    enum ChartType {
+        invalid = "Invalid",
+        columnClustered = "ColumnClustered",
+        columnStacked = "ColumnStacked",
+        columnStacked100 = "ColumnStacked100",
+        _3DColumnClustered = "3DColumnClustered",
+        _3DColumnStacked = "3DColumnStacked",
+        _3DColumnStacked100 = "3DColumnStacked100",
+        barClustered = "BarClustered",
+        barStacked = "BarStacked",
+        barStacked100 = "BarStacked100",
+        _3DBarClustered = "3DBarClustered",
+        _3DBarStacked = "3DBarStacked",
+        _3DBarStacked100 = "3DBarStacked100",
+        lineStacked = "LineStacked",
+        lineStacked100 = "LineStacked100",
+        lineMarkers = "LineMarkers",
+        lineMarkersStacked = "LineMarkersStacked",
+        lineMarkersStacked100 = "LineMarkersStacked100",
+        pieOfPie = "PieOfPie",
+        pieExploded = "PieExploded",
+        _3DPieExploded = "3DPieExploded",
+        barOfPie = "BarOfPie",
+        xyscatterSmooth = "XYScatterSmooth",
+        xyscatterSmoothNoMarkers = "XYScatterSmoothNoMarkers",
+        xyscatterLines = "XYScatterLines",
+        xyscatterLinesNoMarkers = "XYScatterLinesNoMarkers",
+        areaStacked = "AreaStacked",
+        areaStacked100 = "AreaStacked100",
+        _3DAreaStacked = "3DAreaStacked",
+        _3DAreaStacked100 = "3DAreaStacked100",
+        doughnutExploded = "DoughnutExploded",
+        radarMarkers = "RadarMarkers",
+        radarFilled = "RadarFilled",
+        surface = "Surface",
+        surfaceWireframe = "SurfaceWireframe",
+        surfaceTopView = "SurfaceTopView",
+        surfaceTopViewWireframe = "SurfaceTopViewWireframe",
+        bubble = "Bubble",
+        bubble3DEffect = "Bubble3DEffect",
+        stockHLC = "StockHLC",
+        stockOHLC = "StockOHLC",
+        stockVHLC = "StockVHLC",
+        stockVOHLC = "StockVOHLC",
+        cylinderColClustered = "CylinderColClustered",
+        cylinderColStacked = "CylinderColStacked",
+        cylinderColStacked100 = "CylinderColStacked100",
+        cylinderBarClustered = "CylinderBarClustered",
+        cylinderBarStacked = "CylinderBarStacked",
+        cylinderBarStacked100 = "CylinderBarStacked100",
+        cylinderCol = "CylinderCol",
+        coneColClustered = "ConeColClustered",
+        coneColStacked = "ConeColStacked",
+        coneColStacked100 = "ConeColStacked100",
+        coneBarClustered = "ConeBarClustered",
+        coneBarStacked = "ConeBarStacked",
+        coneBarStacked100 = "ConeBarStacked100",
+        coneCol = "ConeCol",
+        pyramidColClustered = "PyramidColClustered",
+        pyramidColStacked = "PyramidColStacked",
+        pyramidColStacked100 = "PyramidColStacked100",
+        pyramidBarClustered = "PyramidBarClustered",
+        pyramidBarStacked = "PyramidBarStacked",
+        pyramidBarStacked100 = "PyramidBarStacked100",
+        pyramidCol = "PyramidCol",
+        _3DColumn = "3DColumn",
+        line = "Line",
+        _3DLine = "3DLine",
+        _3DPie = "3DPie",
+        pie = "Pie",
+        xyscatter = "XYScatter",
+        _3DArea = "3DArea",
+        area = "Area",
+        doughnut = "Doughnut",
+        radar = "Radar",
+    }
+
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    enum ChartUnderlineStyle {
+        none = "None",
+        single = "Single",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ChartTrendlineType {
+        linear = "Linear",
+        exponential = "Exponential",
+        logarithmic = "Logarithmic",
+        movingAverage = "MovingAverage",
+        polynomial = "Polynomial",
+        power = "Power",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace ChartUnderlineStyle {
-        var none: string;
-        var single: string;
+    enum BindingType {
+        range = "Range",
+        table = "Table",
+        text = "Text",
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    enum BorderIndex {
+        edgeTop = "EdgeTop",
+        edgeBottom = "EdgeBottom",
+        edgeLeft = "EdgeLeft",
+        edgeRight = "EdgeRight",
+        insideVertical = "InsideVertical",
+        insideHorizontal = "InsideHorizontal",
+        diagonalDown = "DiagonalDown",
+        diagonalUp = "DiagonalUp",
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    enum BorderLineStyle {
+        none = "None",
+        continuous = "Continuous",
+        dash = "Dash",
+        dashDot = "DashDot",
+        dashDotDot = "DashDotDot",
+        dot = "Dot",
+        double = "Double",
+        slantDashDot = "SlantDashDot",
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    enum BorderWeight {
+        hairline = "Hairline",
+        thin = "Thin",
+        medium = "Medium",
+        thick = "Thick",
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    enum CalculationMode {
+        automatic = "Automatic",
+        automaticExceptTables = "AutomaticExceptTables",
+        manual = "Manual",
+    }
+    /**
+     * [Api set: ExcelApi 1.1]
+     */
+    enum CalculationType {
+        /**
+         *
+         * Recalculates all cells that Excel has marked as dirty, that is, dependents of volatile or changed data, and cells programmatically marked as dirty.
+         *
+         */
+        recalculate = "Recalculate",
+        /**
+         *
+         * This will mark all cells as dirty and then recalculate them.
+         *
+         */
+        full = "Full",
+        /**
+         *
+         * This will rebuild the full dependency chain, mark all cells as dirty and then recalculate them.
+         *
+         */
+        fullRebuild = "FullRebuild",
+    }
+    /**
+     * [Api set: ExcelApi 1.1 for All/Formats/Contents, 1.7 for Hyperlinks & HyperlinksAndFormats.]
+     */
+    enum ClearApplyTo {
+        all = "All",
+        /**
+         *
+         * Clears all formatting for the range.
+         *
+         */
+        formats = "Formats",
+        /**
+         *
+         * Clears the contents of the range.
+         *
+         */
+        contents = "Contents",
+        /**
+         *
+         * Clears all hyperlinks, but leaves all content and formatting intact.
+         *
+         */
+        hyperlinks = "Hyperlinks",
+        /**
+         *
+         * Removes hyperlinks and formatting for the cell but leaves content, conditional formats and data validation intact.
+         *
+         */
+        removeHyperlinks = "RemoveHyperlinks",
     }
     /**
      *
      * Represents the format options for a Data Bar Axis.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalDataBarAxisFormat {
-        var automatic: string;
-        var none: string;
-        var cellMidPoint: string;
+    enum ConditionalDataBarAxisFormat {
+        automatic = "Automatic",
+        none = "None",
+        cellMidPoint = "CellMidPoint",
     }
     /**
      *
      * Represents the Data Bar direction within a cell.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalDataBarDirection {
-        var context: string;
-        var leftToRight: string;
-        var rightToLeft: string;
+    enum ConditionalDataBarDirection {
+        context = "Context",
+        leftToRight = "LeftToRight",
+        rightToLeft = "RightToLeft",
     }
     /**
      *
      * Represents the direction for a selection.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalFormatDirection {
-        var top: string;
-        var bottom: string;
+    enum ConditionalFormatDirection {
+        top = "Top",
+        bottom = "Bottom",
     }
     /**
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalFormatType {
-        var custom: string;
-        var dataBar: string;
-        var colorScale: string;
-        var iconSet: string;
-        var topBottom: string;
-        var presetCriteria: string;
-        var containsText: string;
-        var cellValue: string;
+    enum ConditionalFormatType {
+        custom = "Custom",
+        dataBar = "DataBar",
+        colorScale = "ColorScale",
+        iconSet = "IconSet",
+        topBottom = "TopBottom",
+        presetCriteria = "PresetCriteria",
+        containsText = "ContainsText",
+        cellValue = "CellValue",
     }
     /**
      *
      * Represents the types of conditional format values.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalFormatRuleType {
-        var invalid: string;
-        var automatic: string;
-        var lowestValue: string;
-        var highestValue: string;
-        var number: string;
-        var percent: string;
-        var formula: string;
-        var percentile: string;
+    enum ConditionalFormatRuleType {
+        invalid = "Invalid",
+        automatic = "Automatic",
+        lowestValue = "LowestValue",
+        highestValue = "HighestValue",
+        number = "Number",
+        percent = "Percent",
+        formula = "Formula",
+        percentile = "Percentile",
     }
     /**
      *
      * Represents the types of conditional format values.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalFormatIconRuleType {
-        var invalid: string;
-        var number: string;
-        var percent: string;
-        var formula: string;
-        var percentile: string;
+    enum ConditionalFormatIconRuleType {
+        invalid = "Invalid",
+        number = "Number",
+        percent = "Percent",
+        formula = "Formula",
+        percentile = "Percentile",
     }
     /**
      *
      * Represents the types of conditional format values.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalFormatColorCriterionType {
-        var invalid: string;
-        var lowestValue: string;
-        var highestValue: string;
-        var number: string;
-        var percent: string;
-        var formula: string;
-        var percentile: string;
+    enum ConditionalFormatColorCriterionType {
+        invalid = "Invalid",
+        lowestValue = "LowestValue",
+        highestValue = "HighestValue",
+        number = "Number",
+        percent = "Percent",
+        formula = "Formula",
+        percentile = "Percentile",
     }
     /**
      *
      * Represents the criteria for the above/below average conditional format type.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalTopBottomCriterionType {
-        var invalid: string;
-        var topItems: string;
-        var topPercent: string;
-        var bottomItems: string;
-        var bottomPercent: string;
+    enum ConditionalTopBottomCriterionType {
+        invalid = "Invalid",
+        topItems = "TopItems",
+        topPercent = "TopPercent",
+        bottomItems = "BottomItems",
+        bottomPercent = "BottomPercent",
     }
     /**
      *
      * Represents the criteria for the Preset Criteria conditional format type.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalFormatPresetCriterion {
-        var invalid: string;
-        var blanks: string;
-        var nonBlanks: string;
-        var errors: string;
-        var nonErrors: string;
-        var yesterday: string;
-        var today: string;
-        var tomorrow: string;
-        var lastSevenDays: string;
-        var lastWeek: string;
-        var thisWeek: string;
-        var nextWeek: string;
-        var lastMonth: string;
-        var thisMonth: string;
-        var nextMonth: string;
-        var aboveAverage: string;
-        var belowAverage: string;
-        var equalOrAboveAverage: string;
-        var equalOrBelowAverage: string;
-        var oneStdDevAboveAverage: string;
-        var oneStdDevBelowAverage: string;
-        var twoStdDevAboveAverage: string;
-        var twoStdDevBelowAverage: string;
-        var threeStdDevAboveAverage: string;
-        var threeStdDevBelowAverage: string;
-        var uniqueValues: string;
-        var duplicateValues: string;
+    enum ConditionalFormatPresetCriterion {
+        invalid = "Invalid",
+        blanks = "Blanks",
+        nonBlanks = "NonBlanks",
+        errors = "Errors",
+        nonErrors = "NonErrors",
+        yesterday = "Yesterday",
+        today = "Today",
+        tomorrow = "Tomorrow",
+        lastSevenDays = "LastSevenDays",
+        lastWeek = "LastWeek",
+        thisWeek = "ThisWeek",
+        nextWeek = "NextWeek",
+        lastMonth = "LastMonth",
+        thisMonth = "ThisMonth",
+        nextMonth = "NextMonth",
+        aboveAverage = "AboveAverage",
+        belowAverage = "BelowAverage",
+        equalOrAboveAverage = "EqualOrAboveAverage",
+        equalOrBelowAverage = "EqualOrBelowAverage",
+        oneStdDevAboveAverage = "OneStdDevAboveAverage",
+        oneStdDevBelowAverage = "OneStdDevBelowAverage",
+        twoStdDevAboveAverage = "TwoStdDevAboveAverage",
+        twoStdDevBelowAverage = "TwoStdDevBelowAverage",
+        threeStdDevAboveAverage = "ThreeStdDevAboveAverage",
+        threeStdDevBelowAverage = "ThreeStdDevBelowAverage",
+        uniqueValues = "UniqueValues",
+        duplicateValues = "DuplicateValues",
     }
     /**
      *
      * Represents the operator of the text conditional format type.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalTextOperator {
-        var invalid: string;
-        var contains: string;
-        var notContains: string;
-        var beginsWith: string;
-        var endsWith: string;
+    enum ConditionalTextOperator {
+        invalid = "Invalid",
+        contains = "Contains",
+        notContains = "NotContains",
+        beginsWith = "BeginsWith",
+        endsWith = "EndsWith",
     }
     /**
      *
      * Represents the operator of the text conditional format type.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalCellValueOperator {
-        var invalid: string;
-        var between: string;
-        var notBetween: string;
-        var equalTo: string;
-        var notEqualTo: string;
-        var greaterThan: string;
-        var lessThan: string;
-        var greaterThanOrEqual: string;
-        var lessThanOrEqual: string;
+    enum ConditionalCellValueOperator {
+        invalid = "Invalid",
+        between = "Between",
+        notBetween = "NotBetween",
+        equalTo = "EqualTo",
+        notEqualTo = "NotEqualTo",
+        greaterThan = "GreaterThan",
+        lessThan = "LessThan",
+        greaterThanOrEqual = "GreaterThanOrEqual",
+        lessThanOrEqual = "LessThanOrEqual",
     }
     /**
      *
      * Represents the operator for each icon criteria.
      *
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalIconCriterionOperator {
-        var invalid: string;
-        var greaterThan: string;
-        var greaterThanOrEqual: string;
+    enum ConditionalIconCriterionOperator {
+        invalid = "Invalid",
+        greaterThan = "GreaterThan",
+        greaterThanOrEqual = "GreaterThanOrEqual",
     }
     /**
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalRangeBorderIndex {
-        var edgeTop: string;
-        var edgeBottom: string;
-        var edgeLeft: string;
-        var edgeRight: string;
+    enum ConditionalRangeBorderIndex {
+        edgeTop = "EdgeTop",
+        edgeBottom = "EdgeBottom",
+        edgeLeft = "EdgeLeft",
+        edgeRight = "EdgeRight",
     }
     /**
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalRangeBorderLineStyle {
-        var none: string;
-        var continuous: string;
-        var dash: string;
-        var dashDot: string;
-        var dashDotDot: string;
-        var dot: string;
+    enum ConditionalRangeBorderLineStyle {
+        none = "None",
+        continuous = "Continuous",
+        dash = "Dash",
+        dashDot = "DashDot",
+        dashDotDot = "DashDotDot",
+        dot = "Dot",
     }
     /**
-     * [Api set: ExcelApi 1.6 (PREVIEW)]
+     * [Api set: ExcelApi 1.6]
      */
-    namespace ConditionalRangeFontUnderlineStyle {
-        var none: string;
-        var single: string;
-        var double: string;
+    enum ConditionalRangeFontUnderlineStyle {
+        none = "None",
+        single = "Single",
+        double = "Double",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace DeleteShiftDirection {
-        var up: string;
-        var left: string;
+    enum DeleteShiftDirection {
+        up = "Up",
+        left = "Left",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace DynamicFilterCriteria {
-        var unknown: string;
-        var aboveAverage: string;
-        var allDatesInPeriodApril: string;
-        var allDatesInPeriodAugust: string;
-        var allDatesInPeriodDecember: string;
-        var allDatesInPeriodFebruray: string;
-        var allDatesInPeriodJanuary: string;
-        var allDatesInPeriodJuly: string;
-        var allDatesInPeriodJune: string;
-        var allDatesInPeriodMarch: string;
-        var allDatesInPeriodMay: string;
-        var allDatesInPeriodNovember: string;
-        var allDatesInPeriodOctober: string;
-        var allDatesInPeriodQuarter1: string;
-        var allDatesInPeriodQuarter2: string;
-        var allDatesInPeriodQuarter3: string;
-        var allDatesInPeriodQuarter4: string;
-        var allDatesInPeriodSeptember: string;
-        var belowAverage: string;
-        var lastMonth: string;
-        var lastQuarter: string;
-        var lastWeek: string;
-        var lastYear: string;
-        var nextMonth: string;
-        var nextQuarter: string;
-        var nextWeek: string;
-        var nextYear: string;
-        var thisMonth: string;
-        var thisQuarter: string;
-        var thisWeek: string;
-        var thisYear: string;
-        var today: string;
-        var tomorrow: string;
-        var yearToDate: string;
-        var yesterday: string;
+    enum DynamicFilterCriteria {
+        unknown = "Unknown",
+        aboveAverage = "AboveAverage",
+        allDatesInPeriodApril = "AllDatesInPeriodApril",
+        allDatesInPeriodAugust = "AllDatesInPeriodAugust",
+        allDatesInPeriodDecember = "AllDatesInPeriodDecember",
+        allDatesInPeriodFebruray = "AllDatesInPeriodFebruray",
+        allDatesInPeriodJanuary = "AllDatesInPeriodJanuary",
+        allDatesInPeriodJuly = "AllDatesInPeriodJuly",
+        allDatesInPeriodJune = "AllDatesInPeriodJune",
+        allDatesInPeriodMarch = "AllDatesInPeriodMarch",
+        allDatesInPeriodMay = "AllDatesInPeriodMay",
+        allDatesInPeriodNovember = "AllDatesInPeriodNovember",
+        allDatesInPeriodOctober = "AllDatesInPeriodOctober",
+        allDatesInPeriodQuarter1 = "AllDatesInPeriodQuarter1",
+        allDatesInPeriodQuarter2 = "AllDatesInPeriodQuarter2",
+        allDatesInPeriodQuarter3 = "AllDatesInPeriodQuarter3",
+        allDatesInPeriodQuarter4 = "AllDatesInPeriodQuarter4",
+        allDatesInPeriodSeptember = "AllDatesInPeriodSeptember",
+        belowAverage = "BelowAverage",
+        lastMonth = "LastMonth",
+        lastQuarter = "LastQuarter",
+        lastWeek = "LastWeek",
+        lastYear = "LastYear",
+        nextMonth = "NextMonth",
+        nextQuarter = "NextQuarter",
+        nextWeek = "NextWeek",
+        nextYear = "NextYear",
+        thisMonth = "ThisMonth",
+        thisQuarter = "ThisQuarter",
+        thisWeek = "ThisWeek",
+        thisYear = "ThisYear",
+        today = "Today",
+        tomorrow = "Tomorrow",
+        yearToDate = "YearToDate",
+        yesterday = "Yesterday",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace FilterDatetimeSpecificity {
-        var year: string;
-        var month: string;
-        var day: string;
-        var hour: string;
-        var minute: string;
-        var second: string;
+    enum FilterDatetimeSpecificity {
+        year = "Year",
+        month = "Month",
+        day = "Day",
+        hour = "Hour",
+        minute = "Minute",
+        second = "Second",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace FilterOn {
-        var bottomItems: string;
-        var bottomPercent: string;
-        var cellColor: string;
-        var dynamic: string;
-        var fontColor: string;
-        var values: string;
-        var topItems: string;
-        var topPercent: string;
-        var icon: string;
-        var custom: string;
+    enum FilterOn {
+        bottomItems = "BottomItems",
+        bottomPercent = "BottomPercent",
+        cellColor = "CellColor",
+        dynamic = "Dynamic",
+        fontColor = "FontColor",
+        values = "Values",
+        topItems = "TopItems",
+        topPercent = "TopPercent",
+        icon = "Icon",
+        custom = "Custom",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace FilterOperator {
-        var and: string;
-        var or: string;
+    enum FilterOperator {
+        and = "And",
+        or = "Or",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace HorizontalAlignment {
-        var general: string;
-        var left: string;
-        var center: string;
-        var right: string;
-        var fill: string;
-        var justify: string;
-        var centerAcrossSelection: string;
-        var distributed: string;
+    enum HorizontalAlignment {
+        general = "General",
+        left = "Left",
+        center = "Center",
+        right = "Right",
+        fill = "Fill",
+        justify = "Justify",
+        centerAcrossSelection = "CenterAcrossSelection",
+        distributed = "Distributed",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace IconSet {
-        var invalid: string;
-        var threeArrows: string;
-        var threeArrowsGray: string;
-        var threeFlags: string;
-        var threeTrafficLights1: string;
-        var threeTrafficLights2: string;
-        var threeSigns: string;
-        var threeSymbols: string;
-        var threeSymbols2: string;
-        var fourArrows: string;
-        var fourArrowsGray: string;
-        var fourRedToBlack: string;
-        var fourRating: string;
-        var fourTrafficLights: string;
-        var fiveArrows: string;
-        var fiveArrowsGray: string;
-        var fiveRating: string;
-        var fiveQuarters: string;
-        var threeStars: string;
-        var threeTriangles: string;
-        var fiveBoxes: string;
+    enum IconSet {
+        invalid = "Invalid",
+        threeArrows = "ThreeArrows",
+        threeArrowsGray = "ThreeArrowsGray",
+        threeFlags = "ThreeFlags",
+        threeTrafficLights1 = "ThreeTrafficLights1",
+        threeTrafficLights2 = "ThreeTrafficLights2",
+        threeSigns = "ThreeSigns",
+        threeSymbols = "ThreeSymbols",
+        threeSymbols2 = "ThreeSymbols2",
+        fourArrows = "FourArrows",
+        fourArrowsGray = "FourArrowsGray",
+        fourRedToBlack = "FourRedToBlack",
+        fourRating = "FourRating",
+        fourTrafficLights = "FourTrafficLights",
+        fiveArrows = "FiveArrows",
+        fiveArrowsGray = "FiveArrowsGray",
+        fiveRating = "FiveRating",
+        fiveQuarters = "FiveQuarters",
+        threeStars = "ThreeStars",
+        threeTriangles = "ThreeTriangles",
+        fiveBoxes = "FiveBoxes",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace ImageFittingMode {
-        var fit: string;
-        var fitAndCenter: string;
-        var fill: string;
+    enum ImageFittingMode {
+        fit = "Fit",
+        fitAndCenter = "FitAndCenter",
+        fill = "Fill",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace InsertShiftDirection {
-        var down: string;
-        var right: string;
+    enum InsertShiftDirection {
+        down = "Down",
+        right = "Right",
     }
     /**
      * [Api set: ExcelApi 1.4]
      */
-    namespace NamedItemScope {
-        var worksheet: string;
-        var workbook: string;
+    enum NamedItemScope {
+        worksheet = "Worksheet",
+        workbook = "Workbook",
+    }
+    /**
+     * [Api set: ExcelApi 1.1 for String,Integer,Double,Boolean,Range,Error; 1.7 for Array]
+     */
+    enum NamedItemType {
+        string = "String",
+        integer = "Integer",
+        double = "Double",
+        boolean = "Boolean",
+        range = "Range",
+        error = "Error",
+        array = "Array",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace NamedItemType {
-        var string: string;
-        var integer: string;
-        var double: string;
-        var boolean: string;
-        var range: string;
-        var error: string;
+    enum RangeUnderlineStyle {
+        none = "None",
+        single = "Single",
+        double = "Double",
+        singleAccountant = "SingleAccountant",
+        doubleAccountant = "DoubleAccountant",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace RangeUnderlineStyle {
-        var none: string;
-        var single: string;
-        var double: string;
-        var singleAccountant: string;
-        var doubleAccountant: string;
+    enum SheetVisibility {
+        visible = "Visible",
+        hidden = "Hidden",
+        veryHidden = "VeryHidden",
     }
     /**
-     * [Api set: ExcelApi 1.1]
+     * [Api set: ExcelApi 1.1 for Unknown, Empty, String, Integer, Double, Boolean, Error. 1.7 for RichValue]
      */
-    namespace SheetVisibility {
-        var visible: string;
-        var hidden: string;
-        var veryHidden: string;
-    }
-    /**
-     * [Api set: ExcelApi 1.1]
-     */
-    namespace RangeValueType {
-        var unknown: string;
-        var empty: string;
-        var string: string;
-        var integer: string;
-        var double: string;
-        var boolean: string;
-        var error: string;
+    enum RangeValueType {
+        unknown = "Unknown",
+        empty = "Empty",
+        string = "String",
+        integer = "Integer",
+        double = "Double",
+        boolean = "Boolean",
+        error = "Error",
+        richValue = "RichValue",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace SortOrientation {
-        var rows: string;
-        var columns: string;
+    enum SortOrientation {
+        rows = "Rows",
+        columns = "Columns",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace SortOn {
-        var value: string;
-        var cellColor: string;
-        var fontColor: string;
-        var icon: string;
+    enum SortOn {
+        value = "Value",
+        cellColor = "CellColor",
+        fontColor = "FontColor",
+        icon = "Icon",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace SortDataOption {
-        var normal: string;
-        var textAsNumber: string;
+    enum SortDataOption {
+        normal = "Normal",
+        textAsNumber = "TextAsNumber",
     }
     /**
      * [Api set: ExcelApi 1.2]
      */
-    namespace SortMethod {
-        var pinYin: string;
-        var strokeCount: string;
+    enum SortMethod {
+        pinYin = "PinYin",
+        strokeCount = "StrokeCount",
     }
     /**
      * [Api set: ExcelApi 1.1]
      */
-    namespace VerticalAlignment {
-        var top: string;
-        var center: string;
-        var bottom: string;
-        var justify: string;
-        var distributed: string;
+    enum VerticalAlignment {
+        top = "Top",
+        center = "Center",
+        bottom = "Bottom",
+        justify = "Justify",
+        distributed = "Distributed",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum DocumentPropertyType {
+        number = "Number",
+        boolean = "Boolean",
+        date = "Date",
+        string = "String",
+        float = "Float",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum EventSource {
+        /**
+         *
+         * Local means event comes from local user session.
+         *
+         */
+        local = "Local",
+        /**
+         *
+         * Remote means event comes from remote user session.
+         *
+         */
+        remote = "Remote",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum DataChangeType {
+        /**
+         *
+         * Unknown represents the type of data change is not the listed types.
+         *
+         */
+        unknown = "Unknown",
+        /**
+         *
+         * RangeEdited represents the data change event is triggered by range being edited.
+         *
+         */
+        rangeEdited = "RangeEdited",
+        /**
+         *
+         * RowInserted represents the data change event is triggered by inserting new rows.
+         *
+         */
+        rowInserted = "RowInserted",
+        /**
+         *
+         * RowDeleted represents the data change event is triggered by deleting rows.
+         *
+         */
+        rowDeleted = "RowDeleted",
+        /**
+         *
+         * ColumnInserted represents the data change event is triggered by inserting new columns.
+         *
+         */
+        columnInserted = "ColumnInserted",
+        /**
+         *
+         * ColumnDeleted represents the data change event is triggered by deleting columns.
+         *
+         */
+        columnDeleted = "ColumnDeleted",
+        /**
+         *
+         * CellInserted represents the data change event is triggered by inserting new cells.
+         *
+         */
+        cellInserted = "CellInserted",
+        /**
+         *
+         * CellDeleted represents the data change event is triggered by deleting cells.
+         *
+         */
+        cellDeleted = "CellDeleted",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum EventType {
+        /**
+         *
+         * WorksheetChanged represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when data changes.
+         *
+         */
+        worksheetChanged = "WorksheetChanged",
+        /**
+         *
+         * WorksheetSelectionChanged represents the type of event that is registered on Worksheet, and occurs when selection changes.
+         *
+         */
+        worksheetSelectionChanged = "WorksheetSelectionChanged",
+        /**
+         *
+         * WorksheetAdded represents the type of event that is registered on WorksheetCollection, and occurs when a new worksheet is added to the workbook.
+         *
+         */
+        worksheetAdded = "WorksheetAdded",
+        /**
+         *
+         * WorksheetActivated represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when worksheet activates.
+         *
+         */
+        worksheetActivated = "WorksheetActivated",
+        /**
+         *
+         * WorksheetDeactivated represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when worksheet deactivates.
+         *
+         */
+        worksheetDeactivated = "WorksheetDeactivated",
+        /**
+         *
+         * TableChanged represents the type of event that is registered on Table, and occurs when data changes.
+         *
+         */
+        tableChanged = "TableChanged",
+        /**
+         *
+         * TableSelectionChanged represents the type of event that is registered on Table, and occurs when selection changes.
+         *
+         */
+        tableSelectionChanged = "TableSelectionChanged",
+        /**
+         *
+         * WorksheetDeleted represents the type of event that is registered on WorksheetCollection, and occurs when a worksheet is deleted from the workbook.
+         *
+         */
+        worksheetDeleted = "WorksheetDeleted",
+        /**
+         *
+         * ChartAdded represents the type of event that is registered on ChartCollection, and occurs when a new chart is added to the worksheet.
+         *
+         */
+        chartAdded = "ChartAdded",
+        /**
+         *
+         * ChartActivated represents the type of event that is registered on Chart or ChartCollection, and occurs when chart activates.
+         *
+         */
+        chartActivated = "ChartActivated",
+        /**
+         *
+         * ChartDeactivated represents the type of event that is registered on Chart or ChartCollection, and occurs when chart deactivates.
+         *
+         */
+        chartDeactivated = "ChartDeactivated",
+        /**
+         *
+         * ChartDeleted represents the type of event that is registered on ChartCollection, and occurs when a chart is deleted from the worksheet.
+         *
+         */
+        chartDeleted = "ChartDeleted",
+        /**
+         *
+         * WorksheetCalculated represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when a worksheet is calculated.
+         *
+         */
+        worksheetCalculated = "WorksheetCalculated",
+        /**
+         *
+         * ChartActivated represents the type of event that is registered on Chart or ChartCollection, and occurs when chart activates.
+         *
+         */
+        visualSelectionChanged = "VisualSelectionChanged",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum DocumentPropertyItem {
+        title = "Title",
+        subject = "Subject",
+        author = "Author",
+        keywords = "Keywords",
+        comments = "Comments",
+        template = "Template",
+        lastAuth = "LastAuth",
+        revision = "Revision",
+        appName = "AppName",
+        lastPrint = "LastPrint",
+        creation = "Creation",
+        lastSave = "LastSave",
+        category = "Category",
+        format = "Format",
+        manager = "Manager",
+        company = "Company",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ProtectionSelectionMode {
+        /**
+         *
+         * Selection is allowed for all cells.
+         *
+         */
+        normal = "Normal",
+        /**
+         *
+         * Selection is allowed only for cells that are not locked.
+         *
+         */
+        unlocked = "Unlocked",
+        /**
+         *
+         * Selection is not allowed for all cells.
+         *
+         */
+        none = "None",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum PageOrientation {
+        portrait = "Portrait",
+        landscape = "Landscape",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum PaperType {
+        letter = "Letter",
+        letterSmall = "LetterSmall",
+        tabloid = "Tabloid",
+        ledger = "Ledger",
+        legal = "Legal",
+        statement = "Statement",
+        executive = "Executive",
+        a3 = "A3",
+        a4 = "A4",
+        a4Small = "A4Small",
+        a5 = "A5",
+        b4 = "B4",
+        b5 = "B5",
+        folio = "Folio",
+        quatro = "Quatro",
+        paper10x14 = "Paper10x14",
+        paper11x17 = "Paper11x17",
+        note = "Note",
+        envelope9 = "Envelope9",
+        envelope10 = "Envelope10",
+        envelope11 = "Envelope11",
+        envelope12 = "Envelope12",
+        envelope14 = "Envelope14",
+        csheet = "Csheet",
+        dsheet = "Dsheet",
+        esheet = "Esheet",
+        envelopeDL = "EnvelopeDL",
+        envelopeC5 = "EnvelopeC5",
+        envelopeC3 = "EnvelopeC3",
+        envelopeC4 = "EnvelopeC4",
+        envelopeC6 = "EnvelopeC6",
+        envelopeC65 = "EnvelopeC65",
+        envelopeB4 = "EnvelopeB4",
+        envelopeB5 = "EnvelopeB5",
+        envelopeB6 = "EnvelopeB6",
+        envelopeItaly = "EnvelopeItaly",
+        envelopeMonarch = "EnvelopeMonarch",
+        envelopePersonal = "EnvelopePersonal",
+        fanfoldUS = "FanfoldUS",
+        fanfoldStdGerman = "FanfoldStdGerman",
+        fanfoldLegalGerman = "FanfoldLegalGerman",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum ReadingOrder {
+        /**
+         *
+         * Reading order is determined by the language of the first character entered.
+            If a right-to-left language character is entered first, reading order is right to left.
+            If a left-to-right language character is entered first, reading order is left to right.
+         *
+         */
+        context = "Context",
+        /**
+         *
+         * Left to right reading order
+         *
+         */
+        leftToRight = "LeftToRight",
+        /**
+         *
+         * Right to left reading order
+         *
+         */
+        rightToLeft = "RightToLeft",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum BuiltInStyle {
+        normal = "Normal",
+        comma = "Comma",
+        currency = "Currency",
+        percent = "Percent",
+        wholeComma = "WholeComma",
+        wholeDollar = "WholeDollar",
+        hlink = "Hlink",
+        hlinkTrav = "HlinkTrav",
+        note = "Note",
+        warningText = "WarningText",
+        emphasis1 = "Emphasis1",
+        emphasis2 = "Emphasis2",
+        emphasis3 = "Emphasis3",
+        sheetTitle = "SheetTitle",
+        heading1 = "Heading1",
+        heading2 = "Heading2",
+        heading3 = "Heading3",
+        heading4 = "Heading4",
+        input = "Input",
+        output = "Output",
+        calculation = "Calculation",
+        checkCell = "CheckCell",
+        linkedCell = "LinkedCell",
+        total = "Total",
+        good = "Good",
+        bad = "Bad",
+        neutral = "Neutral",
+        accent1 = "Accent1",
+        accent1_20 = "Accent1_20",
+        accent1_40 = "Accent1_40",
+        accent1_60 = "Accent1_60",
+        accent2 = "Accent2",
+        accent2_20 = "Accent2_20",
+        accent2_40 = "Accent2_40",
+        accent2_60 = "Accent2_60",
+        accent3 = "Accent3",
+        accent3_20 = "Accent3_20",
+        accent3_40 = "Accent3_40",
+        accent3_60 = "Accent3_60",
+        accent4 = "Accent4",
+        accent4_20 = "Accent4_20",
+        accent4_40 = "Accent4_40",
+        accent4_60 = "Accent4_60",
+        accent5 = "Accent5",
+        accent5_20 = "Accent5_20",
+        accent5_40 = "Accent5_40",
+        accent5_60 = "Accent5_60",
+        accent6 = "Accent6",
+        accent6_20 = "Accent6_20",
+        accent6_40 = "Accent6_40",
+        accent6_60 = "Accent6_60",
+        explanatoryText = "ExplanatoryText",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum PrintErrorType {
+        errorsDisplayed = "ErrorsDisplayed",
+        errorsBlank = "ErrorsBlank",
+        errorsDash = "ErrorsDash",
+        errorsNotAvailable = "ErrorsNotAvailable",
+    }
+    /**
+     * [Api set: ExcelApi 1.7]
+     */
+    enum WorksheetPositionType {
+        none = "None",
+        before = "Before",
+        after = "After",
+        beginning = "Beginning",
+        end = "End",
     }
     /**
      *
@@ -9600,11 +12218,13 @@ declare namespace Excel {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): FunctionResult<T>;
-        toJSON(): {
-            "error": string;
-            "value": T;
-        };
+        load(option?: Excel.Interfaces.FunctionResultLoadOptions): FunctionResult<T>;
+        load(option?: string | string[]): FunctionResult<T>;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): FunctionResult<T>;
+        toJSON(): Interfaces.FunctionResultData<T>;
     }
     /**
      *
@@ -13349,25 +15969,52 @@ declare namespace Excel {
          * @param sigma Is the population (known) standard deviation. If omitted, the sample standard deviation is used.
          */
         z_Test(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, sigma?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
-        toJSON(): {};
+        toJSON(): {
+            [key: string]: string;
+        };
     }
-    namespace ErrorCodes {
-        var accessDenied: string;
-        var apiNotFound: string;
-        var generalException: string;
-        var insertDeleteConflict: string;
-        var invalidArgument: string;
-        var invalidBinding: string;
-        var invalidOperation: string;
-        var invalidReference: string;
-        var invalidSelection: string;
-        var itemAlreadyExists: string;
-        var itemNotFound: string;
-        var notImplemented: string;
-        var unsupportedOperation: string;
-        var invalidOperationInCellEditMode: string;
+    enum ErrorCodes {
+        accessDenied = "AccessDenied",
+        apiNotFound = "ApiNotFound",
+        conflict = "Conflict",
+        generalException = "GeneralException",
+        insertDeleteConflict = "InsertDeleteConflict",
+        invalidArgument = "InvalidArgument",
+        invalidBinding = "InvalidBinding",
+        invalidOperation = "InvalidOperation",
+        invalidReference = "InvalidReference",
+        invalidSelection = "InvalidSelection",
+        itemAlreadyExists = "ItemAlreadyExists",
+        itemNotFound = "ItemNotFound",
+        notImplemented = "NotImplemented",
+        unsupportedOperation = "UnsupportedOperation",
+        invalidOperationInCellEditMode = "InvalidOperationInCellEditMode",
     }
-    module Interfaces {
+    namespace Interfaces {
+        interface CollectionLoadOptions {
+            $top?: number;
+            $skip?: number;
+        }
+        /** An interface for updating data on the Application object, for use in "application.set({ ... })". */
+        interface ApplicationUpdateData {
+            /**
+             *
+             * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
+             *
+             * [Api set: ExcelApi 1.1 for get, 1.8 for set]
+             */
+            calculationMode?: Excel.CalculationMode | "Automatic" | "AutomaticExceptTables" | "Manual";
+        }
+        /** An interface for updating data on the Workbook object, for use in "workbook.set({ ... })". */
+        interface WorkbookUpdateData {
+            /**
+            *
+            * Gets the workbook properties.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            properties?: Excel.Interfaces.DocumentPropertiesUpdateData;
+        }
         /** An interface for updating data on the Worksheet object, for use in "worksheet.set({ ... })". */
         interface WorksheetUpdateData {
             /**
@@ -13384,13 +16031,34 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             position?: number;
+            /**
+             *
+             * Returns or sets the standard (default) width of all the columns in the worksheet.
+            One unit of column width is equal to the width of one character in the Normal style. For proportional fonts, the width of the character 0 (zero) is used.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            standardWidth?: number;
+            /**
+             *
+             * Gets or sets the worksheet tab color.
+            When retrieving the tab color, if the worksheet is invisible, the value will be null. If the worksheet is visible but the tab color is set to auto, an empty string will be returned. Otherwise, the property will be set to a color, in the form "#123456"
+            When setting the color, use an empty-string to set an "auto" color, or a real color otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tabColor?: string;
             /**
              *
              * The Visibility of the worksheet.
              *
              * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
              */
-            visibility?: string;
+            visibility?: Excel.SheetVisibility | "Visible" | "Hidden" | "VeryHidden";
+        }
+        /** An interface for updating data on the WorksheetCollection object, for use in "worksheetCollection.set({ ... })". */
+        interface WorksheetCollectionUpdateData {
+            items?: Excel.Interfaces.WorksheetData[];
         }
         /** An interface for updating data on the Range object, for use in "range.set({ ... })". */
         interface RangeUpdateData {
@@ -13411,31 +16079,50 @@ declare namespace Excel {
             /**
              *
              * Represents the formula in A1-style notation.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
-            formulas?: Array<Array<any>>;
+            formulas?: any[][];
             /**
              *
              * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
-            formulasLocal?: Array<Array<any>>;
+            formulasLocal?: any[][];
             /**
              *
              * Represents the formula in R1C1-style notation.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.2]
              */
-            formulasR1C1?: Array<Array<any>>;
+            formulasR1C1?: any[][];
             /**
              *
-             * Represents Excel's number format code for the given cell.
+             * Represents the hyperlink for the current range.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hyperlink?: Excel.RangeHyperlink;
+            /**
+             *
+             * Represents Excel's number format code for the given range.
+            When setting number format to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
-            numberFormat?: Array<Array<any>>;
+            numberFormat?: any[][];
+            /**
+             *
+             * Represents Excel's number format code for the given range as a string in the language of the user.
+            When setting number format local to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormatLocal?: any[][];
             /**
              *
              * Represents if all rows of the current range are hidden.
@@ -13443,13 +16130,23 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.2]
              */
             rowHidden?: boolean;
+            /**
+             *
+             * Represents the style of the current range.
+            If the styles of the cells are inconsistent, null will be returned.
+            For custom styles, the style name will be returned. For built-in styles, a string representing a value in the BuiltInStyle enum will be returned.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            style?: string;
             /**
              *
              * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+            When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
-            values?: Array<Array<any>>;
+            values?: any[][];
         }
         /** An interface for updating data on the RangeView object, for use in "rangeView.set({ ... })". */
         interface RangeViewUpdateData {
@@ -13459,35 +16156,43 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.3]
              */
-            formulas?: Array<Array<any>>;
+            formulas?: any[][];
             /**
              *
              * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
              *
              * [Api set: ExcelApi 1.3]
              */
-            formulasLocal?: Array<Array<any>>;
+            formulasLocal?: any[][];
             /**
              *
              * Represents the formula in R1C1-style notation.
              *
              * [Api set: ExcelApi 1.3]
              */
-            formulasR1C1?: Array<Array<any>>;
+            formulasR1C1?: any[][];
             /**
              *
              * Represents Excel's number format code for the given cell.
              *
              * [Api set: ExcelApi 1.3]
              */
-            numberFormat?: Array<Array<any>>;
+            numberFormat?: any[][];
             /**
              *
              * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.3]
              */
-            values?: Array<Array<any>>;
+            values?: any[][];
+        }
+        /** An interface for updating data on the RangeViewCollection object, for use in "rangeViewCollection.set({ ... })". */
+        interface RangeViewCollectionUpdateData {
+            items?: Excel.Interfaces.RangeViewData[];
+        }
+        /** An interface for updating data on the SettingCollection object, for use in "settingCollection.set({ ... })". */
+        interface SettingCollectionUpdateData {
+            items?: Excel.Interfaces.SettingData[];
         }
         /** An interface for updating data on the Setting object, for use in "setting.set({ ... })". */
         interface SettingUpdateData {
@@ -13499,6 +16204,10 @@ declare namespace Excel {
              */
             value?: any;
         }
+        /** An interface for updating data on the NamedItemCollection object, for use in "namedItemCollection.set({ ... })". */
+        interface NamedItemCollectionUpdateData {
+            items?: Excel.Interfaces.NamedItemData[];
+        }
         /** An interface for updating data on the NamedItem object, for use in "namedItem.set({ ... })". */
         interface NamedItemUpdateData {
             /**
@@ -13508,6 +16217,13 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.4]
              */
             comment?: string;
+            /**
+             *
+             * Gets or sets the formula of the named item.  Formula always starts with a '=' sign.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formula?: any;
             /**
              *
              * Specifies whether the object is visible or not.
@@ -13516,6 +16232,14 @@ declare namespace Excel {
              */
             visible?: boolean;
         }
+        /** An interface for updating data on the BindingCollection object, for use in "bindingCollection.set({ ... })". */
+        interface BindingCollectionUpdateData {
+            items?: Excel.Interfaces.BindingData[];
+        }
+        /** An interface for updating data on the TableCollection object, for use in "tableCollection.set({ ... })". */
+        interface TableCollectionUpdateData {
+            items?: Excel.Interfaces.TableData[];
+        }
         /** An interface for updating data on the Table object, for use in "table.set({ ... })". */
         interface TableUpdateData {
             /**
@@ -13582,6 +16306,10 @@ declare namespace Excel {
              */
             style?: string;
         }
+        /** An interface for updating data on the TableColumnCollection object, for use in "tableColumnCollection.set({ ... })". */
+        interface TableColumnCollectionUpdateData {
+            items?: Excel.Interfaces.TableColumnData[];
+        }
         /** An interface for updating data on the TableColumn object, for use in "tableColumn.set({ ... })". */
         interface TableColumnUpdateData {
             /**
@@ -13597,7 +16325,11 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            values?: Array<Array<any>>;
+            values?: any[][];
+        }
+        /** An interface for updating data on the TableRowCollection object, for use in "tableRowCollection.set({ ... })". */
+        interface TableRowCollectionUpdateData {
+            items?: Excel.Interfaces.TableRowData[];
         }
         /** An interface for updating data on the TableRow object, for use in "tableRow.set({ ... })". */
         interface TableRowUpdateData {
@@ -13607,7 +16339,7 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            values?: Array<Array<any>>;
+            values?: any[][];
         }
         /** An interface for updating data on the RangeFormat object, for use in "rangeFormat.set({ ... })". */
         interface RangeFormatUpdateData {
@@ -13645,21 +16377,50 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            horizontalAlignment?: string;
+            horizontalAlignment?: Excel.HorizontalAlignment | "General" | "Left" | "Center" | "Right" | "Fill" | "Justify" | "CenterAcrossSelection" | "Distributed";
             /**
              *
-             * Gets or sets the height of all rows in the range. If the row heights are not uniform null will be returned.
+             * Gets or sets the height of all rows in the range. If the row heights are not uniform, null will be returned.
              *
              * [Api set: ExcelApi 1.2]
              */
             rowHeight?: number;
+            /**
+             *
+             * Gets or sets the text orientation of all the cells within the range.
+            The text orientation should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+            If the orientation within a range are not uniform, then null will be returned.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            textOrientation?: number;
+            /**
+             *
+             * Determines if the row height of the Range object equals the standard height of the sheet.
+            Returns True if the row height of the Range object equals the standard height of the sheet.
+            Returns Null if the range contains more than one row and the rows aren't all the same height.
+            Returns False otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            useStandardHeight?: boolean;
+            /**
+             *
+             * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
+            Returns True if the column width of the Range object equals the standard width of the sheet.
+            Returns Null if the range contains more than one column and the columns aren't all the same height.
+            Returns False otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            useStandardWidth?: boolean;
             /**
              *
              * Represents the vertical alignment for the specified object. See Excel.VerticalAlignment for details.
              *
              * [Api set: ExcelApi 1.1]
              */
-            verticalAlignment?: string;
+            verticalAlignment?: Excel.VerticalAlignment | "Top" | "Center" | "Bottom" | "Justify" | "Distributed";
             /**
              *
              * Indicates if Excel wraps the text in the object. A null value indicates that the entire range doesn't have uniform wrap setting
@@ -13710,14 +16471,18 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            style?: string;
+            style?: Excel.BorderLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Double" | "SlantDashDot";
             /**
              *
              * Specifies the weight of the border around a range. See Excel.BorderWeight for details.
              *
              * [Api set: ExcelApi 1.1]
              */
-            weight?: string;
+            weight?: Excel.BorderWeight | "Hairline" | "Thin" | "Medium" | "Thick";
+        }
+        /** An interface for updating data on the RangeBorderCollection object, for use in "rangeBorderCollection.set({ ... })". */
+        interface RangeBorderCollectionUpdateData {
+            items?: Excel.Interfaces.RangeBorderData[];
         }
         /** An interface for updating data on the RangeFont object, for use in "rangeFont.set({ ... })". */
         interface RangeFontUpdateData {
@@ -13762,7 +16527,11 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            underline?: string;
+            underline?: Excel.RangeUnderlineStyle | "None" | "Single" | "Double" | "SingleAccountant" | "DoubleAccountant";
+        }
+        /** An interface for updating data on the ChartCollection object, for use in "chartCollection.set({ ... })". */
+        interface ChartCollectionUpdateData {
+            items?: Excel.Interfaces.ChartData[];
         }
         /** An interface for updating data on the Chart object, for use in "chart.set({ ... })". */
         interface ChartUpdateData {
@@ -13801,6 +16570,13 @@ declare namespace Excel {
             * [Api set: ExcelApi 1.1]
             */
             title?: Excel.Interfaces.ChartTitleUpdateData;
+            /**
+             *
+             * Represents the type of the chart. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
             /**
              *
              * Represents the height, in points, of the chart object.
@@ -13822,6 +16598,13 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             name?: string;
+            /**
+             *
+             * Represents whether to display all field buttons on a PivotChart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showAllFieldButtons?: boolean;
             /**
              *
              * Represents the distance, in points, from the top edge of the object to the top of row 1 (on a worksheet) or the top of the chart area (on a chart).
@@ -13839,6 +16622,13 @@ declare namespace Excel {
         }
         /** An interface for updating data on the ChartAreaFormat object, for use in "chartAreaFormat.set({ ... })". */
         interface ChartAreaFormatUpdateData {
+            /**
+            *
+            * Represents the border format of chart area, which includes color, linestyle and weight.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderUpdateData;
             /**
             *
             * Represents the font attributes (font name, font size, color, etc.) for the current object.
@@ -13847,6 +16637,10 @@ declare namespace Excel {
             */
             font?: Excel.Interfaces.ChartFontUpdateData;
         }
+        /** An interface for updating data on the ChartSeriesCollection object, for use in "chartSeriesCollection.set({ ... })". */
+        interface ChartSeriesCollectionUpdateData {
+            items?: Excel.Interfaces.ChartSeriesData[];
+        }
         /** An interface for updating data on the ChartSeries object, for use in "chartSeries.set({ ... })". */
         interface ChartSeriesUpdateData {
             /**
@@ -13856,6 +16650,71 @@ declare namespace Excel {
             * [Api set: ExcelApi 1.1]
             */
             format?: Excel.Interfaces.ChartSeriesFormatUpdateData;
+            /**
+             *
+             * Represents the chart type of a series. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+            /**
+             *
+             * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
+            Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            doughnutHoleSize?: number;
+            /**
+             *
+             * Boolean value representing if the series is filtered or not. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            filtered?: boolean;
+            /**
+             *
+             * Represents the gap width of a chart series.  Only valid on bar and column charts, as well as
+            specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            gapWidth?: number;
+            /**
+             *
+             * Boolean value representing if the series has data labels or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabels?: boolean;
+            /**
+             *
+             * Represents markers background color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: string;
+            /**
+             *
+             * Represents markers foreground color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: string;
+            /**
+             *
+             * Represents marker size of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: number;
+            /**
+             *
+             * Represents marker style of a chart series. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: Excel.ChartMarkerStyle | "Invalid" | "Automatic" | "None" | "Square" | "Diamond" | "Triangle" | "X" | "Star" | "Dot" | "Dash" | "Circle" | "Plus" | "Picture";
             /**
              *
              * Represents the name of a series in a chart.
@@ -13863,6 +16722,27 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             name?: string;
+            /**
+             *
+             * Represents the plot order of a chart series within the chart group.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            plotOrder?: number;
+            /**
+             *
+             * Boolean value representing if the series has a shadow or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            smooth?: boolean;
         }
         /** An interface for updating data on the ChartSeriesFormat object, for use in "chartSeriesFormat.set({ ... })". */
         interface ChartSeriesFormatUpdateData {
@@ -13874,6 +16754,72 @@ declare namespace Excel {
             */
             line?: Excel.Interfaces.ChartLineFormatUpdateData;
         }
+        /** An interface for updating data on the ChartPointsCollection object, for use in "chartPointsCollection.set({ ... })". */
+        interface ChartPointsCollectionUpdateData {
+            items?: Excel.Interfaces.ChartPointData[];
+        }
+        /** An interface for updating data on the ChartPoint object, for use in "chartPoint.set({ ... })". */
+        interface ChartPointUpdateData {
+            /**
+            *
+            * Returns the data label of a chart point.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            dataLabel?: Excel.Interfaces.ChartDataLabelUpdateData;
+            /**
+            *
+            * Encapsulates the format properties chart point.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartPointFormatUpdateData;
+            /**
+             *
+             * Represents whether a data point has datalabel. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabel?: boolean;
+            /**
+             *
+             * HTML color code representation of the marker background color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: string;
+            /**
+             *
+             * HTML color code representation of the marker foreground color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: string;
+            /**
+             *
+             * Represents marker size of data point.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: number;
+            /**
+             *
+             * Represents marker style of a chart data point. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: Excel.ChartMarkerStyle | "Invalid" | "Automatic" | "None" | "Square" | "Diamond" | "Triangle" | "X" | "Star" | "Dot" | "Dash" | "Circle" | "Plus" | "Picture";
+        }
+        /** An interface for updating data on the ChartPointFormat object, for use in "chartPointFormat.set({ ... })". */
+        interface ChartPointFormatUpdateData {
+            /**
+            *
+            * Represents the border format of a chart data point, which includes color, style and weight information.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderUpdateData;
+        }
         /** An interface for updating data on the ChartAxes object, for use in "chartAxes.set({ ... })". */
         interface ChartAxesUpdateData {
             /**
@@ -13928,6 +16874,55 @@ declare namespace Excel {
             * [Api set: ExcelApi 1.1]
             */
             title?: Excel.Interfaces.ChartAxisTitleUpdateData;
+            /**
+             *
+             * Returns or sets the base unit for the specified category axis.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            baseTimeUnit?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
+            /**
+             *
+             * Returns or sets the category axis type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            categoryType?: Excel.ChartAxisCategoryType | "Automatic" | "TextAxis" | "DateAxis";
+            /**
+             * [DEPRECATED; kept for back-compat with existing first-party solutions]. Please use `Position` instead.
+             * Represents the specified axis where the other axis crosses. See Excel.ChartAxisPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            crosses?: Excel.ChartAxisPosition | "Automatic" | "Maximum" | "Minimum" | "Custom";
+            /**
+             *
+             * Represents the axis display unit. See Excel.ChartAxisDisplayUnit for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            displayUnit?: Excel.ChartAxisDisplayUnit | "None" | "Hundreds" | "Thousands" | "TenThousands" | "HundredThousands" | "Millions" | "TenMillions" | "HundredMillions" | "Billions" | "Trillions" | "Custom";
+            /**
+             *
+             * Represents the base of the logarithm when using logarithmic scales.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            logBase?: number;
+            /**
+             *
+             * Represents the type of major tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            majorTickMark?: Excel.ChartAxisTickMark | "None" | "Cross" | "Inside" | "Outside";
+            /**
+             *
+             * Returns or sets the major unit scale value for the category axis when the CategoryType property is set to TimeScale.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            majorTimeUnitScale?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
             /**
              *
              * Represents the interval between two major tick marks. Can be set to a numeric value or an empty string.  The returned value is always a number.
@@ -13949,6 +16944,20 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             minimum?: any;
+            /**
+             *
+             * Represents the type of minor tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            minorTickMark?: Excel.ChartAxisTickMark | "None" | "Cross" | "Inside" | "Outside";
+            /**
+             *
+             * Returns or sets the minor unit scale value for the category axis when the CategoryType property is set to TimeScale.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            minorTimeUnitScale?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
             /**
              *
              * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
@@ -13956,6 +16965,55 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             minorUnit?: any;
+            /**
+             *
+             * Represents whether Microsoft Excel plots data points from last to first.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            reversePlotOrder?: boolean;
+            /**
+             *
+             * Represents the value axis scale type. See Excel.ChartAxisScaleType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            scaleType?: Excel.ChartAxisScaleType | "Linear" | "Logarithmic";
+            /**
+             *
+             * Represents whether the axis display unit label is visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showDisplayUnitLabel?: boolean;
+            /**
+             *
+             * Represents the position of tick-mark labels on the specified axis. See Excel.ChartAxisTickLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickLabelPosition?: Excel.ChartAxisTickLabelPosition | "NextToAxis" | "High" | "Low" | "None";
+            /**
+             *
+             * Represents the number of categories or series between tick-mark labels. Can be a value from 1 through 31999 or an empty string for automatic setting. The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickLabelSpacing?: any;
+            /**
+             *
+             * Represents the number of categories or series between tick marks.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickMarkSpacing?: number;
+            /**
+             *
+             * A boolean value represents the visibility of the axis.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            visible?: boolean;
         }
         /** An interface for updating data on the ChartAxisFormat object, for use in "chartAxisFormat.set({ ... })". */
         interface ChartAxisFormatUpdateData {
@@ -14023,7 +17081,7 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            position?: string;
+            position?: Excel.ChartDataLabelPosition | "Invalid" | "None" | "Center" | "InsideEnd" | "InsideBase" | "OutsideEnd" | "Left" | "Right" | "Top" | "Bottom" | "BestFit" | "Callout";
             /**
              *
              * String representing the separator used for the data labels on a chart.
@@ -14074,6 +17132,65 @@ declare namespace Excel {
              */
             showValue?: boolean;
         }
+        /** An interface for updating data on the ChartDataLabel object, for use in "chartDataLabel.set({ ... })". */
+        interface ChartDataLabelUpdateData {
+            /**
+             *
+             * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            position?: Excel.ChartDataLabelPosition | "Invalid" | "None" | "Center" | "InsideEnd" | "InsideBase" | "OutsideEnd" | "Left" | "Right" | "Top" | "Bottom" | "BestFit" | "Callout";
+            /**
+             *
+             * String representing the separator used for the data label on a chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            separator?: string;
+            /**
+             *
+             * Boolean value representing if the data label bubble size is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showBubbleSize?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label category name is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showCategoryName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label legend key is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showLegendKey?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label percentage is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showPercentage?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label series name is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showSeriesName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label value is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showValue?: boolean;
+        }
         /** An interface for updating data on the ChartDataLabelFormat object, for use in "chartDataLabelFormat.set({ ... })". */
         interface ChartDataLabelFormatUpdateData {
             /**
@@ -14120,6 +17237,20 @@ declare namespace Excel {
             * [Api set: ExcelApi 1.1]
             */
             format?: Excel.Interfaces.ChartLegendFormatUpdateData;
+            /**
+             *
+             * Represents the height, in points, of the legend on the chart. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            height?: number;
+            /**
+             *
+             * Represents the left, in points, of a chart legend. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: number;
             /**
              *
              * Boolean value for whether the chart legend should overlap with the main body of the chart.
@@ -14133,7 +17264,21 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            position?: string;
+            position?: Excel.ChartLegendPosition | "Invalid" | "Top" | "Bottom" | "Left" | "Right" | "Corner" | "Custom";
+            /**
+             *
+             * Represents if the legend has a shadow on the chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Represents the top of a chart legend.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: number;
             /**
              *
              * A boolean value the represents the visibility of a ChartLegend object.
@@ -14141,6 +17286,27 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             visible?: boolean;
+            /**
+             *
+             * Represents the width, in points, of the legend on the chart. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            width?: number;
+        }
+        /** An interface for updating data on the ChartLegendEntry object, for use in "chartLegendEntry.set({ ... })". */
+        interface ChartLegendEntryUpdateData {
+            /**
+             *
+             * Represents the visible of a chart legend entry.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            visible?: boolean;
+        }
+        /** An interface for updating data on the ChartLegendEntryCollection object, for use in "chartLegendEntryCollection.set({ ... })". */
+        interface ChartLegendEntryCollectionUpdateData {
+            items?: Excel.Interfaces.ChartLegendEntryData[];
         }
         /** An interface for updating data on the ChartLegendFormat object, for use in "chartLegendFormat.set({ ... })". */
         interface ChartLegendFormatUpdateData {
@@ -14161,6 +17327,20 @@ declare namespace Excel {
             * [Api set: ExcelApi 1.1]
             */
             format?: Excel.Interfaces.ChartTitleFormatUpdateData;
+            /**
+             *
+             * Represents the horizontal alignment for chart title.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            horizontalAlignment?: Excel.ChartTextHorizontalAlignment | "Center" | "Left" | "Right" | "Justify" | "Distributed";
+            /**
+             *
+             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: number;
             /**
              *
              * Boolean value representing if the chart title will overlay the chart or not.
@@ -14168,6 +17348,20 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             overlay?: boolean;
+            /**
+             *
+             * Represents the position of chart title. See Excel.ChartTitlePosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            position?: Excel.ChartTitlePosition | "Automatic" | "Top" | "Bottom" | "Left" | "Right";
+            /**
+             *
+             * Represents a boolean value that determines if the chart title has a shadow.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
             /**
              *
              * Represents the title text of a chart.
@@ -14175,6 +17369,27 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             text?: string;
+            /**
+             *
+             * Represents the text orientation of chart title. The value should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            textOrientation?: number;
+            /**
+             *
+             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: number;
+            /**
+             *
+             * Represents the vertical alignment of chart title. See Excel.ChartTextVerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            verticalAlignment?: Excel.ChartTextVerticalAlignment | "Center" | "Bottom" | "Top" | "Justify" | "Distributed";
             /**
              *
              * A boolean value the represents the visibility of a chart title object.
@@ -14183,8 +17398,25 @@ declare namespace Excel {
              */
             visible?: boolean;
         }
+        /** An interface for updating data on the ChartFormatString object, for use in "chartFormatString.set({ ... })". */
+        interface ChartFormatStringUpdateData {
+            /**
+            *
+            * Represents the font attributes, such as font name, font size, color, etc. of chart characters object.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            font?: Excel.Interfaces.ChartFontUpdateData;
+        }
         /** An interface for updating data on the ChartTitleFormat object, for use in "chartTitleFormat.set({ ... })". */
         interface ChartTitleFormatUpdateData {
+            /**
+            *
+            * Represents the border format of chart title, which includes color, linestyle and weight.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderUpdateData;
             /**
             *
             * Represents the font attributes (font name, font size, color, etc.) for an object.
@@ -14193,6 +17425,30 @@ declare namespace Excel {
             */
             font?: Excel.Interfaces.ChartFontUpdateData;
         }
+        /** An interface for updating data on the ChartBorder object, for use in "chartBorder.set({ ... })". */
+        interface ChartBorderUpdateData {
+            /**
+             *
+             * HTML color code representing the color of borders in the chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            color?: string;
+            /**
+             *
+             * Represents the line style of the border. See Excel.ChartLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lineStyle?: Excel.ChartLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Grey25" | "Grey50" | "Grey75" | "Automatic" | "RoundDot";
+            /**
+             *
+             * Represents weight of the border, in points.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            weight?: number;
+        }
         /** An interface for updating data on the ChartLineFormat object, for use in "chartLineFormat.set({ ... })". */
         interface ChartLineFormatUpdateData {
             /**
@@ -14202,6 +17458,20 @@ declare namespace Excel {
              * [Api set: ExcelApi 1.1]
              */
             color?: string;
+            /**
+             *
+             * Represents the line style. See Excel.ChartLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lineStyle?: Excel.ChartLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Grey25" | "Grey50" | "Grey75" | "Automatic" | "RoundDot";
+            /**
+             *
+             * Represents weight of the line, in points.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            weight?: number;
         }
         /** An interface for updating data on the ChartFont object, for use in "chartFont.set({ ... })". */
         interface ChartFontUpdateData {
@@ -14246,7 +17516,78 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.1]
              */
-            underline?: string;
+            underline?: Excel.ChartUnderlineStyle | "None" | "Single";
+        }
+        /** An interface for updating data on the ChartTrendline object, for use in "chartTrendline.set({ ... })". */
+        interface ChartTrendlineUpdateData {
+            /**
+            *
+            * Represents the formatting of a chart trendline.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            format?: Excel.Interfaces.ChartTrendlineFormatUpdateData;
+            /**
+             *
+             * Represents the intercept value of the trendline. Can be set to a numeric value or an empty string (for automatic values). The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            intercept?: any;
+            /**
+             *
+             * Represents the period of a chart trendline. Only applicable for trendline with MovingAverage type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            movingAveragePeriod?: number;
+            /**
+             *
+             * Represents the name of the trendline. Can be set to a string value, or can be set to null value represents automatic values. The returned value is always a string
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: string;
+            /**
+             *
+             * Represents the order of a chart trendline. Only applicable for trendline with Polynomial type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            polynomialOrder?: number;
+            /**
+             *
+             * Represents the type of a chart trendline.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: Excel.ChartTrendlineType | "Linear" | "Exponential" | "Logarithmic" | "MovingAverage" | "Polynomial" | "Power";
+        }
+        /** An interface for updating data on the ChartTrendlineCollection object, for use in "chartTrendlineCollection.set({ ... })". */
+        interface ChartTrendlineCollectionUpdateData {
+            items?: Excel.Interfaces.ChartTrendlineData[];
+        }
+        /** An interface for updating data on the ChartTrendlineFormat object, for use in "chartTrendlineFormat.set({ ... })". */
+        interface ChartTrendlineFormatUpdateData {
+            /**
+            *
+            * Represents chart line formatting.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            line?: Excel.Interfaces.ChartLineFormatUpdateData;
+        }
+        /** An interface for updating data on the CustomXmlPartScopedCollection object, for use in "customXmlPartScopedCollection.set({ ... })". */
+        interface CustomXmlPartScopedCollectionUpdateData {
+            items?: Excel.Interfaces.CustomXmlPartData[];
+        }
+        /** An interface for updating data on the CustomXmlPartCollection object, for use in "customXmlPartCollection.set({ ... })". */
+        interface CustomXmlPartCollectionUpdateData {
+            items?: Excel.Interfaces.CustomXmlPartData[];
+        }
+        /** An interface for updating data on the PivotTableCollection object, for use in "pivotTableCollection.set({ ... })". */
+        interface PivotTableCollectionUpdateData {
+            items?: Excel.Interfaces.PivotTableData[];
         }
         /** An interface for updating data on the PivotTable object, for use in "pivotTable.set({ ... })". */
         interface PivotTableUpdateData {
@@ -14258,6 +17599,90 @@ declare namespace Excel {
              */
             name?: string;
         }
+        /** An interface for updating data on the DocumentProperties object, for use in "documentProperties.set({ ... })". */
+        interface DocumentPropertiesUpdateData {
+            /**
+             *
+             * Gets or sets the author of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            author?: string;
+            /**
+             *
+             * Gets or sets the category of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            category?: string;
+            /**
+             *
+             * Gets or sets the comments of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            comments?: string;
+            /**
+             *
+             * Gets or sets the company of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            company?: string;
+            /**
+             *
+             * Gets or sets the keywords of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            keywords?: string;
+            /**
+             *
+             * Gets or sets the manager of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            manager?: string;
+            /**
+             *
+             * Gets the revision number of the workbook. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            revisionNumber?: number;
+            /**
+             *
+             * Gets or sets the subject of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            subject?: string;
+            /**
+             *
+             * Gets or sets the title of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            title?: string;
+        }
+        /** An interface for updating data on the CustomProperty object, for use in "customProperty.set({ ... })". */
+        interface CustomPropertyUpdateData {
+            /**
+             *
+             * Gets or sets the value of the custom property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            value?: any;
+        }
+        /** An interface for updating data on the CustomPropertyCollection object, for use in "customPropertyCollection.set({ ... })". */
+        interface CustomPropertyCollectionUpdateData {
+            items?: Excel.Interfaces.CustomPropertyData[];
+        }
+        /** An interface for updating data on the ConditionalFormatCollection object, for use in "conditionalFormatCollection.set({ ... })". */
+        interface ConditionalFormatCollectionUpdateData {
+            items?: Excel.Interfaces.ConditionalFormatData[];
+        }
         /** An interface for updating data on the ConditionalFormat object, for use in "conditionalFormat.set({ ... })". */
         interface ConditionalFormatUpdateData {
             /**
@@ -14265,7 +17690,7 @@ declare namespace Excel {
             * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
             For example to format all cells between 5 and 10.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             cellValue?: Excel.Interfaces.CellValueConditionalFormatUpdateData;
             /**
@@ -14273,77 +17698,77 @@ declare namespace Excel {
             * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
             For example to format all cells between 5 and 10.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             cellValueOrNullObject?: Excel.Interfaces.CellValueConditionalFormatUpdateData;
             /**
             *
             * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             colorScale?: Excel.Interfaces.ColorScaleConditionalFormatUpdateData;
             /**
             *
             * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             colorScaleOrNullObject?: Excel.Interfaces.ColorScaleConditionalFormatUpdateData;
             /**
             *
             * Returns the custom conditional format properties if the current conditional format is a custom type.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             custom?: Excel.Interfaces.CustomConditionalFormatUpdateData;
             /**
             *
             * Returns the custom conditional format properties if the current conditional format is a custom type.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             customOrNullObject?: Excel.Interfaces.CustomConditionalFormatUpdateData;
             /**
             *
             * Returns the data bar properties if the current conditional format is a data bar.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             dataBar?: Excel.Interfaces.DataBarConditionalFormatUpdateData;
             /**
             *
             * Returns the data bar properties if the current conditional format is a data bar.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             dataBarOrNullObject?: Excel.Interfaces.DataBarConditionalFormatUpdateData;
             /**
             *
             * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             iconSet?: Excel.Interfaces.IconSetConditionalFormatUpdateData;
             /**
             *
             * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatUpdateData;
             /**
             *
             * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             preset?: Excel.Interfaces.PresetCriteriaConditionalFormatUpdateData;
             /**
             *
             * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             presetOrNullObject?: Excel.Interfaces.PresetCriteriaConditionalFormatUpdateData;
             /**
@@ -14351,7 +17776,7 @@ declare namespace Excel {
             * Returns the specific text conditional format properties if the current conditional format is a text type.
             For example to format cells matching the word "Text".
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             textComparison?: Excel.Interfaces.TextConditionalFormatUpdateData;
             /**
@@ -14359,7 +17784,7 @@ declare namespace Excel {
             * Returns the specific text conditional format properties if the current conditional format is a text type.
             For example to format cells matching the word "Text".
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             textComparisonOrNullObject?: Excel.Interfaces.TextConditionalFormatUpdateData;
             /**
@@ -14367,7 +17792,7 @@ declare namespace Excel {
             * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
             For example to format the top 10% or bottom 10 items.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             topBottom?: Excel.Interfaces.TopBottomConditionalFormatUpdateData;
             /**
@@ -14375,7 +17800,7 @@ declare namespace Excel {
             * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
             For example to format the top 10% or bottom 10 items.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             topBottomOrNullObject?: Excel.Interfaces.TopBottomConditionalFormatUpdateData;
             /**
@@ -14384,8 +17809,9 @@ declare namespace Excel {
             changes other conditional formats' priorities, to allow for a contiguous priority order.
             Use a negative priority to begin from the back.
             Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             priority?: number;
             /**
@@ -14393,7 +17819,7 @@ declare namespace Excel {
              * If the conditions of this conditional format are met, no lower-priority formats shall take effect on that cell.
             Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             stopIfTrue?: boolean;
         }
@@ -14403,14 +17829,14 @@ declare namespace Excel {
             *
             * Representation of all values to the left of the axis in an Excel data bar.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             negativeFormat?: Excel.Interfaces.ConditionalDataBarNegativeFormatUpdateData;
             /**
             *
             * Representation of all values to the right of the axis in an Excel data bar.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             positiveFormat?: Excel.Interfaces.ConditionalDataBarPositiveFormatUpdateData;
             /**
@@ -14418,42 +17844,42 @@ declare namespace Excel {
              * HTML color code representing the color of the Axis line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
             "" (empty string) if no axis is present or set.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             axisColor?: string;
             /**
              *
              * Representation of how the axis is determined for an Excel data bar.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
-            axisFormat?: string;
+            axisFormat?: Excel.ConditionalDataBarAxisFormat | "Automatic" | "None" | "CellMidPoint";
             /**
              *
              * Represents the direction that the data bar graphic should be based on.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
-            barDirection?: string;
+            barDirection?: Excel.ConditionalDataBarDirection | "Context" | "LeftToRight" | "RightToLeft";
             /**
              *
              * The rule for what consistutes the lower bound (and how to calculate it, if applicable) for a data bar.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             lowerBoundRule?: Excel.ConditionalDataBarRule;
             /**
              *
              * If true, hides the values from the cells where the data bar is applied.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             showDataBarOnly?: boolean;
             /**
              *
              * The rule for what constitutes the upper bound (and how to calculate it, if applicable) for a data bar.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             upperBoundRule?: Excel.ConditionalDataBarRule;
         }
@@ -14464,21 +17890,21 @@ declare namespace Excel {
              * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
             "" (empty string) if no border is present or set.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             borderColor?: string;
             /**
              *
              * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             fillColor?: string;
             /**
              *
              * Boolean representation of whether or not the DataBar has a gradient.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             gradientFill?: boolean;
         }
@@ -14489,28 +17915,28 @@ declare namespace Excel {
              * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
             "Empty String" if no border is present or set.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             borderColor?: string;
             /**
              *
              * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             fillColor?: string;
             /**
              *
              * Boolean representation of whether or not the negative DataBar has the same border color as the positive DataBar.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             matchPositiveBorderColor?: boolean;
             /**
              *
              * Boolean representation of whether or not the negative DataBar has the same fill color as the positive DataBar.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             matchPositiveFillColor?: boolean;
         }
@@ -14520,14 +17946,14 @@ declare namespace Excel {
             *
             * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             format?: Excel.Interfaces.ConditionalRangeFormatUpdateData;
             /**
             *
             * Represents the Rule object on this conditional format.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             rule?: Excel.Interfaces.ConditionalFormatRuleUpdateData;
         }
@@ -14537,21 +17963,21 @@ declare namespace Excel {
              *
              * The formula, if required, to evaluate the conditional format rule on.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             formula?: string;
             /**
              *
              * The formula, if required, to evaluate the conditional format rule on in the user's language.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             formulaLocal?: string;
             /**
              *
              * The formula, if required, to evaluate the conditional format rule on in R1C1-style notation.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             formulaR1C1?: string;
         }
@@ -14561,30 +17987,30 @@ declare namespace Excel {
              *
              * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
-            criteria?: Array<Excel.ConditionalIconCriterion>;
+            criteria?: Excel.ConditionalIconCriterion[];
             /**
              *
              * If true, reverses the icon orders for the IconSet. Note that this cannot be set if custom icons are used.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             reverseIconOrder?: boolean;
             /**
              *
              * If true, hides the values and only shows icons.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             showIconOnly?: boolean;
             /**
              *
              * If set, displays the IconSet option for the conditional format.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
-            style?: string;
+            style?: Excel.IconSet | "Invalid" | "ThreeArrows" | "ThreeArrowsGray" | "ThreeFlags" | "ThreeTrafficLights1" | "ThreeTrafficLights2" | "ThreeSigns" | "ThreeSymbols" | "ThreeSymbols2" | "FourArrows" | "FourArrowsGray" | "FourRedToBlack" | "FourRating" | "FourTrafficLights" | "FiveArrows" | "FiveArrowsGray" | "FiveRating" | "FiveQuarters" | "ThreeStars" | "ThreeTriangles" | "FiveBoxes";
         }
         /** An interface for updating data on the ColorScaleConditionalFormat object, for use in "colorScaleConditionalFormat.set({ ... })". */
         interface ColorScaleConditionalFormatUpdateData {
@@ -14592,7 +18018,7 @@ declare namespace Excel {
              *
              * The criteria of the color scale. Midpoint is optional when using a two point color scale.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             criteria?: Excel.ConditionalColorScaleCriteria;
         }
@@ -14602,14 +18028,14 @@ declare namespace Excel {
             *
             * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             format?: Excel.Interfaces.ConditionalRangeFormatUpdateData;
             /**
              *
              * The criteria of the Top/Bottom conditional format.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             rule?: Excel.ConditionalTopBottomRule;
         }
@@ -14619,14 +18045,14 @@ declare namespace Excel {
             *
             * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             format?: Excel.Interfaces.ConditionalRangeFormatUpdateData;
             /**
              *
              * The rule of the conditional format.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             rule?: Excel.ConditionalPresetCriteriaRule;
         }
@@ -14636,14 +18062,14 @@ declare namespace Excel {
             *
             * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             format?: Excel.Interfaces.ConditionalRangeFormatUpdateData;
             /**
              *
              * The rule of the conditional format.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             rule?: Excel.ConditionalTextComparisonRule;
         }
@@ -14653,24 +18079,45 @@ declare namespace Excel {
             *
             * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
             *
-            * [Api set: ExcelApi 1.6 (PREVIEW)]
+            * [Api set: ExcelApi 1.6]
             */
             format?: Excel.Interfaces.ConditionalRangeFormatUpdateData;
             /**
              *
              * Represents the Rule object on this conditional format.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             rule?: Excel.ConditionalCellValueRule;
         }
         /** An interface for updating data on the ConditionalRangeFormat object, for use in "conditionalRangeFormat.set({ ... })". */
         interface ConditionalRangeFormatUpdateData {
+            /**
+            *
+            * Collection of border objects that apply to the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            borders?: Excel.Interfaces.ConditionalRangeBorderCollectionUpdateData;
+            /**
+            *
+            * Returns the fill object defined on the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            fill?: Excel.Interfaces.ConditionalRangeFillUpdateData;
+            /**
+            *
+            * Returns the font object defined on the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            font?: Excel.Interfaces.ConditionalRangeFontUpdateData;
             /**
              *
              * Represents Excel's number format code for the given range. Cleared if null is passed in.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             numberFormat?: any;
         }
@@ -14680,37 +18127,37 @@ declare namespace Excel {
              *
              * Represents the bold status of font.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             bold?: boolean;
             /**
              *
              * HTML color code representation of the text color. E.g. #FF0000 represents Red.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             color?: string;
             /**
              *
              * Represents the italic status of the font.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             italic?: boolean;
             /**
              *
              * Represents the strikethrough status of the font.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             strikethrough?: boolean;
             /**
              *
              * Type of underline applied to the font. See Excel.ConditionalRangeFontUnderlineStyle for details.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
-            underline?: string;
+            underline?: Excel.ConditionalRangeFontUnderlineStyle | "None" | "Single" | "Double";
         }
         /** An interface for updating data on the ConditionalRangeFill object, for use in "conditionalRangeFill.set({ ... })". */
         interface ConditionalRangeFillUpdateData {
@@ -14718,7 +18165,7 @@ declare namespace Excel {
              *
              * HTML color code representing the color of the fill, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             color?: string;
         }
@@ -14728,16 +18175,7876 @@ declare namespace Excel {
              *
              * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
              */
             color?: string;
             /**
              *
              * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
              *
-             * [Api set: ExcelApi 1.6 (PREVIEW)]
+             * [Api set: ExcelApi 1.6]
+             */
+            style?: Excel.ConditionalRangeBorderLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot";
+        }
+        /** An interface for updating data on the ConditionalRangeBorderCollection object, for use in "conditionalRangeBorderCollection.set({ ... })". */
+        interface ConditionalRangeBorderCollectionUpdateData {
+            /**
+            *
+            * Gets the top border
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            bottom?: Excel.Interfaces.ConditionalRangeBorderUpdateData;
+            /**
+            *
+            * Gets the top border
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            left?: Excel.Interfaces.ConditionalRangeBorderUpdateData;
+            /**
+            *
+            * Gets the top border
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            right?: Excel.Interfaces.ConditionalRangeBorderUpdateData;
+            /**
+            *
+            * Gets the top border
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            top?: Excel.Interfaces.ConditionalRangeBorderUpdateData;
+            items?: Excel.Interfaces.ConditionalRangeBorderData[];
+        }
+        /** An interface for updating data on the Style object, for use in "style.set({ ... })". */
+        interface StyleUpdateData {
+            /**
+            *
+            * The Fill of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            fill?: Excel.Interfaces.RangeFillUpdateData;
+            /**
+            *
+            * A Font object that represents the font of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            font?: Excel.Interfaces.RangeFontUpdateData;
+            /**
+             *
+             * Indicates if the formula will be hidden when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formulaHidden?: boolean;
+            /**
+             *
+             * Represents the horizontal alignment for the style. See Excel.HorizontalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            horizontalAlignment?: Excel.HorizontalAlignment | "General" | "Left" | "Center" | "Right" | "Fill" | "Justify" | "CenterAcrossSelection" | "Distributed";
+            /**
+             *
+             * Indicates if the style includes the AutoIndent, HorizontalAlignment, VerticalAlignment, WrapText, IndentLevel, and TextOrientation properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeAlignment?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Color, ColorIndex, LineStyle, and Weight border properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeBorder?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Background, Bold, Color, ColorIndex, FontStyle, Italic, Name, Size, Strikethrough, Subscript, Superscript, and Underline font properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeFont?: boolean;
+            /**
+             *
+             * Indicates if the style includes the NumberFormat property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeNumber?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Color, ColorIndex, InvertIfNegative, Pattern, PatternColor, and PatternColorIndex interior properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includePatterns?: boolean;
+            /**
+             *
+             * Indicates if the style includes the FormulaHidden and Locked protection properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeProtection?: boolean;
+            /**
+             *
+             * An integer from 0 to 250 that indicates the indent level for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            indentLevel?: number;
+            /**
+             *
+             * Indicates if the object is locked when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            locked?: boolean;
+            /**
+             *
+             * The format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormat?: string;
+            /**
+             *
+             * The localized format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormatLocal?: string;
+            /**
+             *
+             * The reading order for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            readingOrder?: Excel.ReadingOrder | "Context" | "LeftToRight" | "RightToLeft";
+            /**
+             *
+             * Indicates if text automatically shrinks to fit in the available column width.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            shrinkToFit?: boolean;
+            /**
+             *
+             * Represents the vertical alignment for the style. See Excel.VerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            verticalAlignment?: Excel.VerticalAlignment | "Top" | "Center" | "Bottom" | "Justify" | "Distributed";
+            /**
+             *
+             * Indicates if Microsoft Excel wraps the text in the object.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            wrapText?: boolean;
+        }
+        /** An interface for updating data on the StyleCollection object, for use in "styleCollection.set({ ... })". */
+        interface StyleCollectionUpdateData {
+            items?: Excel.Interfaces.StyleData[];
+        }
+        /** An interface describing the data returned by calling "application.toJSON()". */
+        interface ApplicationData {
+            /**
+             *
+             * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
+             *
+             * [Api set: ExcelApi 1.1 for get, 1.8 for set]
+             */
+            calculationMode?: Excel.CalculationMode | "Automatic" | "AutomaticExceptTables" | "Manual";
+        }
+        /** An interface describing the data returned by calling "workbook.toJSON()". */
+        interface WorkbookData {
+            /**
+            *
+            * Represents the Excel application instance that contains this workbook.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            application?: Excel.Interfaces.ApplicationData;
+            /**
+            *
+            * Represents a collection of bindings that are part of the workbook.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            bindings?: Excel.Interfaces.BindingData[];
+            /**
+            *
+            * Represents the collection of custom XML parts contained by this workbook.
+            *
+            * [Api set: ExcelApi 1.5]
+            */
+            customXmlParts?: Excel.Interfaces.CustomXmlPartData[];
+            /**
+            *
+            * Represents a collection of workbook scoped named items (named ranges and constants).
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            names?: Excel.Interfaces.NamedItemData[];
+            /**
+            *
+            * Represents a collection of PivotTables associated with the workbook.
+            *
+            * [Api set: ExcelApi 1.3]
+            */
+            pivotTables?: Excel.Interfaces.PivotTableData[];
+            /**
+            *
+            * Gets the workbook properties.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            properties?: Excel.Interfaces.DocumentPropertiesData;
+            /**
+            *
+            * Represents a collection of Settings associated with the workbook.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            settings?: Excel.Interfaces.SettingData[];
+            /**
+            *
+            * Represents a collection of styles associated with the workbook.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            styles?: Excel.Interfaces.StyleData[];
+            /**
+            *
+            * Represents a collection of tables associated with the workbook.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            tables?: Excel.Interfaces.TableData[];
+            /**
+            *
+            * Represents a collection of worksheets associated with the workbook.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            worksheets?: Excel.Interfaces.WorksheetData[];
+            /**
+             *
+             * Gets the workbook name.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: string;
+        }
+        /** An interface describing the data returned by calling "worksheet.toJSON()". */
+        interface WorksheetData {
+            /**
+            *
+            * Returns collection of charts that are part of the worksheet.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            charts?: Excel.Interfaces.ChartData[];
+            /**
+            *
+            * Collection of names scoped to the current worksheet.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            names?: Excel.Interfaces.NamedItemData[];
+            /**
+            *
+            * Collection of PivotTables that are part of the worksheet.
+            *
+            * [Api set: ExcelApi 1.3]
+            */
+            pivotTables?: Excel.Interfaces.PivotTableData[];
+            /**
+            *
+            * Returns sheet protection object for a worksheet.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            protection?: Excel.Interfaces.WorksheetProtectionData;
+            /**
+            *
+            * Collection of tables that are part of the worksheet.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            tables?: Excel.Interfaces.TableData[];
+            /**
+             *
+             * Returns a value that uniquely identifies the worksheet in a given workbook. The value of the identifier remains the same even when the worksheet is renamed or moved. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * The display name of the worksheet.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * The zero-based position of the worksheet within the workbook.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            position?: number;
+            /**
+             *
+             * Returns the standard (default) height of all the rows in the worksheet, in points. Read-only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            standardHeight?: number;
+            /**
+             *
+             * Returns or sets the standard (default) width of all the columns in the worksheet.
+            One unit of column width is equal to the width of one character in the Normal style. For proportional fonts, the width of the character 0 (zero) is used.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            standardWidth?: number;
+            /**
+             *
+             * Gets or sets the worksheet tab color.
+            When retrieving the tab color, if the worksheet is invisible, the value will be null. If the worksheet is visible but the tab color is set to auto, an empty string will be returned. Otherwise, the property will be set to a color, in the form "#123456"
+            When setting the color, use an empty-string to set an "auto" color, or a real color otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tabColor?: string;
+            /**
+             *
+             * The Visibility of the worksheet.
+             *
+             * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
+             */
+            visibility?: Excel.SheetVisibility | "Visible" | "Hidden" | "VeryHidden";
+        }
+        /** An interface describing the data returned by calling "worksheetCollection.toJSON()". */
+        interface WorksheetCollectionData {
+            items?: Excel.Interfaces.WorksheetData[];
+        }
+        /** An interface describing the data returned by calling "worksheetProtection.toJSON()". */
+        interface WorksheetProtectionData {
+            /**
+             *
+             * Sheet protection options.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            options?: Excel.WorksheetProtectionOptions;
+            /**
+             *
+             * Indicates if the worksheet is protected. Read-Only.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            protected?: boolean;
+        }
+        /** An interface describing the data returned by calling "range.toJSON()". */
+        interface RangeData {
+            /**
+            *
+            * Collection of ConditionalFormats that intersect the range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            conditionalFormats?: Excel.Interfaces.ConditionalFormatData[];
+            /**
+            *
+            * Returns a format object, encapsulating the range's font, fill, borders, alignment, and other properties. Read-only.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.RangeFormatData;
+            /**
+            *
+            * The worksheet containing the current range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            worksheet?: Excel.Interfaces.WorksheetData;
+            /**
+             *
+             * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. Sheet1!A1:B4). Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            address?: string;
+            /**
+             *
+             * Represents range reference for the specified range in the language of the user. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            addressLocal?: string;
+            /**
+             *
+             * Number of cells in the range. This API will return -1 if the cell count exceeds 2^31-1 (2,147,483,647). Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            cellCount?: number;
+            /**
+             *
+             * Represents the total number of columns in the range. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            columnCount?: number;
+            /**
+             *
+             * Represents if all columns of the current range are hidden.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            columnHidden?: boolean;
+            /**
+             *
+             * Represents the column number of the first cell in the range. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            columnIndex?: number;
+            /**
+             *
+             * Represents the formula in A1-style notation.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            formulas?: any[][];
+            /**
+             *
+             * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            formulasLocal?: any[][];
+            /**
+             *
+             * Represents the formula in R1C1-style notation.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            formulasR1C1?: any[][];
+            /**
+             *
+             * Represents if all cells of the current range are hidden.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            hidden?: boolean;
+            /**
+             *
+             * Represents the hyperlink for the current range.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hyperlink?: Excel.RangeHyperlink;
+            /**
+             *
+             * Represents if the current range is an entire column.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            isEntireColumn?: boolean;
+            /**
+             *
+             * Represents if the current range is an entire row.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            isEntireRow?: boolean;
+            /**
+             *
+             * Represents Excel's number format code for the given range.
+            When setting number format to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            numberFormat?: any[][];
+            /**
+             *
+             * Represents Excel's number format code for the given range as a string in the language of the user.
+            When setting number format local to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormatLocal?: any[][];
+            /**
+             *
+             * Returns the total number of rows in the range. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            rowCount?: number;
+            /**
+             *
+             * Represents if all rows of the current range are hidden.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            rowHidden?: boolean;
+            /**
+             *
+             * Returns the row number of the first cell in the range. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            rowIndex?: number;
+            /**
+             *
+             * Represents the style of the current range.
+            If the styles of the cells are inconsistent, null will be returned.
+            For custom styles, the style name will be returned. For built-in styles, a string representing a value in the BuiltInStyle enum will be returned.
+             *
+             * [Api set: ExcelApi 1.7]
              */
             style?: string;
+            /**
+             *
+             * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            text?: string[][];
+            /**
+             *
+             * Represents the type of data of each cell. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            valueTypes?: Excel.RangeValueType[][];
+            /**
+             *
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+            When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: any[][];
+        }
+        /** An interface describing the data returned by calling "rangeView.toJSON()". */
+        interface RangeViewData {
+            /**
+            *
+            * Represents a collection of range views associated with the range.
+            *
+            * [Api set: ExcelApi 1.3]
+            */
+            rows?: Excel.Interfaces.RangeViewData[];
+            /**
+             *
+             * Represents the cell addresses of the RangeView.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            cellAddresses?: any[][];
+            /**
+             *
+             * Returns the number of visible columns. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            columnCount?: number;
+            /**
+             *
+             * Represents the formula in A1-style notation.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulas?: any[][];
+            /**
+             *
+             * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulasLocal?: any[][];
+            /**
+             *
+             * Represents the formula in R1C1-style notation.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulasR1C1?: any[][];
+            /**
+             *
+             * Returns a value that represents the index of the RangeView. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            index?: number;
+            /**
+             *
+             * Represents Excel's number format code for the given cell.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            numberFormat?: any[][];
+            /**
+             *
+             * Returns the number of visible rows. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            rowCount?: number;
+            /**
+             *
+             * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            text?: string[][];
+            /**
+             *
+             * Represents the type of data of each cell. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            valueTypes?: Excel.RangeValueType[][];
+            /**
+             *
+             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            values?: any[][];
+        }
+        /** An interface describing the data returned by calling "rangeViewCollection.toJSON()". */
+        interface RangeViewCollectionData {
+            items?: Excel.Interfaces.RangeViewData[];
+        }
+        /** An interface describing the data returned by calling "settingCollection.toJSON()". */
+        interface SettingCollectionData {
+            items?: Excel.Interfaces.SettingData[];
+        }
+        /** An interface describing the data returned by calling "setting.toJSON()". */
+        interface SettingData {
+            /**
+             *
+             * Returns the key that represents the id of the Setting. Read-only.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            key?: string;
+            /**
+             *
+             * Represents the value stored for this setting.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            value?: any;
+        }
+        /** An interface describing the data returned by calling "namedItemCollection.toJSON()". */
+        interface NamedItemCollectionData {
+            items?: Excel.Interfaces.NamedItemData[];
+        }
+        /** An interface describing the data returned by calling "namedItem.toJSON()". */
+        interface NamedItemData {
+            /**
+            *
+            * Returns an object containing values and types of the named item.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            arrayValues?: Excel.Interfaces.NamedItemArrayValuesData;
+            /**
+            *
+            * Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            worksheet?: Excel.Interfaces.WorksheetData;
+            /**
+            *
+            * Returns the worksheet on which the named item is scoped to. Returns a null object if the item is scoped to the workbook instead.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            worksheetOrNullObject?: Excel.Interfaces.WorksheetData;
+            /**
+             *
+             * Represents the comment associated with this name.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            comment?: string;
+            /**
+             *
+             * Gets or sets the formula of the named item.  Formula always starts with a '=' sign.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formula?: any;
+            /**
+             *
+             * The name of the object. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Indicates whether the name is scoped to the workbook or to a specific worksheet. Read-only.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            scope?: Excel.NamedItemScope | "Worksheet" | "Workbook";
+            /**
+             *
+             * Indicates the type of the value returned by the name's formula. See Excel.NamedItemType for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1 for String,Integer,Double,Boolean,Range,Error; 1.7 for Array]
+             */
+            type?: Excel.NamedItemType | "String" | "Integer" | "Double" | "Boolean" | "Range" | "Error" | "Array";
+            /**
+             *
+             * Represents the value computed by the name's formula. For a named range, will return the range address. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            value?: any;
+            /**
+             *
+             * Specifies whether the object is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+        }
+        /** An interface describing the data returned by calling "namedItemArrayValues.toJSON()". */
+        interface NamedItemArrayValuesData {
+            /**
+             *
+             * Represents the types for each item in the named item array
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            types?: Excel.RangeValueType[][];
+            /**
+             *
+             * Represents the values of each item in the named item array.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            values?: any[][];
+        }
+        /** An interface describing the data returned by calling "binding.toJSON()". */
+        interface BindingData {
+            /**
+             *
+             * Represents binding identifier. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Returns the type of the binding. See Excel.BindingType for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            type?: Excel.BindingType | "Range" | "Table" | "Text";
+        }
+        /** An interface describing the data returned by calling "bindingCollection.toJSON()". */
+        interface BindingCollectionData {
+            items?: Excel.Interfaces.BindingData[];
+        }
+        /** An interface describing the data returned by calling "tableCollection.toJSON()". */
+        interface TableCollectionData {
+            items?: Excel.Interfaces.TableData[];
+        }
+        /** An interface describing the data returned by calling "table.toJSON()". */
+        interface TableData {
+            /**
+            *
+            * Represents a collection of all the columns in the table.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            columns?: Excel.Interfaces.TableColumnData[];
+            /**
+            *
+            * Represents a collection of all the rows in the table.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            rows?: Excel.Interfaces.TableRowData[];
+            /**
+            *
+            * Represents the sorting for the table.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            sort?: Excel.Interfaces.TableSortData;
+            /**
+            *
+            * The worksheet containing the current table.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            worksheet?: Excel.Interfaces.WorksheetData;
+            /**
+             *
+             * Indicates whether the first column contains special formatting.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            highlightFirstColumn?: boolean;
+            /**
+             *
+             * Indicates whether the last column contains special formatting.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            highlightLastColumn?: boolean;
+            /**
+             *
+             * Returns a value that uniquely identifies the table in a given workbook. The value of the identifier remains the same even when the table is renamed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Name of the table.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Indicates whether the columns show banded formatting in which odd columns are highlighted differently from even ones to make reading the table easier.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showBandedColumns?: boolean;
+            /**
+             *
+             * Indicates whether the rows show banded formatting in which odd rows are highlighted differently from even ones to make reading the table easier.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showBandedRows?: boolean;
+            /**
+             *
+             * Indicates whether the filter buttons are visible at the top of each column header. Setting this is only allowed if the table contains a header row.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showFilterButton?: boolean;
+            /**
+             *
+             * Indicates whether the header row is visible or not. This value can be set to show or remove the header row.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showHeaders?: boolean;
+            /**
+             *
+             * Indicates whether the total row is visible or not. This value can be set to show or remove the total row.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showTotals?: boolean;
+            /**
+             *
+             * Constant value that represents the Table style. Possible values are: TableStyleLight1 thru TableStyleLight21, TableStyleMedium1 thru TableStyleMedium28, TableStyleStyleDark1 thru TableStyleStyleDark11. A custom user-defined style present in the workbook can also be specified.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            style?: string;
+        }
+        /** An interface describing the data returned by calling "tableColumnCollection.toJSON()". */
+        interface TableColumnCollectionData {
+            items?: Excel.Interfaces.TableColumnData[];
+        }
+        /** An interface describing the data returned by calling "tableColumn.toJSON()". */
+        interface TableColumnData {
+            /**
+            *
+            * Retrieve the filter applied to the column.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            filter?: Excel.Interfaces.FilterData;
+            /**
+             *
+             * Returns a unique key that identifies the column within the table. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: number;
+            /**
+             *
+             * Returns the index number of the column within the columns collection of the table. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            index?: number;
+            /**
+             *
+             * Represents the name of the table column.
+             *
+             * [Api set: ExcelApi 1.1 for getting the name; 1.4 for setting it.]
+             */
+            name?: string;
+            /**
+             *
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: any[][];
+        }
+        /** An interface describing the data returned by calling "tableRowCollection.toJSON()". */
+        interface TableRowCollectionData {
+            items?: Excel.Interfaces.TableRowData[];
+        }
+        /** An interface describing the data returned by calling "tableRow.toJSON()". */
+        interface TableRowData {
+            /**
+             *
+             * Returns the index number of the row within the rows collection of the table. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            index?: number;
+            /**
+             *
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: any[][];
+        }
+        /** An interface describing the data returned by calling "rangeFormat.toJSON()". */
+        interface RangeFormatData {
+            /**
+            *
+            * Collection of border objects that apply to the overall range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            borders?: Excel.Interfaces.RangeBorderData[];
+            /**
+            *
+            * Returns the fill object defined on the overall range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            fill?: Excel.Interfaces.RangeFillData;
+            /**
+            *
+            * Returns the font object defined on the overall range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.RangeFontData;
+            /**
+            *
+            * Returns the format protection object for a range.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            protection?: Excel.Interfaces.FormatProtectionData;
+            /**
+             *
+             * Gets or sets the width of all colums within the range. If the column widths are not uniform, null will be returned.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            columnWidth?: number;
+            /**
+             *
+             * Represents the horizontal alignment for the specified object. See Excel.HorizontalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            horizontalAlignment?: Excel.HorizontalAlignment | "General" | "Left" | "Center" | "Right" | "Fill" | "Justify" | "CenterAcrossSelection" | "Distributed";
+            /**
+             *
+             * Gets or sets the height of all rows in the range. If the row heights are not uniform, null will be returned.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            rowHeight?: number;
+            /**
+             *
+             * Gets or sets the text orientation of all the cells within the range.
+            The text orientation should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+            If the orientation within a range are not uniform, then null will be returned.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            textOrientation?: number;
+            /**
+             *
+             * Determines if the row height of the Range object equals the standard height of the sheet.
+            Returns True if the row height of the Range object equals the standard height of the sheet.
+            Returns Null if the range contains more than one row and the rows aren't all the same height.
+            Returns False otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            useStandardHeight?: boolean;
+            /**
+             *
+             * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
+            Returns True if the column width of the Range object equals the standard width of the sheet.
+            Returns Null if the range contains more than one column and the columns aren't all the same height.
+            Returns False otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            useStandardWidth?: boolean;
+            /**
+             *
+             * Represents the vertical alignment for the specified object. See Excel.VerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            verticalAlignment?: Excel.VerticalAlignment | "Top" | "Center" | "Bottom" | "Justify" | "Distributed";
+            /**
+             *
+             * Indicates if Excel wraps the text in the object. A null value indicates that the entire range doesn't have uniform wrap setting
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            wrapText?: boolean;
+        }
+        /** An interface describing the data returned by calling "formatProtection.toJSON()". */
+        interface FormatProtectionData {
+            /**
+             *
+             * Indicates if Excel hides the formula for the cells in the range. A null value indicates that the entire range doesn't have uniform formula hidden setting.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            formulaHidden?: boolean;
+            /**
+             *
+             * Indicates if Excel locks the cells in the object. A null value indicates that the entire range doesn't have uniform lock setting.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            locked?: boolean;
+        }
+        /** An interface describing the data returned by calling "rangeFill.toJSON()". */
+        interface RangeFillData {
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: string;
+        }
+        /** An interface describing the data returned by calling "rangeBorder.toJSON()". */
+        interface RangeBorderData {
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: string;
+            /**
+             *
+             * Constant value that indicates the specific side of the border. See Excel.BorderIndex for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            sideIndex?: Excel.BorderIndex | "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight" | "InsideVertical" | "InsideHorizontal" | "DiagonalDown" | "DiagonalUp";
+            /**
+             *
+             * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            style?: Excel.BorderLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Double" | "SlantDashDot";
+            /**
+             *
+             * Specifies the weight of the border around a range. See Excel.BorderWeight for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            weight?: Excel.BorderWeight | "Hairline" | "Thin" | "Medium" | "Thick";
+        }
+        /** An interface describing the data returned by calling "rangeBorderCollection.toJSON()". */
+        interface RangeBorderCollectionData {
+            items?: Excel.Interfaces.RangeBorderData[];
+        }
+        /** An interface describing the data returned by calling "rangeFont.toJSON()". */
+        interface RangeFontData {
+            /**
+             *
+             * Represents the bold status of font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            bold?: boolean;
+            /**
+             *
+             * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: string;
+            /**
+             *
+             * Represents the italic status of the font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Font name (e.g. "Calibri")
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Font size.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            size?: number;
+            /**
+             *
+             * Type of underline applied to the font. See Excel.RangeUnderlineStyle for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            underline?: Excel.RangeUnderlineStyle | "None" | "Single" | "Double" | "SingleAccountant" | "DoubleAccountant";
+        }
+        /** An interface describing the data returned by calling "chartCollection.toJSON()". */
+        interface ChartCollectionData {
+            items?: Excel.Interfaces.ChartData[];
+        }
+        /** An interface describing the data returned by calling "chart.toJSON()". */
+        interface ChartData {
+            /**
+            *
+            * Represents chart axes.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            axes?: Excel.Interfaces.ChartAxesData;
+            /**
+            *
+            * Represents the datalabels on the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            dataLabels?: Excel.Interfaces.ChartDataLabelsData;
+            /**
+            *
+            * Encapsulates the format properties for the chart area. Read-only.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartAreaFormatData;
+            /**
+            *
+            * Represents the legend for the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            legend?: Excel.Interfaces.ChartLegendData;
+            /**
+            *
+            * Represents either a single series or collection of series in the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            series?: Excel.Interfaces.ChartSeriesData[];
+            /**
+            *
+            * Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            title?: Excel.Interfaces.ChartTitleData;
+            /**
+            *
+            * The worksheet containing the current chart.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            worksheet?: Excel.Interfaces.WorksheetData;
+            /**
+             *
+             * Represents the type of the chart. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+            /**
+             *
+             * Represents the height, in points, of the chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            height?: number;
+            /**
+             *
+             * The unique id of chart. Read-only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            id?: string;
+            /**
+             *
+             * The distance, in points, from the left side of the chart to the worksheet origin.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            left?: number;
+            /**
+             *
+             * Represents the name of a chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Represents whether to display all field buttons on a PivotChart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showAllFieldButtons?: boolean;
+            /**
+             *
+             * Represents the distance, in points, from the top edge of the object to the top of row 1 (on a worksheet) or the top of the chart area (on a chart).
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            top?: number;
+            /**
+             *
+             * Represents the width, in points, of the chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "chartAreaFormat.toJSON()". */
+        interface ChartAreaFormatData {
+            /**
+            *
+            * Represents the border format of chart area, which includes color, linestyle and weight.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderData;
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for the current object.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontData;
+        }
+        /** An interface describing the data returned by calling "chartSeriesCollection.toJSON()". */
+        interface ChartSeriesCollectionData {
+            items?: Excel.Interfaces.ChartSeriesData[];
+        }
+        /** An interface describing the data returned by calling "chartSeries.toJSON()". */
+        interface ChartSeriesData {
+            /**
+            *
+            * Represents the formatting of a chart series, which includes fill and line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartSeriesFormatData;
+            /**
+            *
+            * Represents a collection of all points in the series.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            points?: Excel.Interfaces.ChartPointData[];
+            /**
+            *
+            * Represents a collection of trendlines in the series.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            trendlines?: Excel.Interfaces.ChartTrendlineData[];
+            /**
+             *
+             * Represents the chart type of a series. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+            /**
+             *
+             * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
+            Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            doughnutHoleSize?: number;
+            /**
+             *
+             * Boolean value representing if the series is filtered or not. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            filtered?: boolean;
+            /**
+             *
+             * Represents the gap width of a chart series.  Only valid on bar and column charts, as well as
+            specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            gapWidth?: number;
+            /**
+             *
+             * Boolean value representing if the series has data labels or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabels?: boolean;
+            /**
+             *
+             * Represents markers background color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: string;
+            /**
+             *
+             * Represents markers foreground color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: string;
+            /**
+             *
+             * Represents marker size of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: number;
+            /**
+             *
+             * Represents marker style of a chart series. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: Excel.ChartMarkerStyle | "Invalid" | "Automatic" | "None" | "Square" | "Diamond" | "Triangle" | "X" | "Star" | "Dot" | "Dash" | "Circle" | "Plus" | "Picture";
+            /**
+             *
+             * Represents the name of a series in a chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Represents the plot order of a chart series within the chart group.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            plotOrder?: number;
+            /**
+             *
+             * Boolean value representing if the series has a shadow or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            smooth?: boolean;
+        }
+        /** An interface describing the data returned by calling "chartSeriesFormat.toJSON()". */
+        interface ChartSeriesFormatData {
+            /**
+            *
+            * Represents line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            line?: Excel.Interfaces.ChartLineFormatData;
+        }
+        /** An interface describing the data returned by calling "chartPointsCollection.toJSON()". */
+        interface ChartPointsCollectionData {
+            items?: Excel.Interfaces.ChartPointData[];
+        }
+        /** An interface describing the data returned by calling "chartPoint.toJSON()". */
+        interface ChartPointData {
+            /**
+            *
+            * Returns the data label of a chart point.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            dataLabel?: Excel.Interfaces.ChartDataLabelData;
+            /**
+            *
+            * Encapsulates the format properties chart point. Read-only.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartPointFormatData;
+            /**
+             *
+             * Represents whether a data point has datalabel. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabel?: boolean;
+            /**
+             *
+             * HTML color code representation of the marker background color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: string;
+            /**
+             *
+             * HTML color code representation of the marker foreground color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: string;
+            /**
+             *
+             * Represents marker size of data point.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: number;
+            /**
+             *
+             * Represents marker style of a chart data point. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: Excel.ChartMarkerStyle | "Invalid" | "Automatic" | "None" | "Square" | "Diamond" | "Triangle" | "X" | "Star" | "Dot" | "Dash" | "Circle" | "Plus" | "Picture";
+            /**
+             *
+             * Returns the value of a chart point. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            value?: any;
+        }
+        /** An interface describing the data returned by calling "chartPointFormat.toJSON()". */
+        interface ChartPointFormatData {
+            /**
+            *
+            * Represents the border format of a chart data point, which includes color, style and weight information.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderData;
+        }
+        /** An interface describing the data returned by calling "chartAxes.toJSON()". */
+        interface ChartAxesData {
+            /**
+            *
+            * Represents the category axis in a chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            categoryAxis?: Excel.Interfaces.ChartAxisData;
+            /**
+            *
+            * Represents the series axis of a 3-dimensional chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            seriesAxis?: Excel.Interfaces.ChartAxisData;
+            /**
+            *
+            * Represents the value axis in an axis.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            valueAxis?: Excel.Interfaces.ChartAxisData;
+        }
+        /** An interface describing the data returned by calling "chartAxis.toJSON()". */
+        interface ChartAxisData {
+            /**
+            *
+            * Represents the formatting of a chart object, which includes line and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartAxisFormatData;
+            /**
+            *
+            * Returns a gridlines object that represents the major gridlines for the specified axis.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            majorGridlines?: Excel.Interfaces.ChartGridlinesData;
+            /**
+            *
+            * Returns a Gridlines object that represents the minor gridlines for the specified axis.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            minorGridlines?: Excel.Interfaces.ChartGridlinesData;
+            /**
+            *
+            * Represents the axis title.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            title?: Excel.Interfaces.ChartAxisTitleData;
+            /**
+             *
+             * Represents the group for the specified axis. See Excel.ChartAxisGroup for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            axisGroup?: Excel.ChartAxisGroup | "Primary" | "Secondary";
+            /**
+             *
+             * Returns or sets the base unit for the specified category axis.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            baseTimeUnit?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
+            /**
+             *
+             * Returns or sets the category axis type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            categoryType?: Excel.ChartAxisCategoryType | "Automatic" | "TextAxis" | "DateAxis";
+            /**
+             * [DEPRECATED; kept for back-compat with existing first-party solutions]. Please use `Position` instead.
+             * Represents the specified axis where the other axis crosses. See Excel.ChartAxisPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            crosses?: Excel.ChartAxisPosition | "Automatic" | "Maximum" | "Minimum" | "Custom";
+            /**
+             * [DEPRECATED; kept for back-compat with existing first-party solutions]. Please use `PositionAt` instead.
+             * Represents the specified axis where the other axis crosses at. Read Only. Set to this property should use SetCrossesAt(double) method.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            crossesAt?: number;
+            /**
+             *
+             * Represents the custom axis display unit value. Read Only. To set this property, please use the SetCustomDisplayUnit(double) method.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            customDisplayUnit?: number;
+            /**
+             *
+             * Represents the axis display unit. See Excel.ChartAxisDisplayUnit for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            displayUnit?: Excel.ChartAxisDisplayUnit | "None" | "Hundreds" | "Thousands" | "TenThousands" | "HundredThousands" | "Millions" | "TenMillions" | "HundredMillions" | "Billions" | "Trillions" | "Custom";
+            /**
+             *
+             * Represents the height, in points, of the chart axis. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            height?: number;
+            /**
+             *
+             * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: number;
+            /**
+             *
+             * Represents the base of the logarithm when using logarithmic scales.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            logBase?: number;
+            /**
+             *
+             * Represents the type of major tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            majorTickMark?: Excel.ChartAxisTickMark | "None" | "Cross" | "Inside" | "Outside";
+            /**
+             *
+             * Returns or sets the major unit scale value for the category axis when the CategoryType property is set to TimeScale.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            majorTimeUnitScale?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
+            /**
+             *
+             * Represents the interval between two major tick marks. Can be set to a numeric value or an empty string.  The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            majorUnit?: any;
+            /**
+             *
+             * Represents the maximum value on the value axis.  Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            maximum?: any;
+            /**
+             *
+             * Represents the minimum value on the value axis. Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            minimum?: any;
+            /**
+             *
+             * Represents the type of minor tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            minorTickMark?: Excel.ChartAxisTickMark | "None" | "Cross" | "Inside" | "Outside";
+            /**
+             *
+             * Returns or sets the minor unit scale value for the category axis when the CategoryType property is set to TimeScale.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            minorTimeUnitScale?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
+            /**
+             *
+             * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            minorUnit?: any;
+            /**
+             *
+             * Represents whether Microsoft Excel plots data points from last to first.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            reversePlotOrder?: boolean;
+            /**
+             *
+             * Represents the value axis scale type. See Excel.ChartAxisScaleType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            scaleType?: Excel.ChartAxisScaleType | "Linear" | "Logarithmic";
+            /**
+             *
+             * Represents whether the axis display unit label is visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showDisplayUnitLabel?: boolean;
+            /**
+             *
+             * Represents the position of tick-mark labels on the specified axis. See Excel.ChartAxisTickLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickLabelPosition?: Excel.ChartAxisTickLabelPosition | "NextToAxis" | "High" | "Low" | "None";
+            /**
+             *
+             * Represents the number of categories or series between tick-mark labels. Can be a value from 1 through 31999 or an empty string for automatic setting. The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickLabelSpacing?: any;
+            /**
+             *
+             * Represents the number of categories or series between tick marks.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickMarkSpacing?: number;
+            /**
+             *
+             * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: number;
+            /**
+             *
+             * Represents the axis type. See Excel.ChartAxisType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: Excel.ChartAxisType | "Invalid" | "Category" | "Value" | "Series";
+            /**
+             *
+             * A boolean value represents the visibility of the axis.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            visible?: boolean;
+            /**
+             *
+             * Represents the width, in points, of the chart axis. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "chartAxisFormat.toJSON()". */
+        interface ChartAxisFormatData {
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for a chart axis element.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontData;
+            /**
+            *
+            * Represents chart line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            line?: Excel.Interfaces.ChartLineFormatData;
+        }
+        /** An interface describing the data returned by calling "chartAxisTitle.toJSON()". */
+        interface ChartAxisTitleData {
+            /**
+            *
+            * Represents the formatting of chart axis title.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartAxisTitleFormatData;
+            /**
+             *
+             * Represents the axis title.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            text?: string;
+            /**
+             *
+             * A boolean that specifies the visibility of an axis title.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+        }
+        /** An interface describing the data returned by calling "chartAxisTitleFormat.toJSON()". */
+        interface ChartAxisTitleFormatData {
+            /**
+            *
+            * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontData;
+        }
+        /** An interface describing the data returned by calling "chartDataLabels.toJSON()". */
+        interface ChartDataLabelsData {
+            /**
+            *
+            * Represents the format of chart data labels, which includes fill and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartDataLabelFormatData;
+            /**
+             *
+             * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            position?: Excel.ChartDataLabelPosition | "Invalid" | "None" | "Center" | "InsideEnd" | "InsideBase" | "OutsideEnd" | "Left" | "Right" | "Top" | "Bottom" | "BestFit" | "Callout";
+            /**
+             *
+             * String representing the separator used for the data labels on a chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            separator?: string;
+            /**
+             *
+             * Boolean value representing if the data label bubble size is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showBubbleSize?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label category name is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showCategoryName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label legend key is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showLegendKey?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label percentage is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showPercentage?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label series name is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showSeriesName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label value is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showValue?: boolean;
+        }
+        /** An interface describing the data returned by calling "chartDataLabel.toJSON()". */
+        interface ChartDataLabelData {
+            /**
+             *
+             * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            position?: Excel.ChartDataLabelPosition | "Invalid" | "None" | "Center" | "InsideEnd" | "InsideBase" | "OutsideEnd" | "Left" | "Right" | "Top" | "Bottom" | "BestFit" | "Callout";
+            /**
+             *
+             * String representing the separator used for the data label on a chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            separator?: string;
+            /**
+             *
+             * Boolean value representing if the data label bubble size is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showBubbleSize?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label category name is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showCategoryName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label legend key is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showLegendKey?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label percentage is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showPercentage?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label series name is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showSeriesName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label value is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showValue?: boolean;
+        }
+        /** An interface describing the data returned by calling "chartDataLabelFormat.toJSON()". */
+        interface ChartDataLabelFormatData {
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for a chart data label.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontData;
+        }
+        /** An interface describing the data returned by calling "chartGridlines.toJSON()". */
+        interface ChartGridlinesData {
+            /**
+            *
+            * Represents the formatting of chart gridlines.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartGridlinesFormatData;
+            /**
+             *
+             * Boolean value representing if the axis gridlines are visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+        }
+        /** An interface describing the data returned by calling "chartGridlinesFormat.toJSON()". */
+        interface ChartGridlinesFormatData {
+            /**
+            *
+            * Represents chart line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            line?: Excel.Interfaces.ChartLineFormatData;
+        }
+        /** An interface describing the data returned by calling "chartLegend.toJSON()". */
+        interface ChartLegendData {
+            /**
+            *
+            * Represents the formatting of a chart legend, which includes fill and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartLegendFormatData;
+            /**
+            *
+            * Represents a collection of legendEntries in the legend.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            legendEntries?: Excel.Interfaces.ChartLegendEntryData[];
+            /**
+             *
+             * Represents the height, in points, of the legend on the chart. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            height?: number;
+            /**
+             *
+             * Represents the left, in points, of a chart legend. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: number;
+            /**
+             *
+             * Boolean value for whether the chart legend should overlap with the main body of the chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            overlay?: boolean;
+            /**
+             *
+             * Represents the position of the legend on the chart. See Excel.ChartLegendPosition for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            position?: Excel.ChartLegendPosition | "Invalid" | "Top" | "Bottom" | "Left" | "Right" | "Corner" | "Custom";
+            /**
+             *
+             * Represents if the legend has a shadow on the chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Represents the top of a chart legend.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: number;
+            /**
+             *
+             * A boolean value the represents the visibility of a ChartLegend object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+            /**
+             *
+             * Represents the width, in points, of the legend on the chart. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "chartLegendEntry.toJSON()". */
+        interface ChartLegendEntryData {
+            /**
+             *
+             * Represents the visible of a chart legend entry.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            visible?: boolean;
+        }
+        /** An interface describing the data returned by calling "chartLegendEntryCollection.toJSON()". */
+        interface ChartLegendEntryCollectionData {
+            items?: Excel.Interfaces.ChartLegendEntryData[];
+        }
+        /** An interface describing the data returned by calling "chartLegendFormat.toJSON()". */
+        interface ChartLegendFormatData {
+            /**
+            *
+            * Represents the font attributes such as font name, font size, color, etc. of a chart legend.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontData;
+        }
+        /** An interface describing the data returned by calling "chartTitle.toJSON()". */
+        interface ChartTitleData {
+            /**
+            *
+            * Represents the formatting of a chart title, which includes fill and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartTitleFormatData;
+            /**
+             *
+             * Returns the height, in points, of the chart title. Read-only. Null if chart title is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            height?: number;
+            /**
+             *
+             * Represents the horizontal alignment for chart title.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            horizontalAlignment?: Excel.ChartTextHorizontalAlignment | "Center" | "Left" | "Right" | "Justify" | "Distributed";
+            /**
+             *
+             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: number;
+            /**
+             *
+             * Boolean value representing if the chart title will overlay the chart or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            overlay?: boolean;
+            /**
+             *
+             * Represents the position of chart title. See Excel.ChartTitlePosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            position?: Excel.ChartTitlePosition | "Automatic" | "Top" | "Bottom" | "Left" | "Right";
+            /**
+             *
+             * Represents a boolean value that determines if the chart title has a shadow.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Represents the title text of a chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            text?: string;
+            /**
+             *
+             * Represents the text orientation of chart title. The value should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            textOrientation?: number;
+            /**
+             *
+             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: number;
+            /**
+             *
+             * Represents the vertical alignment of chart title. See Excel.ChartTextVerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            verticalAlignment?: Excel.ChartTextVerticalAlignment | "Center" | "Bottom" | "Top" | "Justify" | "Distributed";
+            /**
+             *
+             * A boolean value the represents the visibility of a chart title object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+            /**
+             *
+             * Returns the width, in points, of the chart title. Read-only. Null if chart title is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "chartFormatString.toJSON()". */
+        interface ChartFormatStringData {
+            /**
+            *
+            * Represents the font attributes, such as font name, font size, color, etc. of chart characters object.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            font?: Excel.Interfaces.ChartFontData;
+        }
+        /** An interface describing the data returned by calling "chartTitleFormat.toJSON()". */
+        interface ChartTitleFormatData {
+            /**
+            *
+            * Represents the border format of chart title, which includes color, linestyle and weight.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderData;
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for an object.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontData;
+        }
+        /** An interface describing the data returned by calling "chartBorder.toJSON()". */
+        interface ChartBorderData {
+            /**
+             *
+             * HTML color code representing the color of borders in the chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            color?: string;
+            /**
+             *
+             * Represents the line style of the border. See Excel.ChartLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lineStyle?: Excel.ChartLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Grey25" | "Grey50" | "Grey75" | "Automatic" | "RoundDot";
+            /**
+             *
+             * Represents weight of the border, in points.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            weight?: number;
+        }
+        /** An interface describing the data returned by calling "chartLineFormat.toJSON()". */
+        interface ChartLineFormatData {
+            /**
+             *
+             * HTML color code representing the color of lines in the chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: string;
+            /**
+             *
+             * Represents the line style. See Excel.ChartLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lineStyle?: Excel.ChartLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot" | "Grey25" | "Grey50" | "Grey75" | "Automatic" | "RoundDot";
+            /**
+             *
+             * Represents weight of the line, in points.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            weight?: number;
+        }
+        /** An interface describing the data returned by calling "chartFont.toJSON()". */
+        interface ChartFontData {
+            /**
+             *
+             * Represents the bold status of font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            bold?: boolean;
+            /**
+             *
+             * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: string;
+            /**
+             *
+             * Represents the italic status of the font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Font name (e.g. "Calibri")
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Size of the font (e.g. 11)
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            size?: number;
+            /**
+             *
+             * Type of underline applied to the font. See Excel.ChartUnderlineStyle for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            underline?: Excel.ChartUnderlineStyle | "None" | "Single";
+        }
+        /** An interface describing the data returned by calling "chartTrendline.toJSON()". */
+        interface ChartTrendlineData {
+            /**
+            *
+            * Represents the formatting of a chart trendline.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            format?: Excel.Interfaces.ChartTrendlineFormatData;
+            /**
+             *
+             * Represents the intercept value of the trendline. Can be set to a numeric value or an empty string (for automatic values). The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            intercept?: any;
+            /**
+             *
+             * Represents the period of a chart trendline. Only applicable for trendline with MovingAverage type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            movingAveragePeriod?: number;
+            /**
+             *
+             * Represents the name of the trendline. Can be set to a string value, or can be set to null value represents automatic values. The returned value is always a string
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: string;
+            /**
+             *
+             * Represents the order of a chart trendline. Only applicable for trendline with Polynomial type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            polynomialOrder?: number;
+            /**
+             *
+             * Represents the type of a chart trendline.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: Excel.ChartTrendlineType | "Linear" | "Exponential" | "Logarithmic" | "MovingAverage" | "Polynomial" | "Power";
+        }
+        /** An interface describing the data returned by calling "chartTrendlineCollection.toJSON()". */
+        interface ChartTrendlineCollectionData {
+            items?: Excel.Interfaces.ChartTrendlineData[];
+        }
+        /** An interface describing the data returned by calling "chartTrendlineFormat.toJSON()". */
+        interface ChartTrendlineFormatData {
+            /**
+            *
+            * Represents chart line formatting.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            line?: Excel.Interfaces.ChartLineFormatData;
+        }
+        /** An interface describing the data returned by calling "tableSort.toJSON()". */
+        interface TableSortData {
+            /**
+             *
+             * Represents the current conditions used to last sort the table.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            fields?: Excel.SortField[];
+            /**
+             *
+             * Represents whether the casing impacted the last sort of the table.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            matchCase?: boolean;
+            /**
+             *
+             * Represents Chinese character ordering method last used to sort the table.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            method?: Excel.SortMethod | "PinYin" | "StrokeCount";
+        }
+        /** An interface describing the data returned by calling "filter.toJSON()". */
+        interface FilterData {
+            /**
+             *
+             * The currently applied filter on the given column.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            criteria?: Excel.FilterCriteria;
+        }
+        /** An interface describing the data returned by calling "customXmlPartScopedCollection.toJSON()". */
+        interface CustomXmlPartScopedCollectionData {
+            items?: Excel.Interfaces.CustomXmlPartData[];
+        }
+        /** An interface describing the data returned by calling "customXmlPartCollection.toJSON()". */
+        interface CustomXmlPartCollectionData {
+            items?: Excel.Interfaces.CustomXmlPartData[];
+        }
+        /** An interface describing the data returned by calling "customXmlPart.toJSON()". */
+        interface CustomXmlPartData {
+            /**
+             *
+             * The custom XML part's ID. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            id?: string;
+            /**
+             *
+             * The custom XML part's namespace URI. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            namespaceUri?: string;
+        }
+        /** An interface describing the data returned by calling "pivotTableCollection.toJSON()". */
+        interface PivotTableCollectionData {
+            items?: Excel.Interfaces.PivotTableData[];
+        }
+        /** An interface describing the data returned by calling "pivotTable.toJSON()". */
+        interface PivotTableData {
+            /**
+            *
+            * The worksheet containing the current PivotTable.
+            *
+            * [Api set: ExcelApi 1.3]
+            */
+            worksheet?: Excel.Interfaces.WorksheetData;
+            /**
+             *
+             * Id of the PivotTable.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            id?: string;
+            /**
+             *
+             * Name of the PivotTable.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            name?: string;
+        }
+        /** An interface describing the data returned by calling "documentProperties.toJSON()". */
+        interface DocumentPropertiesData {
+            /**
+            *
+            * Gets the collection of custom properties of the workbook. Read only.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            custom?: Excel.Interfaces.CustomPropertyData[];
+            /**
+             *
+             * Gets or sets the author of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            author?: string;
+            /**
+             *
+             * Gets or sets the category of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            category?: string;
+            /**
+             *
+             * Gets or sets the comments of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            comments?: string;
+            /**
+             *
+             * Gets or sets the company of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            company?: string;
+            /**
+             *
+             * Gets the creation date of the workbook. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            creationDate?: Date;
+            /**
+             *
+             * Gets or sets the keywords of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            keywords?: string;
+            /**
+             *
+             * Gets the last author of the workbook. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lastAuthor?: string;
+            /**
+             *
+             * Gets or sets the manager of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            manager?: string;
+            /**
+             *
+             * Gets the revision number of the workbook. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            revisionNumber?: number;
+            /**
+             *
+             * Gets or sets the subject of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            subject?: string;
+            /**
+             *
+             * Gets or sets the title of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            title?: string;
+        }
+        /** An interface describing the data returned by calling "customProperty.toJSON()". */
+        interface CustomPropertyData {
+            /**
+             *
+             * Gets the key of the custom property. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            key?: string;
+            /**
+             *
+             * Gets the value type of the custom property. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: Excel.DocumentPropertyType | "Number" | "Boolean" | "Date" | "String" | "Float";
+            /**
+             *
+             * Gets or sets the value of the custom property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            value?: any;
+        }
+        /** An interface describing the data returned by calling "customPropertyCollection.toJSON()". */
+        interface CustomPropertyCollectionData {
+            items?: Excel.Interfaces.CustomPropertyData[];
+        }
+        /** An interface describing the data returned by calling "conditionalFormatCollection.toJSON()". */
+        interface ConditionalFormatCollectionData {
+            items?: Excel.Interfaces.ConditionalFormatData[];
+        }
+        /** An interface describing the data returned by calling "conditionalFormat.toJSON()". */
+        interface ConditionalFormatData {
+            /**
+            *
+            * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
+            For example to format all cells between 5 and 10.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            cellValue?: Excel.Interfaces.CellValueConditionalFormatData;
+            /**
+            *
+            * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
+            For example to format all cells between 5 and 10.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            cellValueOrNullObject?: Excel.Interfaces.CellValueConditionalFormatData;
+            /**
+            *
+            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            colorScale?: Excel.Interfaces.ColorScaleConditionalFormatData;
+            /**
+            *
+            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            colorScaleOrNullObject?: Excel.Interfaces.ColorScaleConditionalFormatData;
+            /**
+            *
+            * Returns the custom conditional format properties if the current conditional format is a custom type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            custom?: Excel.Interfaces.CustomConditionalFormatData;
+            /**
+            *
+            * Returns the custom conditional format properties if the current conditional format is a custom type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            customOrNullObject?: Excel.Interfaces.CustomConditionalFormatData;
+            /**
+            *
+            * Returns the data bar properties if the current conditional format is a data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            dataBar?: Excel.Interfaces.DataBarConditionalFormatData;
+            /**
+            *
+            * Returns the data bar properties if the current conditional format is a data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            dataBarOrNullObject?: Excel.Interfaces.DataBarConditionalFormatData;
+            /**
+            *
+            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            iconSet?: Excel.Interfaces.IconSetConditionalFormatData;
+            /**
+            *
+            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatData;
+            /**
+            *
+            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            preset?: Excel.Interfaces.PresetCriteriaConditionalFormatData;
+            /**
+            *
+            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            presetOrNullObject?: Excel.Interfaces.PresetCriteriaConditionalFormatData;
+            /**
+            *
+            * Returns the specific text conditional format properties if the current conditional format is a text type.
+            For example to format cells matching the word "Text".
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            textComparison?: Excel.Interfaces.TextConditionalFormatData;
+            /**
+            *
+            * Returns the specific text conditional format properties if the current conditional format is a text type.
+            For example to format cells matching the word "Text".
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            textComparisonOrNullObject?: Excel.Interfaces.TextConditionalFormatData;
+            /**
+            *
+            * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
+            For example to format the top 10% or bottom 10 items.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            topBottom?: Excel.Interfaces.TopBottomConditionalFormatData;
+            /**
+            *
+            * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
+            For example to format the top 10% or bottom 10 items.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            topBottomOrNullObject?: Excel.Interfaces.TopBottomConditionalFormatData;
+            /**
+             *
+             * The Priority of the Conditional Format within the current ConditionalFormatCollection.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            id?: string;
+            /**
+             *
+             * The priority (or index) within the conditional format collection that this conditional format currently exists in. Changing this also
+            changes other conditional formats' priorities, to allow for a contiguous priority order.
+            Use a negative priority to begin from the back.
+            Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            priority?: number;
+            /**
+             *
+             * If the conditions of this conditional format are met, no lower-priority formats shall take effect on that cell.
+            Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            stopIfTrue?: boolean;
+            /**
+             *
+             * A type of conditional format. Only one can be set at a time. Read-Only.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            type?: Excel.ConditionalFormatType | "Custom" | "DataBar" | "ColorScale" | "IconSet" | "TopBottom" | "PresetCriteria" | "ContainsText" | "CellValue";
+        }
+        /** An interface describing the data returned by calling "dataBarConditionalFormat.toJSON()". */
+        interface DataBarConditionalFormatData {
+            /**
+            *
+            * Representation of all values to the left of the axis in an Excel data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            negativeFormat?: Excel.Interfaces.ConditionalDataBarNegativeFormatData;
+            /**
+            *
+            * Representation of all values to the right of the axis in an Excel data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            positiveFormat?: Excel.Interfaces.ConditionalDataBarPositiveFormatData;
+            /**
+             *
+             * HTML color code representing the color of the Axis line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+            "" (empty string) if no axis is present or set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            axisColor?: string;
+            /**
+             *
+             * Representation of how the axis is determined for an Excel data bar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            axisFormat?: Excel.ConditionalDataBarAxisFormat | "Automatic" | "None" | "CellMidPoint";
+            /**
+             *
+             * Represents the direction that the data bar graphic should be based on.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            barDirection?: Excel.ConditionalDataBarDirection | "Context" | "LeftToRight" | "RightToLeft";
+            /**
+             *
+             * The rule for what consistutes the lower bound (and how to calculate it, if applicable) for a data bar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            lowerBoundRule?: Excel.ConditionalDataBarRule;
+            /**
+             *
+             * If true, hides the values from the cells where the data bar is applied.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            showDataBarOnly?: boolean;
+            /**
+             *
+             * The rule for what constitutes the upper bound (and how to calculate it, if applicable) for a data bar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            upperBoundRule?: Excel.ConditionalDataBarRule;
+        }
+        /** An interface describing the data returned by calling "conditionalDataBarPositiveFormat.toJSON()". */
+        interface ConditionalDataBarPositiveFormatData {
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+            "" (empty string) if no border is present or set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            borderColor?: string;
+            /**
+             *
+             * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            fillColor?: string;
+            /**
+             *
+             * Boolean representation of whether or not the DataBar has a gradient.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            gradientFill?: boolean;
+        }
+        /** An interface describing the data returned by calling "conditionalDataBarNegativeFormat.toJSON()". */
+        interface ConditionalDataBarNegativeFormatData {
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+            "Empty String" if no border is present or set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            borderColor?: string;
+            /**
+             *
+             * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            fillColor?: string;
+            /**
+             *
+             * Boolean representation of whether or not the negative DataBar has the same border color as the positive DataBar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            matchPositiveBorderColor?: boolean;
+            /**
+             *
+             * Boolean representation of whether or not the negative DataBar has the same fill color as the positive DataBar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            matchPositiveFillColor?: boolean;
+        }
+        /** An interface describing the data returned by calling "customConditionalFormat.toJSON()". */
+        interface CustomConditionalFormatData {
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatData;
+            /**
+            *
+            * Represents the Rule object on this conditional format.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            rule?: Excel.Interfaces.ConditionalFormatRuleData;
+        }
+        /** An interface describing the data returned by calling "conditionalFormatRule.toJSON()". */
+        interface ConditionalFormatRuleData {
+            /**
+             *
+             * The formula, if required, to evaluate the conditional format rule on.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            formula?: string;
+            /**
+             *
+             * The formula, if required, to evaluate the conditional format rule on in the user's language.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            formulaLocal?: string;
+            /**
+             *
+             * The formula, if required, to evaluate the conditional format rule on in R1C1-style notation.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            formulaR1C1?: string;
+        }
+        /** An interface describing the data returned by calling "iconSetConditionalFormat.toJSON()". */
+        interface IconSetConditionalFormatData {
+            /**
+             *
+             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            criteria?: Excel.ConditionalIconCriterion[];
+            /**
+             *
+             * If true, reverses the icon orders for the IconSet. Note that this cannot be set if custom icons are used.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            reverseIconOrder?: boolean;
+            /**
+             *
+             * If true, hides the values and only shows icons.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            showIconOnly?: boolean;
+            /**
+             *
+             * If set, displays the IconSet option for the conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            style?: Excel.IconSet | "Invalid" | "ThreeArrows" | "ThreeArrowsGray" | "ThreeFlags" | "ThreeTrafficLights1" | "ThreeTrafficLights2" | "ThreeSigns" | "ThreeSymbols" | "ThreeSymbols2" | "FourArrows" | "FourArrowsGray" | "FourRedToBlack" | "FourRating" | "FourTrafficLights" | "FiveArrows" | "FiveArrowsGray" | "FiveRating" | "FiveQuarters" | "ThreeStars" | "ThreeTriangles" | "FiveBoxes";
+        }
+        /** An interface describing the data returned by calling "colorScaleConditionalFormat.toJSON()". */
+        interface ColorScaleConditionalFormatData {
+            /**
+             *
+             * The criteria of the color scale. Midpoint is optional when using a two point color scale.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            criteria?: Excel.ConditionalColorScaleCriteria;
+            /**
+             *
+             * If true the color scale will have three points (minimum, midpoint, maximum), otherwise it will have two (minimum, maximum).
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            threeColorScale?: boolean;
+        }
+        /** An interface describing the data returned by calling "topBottomConditionalFormat.toJSON()". */
+        interface TopBottomConditionalFormatData {
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatData;
+            /**
+             *
+             * The criteria of the Top/Bottom conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: Excel.ConditionalTopBottomRule;
+        }
+        /** An interface describing the data returned by calling "presetCriteriaConditionalFormat.toJSON()". */
+        interface PresetCriteriaConditionalFormatData {
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatData;
+            /**
+             *
+             * The rule of the conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: Excel.ConditionalPresetCriteriaRule;
+        }
+        /** An interface describing the data returned by calling "textConditionalFormat.toJSON()". */
+        interface TextConditionalFormatData {
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatData;
+            /**
+             *
+             * The rule of the conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: Excel.ConditionalTextComparisonRule;
+        }
+        /** An interface describing the data returned by calling "cellValueConditionalFormat.toJSON()". */
+        interface CellValueConditionalFormatData {
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatData;
+            /**
+             *
+             * Represents the Rule object on this conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: Excel.ConditionalCellValueRule;
+        }
+        /** An interface describing the data returned by calling "conditionalRangeFormat.toJSON()". */
+        interface ConditionalRangeFormatData {
+            /**
+            *
+            * Collection of border objects that apply to the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            borders?: Excel.Interfaces.ConditionalRangeBorderData[];
+            /**
+            *
+            * Returns the fill object defined on the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            fill?: Excel.Interfaces.ConditionalRangeFillData;
+            /**
+            *
+            * Returns the font object defined on the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            font?: Excel.Interfaces.ConditionalRangeFontData;
+            /**
+             *
+             * Represents Excel's number format code for the given range. Cleared if null is passed in.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            numberFormat?: any;
+        }
+        /** An interface describing the data returned by calling "conditionalRangeFont.toJSON()". */
+        interface ConditionalRangeFontData {
+            /**
+             *
+             * Represents the bold status of font.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            bold?: boolean;
+            /**
+             *
+             * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            color?: string;
+            /**
+             *
+             * Represents the italic status of the font.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Represents the strikethrough status of the font.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            strikethrough?: boolean;
+            /**
+             *
+             * Type of underline applied to the font. See Excel.ConditionalRangeFontUnderlineStyle for details.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            underline?: Excel.ConditionalRangeFontUnderlineStyle | "None" | "Single" | "Double";
+        }
+        /** An interface describing the data returned by calling "conditionalRangeFill.toJSON()". */
+        interface ConditionalRangeFillData {
+            /**
+             *
+             * HTML color code representing the color of the fill, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            color?: string;
+        }
+        /** An interface describing the data returned by calling "conditionalRangeBorder.toJSON()". */
+        interface ConditionalRangeBorderData {
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            color?: string;
+            /**
+             *
+             * Constant value that indicates the specific side of the border. See Excel.ConditionalRangeBorderIndex for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            sideIndex?: Excel.ConditionalRangeBorderIndex | "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight";
+            /**
+             *
+             * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            style?: Excel.ConditionalRangeBorderLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot";
+        }
+        /** An interface describing the data returned by calling "conditionalRangeBorderCollection.toJSON()". */
+        interface ConditionalRangeBorderCollectionData {
+            items?: Excel.Interfaces.ConditionalRangeBorderData[];
+        }
+        /** An interface describing the data returned by calling "style.toJSON()". */
+        interface StyleData {
+            /**
+            *
+            * A Border collection of four Border objects that represent the style of the four borders.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            borders?: Excel.Interfaces.RangeBorderData[];
+            /**
+            *
+            * The Fill of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            fill?: Excel.Interfaces.RangeFillData;
+            /**
+            *
+            * A Font object that represents the font of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            font?: Excel.Interfaces.RangeFontData;
+            /**
+             *
+             * Indicates if the style is a built-in style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            builtIn?: boolean;
+            /**
+             *
+             * Indicates if the formula will be hidden when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formulaHidden?: boolean;
+            /**
+             *
+             * Represents the horizontal alignment for the style. See Excel.HorizontalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            horizontalAlignment?: Excel.HorizontalAlignment | "General" | "Left" | "Center" | "Right" | "Fill" | "Justify" | "CenterAcrossSelection" | "Distributed";
+            /**
+             *
+             * Indicates if the style includes the AutoIndent, HorizontalAlignment, VerticalAlignment, WrapText, IndentLevel, and TextOrientation properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeAlignment?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Color, ColorIndex, LineStyle, and Weight border properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeBorder?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Background, Bold, Color, ColorIndex, FontStyle, Italic, Name, Size, Strikethrough, Subscript, Superscript, and Underline font properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeFont?: boolean;
+            /**
+             *
+             * Indicates if the style includes the NumberFormat property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeNumber?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Color, ColorIndex, InvertIfNegative, Pattern, PatternColor, and PatternColorIndex interior properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includePatterns?: boolean;
+            /**
+             *
+             * Indicates if the style includes the FormulaHidden and Locked protection properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeProtection?: boolean;
+            /**
+             *
+             * An integer from 0 to 250 that indicates the indent level for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            indentLevel?: number;
+            /**
+             *
+             * Indicates if the object is locked when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            locked?: boolean;
+            /**
+             *
+             * The name of the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: string;
+            /**
+             *
+             * The format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormat?: string;
+            /**
+             *
+             * The localized format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormatLocal?: string;
+            /**
+             *
+             * The reading order for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            readingOrder?: Excel.ReadingOrder | "Context" | "LeftToRight" | "RightToLeft";
+            /**
+             *
+             * Indicates if text automatically shrinks to fit in the available column width.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            shrinkToFit?: boolean;
+            /**
+             *
+             * Represents the vertical alignment for the style. See Excel.VerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            verticalAlignment?: Excel.VerticalAlignment | "Top" | "Center" | "Bottom" | "Justify" | "Distributed";
+            /**
+             *
+             * Indicates if Microsoft Excel wraps the text in the object.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            wrapText?: boolean;
+        }
+        /** An interface describing the data returned by calling "styleCollection.toJSON()". */
+        interface StyleCollectionData {
+            items?: Excel.Interfaces.StyleData[];
+        }
+        /** An interface describing the data returned by calling "functionResult.toJSON()". */
+        interface FunctionResultData<T> {
+            /**
+             *
+             * Error value (such as "#DIV/0") representing the error. If the error string is not set, then the function succeeded, and its result is written to the Value field. The error is always in the English locale.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            error?: string;
+            /**
+             *
+             * The value of function evaluation. The value field will be populated only if no error has occurred (i.e., the Error property is not set).
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            value?: T;
+        }
+        /**
+         *
+         * Represents the Excel application that manages the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ApplicationLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
+             *
+             * [Api set: ExcelApi 1.1 for get, 1.8 for set]
+             */
+            calculationMode?: boolean;
+        }
+        /**
+         *
+         * Workbook is the top level object which contains related workbook objects such as worksheets, tables, ranges, etc.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface WorkbookLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the Excel application instance that contains this workbook.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            application?: Excel.Interfaces.ApplicationLoadOptions;
+            /**
+            *
+            * Represents a collection of bindings that are part of the workbook.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            bindings?: Excel.Interfaces.BindingCollectionLoadOptions;
+            /**
+            *
+            * Gets the workbook properties.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            properties?: Excel.Interfaces.DocumentPropertiesLoadOptions;
+            /**
+            *
+            * Represents a collection of tables associated with the workbook.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            tables?: Excel.Interfaces.TableCollectionLoadOptions;
+            /**
+             *
+             * Gets the workbook name.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: boolean;
+        }
+        /**
+         *
+         * An Excel worksheet is a grid of cells. It can contain data, tables, charts, etc.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface WorksheetLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns collection of charts that are part of the worksheet.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            charts?: Excel.Interfaces.ChartCollectionLoadOptions;
+            /**
+            *
+            * Returns sheet protection object for a worksheet.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            protection?: Excel.Interfaces.WorksheetProtectionLoadOptions;
+            /**
+            *
+            * Collection of tables that are part of the worksheet.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            tables?: Excel.Interfaces.TableCollectionLoadOptions;
+            /**
+             *
+             * Returns a value that uniquely identifies the worksheet in a given workbook. The value of the identifier remains the same even when the worksheet is renamed or moved. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * The display name of the worksheet.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * The zero-based position of the worksheet within the workbook.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            position?: boolean;
+            /**
+             *
+             * Returns the standard (default) height of all the rows in the worksheet, in points. Read-only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            standardHeight?: boolean;
+            /**
+             *
+             * Returns or sets the standard (default) width of all the columns in the worksheet.
+            One unit of column width is equal to the width of one character in the Normal style. For proportional fonts, the width of the character 0 (zero) is used.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            standardWidth?: boolean;
+            /**
+             *
+             * Gets or sets the worksheet tab color.
+            When retrieving the tab color, if the worksheet is invisible, the value will be null. If the worksheet is visible but the tab color is set to auto, an empty string will be returned. Otherwise, the property will be set to a color, in the form "#123456"
+            When setting the color, use an empty-string to set an "auto" color, or a real color otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tabColor?: boolean;
+            /**
+             *
+             * The Visibility of the worksheet.
+             *
+             * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
+             */
+            visibility?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of worksheet objects that are part of the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface WorksheetCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns collection of charts that are part of the worksheet.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            charts?: Excel.Interfaces.ChartCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns sheet protection object for a worksheet.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            protection?: Excel.Interfaces.WorksheetProtectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Collection of tables that are part of the worksheet.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            tables?: Excel.Interfaces.TableCollectionLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns a value that uniquely identifies the worksheet in a given workbook. The value of the identifier remains the same even when the worksheet is renamed or moved. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The display name of the worksheet.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The zero-based position of the worksheet within the workbook.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            position?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the standard (default) height of all the rows in the worksheet, in points. Read-only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            standardHeight?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns or sets the standard (default) width of all the columns in the worksheet.
+            One unit of column width is equal to the width of one character in the Normal style. For proportional fonts, the width of the character 0 (zero) is used.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            standardWidth?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the worksheet tab color.
+            When retrieving the tab color, if the worksheet is invisible, the value will be null. If the worksheet is visible but the tab color is set to auto, an empty string will be returned. Otherwise, the property will be set to a color, in the form "#123456"
+            When setting the color, use an empty-string to set an "auto" color, or a real color otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tabColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The Visibility of the worksheet.
+             *
+             * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
+             */
+            visibility?: boolean;
+        }
+        /**
+         *
+         * Represents the protection of a sheet object.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        interface WorksheetProtectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Sheet protection options.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            options?: boolean;
+            /**
+             *
+             * Indicates if the worksheet is protected. Read-Only.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            protected?: boolean;
+        }
+        /**
+         *
+         * Range represents a set of one or more contiguous cells such as a cell, a row, a column, block of cells, etc.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface RangeLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns a format object, encapsulating the range's font, fill, borders, alignment, and other properties.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.RangeFormatLoadOptions;
+            /**
+            *
+            * The worksheet containing the current range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. Sheet1!A1:B4). Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            address?: boolean;
+            /**
+             *
+             * Represents range reference for the specified range in the language of the user. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            addressLocal?: boolean;
+            /**
+             *
+             * Number of cells in the range. This API will return -1 if the cell count exceeds 2^31-1 (2,147,483,647). Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            cellCount?: boolean;
+            /**
+             *
+             * Represents the total number of columns in the range. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            columnCount?: boolean;
+            /**
+             *
+             * Represents if all columns of the current range are hidden.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            columnHidden?: boolean;
+            /**
+             *
+             * Represents the column number of the first cell in the range. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            columnIndex?: boolean;
+            /**
+             *
+             * Represents the formula in A1-style notation.
+                When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            formulas?: boolean;
+            /**
+             *
+             * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+                When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            formulasLocal?: boolean;
+            /**
+             *
+             * Represents the formula in R1C1-style notation.
+                When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            formulasR1C1?: boolean;
+            /**
+             *
+             * Represents if all cells of the current range are hidden.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            hidden?: boolean;
+            /**
+             *
+             * Represents the hyperlink for the current range.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hyperlink?: boolean;
+            /**
+             *
+             * Represents if the current range is an entire column.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            isEntireColumn?: boolean;
+            /**
+             *
+             * Represents if the current range is an entire row.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            isEntireRow?: boolean;
+            /**
+             *
+             * Represents Excel's number format code for the given range.
+                When setting number format to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            numberFormat?: boolean;
+            /**
+             *
+             * Represents Excel's number format code for the given range as a string in the language of the user.
+                When setting number format local to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormatLocal?: boolean;
+            /**
+             *
+             * Returns the total number of rows in the range. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            rowCount?: boolean;
+            /**
+             *
+             * Represents if all rows of the current range are hidden.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            rowHidden?: boolean;
+            /**
+             *
+             * Returns the row number of the first cell in the range. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            rowIndex?: boolean;
+            /**
+             *
+             * Represents the style of the current range.
+                If the styles of the cells are inconsistent, null will be returned.
+                For custom styles, the style name will be returned. For built-in styles, a string representing a value in the BuiltInStyle enum will be returned.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            style?: boolean;
+            /**
+             *
+             * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            text?: boolean;
+            /**
+             *
+             * Represents the type of data of each cell. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            valueTypes?: boolean;
+            /**
+             *
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+                When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * RangeView represents a set of visible cells of the parent range.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        interface RangeViewLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the cell addresses of the RangeView.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            cellAddresses?: boolean;
+            /**
+             *
+             * Returns the number of visible columns. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            columnCount?: boolean;
+            /**
+             *
+             * Represents the formula in A1-style notation.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulas?: boolean;
+            /**
+             *
+             * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulasLocal?: boolean;
+            /**
+             *
+             * Represents the formula in R1C1-style notation.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulasR1C1?: boolean;
+            /**
+             *
+             * Returns a value that represents the index of the RangeView. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            index?: boolean;
+            /**
+             *
+             * Represents Excel's number format code for the given cell.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            numberFormat?: boolean;
+            /**
+             *
+             * Returns the number of visible rows. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            rowCount?: boolean;
+            /**
+             *
+             * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            text?: boolean;
+            /**
+             *
+             * Represents the type of data of each cell. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            valueTypes?: boolean;
+            /**
+             *
+             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of RangeView objects.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        interface RangeViewCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the cell addresses of the RangeView.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            cellAddresses?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the number of visible columns. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            columnCount?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the formula in A1-style notation.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulas?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulasLocal?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the formula in R1C1-style notation.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            formulasR1C1?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns a value that represents the index of the RangeView. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            index?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents Excel's number format code for the given cell.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            numberFormat?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the number of visible rows. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            rowCount?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            text?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the type of data of each cell. Read-only.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            valueTypes?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of worksheet objects that are part of the workbook.
+         *
+         * [Api set: ExcelApi 1.4]
+         */
+        interface SettingCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the key that represents the id of the Setting. Read-only.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            key?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the value stored for this setting.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Setting represents a key-value pair of a setting persisted to the document.
+         *
+         * [Api set: ExcelApi 1.4]
+         */
+        interface SettingLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Returns the key that represents the id of the Setting. Read-only.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            key?: boolean;
+            /**
+             *
+             * Represents the value stored for this setting.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * A collection of all the nameditem objects that are part of the workbook or worksheet, depending on how it was reached.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface NamedItemCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns an object containing values and types of the named item.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            arrayValues?: Excel.Interfaces.NamedItemArrayValuesLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the worksheet on which the named item is scoped to. Returns a null object if the item is scoped to the workbook instead.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            worksheetOrNullObject?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the comment associated with this name.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            comment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the formula of the named item.  Formula always starts with a '=' sign.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formula?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The name of the object. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the name is scoped to the workbook or to a specific worksheet. Read-only.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            scope?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates the type of the value returned by the name's formula. See Excel.NamedItemType for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1 for String,Integer,Double,Boolean,Range,Error; 1.7 for Array]
+             */
+            type?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the value computed by the name's formula. For a named range, will return the range address. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            value?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Specifies whether the object is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+        }
+        /**
+         *
+         * Represents a defined name for a range of cells or value. Names can be primitive named objects (as seen in the type below), range object, reference to a range. This object can be used to obtain range object associated with names.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface NamedItemLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns an object containing values and types of the named item.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            arrayValues?: Excel.Interfaces.NamedItemArrayValuesLoadOptions;
+            /**
+            *
+            * Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+            *
+            * Returns the worksheet on which the named item is scoped to. Returns a null object if the item is scoped to the workbook instead.
+            *
+            * [Api set: ExcelApi 1.4]
+            */
+            worksheetOrNullObject?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * Represents the comment associated with this name.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            comment?: boolean;
+            /**
+             *
+             * Gets or sets the formula of the named item.  Formula always starts with a '=' sign.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formula?: boolean;
+            /**
+             *
+             * The name of the object. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Indicates whether the name is scoped to the workbook or to a specific worksheet. Read-only.
+             *
+             * [Api set: ExcelApi 1.4]
+             */
+            scope?: boolean;
+            /**
+             *
+             * Indicates the type of the value returned by the name's formula. See Excel.NamedItemType for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1 for String,Integer,Double,Boolean,Range,Error; 1.7 for Array]
+             */
+            type?: boolean;
+            /**
+             *
+             * Represents the value computed by the name's formula. For a named range, will return the range address. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            value?: boolean;
+            /**
+             *
+             * Specifies whether the object is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+        }
+        /**
+         *
+         * Represents an object containing values and types of a named item.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface NamedItemArrayValuesLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the types for each item in the named item array
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            types?: boolean;
+            /**
+             *
+             * Represents the values of each item in the named item array.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * Represents an Office.js binding that is defined in the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface BindingLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents binding identifier. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Returns the type of the binding. See Excel.BindingType for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents the collection of all the binding objects that are part of the workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface BindingCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents binding identifier. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the type of the binding. See Excel.BindingType for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of all the tables that are part of the workbook or worksheet, depending on how it was reached.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface TableCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents a collection of all the columns in the table.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            columns?: Excel.Interfaces.TableColumnCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents a collection of all the rows in the table.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            rows?: Excel.Interfaces.TableRowCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents the sorting for the table.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            sort?: Excel.Interfaces.TableSortLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The worksheet containing the current table.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the first column contains special formatting.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            highlightFirstColumn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the last column contains special formatting.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            highlightLastColumn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns a value that uniquely identifies the table in a given workbook. The value of the identifier remains the same even when the table is renamed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Name of the table.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the columns show banded formatting in which odd columns are highlighted differently from even ones to make reading the table easier.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showBandedColumns?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the rows show banded formatting in which odd rows are highlighted differently from even ones to make reading the table easier.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showBandedRows?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the filter buttons are visible at the top of each column header. Setting this is only allowed if the table contains a header row.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showFilterButton?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the header row is visible or not. This value can be set to show or remove the header row.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showHeaders?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether the total row is visible or not. This value can be set to show or remove the total row.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showTotals?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Constant value that represents the Table style. Possible values are: TableStyleLight1 thru TableStyleLight21, TableStyleMedium1 thru TableStyleMedium28, TableStyleStyleDark1 thru TableStyleStyleDark11. A custom user-defined style present in the workbook can also be specified.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            style?: boolean;
+        }
+        /**
+         *
+         * Represents an Excel table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface TableLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents a collection of all the columns in the table.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            columns?: Excel.Interfaces.TableColumnCollectionLoadOptions;
+            /**
+            *
+            * Represents a collection of all the rows in the table.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            rows?: Excel.Interfaces.TableRowCollectionLoadOptions;
+            /**
+            *
+            * Represents the sorting for the table.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            sort?: Excel.Interfaces.TableSortLoadOptions;
+            /**
+            *
+            * The worksheet containing the current table.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * Indicates whether the first column contains special formatting.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            highlightFirstColumn?: boolean;
+            /**
+             *
+             * Indicates whether the last column contains special formatting.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            highlightLastColumn?: boolean;
+            /**
+             *
+             * Returns a value that uniquely identifies the table in a given workbook. The value of the identifier remains the same even when the table is renamed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Name of the table.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Indicates whether the columns show banded formatting in which odd columns are highlighted differently from even ones to make reading the table easier.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showBandedColumns?: boolean;
+            /**
+             *
+             * Indicates whether the rows show banded formatting in which odd rows are highlighted differently from even ones to make reading the table easier.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showBandedRows?: boolean;
+            /**
+             *
+             * Indicates whether the filter buttons are visible at the top of each column header. Setting this is only allowed if the table contains a header row.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            showFilterButton?: boolean;
+            /**
+             *
+             * Indicates whether the header row is visible or not. This value can be set to show or remove the header row.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showHeaders?: boolean;
+            /**
+             *
+             * Indicates whether the total row is visible or not. This value can be set to show or remove the total row.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showTotals?: boolean;
+            /**
+             *
+             * Constant value that represents the Table style. Possible values are: TableStyleLight1 thru TableStyleLight21, TableStyleMedium1 thru TableStyleMedium28, TableStyleStyleDark1 thru TableStyleStyleDark11. A custom user-defined style present in the workbook can also be specified.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            style?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of all the columns that are part of the table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface TableColumnCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Retrieve the filter applied to the column.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            filter?: Excel.Interfaces.FilterLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns a unique key that identifies the column within the table. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the index number of the column within the columns collection of the table. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            index?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the name of the table column.
+             *
+             * [Api set: ExcelApi 1.1 for getting the name; 1.4 for setting it.]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * Represents a column in a table.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface TableColumnLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Retrieve the filter applied to the column.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            filter?: Excel.Interfaces.FilterLoadOptions;
+            /**
+             *
+             * Returns a unique key that identifies the column within the table. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Returns the index number of the column within the columns collection of the table. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            index?: boolean;
+            /**
+             *
+             * Represents the name of the table column.
+             *
+             * [Api set: ExcelApi 1.1 for getting the name; 1.4 for setting it.]
+             */
+            name?: boolean;
+            /**
+             *
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of all the rows that are part of the table.
+
+                Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+                a TableRow object represent the physical location of the table row, but not the data.
+                That is, if the data is sorted or if new rows are added, a table row will continue
+                to point at the index for which it was created.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface TableRowCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the index number of the row within the rows collection of the table. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            index?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * Represents a row in a table.
+
+                Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+                a TableRow object represent the physical location of the table row, but not the data.
+                That is, if the data is sorted or if new rows are added, a table row will continue
+                to point at the index for which it was created.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface TableRowLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Returns the index number of the row within the rows collection of the table. Zero-indexed. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            index?: boolean;
+            /**
+             *
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            values?: boolean;
+        }
+        /**
+         *
+         * A format object encapsulating the range's font, fill, borders, alignment, and other properties.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface RangeFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Collection of border objects that apply to the overall range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            borders?: Excel.Interfaces.RangeBorderCollectionLoadOptions;
+            /**
+            *
+            * Returns the fill object defined on the overall range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            fill?: Excel.Interfaces.RangeFillLoadOptions;
+            /**
+            *
+            * Returns the font object defined on the overall range.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.RangeFontLoadOptions;
+            /**
+            *
+            * Returns the format protection object for a range.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            protection?: Excel.Interfaces.FormatProtectionLoadOptions;
+            /**
+             *
+             * Gets or sets the width of all colums within the range. If the column widths are not uniform, null will be returned.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            columnWidth?: boolean;
+            /**
+             *
+             * Represents the horizontal alignment for the specified object. See Excel.HorizontalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * Gets or sets the height of all rows in the range. If the row heights are not uniform, null will be returned.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            rowHeight?: boolean;
+            /**
+             *
+             * Gets or sets the text orientation of all the cells within the range.
+                The text orientation should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+                If the orientation within a range are not uniform, then null will be returned.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            textOrientation?: boolean;
+            /**
+             *
+             * Determines if the row height of the Range object equals the standard height of the sheet.
+                Returns True if the row height of the Range object equals the standard height of the sheet.
+                Returns Null if the range contains more than one row and the rows aren't all the same height.
+                Returns False otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            useStandardHeight?: boolean;
+            /**
+             *
+             * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
+                Returns True if the column width of the Range object equals the standard width of the sheet.
+                Returns Null if the range contains more than one column and the columns aren't all the same height.
+                Returns False otherwise.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            useStandardWidth?: boolean;
+            /**
+             *
+             * Represents the vertical alignment for the specified object. See Excel.VerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * Indicates if Excel wraps the text in the object. A null value indicates that the entire range doesn't have uniform wrap setting
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            wrapText?: boolean;
+        }
+        /**
+         *
+         * Represents the format protection of a range object.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        interface FormatProtectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Indicates if Excel hides the formula for the cells in the range. A null value indicates that the entire range doesn't have uniform formula hidden setting.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            formulaHidden?: boolean;
+            /**
+             *
+             * Indicates if Excel locks the cells in the object. A null value indicates that the entire range doesn't have uniform lock setting.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            locked?: boolean;
+        }
+        /**
+         *
+         * Represents the background of a range object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface RangeFillLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: boolean;
+        }
+        /**
+         *
+         * Represents the border of an object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface RangeBorderLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * Constant value that indicates the specific side of the border. See Excel.BorderIndex for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            sideIndex?: boolean;
+            /**
+             *
+             * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * Specifies the weight of the border around a range. See Excel.BorderWeight for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            weight?: boolean;
+        }
+        /**
+         *
+         * Represents the border objects that make up the range border.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface RangeBorderCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Constant value that indicates the specific side of the border. See Excel.BorderIndex for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            sideIndex?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Specifies the weight of the border around a range. See Excel.BorderWeight for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            weight?: boolean;
+        }
+        /**
+         *
+         * This object represents the font attributes (font name, font size, color, etc.) for an object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface RangeFontLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the bold status of font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            bold?: boolean;
+            /**
+             *
+             * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * Represents the italic status of the font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Font name (e.g. "Calibri")
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Font size.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            size?: boolean;
+            /**
+             *
+             * Type of underline applied to the font. See Excel.RangeUnderlineStyle for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            underline?: boolean;
+        }
+        /**
+         *
+         * A collection of all the chart objects on a worksheet.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents chart axes.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            axes?: Excel.Interfaces.ChartAxesLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents the datalabels on the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            dataLabels?: Excel.Interfaces.ChartDataLabelsLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Encapsulates the format properties for the chart area.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartAreaFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents the legend for the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            legend?: Excel.Interfaces.ChartLegendLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents either a single series or collection of series in the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            series?: Excel.Interfaces.ChartSeriesCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            title?: Excel.Interfaces.ChartTitleLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The worksheet containing the current chart.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the type of the chart. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the height, in points, of the chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            height?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The unique id of chart. Read-only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The distance, in points, from the left side of the chart to the worksheet origin.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            left?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the name of a chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents whether to display all field buttons on a PivotChart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showAllFieldButtons?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the distance, in points, from the top edge of the object to the top of row 1 (on a worksheet) or the top of the chart area (on a chart).
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            top?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the width, in points, of the chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Represents a chart object in a workbook.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents chart axes.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            axes?: Excel.Interfaces.ChartAxesLoadOptions;
+            /**
+            *
+            * Represents the datalabels on the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            dataLabels?: Excel.Interfaces.ChartDataLabelsLoadOptions;
+            /**
+            *
+            * Encapsulates the format properties for the chart area.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartAreaFormatLoadOptions;
+            /**
+            *
+            * Represents the legend for the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            legend?: Excel.Interfaces.ChartLegendLoadOptions;
+            /**
+            *
+            * Represents either a single series or collection of series in the chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            series?: Excel.Interfaces.ChartSeriesCollectionLoadOptions;
+            /**
+            *
+            * Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            title?: Excel.Interfaces.ChartTitleLoadOptions;
+            /**
+            *
+            * The worksheet containing the current chart.
+            *
+            * [Api set: ExcelApi 1.2]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * Represents the type of the chart. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: boolean;
+            /**
+             *
+             * Represents the height, in points, of the chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            height?: boolean;
+            /**
+             *
+             * The unique id of chart. Read-only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            id?: boolean;
+            /**
+             *
+             * The distance, in points, from the left side of the chart to the worksheet origin.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            left?: boolean;
+            /**
+             *
+             * Represents the name of a chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Represents whether to display all field buttons on a PivotChart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showAllFieldButtons?: boolean;
+            /**
+             *
+             * Represents the distance, in points, from the top edge of the object to the top of row 1 (on a worksheet) or the top of the chart area (on a chart).
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            top?: boolean;
+            /**
+             *
+             * Represents the width, in points, of the chart object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Encapsulates the format properties for the overall chart area.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartAreaFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the border format of chart area, which includes color, linestyle and weight.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderLoadOptions;
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for the current object.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontLoadOptions;
+        }
+        /**
+         *
+         * Represents a collection of chart series.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartSeriesCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents the formatting of a chart series, which includes fill and line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartSeriesFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents a collection of all points in the series.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            points?: Excel.Interfaces.ChartPointsCollectionLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the chart type of a series. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
+                Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            doughnutHoleSize?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Boolean value representing if the series is filtered or not. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            filtered?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the gap width of a chart series.  Only valid on bar and column charts, as well as
+                specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            gapWidth?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Boolean value representing if the series has data labels or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabels?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents markers background color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents markers foreground color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents marker size of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents marker style of a chart series. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the name of a series in a chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the plot order of a chart series within the chart group.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            plotOrder?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Boolean value representing if the series has a shadow or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            smooth?: boolean;
+        }
+        /**
+         *
+         * Represents a series in a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartSeriesLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the formatting of a chart series, which includes fill and line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartSeriesFormatLoadOptions;
+            /**
+            *
+            * Represents a collection of all points in the series.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            points?: Excel.Interfaces.ChartPointsCollectionLoadOptions;
+            /**
+             *
+             * Represents the chart type of a series. See Excel.ChartType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            chartType?: boolean;
+            /**
+             *
+             * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
+                Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            doughnutHoleSize?: boolean;
+            /**
+             *
+             * Boolean value representing if the series is filtered or not. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            filtered?: boolean;
+            /**
+             *
+             * Represents the gap width of a chart series.  Only valid on bar and column charts, as well as
+                specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            gapWidth?: boolean;
+            /**
+             *
+             * Boolean value representing if the series has data labels or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabels?: boolean;
+            /**
+             *
+             * Represents markers background color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: boolean;
+            /**
+             *
+             * Represents markers foreground color of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: boolean;
+            /**
+             *
+             * Represents marker size of a chart series.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: boolean;
+            /**
+             *
+             * Represents marker style of a chart series. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: boolean;
+            /**
+             *
+             * Represents the name of a series in a chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Represents the plot order of a chart series within the chart group.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            plotOrder?: boolean;
+            /**
+             *
+             * Boolean value representing if the series has a shadow or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            smooth?: boolean;
+        }
+        /**
+         *
+         * encapsulates the format properties for the chart series
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartSeriesFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            line?: Excel.Interfaces.ChartLineFormatLoadOptions;
+        }
+        /**
+         *
+         * A collection of all the chart points within a series inside a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartPointsCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the data label of a chart point.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            dataLabel?: Excel.Interfaces.ChartDataLabelLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Encapsulates the format properties chart point.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartPointFormatLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents whether a data point has datalabel. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabel?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: HTML color code representation of the marker background color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: HTML color code representation of the marker foreground color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents marker size of data point.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents marker style of a chart data point. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Returns the value of a chart point. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Represents a point of a series in a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartPointLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns the data label of a chart point.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            dataLabel?: Excel.Interfaces.ChartDataLabelLoadOptions;
+            /**
+            *
+            * Encapsulates the format properties chart point.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartPointFormatLoadOptions;
+            /**
+             *
+             * Represents whether a data point has datalabel. Not applicable for surface charts.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            hasDataLabel?: boolean;
+            /**
+             *
+             * HTML color code representation of the marker background color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerBackgroundColor?: boolean;
+            /**
+             *
+             * HTML color code representation of the marker foreground color of data point. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerForegroundColor?: boolean;
+            /**
+             *
+             * Represents marker size of data point.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerSize?: boolean;
+            /**
+             *
+             * Represents marker style of a chart data point. See Excel.ChartMarkerStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            markerStyle?: boolean;
+            /**
+             *
+             * Returns the value of a chart point. Read-only.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Represents formatting object for chart points.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartPointFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the border format of a chart data point, which includes color, style and weight information.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderLoadOptions;
+        }
+        /**
+         *
+         * Represents the chart axes.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartAxesLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the category axis in a chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            categoryAxis?: Excel.Interfaces.ChartAxisLoadOptions;
+            /**
+            *
+            * Represents the series axis of a 3-dimensional chart.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            seriesAxis?: Excel.Interfaces.ChartAxisLoadOptions;
+            /**
+            *
+            * Represents the value axis in an axis.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            valueAxis?: Excel.Interfaces.ChartAxisLoadOptions;
+        }
+        /**
+         *
+         * Represents a single axis in a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartAxisLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the formatting of a chart object, which includes line and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartAxisFormatLoadOptions;
+            /**
+            *
+            * Returns a gridlines object that represents the major gridlines for the specified axis.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            majorGridlines?: Excel.Interfaces.ChartGridlinesLoadOptions;
+            /**
+            *
+            * Returns a Gridlines object that represents the minor gridlines for the specified axis.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            minorGridlines?: Excel.Interfaces.ChartGridlinesLoadOptions;
+            /**
+            *
+            * Represents the axis title.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            title?: Excel.Interfaces.ChartAxisTitleLoadOptions;
+            /**
+             *
+             * Represents the group for the specified axis. See Excel.ChartAxisGroup for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            axisGroup?: boolean;
+            /**
+             *
+             * Returns or sets the base unit for the specified category axis.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            baseTimeUnit?: boolean;
+            /**
+             *
+             * Returns or sets the category axis type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            categoryType?: boolean;
+            /**
+             * [DEPRECATED; kept for back-compat with existing first-party solutions]. Please use `Position` instead.
+             * Represents the specified axis where the other axis crosses. See Excel.ChartAxisPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            crosses?: boolean;
+            /**
+             * [DEPRECATED; kept for back-compat with existing first-party solutions]. Please use `PositionAt` instead.
+             * Represents the specified axis where the other axis crosses at. Read Only. Set to this property should use SetCrossesAt(double) method.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            crossesAt?: boolean;
+            /**
+             *
+             * Represents the custom axis display unit value. Read Only. To set this property, please use the SetCustomDisplayUnit(double) method.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            customDisplayUnit?: boolean;
+            /**
+             *
+             * Represents the axis display unit. See Excel.ChartAxisDisplayUnit for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            displayUnit?: boolean;
+            /**
+             *
+             * Represents the height, in points, of the chart axis. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            height?: boolean;
+            /**
+             *
+             * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: boolean;
+            /**
+             *
+             * Represents the base of the logarithm when using logarithmic scales.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            logBase?: boolean;
+            /**
+             *
+             * Represents the type of major tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            majorTickMark?: boolean;
+            /**
+             *
+             * Returns or sets the major unit scale value for the category axis when the CategoryType property is set to TimeScale.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            majorTimeUnitScale?: boolean;
+            /**
+             *
+             * Represents the interval between two major tick marks. Can be set to a numeric value or an empty string.  The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            majorUnit?: boolean;
+            /**
+             *
+             * Represents the maximum value on the value axis.  Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            maximum?: boolean;
+            /**
+             *
+             * Represents the minimum value on the value axis. Can be set to a numeric value or an empty string (for automatic axis values).  The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            minimum?: boolean;
+            /**
+             *
+             * Represents the type of minor tick mark for the specified axis. See Excel.ChartAxisTickMark for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            minorTickMark?: boolean;
+            /**
+             *
+             * Returns or sets the minor unit scale value for the category axis when the CategoryType property is set to TimeScale.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            minorTimeUnitScale?: boolean;
+            /**
+             *
+             * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            minorUnit?: boolean;
+            /**
+             *
+             * Represents whether Microsoft Excel plots data points from last to first.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            reversePlotOrder?: boolean;
+            /**
+             *
+             * Represents the value axis scale type. See Excel.ChartAxisScaleType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            scaleType?: boolean;
+            /**
+             *
+             * Represents whether the axis display unit label is visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showDisplayUnitLabel?: boolean;
+            /**
+             *
+             * Represents the position of tick-mark labels on the specified axis. See Excel.ChartAxisTickLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickLabelPosition?: boolean;
+            /**
+             *
+             * Represents the number of categories or series between tick-mark labels. Can be a value from 1 through 31999 or an empty string for automatic setting. The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickLabelSpacing?: boolean;
+            /**
+             *
+             * Represents the number of categories or series between tick marks.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            tickMarkSpacing?: boolean;
+            /**
+             *
+             * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: boolean;
+            /**
+             *
+             * Represents the axis type. See Excel.ChartAxisType for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: boolean;
+            /**
+             *
+             * A boolean value represents the visibility of the axis.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            visible?: boolean;
+            /**
+             *
+             * Represents the width, in points, of the chart axis. Null if the axis's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Encapsulates the format properties for the chart axis.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartAxisFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for a chart axis element.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontLoadOptions;
+            /**
+            *
+            * Represents chart line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            line?: Excel.Interfaces.ChartLineFormatLoadOptions;
+        }
+        /**
+         *
+         * Represents the title of a chart axis.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartAxisTitleLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the formatting of chart axis title.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartAxisTitleFormatLoadOptions;
+            /**
+             *
+             * Represents the axis title.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            text?: boolean;
+            /**
+             *
+             * A boolean that specifies the visibility of an axis title.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+        }
+        /**
+         *
+         * Represents the chart axis title formatting.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartAxisTitleFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontLoadOptions;
+        }
+        /**
+         *
+         * Represents a collection of all the data labels on a chart point.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartDataLabelsLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the format of chart data labels, which includes fill and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartDataLabelFormatLoadOptions;
+            /**
+             *
+             * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            position?: boolean;
+            /**
+             *
+             * String representing the separator used for the data labels on a chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            separator?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label bubble size is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showBubbleSize?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label category name is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showCategoryName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label legend key is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showLegendKey?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label percentage is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showPercentage?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label series name is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showSeriesName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label value is visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            showValue?: boolean;
+        }
+        /**
+         *
+         * Represents the data label of a chart point.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartDataLabelLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * DataLabelPosition value that represents the position of the data label. See Excel.ChartDataLabelPosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            position?: boolean;
+            /**
+             *
+             * String representing the separator used for the data label on a chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            separator?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label bubble size is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showBubbleSize?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label category name is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showCategoryName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label legend key is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showLegendKey?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label percentage is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showPercentage?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label series name is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showSeriesName?: boolean;
+            /**
+             *
+             * Boolean value representing if the data label value is visible or not.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showValue?: boolean;
+        }
+        /**
+         *
+         * Encapsulates the format properties for the chart data labels.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartDataLabelFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for a chart data label.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontLoadOptions;
+        }
+        /**
+         *
+         * Represents major or minor gridlines on a chart axis.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartGridlinesLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the formatting of chart gridlines.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartGridlinesFormatLoadOptions;
+            /**
+             *
+             * Boolean value representing if the axis gridlines are visible or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+        }
+        /**
+         *
+         * Encapsulates the format properties for chart gridlines.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartGridlinesFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents chart line formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            line?: Excel.Interfaces.ChartLineFormatLoadOptions;
+        }
+        /**
+         *
+         * Represents the legend in a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartLegendLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the formatting of a chart legend, which includes fill and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartLegendFormatLoadOptions;
+            /**
+             *
+             * Represents the height, in points, of the legend on the chart. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            height?: boolean;
+            /**
+             *
+             * Represents the left, in points, of a chart legend. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: boolean;
+            /**
+             *
+             * Boolean value for whether the chart legend should overlap with the main body of the chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            overlay?: boolean;
+            /**
+             *
+             * Represents the position of the legend on the chart. See Excel.ChartLegendPosition for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            position?: boolean;
+            /**
+             *
+             * Represents if the legend has a shadow on the chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Represents the top of a chart legend.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: boolean;
+            /**
+             *
+             * A boolean value the represents the visibility of a ChartLegend object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+            /**
+             *
+             * Represents the width, in points, of the legend on the chart. Null if legend is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Represents the legendEntry in legendEntryCollection.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartLegendEntryLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the visible of a chart legend entry.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            visible?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of legendEntries.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartLegendEntryCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the visible of a chart legend entry.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            visible?: boolean;
+        }
+        /**
+         *
+         * Encapsulates the format properties of a chart legend.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartLegendFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the font attributes such as font name, font size, color, etc. of a chart legend.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontLoadOptions;
+        }
+        /**
+         *
+         * Represents a chart title object of a chart.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartTitleLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the formatting of a chart title, which includes fill and font formatting.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            format?: Excel.Interfaces.ChartTitleFormatLoadOptions;
+            /**
+             *
+             * Returns the height, in points, of the chart title. Read-only. Null if chart title is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            height?: boolean;
+            /**
+             *
+             * Represents the horizontal alignment for chart title.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            left?: boolean;
+            /**
+             *
+             * Boolean value representing if the chart title will overlay the chart or not.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            overlay?: boolean;
+            /**
+             *
+             * Represents the position of chart title. See Excel.ChartTitlePosition for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            position?: boolean;
+            /**
+             *
+             * Represents a boolean value that determines if the chart title has a shadow.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            showShadow?: boolean;
+            /**
+             *
+             * Represents the title text of a chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            text?: boolean;
+            /**
+             *
+             * Represents the text orientation of chart title. The value should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            textOrientation?: boolean;
+            /**
+             *
+             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            top?: boolean;
+            /**
+             *
+             * Represents the vertical alignment of chart title. See Excel.ChartTextVerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * A boolean value the represents the visibility of a chart title object.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            visible?: boolean;
+            /**
+             *
+             * Returns the width, in points, of the chart title. Read-only. Null if chart title is not visible.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Represents the substring in chart related objects that contains text, like ChartTitle object, ChartAxisTitle object, etc.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartFormatStringLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the font attributes, such as font name, font size, color, etc. of chart characters object.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            font?: Excel.Interfaces.ChartFontLoadOptions;
+        }
+        /**
+         *
+         * Provides access to the office art formatting for chart title.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartTitleFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the border format of chart title, which includes color, linestyle and weight.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            border?: Excel.Interfaces.ChartBorderLoadOptions;
+            /**
+            *
+            * Represents the font attributes (font name, font size, color, etc.) for an object.
+            *
+            * [Api set: ExcelApi 1.1]
+            */
+            font?: Excel.Interfaces.ChartFontLoadOptions;
+        }
+        /**
+         *
+         * Represents the border formatting of a chart element.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartBorderLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of borders in the chart.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            color?: boolean;
+            /**
+             *
+             * Represents the line style of the border. See Excel.ChartLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lineStyle?: boolean;
+            /**
+             *
+             * Represents weight of the border, in points.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            weight?: boolean;
+        }
+        /**
+         *
+         * Enapsulates the formatting options for line elements.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartLineFormatLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of lines in the chart.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * Represents the line style. See Excel.ChartLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lineStyle?: boolean;
+            /**
+             *
+             * Represents weight of the line, in points.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            weight?: boolean;
+        }
+        /**
+         *
+         * This object represents the font attributes (font name, font size, color, etc.) for a chart object.
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        interface ChartFontLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the bold status of font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            bold?: boolean;
+            /**
+             *
+             * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * Represents the italic status of the font.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Font name (e.g. "Calibri")
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Size of the font (e.g. 11)
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            size?: boolean;
+            /**
+             *
+             * Type of underline applied to the font. See Excel.ChartUnderlineStyle for details.
+             *
+             * [Api set: ExcelApi 1.1]
+             */
+            underline?: boolean;
+        }
+        /**
+         *
+         * This object represents the attributes for a chart trendline object.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartTrendlineLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents the formatting of a chart trendline.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            format?: Excel.Interfaces.ChartTrendlineFormatLoadOptions;
+            /**
+             *
+             * Represents the intercept value of the trendline. Can be set to a numeric value or an empty string (for automatic values). The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            intercept?: boolean;
+            /**
+             *
+             * Represents the period of a chart trendline. Only applicable for trendline with MovingAverage type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            movingAveragePeriod?: boolean;
+            /**
+             *
+             * Represents the name of the trendline. Can be set to a string value, or can be set to null value represents automatic values. The returned value is always a string
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: boolean;
+            /**
+             *
+             * Represents the order of a chart trendline. Only applicable for trendline with Polynomial type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            polynomialOrder?: boolean;
+            /**
+             *
+             * Represents the type of a chart trendline.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of Chart Trendlines.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartTrendlineCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Represents the formatting of a chart trendline.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            format?: Excel.Interfaces.ChartTrendlineFormatLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the intercept value of the trendline. Can be set to a numeric value or an empty string (for automatic values). The returned value is always a number.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            intercept?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the period of a chart trendline. Only applicable for trendline with MovingAverage type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            movingAveragePeriod?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the name of the trendline. Can be set to a string value, or can be set to null value represents automatic values. The returned value is always a string
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the order of a chart trendline. Only applicable for trendline with Polynomial type.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            polynomialOrder?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the type of a chart trendline.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents the format properties for chart trendline.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface ChartTrendlineFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Represents chart line formatting.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            line?: Excel.Interfaces.ChartLineFormatLoadOptions;
+        }
+        /**
+         *
+         * Manages sorting operations on Table objects.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        interface TableSortLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the current conditions used to last sort the table.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            fields?: boolean;
+            /**
+             *
+             * Represents whether the casing impacted the last sort of the table.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            matchCase?: boolean;
+            /**
+             *
+             * Represents Chinese character ordering method last used to sort the table.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            method?: boolean;
+        }
+        /**
+         *
+         * Manages the filtering of a table's column.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        interface FilterLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * The currently applied filter on the given column.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            criteria?: boolean;
+        }
+        /**
+         *
+         * A scoped collection of custom XML parts.
+                A scoped collection is the result of some operation, e.g. filtering by namespace.
+                A scoped collection cannot be scoped any further.
+         *
+         * [Api set: ExcelApi 1.5]
+         */
+        interface CustomXmlPartScopedCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The custom XML part's ID. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The custom XML part's namespace URI. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            namespaceUri?: boolean;
+        }
+        /**
+         *
+         * A collection of custom XML parts.
+         *
+         * [Api set: ExcelApi 1.5]
+         */
+        interface CustomXmlPartCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The custom XML part's ID. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The custom XML part's namespace URI. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            namespaceUri?: boolean;
+        }
+        /**
+         *
+         * Represents a custom XML part object in a workbook.
+         *
+         * [Api set: ExcelApi 1.5]
+         */
+        interface CustomXmlPartLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * The custom XML part's ID. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            id?: boolean;
+            /**
+             *
+             * The custom XML part's namespace URI. Read-only.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            namespaceUri?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of all the PivotTables that are part of the workbook or worksheet.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        interface PivotTableCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: The worksheet containing the current PivotTable.
+            *
+            * [Api set: ExcelApi 1.3]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Id of the PivotTable.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Name of the PivotTable.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            name?: boolean;
+        }
+        /**
+         *
+         * Represents an Excel PivotTable.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        interface PivotTableLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * The worksheet containing the current PivotTable.
+            *
+            * [Api set: ExcelApi 1.3]
+            */
+            worksheet?: Excel.Interfaces.WorksheetLoadOptions;
+            /**
+             *
+             * Id of the PivotTable.
+             *
+             * [Api set: ExcelApi 1.5]
+             */
+            id?: boolean;
+            /**
+             *
+             * Name of the PivotTable.
+             *
+             * [Api set: ExcelApi 1.3]
+             */
+            name?: boolean;
+        }
+        /**
+         *
+         * Represents workbook properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface DocumentPropertiesLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets or sets the author of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            author?: boolean;
+            /**
+             *
+             * Gets or sets the category of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            category?: boolean;
+            /**
+             *
+             * Gets or sets the comments of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            comments?: boolean;
+            /**
+             *
+             * Gets or sets the company of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            company?: boolean;
+            /**
+             *
+             * Gets the creation date of the workbook. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            creationDate?: boolean;
+            /**
+             *
+             * Gets or sets the keywords of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            keywords?: boolean;
+            /**
+             *
+             * Gets the last author of the workbook. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            lastAuthor?: boolean;
+            /**
+             *
+             * Gets or sets the manager of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            manager?: boolean;
+            /**
+             *
+             * Gets the revision number of the workbook. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            revisionNumber?: boolean;
+            /**
+             *
+             * Gets or sets the subject of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            subject?: boolean;
+            /**
+             *
+             * Gets or sets the title of the workbook.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            title?: boolean;
+        }
+        /**
+         *
+         * Represents a custom property.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface CustomPropertyLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the key of the custom property. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            key?: boolean;
+            /**
+             *
+             * Gets the value type of the custom property. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: boolean;
+            /**
+             *
+             * Gets or sets the value of the custom property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Contains the collection of customProperty objects.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface CustomPropertyCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the key of the custom property. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            key?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the value type of the custom property. Read only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            type?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the value of the custom property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of all the conditional formats that are overlap the range.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalFormatCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the cell value conditional format properties if the current conditional format is a CellValue type.
+                For example to format all cells between 5 and 10.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            cellValue?: Excel.Interfaces.CellValueConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the cell value conditional format properties if the current conditional format is a CellValue type.
+                For example to format all cells between 5 and 10.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            cellValueOrNullObject?: Excel.Interfaces.CellValueConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            colorScale?: Excel.Interfaces.ColorScaleConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            colorScaleOrNullObject?: Excel.Interfaces.ColorScaleConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the custom conditional format properties if the current conditional format is a custom type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            custom?: Excel.Interfaces.CustomConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the custom conditional format properties if the current conditional format is a custom type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            customOrNullObject?: Excel.Interfaces.CustomConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the data bar properties if the current conditional format is a data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            dataBar?: Excel.Interfaces.DataBarConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the data bar properties if the current conditional format is a data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            dataBarOrNullObject?: Excel.Interfaces.DataBarConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            iconSet?: Excel.Interfaces.IconSetConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            preset?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            presetOrNullObject?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the specific text conditional format properties if the current conditional format is a text type.
+                For example to format cells matching the word "Text".
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            textComparison?: Excel.Interfaces.TextConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the specific text conditional format properties if the current conditional format is a text type.
+                For example to format cells matching the word "Text".
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            textComparisonOrNullObject?: Excel.Interfaces.TextConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
+                For example to format the top 10% or bottom 10 items.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            topBottom?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
+                For example to format the top 10% or bottom 10 items.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            topBottomOrNullObject?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: The Priority of the Conditional Format within the current ConditionalFormatCollection.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The priority (or index) within the conditional format collection that this conditional format currently exists in. Changing this also
+                changes other conditional formats' priorities, to allow for a contiguous priority order.
+                Use a negative priority to begin from the back.
+                Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
+                Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            priority?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: If the conditions of this conditional format are met, no lower-priority formats shall take effect on that cell.
+                Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            stopIfTrue?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: A type of conditional format. Only one can be set at a time. Read-Only.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * An object encapsulating a conditional format's range, format, rule, and other properties.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
+                For example to format all cells between 5 and 10.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            cellValue?: Excel.Interfaces.CellValueConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
+                For example to format all cells between 5 and 10.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            cellValueOrNullObject?: Excel.Interfaces.CellValueConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            colorScale?: Excel.Interfaces.ColorScaleConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            colorScaleOrNullObject?: Excel.Interfaces.ColorScaleConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the custom conditional format properties if the current conditional format is a custom type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            custom?: Excel.Interfaces.CustomConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the custom conditional format properties if the current conditional format is a custom type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            customOrNullObject?: Excel.Interfaces.CustomConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the data bar properties if the current conditional format is a data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            dataBar?: Excel.Interfaces.DataBarConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the data bar properties if the current conditional format is a data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            dataBarOrNullObject?: Excel.Interfaces.DataBarConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            iconSet?: Excel.Interfaces.IconSetConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            preset?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            presetOrNullObject?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the specific text conditional format properties if the current conditional format is a text type.
+                For example to format cells matching the word "Text".
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            textComparison?: Excel.Interfaces.TextConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the specific text conditional format properties if the current conditional format is a text type.
+                For example to format cells matching the word "Text".
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            textComparisonOrNullObject?: Excel.Interfaces.TextConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
+                For example to format the top 10% or bottom 10 items.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            topBottom?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions;
+            /**
+            *
+            * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
+                For example to format the top 10% or bottom 10 items.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            topBottomOrNullObject?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions;
+            /**
+             *
+             * The Priority of the Conditional Format within the current ConditionalFormatCollection.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            id?: boolean;
+            /**
+             *
+             * The priority (or index) within the conditional format collection that this conditional format currently exists in. Changing this also
+                changes other conditional formats' priorities, to allow for a contiguous priority order.
+                Use a negative priority to begin from the back.
+                Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
+                Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            priority?: boolean;
+            /**
+             *
+             * If the conditions of this conditional format are met, no lower-priority formats shall take effect on that cell.
+                Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            stopIfTrue?: boolean;
+            /**
+             *
+             * A type of conditional format. Only one can be set at a time. Read-Only.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents an Excel Conditional Data Bar Type.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface DataBarConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Representation of all values to the left of the axis in an Excel data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            negativeFormat?: Excel.Interfaces.ConditionalDataBarNegativeFormatLoadOptions;
+            /**
+            *
+            * Representation of all values to the right of the axis in an Excel data bar.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            positiveFormat?: Excel.Interfaces.ConditionalDataBarPositiveFormatLoadOptions;
+            /**
+             *
+             * HTML color code representing the color of the Axis line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+                "" (empty string) if no axis is present or set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            axisColor?: boolean;
+            /**
+             *
+             * Representation of how the axis is determined for an Excel data bar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            axisFormat?: boolean;
+            /**
+             *
+             * Represents the direction that the data bar graphic should be based on.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            barDirection?: boolean;
+            /**
+             *
+             * The rule for what consistutes the lower bound (and how to calculate it, if applicable) for a data bar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            lowerBoundRule?: boolean;
+            /**
+             *
+             * If true, hides the values from the cells where the data bar is applied.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            showDataBarOnly?: boolean;
+            /**
+             *
+             * The rule for what constitutes the upper bound (and how to calculate it, if applicable) for a data bar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            upperBoundRule?: boolean;
+        }
+        /**
+         *
+         * Represents a conditional format DataBar Format for the positive side of the data bar.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalDataBarPositiveFormatLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+                "" (empty string) if no border is present or set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            borderColor?: boolean;
+            /**
+             *
+             * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            fillColor?: boolean;
+            /**
+             *
+             * Boolean representation of whether or not the DataBar has a gradient.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            gradientFill?: boolean;
+        }
+        /**
+         *
+         * Represents a conditional format DataBar Format for the negative side of the data bar.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalDataBarNegativeFormatLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+                "Empty String" if no border is present or set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            borderColor?: boolean;
+            /**
+             *
+             * HTML color code representing the fill color, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            fillColor?: boolean;
+            /**
+             *
+             * Boolean representation of whether or not the negative DataBar has the same border color as the positive DataBar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            matchPositiveBorderColor?: boolean;
+            /**
+             *
+             * Boolean representation of whether or not the negative DataBar has the same fill color as the positive DataBar.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            matchPositiveFillColor?: boolean;
+        }
+        /**
+         *
+         * Represents a custom conditional format type.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface CustomConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatLoadOptions;
+            /**
+            *
+            * Represents the Rule object on this conditional format.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            rule?: Excel.Interfaces.ConditionalFormatRuleLoadOptions;
+        }
+        /**
+         *
+         * Represents a rule, for all traditional rule/format pairings.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalFormatRuleLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * The formula, if required, to evaluate the conditional format rule on.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            formula?: boolean;
+            /**
+             *
+             * The formula, if required, to evaluate the conditional format rule on in the user's language.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            formulaLocal?: boolean;
+            /**
+             *
+             * The formula, if required, to evaluate the conditional format rule on in R1C1-style notation.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            formulaR1C1?: boolean;
+        }
+        /**
+         *
+         * Represents an IconSet criteria for conditional formatting.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface IconSetConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            criteria?: boolean;
+            /**
+             *
+             * If true, reverses the icon orders for the IconSet. Note that this cannot be set if custom icons are used.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            reverseIconOrder?: boolean;
+            /**
+             *
+             * If true, hides the values and only shows icons.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            showIconOnly?: boolean;
+            /**
+             *
+             * If set, displays the IconSet option for the conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            style?: boolean;
+        }
+        /**
+         *
+         * Represents an IconSet criteria for conditional formatting.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ColorScaleConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * The criteria of the color scale. Midpoint is optional when using a two point color scale.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            criteria?: boolean;
+            /**
+             *
+             * If true the color scale will have three points (minimum, midpoint, maximum), otherwise it will have two (minimum, maximum).
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            threeColorScale?: boolean;
+        }
+        /**
+         *
+         * Represents a Top/Bottom conditional format.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface TopBottomConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatLoadOptions;
+            /**
+             *
+             * The criteria of the Top/Bottom conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: boolean;
+        }
+        /**
+         *
+         * Represents the the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface PresetCriteriaConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatLoadOptions;
+            /**
+             *
+             * The rule of the conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: boolean;
+        }
+        /**
+         *
+         * Represents a specific text conditional format.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface TextConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatLoadOptions;
+            /**
+             *
+             * The rule of the conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: boolean;
+        }
+        /**
+         *
+         * Represents a cell value conditional format.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface CellValueConditionalFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            format?: Excel.Interfaces.ConditionalRangeFormatLoadOptions;
+            /**
+             *
+             * Represents the Rule object on this conditional format.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            rule?: boolean;
+        }
+        /**
+         *
+         * A format object encapsulating the conditional formats range's font, fill, borders, and other properties.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalRangeFormatLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Collection of border objects that apply to the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            borders?: Excel.Interfaces.ConditionalRangeBorderCollectionLoadOptions;
+            /**
+            *
+            * Returns the fill object defined on the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            fill?: Excel.Interfaces.ConditionalRangeFillLoadOptions;
+            /**
+            *
+            * Returns the font object defined on the overall conditional format range.
+            *
+            * [Api set: ExcelApi 1.6]
+            */
+            font?: Excel.Interfaces.ConditionalRangeFontLoadOptions;
+            /**
+             *
+             * Represents Excel's number format code for the given range. Cleared if null is passed in.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            numberFormat?: boolean;
+        }
+        /**
+         *
+         * This object represents the font attributes (font style,, color, etc.) for an object.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalRangeFontLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Represents the bold status of font.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            bold?: boolean;
+            /**
+             *
+             * HTML color code representation of the text color. E.g. #FF0000 represents Red.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            color?: boolean;
+            /**
+             *
+             * Represents the italic status of the font.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Represents the strikethrough status of the font.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            strikethrough?: boolean;
+            /**
+             *
+             * Type of underline applied to the font. See Excel.ConditionalRangeFontUnderlineStyle for details.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            underline?: boolean;
+        }
+        /**
+         *
+         * Represents the background of a conditional range object.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalRangeFillLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of the fill, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            color?: boolean;
+        }
+        /**
+         *
+         * Represents the border of an object.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalRangeBorderLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            color?: boolean;
+            /**
+             *
+             * Constant value that indicates the specific side of the border. See Excel.ConditionalRangeBorderIndex for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            sideIndex?: boolean;
+            /**
+             *
+             * One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            style?: boolean;
+        }
+        /**
+         *
+         * Represents the border objects that make up range border.
+         *
+         * [Api set: ExcelApi 1.6]
+         */
+        interface ConditionalRangeBorderCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            color?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Constant value that indicates the specific side of the border. See Excel.ConditionalRangeBorderIndex for details. Read-only.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            sideIndex?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: One of the constants of line style specifying the line style for the border. See Excel.BorderLineStyle for details.
+             *
+             * [Api set: ExcelApi 1.6]
+             */
+            style?: boolean;
+        }
+        /**
+         *
+         * An object encapsulating a style's format and other properties.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface StyleLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * A Border collection of four Border objects that represent the style of the four borders.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            borders?: Excel.Interfaces.RangeBorderCollectionLoadOptions;
+            /**
+            *
+            * The Fill of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            fill?: Excel.Interfaces.RangeFillLoadOptions;
+            /**
+            *
+            * A Font object that represents the font of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            font?: Excel.Interfaces.RangeFontLoadOptions;
+            /**
+             *
+             * Indicates if the style is a built-in style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            builtIn?: boolean;
+            /**
+             *
+             * Indicates if the formula will be hidden when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formulaHidden?: boolean;
+            /**
+             *
+             * Represents the horizontal alignment for the style. See Excel.HorizontalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * Indicates if the style includes the AutoIndent, HorizontalAlignment, VerticalAlignment, WrapText, IndentLevel, and TextOrientation properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeAlignment?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Color, ColorIndex, LineStyle, and Weight border properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeBorder?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Background, Bold, Color, ColorIndex, FontStyle, Italic, Name, Size, Strikethrough, Subscript, Superscript, and Underline font properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeFont?: boolean;
+            /**
+             *
+             * Indicates if the style includes the NumberFormat property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeNumber?: boolean;
+            /**
+             *
+             * Indicates if the style includes the Color, ColorIndex, InvertIfNegative, Pattern, PatternColor, and PatternColorIndex interior properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includePatterns?: boolean;
+            /**
+             *
+             * Indicates if the style includes the FormulaHidden and Locked protection properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeProtection?: boolean;
+            /**
+             *
+             * An integer from 0 to 250 that indicates the indent level for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            indentLevel?: boolean;
+            /**
+             *
+             * Indicates if the object is locked when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            locked?: boolean;
+            /**
+             *
+             * The name of the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: boolean;
+            /**
+             *
+             * The format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormat?: boolean;
+            /**
+             *
+             * The localized format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormatLocal?: boolean;
+            /**
+             *
+             * The reading order for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            readingOrder?: boolean;
+            /**
+             *
+             * Indicates if text automatically shrinks to fit in the available column width.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            shrinkToFit?: boolean;
+            /**
+             *
+             * Represents the vertical alignment for the style. See Excel.VerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * Indicates if Microsoft Excel wraps the text in the object.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            wrapText?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of all the styles.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface StyleCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: A Border collection of four Border objects that represent the style of the four borders.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            borders?: Excel.Interfaces.RangeBorderCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The Fill of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            fill?: Excel.Interfaces.RangeFillLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: A Font object that represents the font of the style.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            font?: Excel.Interfaces.RangeFontLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the style is a built-in style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            builtIn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the formula will be hidden when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            formulaHidden?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the horizontal alignment for the style. See Excel.HorizontalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the style includes the AutoIndent, HorizontalAlignment, VerticalAlignment, WrapText, IndentLevel, and TextOrientation properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the style includes the Color, ColorIndex, LineStyle, and Weight border properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeBorder?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the style includes the Background, Bold, Color, ColorIndex, FontStyle, Italic, Name, Size, Strikethrough, Subscript, Superscript, and Underline font properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeFont?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the style includes the NumberFormat property.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeNumber?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the style includes the Color, ColorIndex, InvertIfNegative, Pattern, PatternColor, and PatternColorIndex interior properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includePatterns?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the style includes the FormulaHidden and Locked protection properties.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            includeProtection?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: An integer from 0 to 250 that indicates the indent level for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            indentLevel?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if the object is locked when the worksheet is protected.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            locked?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The name of the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormat?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The localized format code of the number format for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            numberFormatLocal?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The reading order for the style.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            readingOrder?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if text automatically shrinks to fit in the available column width.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            shrinkToFit?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Represents the vertical alignment for the style. See Excel.VerticalAlignment for details.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates if Microsoft Excel wraps the text in the object.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            wrapText?: boolean;
+        }
+        /**
+         *
+         * An object containing the result of a function-evaluation operation
+         *
+         * [Api set: ExcelApi 1.2]
+         */
+        interface FunctionResultLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Error value (such as "#DIV/0") representing the error. If the error string is not set, then the function succeeded, and its result is written to the Value field. The error is always in the English locale.
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            error?: boolean;
+            /**
+             *
+             * The value of function evaluation. The value field will be populated only if no error has occurred (i.e., the Error property is not set).
+             *
+             * [Api set: ExcelApi 1.2]
+             */
+            value?: boolean;
         }
     }
 }
@@ -14760,6 +26067,30 @@ declare namespace Excel {
 ////////////////////////////////////////////////////////////////
 
 declare namespace Word {
+    /**
+     *
+     * The Application object.
+     *
+     * [Api set: WordApi 1.3]
+     */
+    class Application extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Creates a new hidden document by using an optional base64 encoded .docx file.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param base64File Optional. The base64 encoded .docx file. The default value is null.
+         */
+        createDocument(base64File?: string): Word.DocumentCreated;
+        /**
+         * Create a new instance of Word.Application object
+         */
+        static newObject(context: OfficeExtension.ClientRequestContext): Word.Application;
+        toJSON(): {
+            [key: string]: string;
+        };
+    }
     /**
      *
      * Represents the body of a document or a section.
@@ -14773,84 +26104,84 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        contentControls: Word.ContentControlCollection;
+        readonly contentControls: Word.ContentControlCollection;
         /**
          *
          * Gets the text format of the body. Use this to get and set font name, size, color and other properties. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        font: Word.Font;
+        readonly font: Word.Font;
         /**
          *
          * Gets the collection of inlinePicture objects in the body. The collection does not include floating images. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        inlinePictures: Word.InlinePictureCollection;
+        readonly inlinePictures: Word.InlinePictureCollection;
         /**
          *
          * Gets the collection of list objects in the body. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        lists: Word.ListCollection;
+        readonly lists: Word.ListCollection;
         /**
          *
          * Gets the collection of paragraph objects in the body. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        paragraphs: Word.ParagraphCollection;
+        readonly paragraphs: Word.ParagraphCollection;
         /**
          *
          * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Throws if there isn't a parent body. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentBody: Word.Body;
+        readonly parentBody: Word.Body;
         /**
          *
          * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Returns a null object if there isn't a parent body. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentBodyOrNullObject: Word.Body;
+        readonly parentBodyOrNullObject: Word.Body;
         /**
          *
          * Gets the content control that contains the body. Throws if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        parentContentControl: Word.ContentControl;
+        readonly parentContentControl: Word.ContentControl;
         /**
          *
          * Gets the content control that contains the body. Returns a null object if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentContentControlOrNullObject: Word.ContentControl;
+        readonly parentContentControlOrNullObject: Word.ContentControl;
         /**
          *
          * Gets the parent section of the body. Throws if there isn't a parent section. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentSection: Word.Section;
+        readonly parentSection: Word.Section;
         /**
          *
          * Gets the parent section of the body. Returns a null object if there isn't a parent section. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentSectionOrNullObject: Word.Section;
+        readonly parentSectionOrNullObject: Word.Section;
         /**
          *
          * Gets the collection of table objects in the body. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        tables: Word.TableCollection;
+        readonly tables: Word.TableCollection;
         /**
          *
          * Gets or sets the style name for the body. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
@@ -14864,28 +26195,23 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        styleBuiltIn: string;
+        styleBuiltIn: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
         /**
          *
          * Gets the text of the body. Use the insertText method to insert text. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        text: string;
+        readonly text: string;
         /**
          *
          * Gets the type of the body. The type can be 'MainDoc', 'Section', 'Header', 'Footer', or 'TableCell'. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        type: string;
+        readonly type: Word.BodyType | "Unknown" | "MainDoc" | "Section" | "Header" | "Footer" | "TableCell";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.BodyUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.BodyUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Body): void;
         /**
@@ -14917,7 +26243,16 @@ declare namespace Word {
          *
          * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
          */
-        getRange(rangeLocation?: string): Word.Range;
+        getRange(rangeLocation?: Word.RangeLocation): Word.Range;
+        /**
+         *
+         * Gets the whole body, or the starting or ending point of the body, as a range.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         */
+        getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
          *
          * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start' or 'End'.
@@ -14927,7 +26262,17 @@ declare namespace Word {
          * @param breakType Required. The break type to add to the body.
          * @param insertLocation Required. The value can be 'Start' or 'End'.
          */
-        insertBreak(breakType: string, insertLocation: string): void;
+        insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param breakType Required. The break type to add to the body.
+         * @param insertLocation Required. The value can be 'Start' or 'End'.
+         */
+        insertBreak(breakType: "Page" | "Next" | "SectionNext" | "SectionContinuous" | "SectionEven" | "SectionOdd" | "Line", insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): void;
         /**
          *
          * Wraps the body object with a Rich Text content control.
@@ -14944,7 +26289,17 @@ declare namespace Word {
          * @param base64File Required. The base64 encoded content of a .docx file.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts a document into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -14954,7 +26309,17 @@ declare namespace Word {
          * @param html Required. The HTML to be inserted in the document.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertHtml(html: string, insertLocation: string): Word.Range;
+        insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param html Required. The HTML to be inserted in the document.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a picture into the body at the specified location. The insertLocation value can be 'Start' or 'End'.
@@ -14964,7 +26329,17 @@ declare namespace Word {
          * @param base64EncodedImage Required. The base64 encoded image to be inserted in the body.
          * @param insertLocation Required. The value can be 'Start' or 'End'.
          */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
+        /**
+         *
+         * Inserts a picture into the body at the specified location. The insertLocation value can be 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted in the body.
+         * @param insertLocation Required. The value can be 'Start' or 'End'.
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
          * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -14974,7 +26349,17 @@ declare namespace Word {
          * @param ooxml Required. The OOXML to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param ooxml Required. The OOXML to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a paragraph at the specified location. The insertLocation value can be 'Start' or 'End'.
@@ -14984,7 +26369,17 @@ declare namespace Word {
          * @param paragraphText Required. The paragraph text to be inserted.
          * @param insertLocation Required. The value can be 'Start' or 'End'.
          */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Start' or 'End'.
+         */
+        insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
          * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Start' or 'End'.
@@ -14996,7 +26391,19 @@ declare namespace Word {
          * @param insertLocation Required. The value can be 'Start' or 'End'.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertTable(rowCount: number, columnCount: number, insertLocation: string, values?: Array<Array<string>>): Word.Table;
+        insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
+        /**
+         *
+         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rowCount Required. The number of rows in the table.
+         * @param columnCount Required. The number of columns in the table.
+         * @param insertLocation Required. The value can be 'Start' or 'End'.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
          * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -15006,7 +26413,17 @@ declare namespace Word {
          * @param text Required. Text to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertText(text: string, insertLocation: string): Word.Range;
+        insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Performs a search with the specified searchOptions on the scope of the body object. The search results are a collection of range objects.
@@ -15033,11 +26450,25 @@ declare namespace Word {
          *
          * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
          */
-        select(selectionMode?: string): void;
+        select(selectionMode?: Word.SelectionMode): void;
+        /**
+         *
+         * Selects the body and navigates the Word UI to it.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         */
+        select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Body;
+        load(option?: Word.Interfaces.BodyLoadOptions): Word.Body;
+        load(option?: string | string[]): Word.Body;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.Body;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -15046,13 +26477,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Body;
-        toJSON(): {
-            "font": Font;
-            "style": string;
-            "styleBuiltIn": string;
-            "text": string;
-            "type": string;
-        };
+        toJSON(): Word.Interfaces.BodyData;
     }
     /**
      *
@@ -15067,98 +26492,98 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        contentControls: Word.ContentControlCollection;
+        readonly contentControls: Word.ContentControlCollection;
         /**
          *
          * Gets the text format of the content control. Use this to get and set font name, size, color, and other properties. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        font: Word.Font;
+        readonly font: Word.Font;
         /**
          *
          * Gets the collection of inlinePicture objects in the content control. The collection does not include floating images. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        inlinePictures: Word.InlinePictureCollection;
+        readonly inlinePictures: Word.InlinePictureCollection;
         /**
          *
          * Gets the collection of list objects in the content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        lists: Word.ListCollection;
+        readonly lists: Word.ListCollection;
         /**
          *
          * Get the collection of paragraph objects in the content control. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        paragraphs: Word.ParagraphCollection;
+        readonly paragraphs: Word.ParagraphCollection;
         /**
          *
          * Gets the parent body of the content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentBody: Word.Body;
+        readonly parentBody: Word.Body;
         /**
          *
          * Gets the content control that contains the content control. Throws if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        parentContentControl: Word.ContentControl;
+        readonly parentContentControl: Word.ContentControl;
         /**
          *
          * Gets the content control that contains the content control. Returns a null object if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentContentControlOrNullObject: Word.ContentControl;
+        readonly parentContentControlOrNullObject: Word.ContentControl;
         /**
          *
          * Gets the table that contains the content control. Throws if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTable: Word.Table;
+        readonly parentTable: Word.Table;
         /**
          *
          * Gets the table cell that contains the content control. Throws if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCell: Word.TableCell;
+        readonly parentTableCell: Word.TableCell;
         /**
          *
          * Gets the table cell that contains the content control. Returns a null object if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCellOrNullObject: Word.TableCell;
+        readonly parentTableCellOrNullObject: Word.TableCell;
         /**
          *
          * Gets the table that contains the content control. Returns a null object if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableOrNullObject: Word.Table;
+        readonly parentTableOrNullObject: Word.Table;
         /**
          *
          * Gets the collection of table objects in the content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        tables: Word.TableCollection;
+        readonly tables: Word.TableCollection;
         /**
          *
          * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
          *
          * [Api set: WordApi 1.1]
          */
-        appearance: string;
+        appearance: Word.ContentControlAppearance | "BoundingBox" | "Tags" | "Hidden";
         /**
          *
          * Gets or sets a value that indicates whether the user can delete the content control. Mutually exclusive with removeWhenEdited.
@@ -15186,7 +26611,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        id: number;
+        readonly id: number;
         /**
          *
          * Gets or sets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
@@ -15214,14 +26639,14 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        styleBuiltIn: string;
+        styleBuiltIn: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
         /**
          *
          * Gets the content control subtype. The subtype can be 'RichTextInline', 'RichTextParagraphs', 'RichTextTableCell', 'RichTextTableRow' and 'RichTextTable' for rich text content controls. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        subtype: string;
+        readonly subtype: Word.ContentControlType | "Unknown" | "RichTextInline" | "RichTextParagraphs" | "RichTextTableCell" | "RichTextTableRow" | "RichTextTable" | "PlainTextInline" | "PlainTextParagraph" | "Picture" | "BuildingBlockGallery" | "CheckBox" | "ComboBox" | "DropDownList" | "DatePicker" | "RepeatingSection" | "RichText" | "PlainText";
         /**
          *
          * Gets or sets a tag to identify a content control.
@@ -15235,7 +26660,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        text: string;
+        readonly text: string;
         /**
          *
          * Gets or sets the title for a content control.
@@ -15249,14 +26674,9 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        type: string;
+        readonly type: Word.ContentControlType | "Unknown" | "RichTextInline" | "RichTextParagraphs" | "RichTextTableCell" | "RichTextTableRow" | "RichTextTable" | "PlainTextInline" | "PlainTextParagraph" | "Picture" | "BuildingBlockGallery" | "CheckBox" | "ComboBox" | "DropDownList" | "DatePicker" | "RepeatingSection" | "RichText" | "PlainText";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ContentControlUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ContentControlUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ContentControl): void;
         /**
@@ -15297,7 +26717,16 @@ declare namespace Word {
          *
          * @param rangeLocation Optional. The range location can be 'Whole', 'Before', 'Start', 'End', 'After' or 'Content'.
          */
-        getRange(rangeLocation?: string): Word.Range;
+        getRange(rangeLocation?: Word.RangeLocation): Word.Range;
+        /**
+         *
+         * Gets the whole content control, or the starting or ending point of the content control, as a range.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Before', 'Start', 'End', 'After' or 'Content'.
+         */
+        getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
          *
          * Gets the text ranges in the content control by using punctuation marks and/or other ending marks.
@@ -15307,7 +26736,7 @@ declare namespace Word {
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
-        getTextRanges(endingMarks: Array<string>, trimSpacing?: boolean): Word.RangeCollection;
+        getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
          *
          * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before' or 'After'. This method cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
@@ -15317,7 +26746,17 @@ declare namespace Word {
          * @param breakType Required. Type of break.
          * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
          */
-        insertBreak(breakType: string, insertLocation: string): void;
+        insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before' or 'After'. This method cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param breakType Required. Type of break.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         */
+        insertBreak(breakType: "Page" | "Next" | "SectionNext" | "SectionContinuous" | "SectionEven" | "SectionOdd" | "Line", insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): void;
         /**
          *
          * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -15327,7 +26766,17 @@ declare namespace Word {
          * @param base64File Required. The base64 encoded content of a .docx file.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         */
+        insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -15337,7 +26786,17 @@ declare namespace Word {
          * @param html Required. The HTML to be inserted in to the content control.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
-        insertHtml(html: string, insertLocation: string): Word.Range;
+        insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param html Required. The HTML to be inserted in to the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         */
+        insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -15347,7 +26806,17 @@ declare namespace Word {
          * @param base64EncodedImage Required. The base64 encoded image to be inserted in the content control.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
+        /**
+         *
+         * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted in the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
          * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -15357,7 +26826,17 @@ declare namespace Word {
          * @param ooxml Required. The OOXML to be inserted in to the content control.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param ooxml Required. The OOXML to be inserted in to the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         */
+        insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
@@ -15367,7 +26846,17 @@ declare namespace Word {
          * @param paragraphText Required. The paragrph text to be inserted.
          * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param paragraphText Required. The paragrph text to be inserted.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         */
+        insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
          * Inserts a table with the specified number of rows and columns into, or next to, a content control. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
@@ -15379,7 +26868,19 @@ declare namespace Word {
          * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertTable(rowCount: number, columnCount: number, insertLocation: string, values?: Array<Array<string>>): Word.Table;
+        insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
+        /**
+         *
+         * Inserts a table with the specified number of rows and columns into, or next to, a content control. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rowCount Required. The number of rows in the table.
+         * @param columnCount Required. The number of columns in the table.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
          * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -15389,7 +26890,17 @@ declare namespace Word {
          * @param text Required. The text to be inserted in to the content control.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
-        insertText(text: string, insertLocation: string): Word.Range;
+        insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param text Required. The text to be inserted in to the content control.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         */
+        insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Performs a search with the specified searchOptions on the scope of the content control object. The search results are a collection of range objects.
@@ -15416,7 +26927,16 @@ declare namespace Word {
          *
          * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
          */
-        select(selectionMode?: string): void;
+        select(selectionMode?: Word.SelectionMode): void;
+        /**
+         *
+         * Selects the content control. This causes Word to scroll to the selection.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         */
+        select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          *
          * Splits the content control into child ranges by using delimiters.
@@ -15428,11 +26948,16 @@ declare namespace Word {
          * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
-        split(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
+        split(delimiters: string[], multiParagraphs?: boolean, trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ContentControl;
+        load(option?: Word.Interfaces.ContentControlLoadOptions): Word.ContentControl;
+        load(option?: string | string[]): Word.ContentControl;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.ContentControl;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -15441,23 +26966,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ContentControl;
-        toJSON(): {
-            "appearance": string;
-            "cannotDelete": boolean;
-            "cannotEdit": boolean;
-            "color": string;
-            "font": Font;
-            "id": number;
-            "placeholderText": string;
-            "removeWhenEdited": boolean;
-            "style": string;
-            "styleBuiltIn": string;
-            "subtype": string;
-            "tag": string;
-            "text": string;
-            "title": string;
-            "type": string;
-        };
+        toJSON(): Word.Interfaces.ContentControlData;
     }
     /**
      *
@@ -15467,7 +26976,7 @@ declare namespace Word {
      */
     class ContentControlCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.ContentControl>;
+        readonly items: Word.ContentControl[];
         /**
          *
          * Gets a content control by its identifier. Throws if there isn't a content control with the identifier in this collection.
@@ -15512,7 +27021,7 @@ declare namespace Word {
          *
          * @param types Required. An array of content control types and/or subtypes.
          */
-        getByTypes(types: Array<string>): Word.ContentControlCollection;
+        getByTypes(types: Word.ContentControlType[]): Word.ContentControlCollection;
         /**
          *
          * Gets the first content control in this collection. Throws if this collection is empty.
@@ -15539,7 +27048,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ContentControlCollection;
+        load(option?: Word.Interfaces.ContentControlCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.ContentControlCollection;
+        load(option?: string | string[]): Word.ContentControlCollection;
+        load(option?: OfficeExtension.LoadOption): Word.ContentControlCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -15548,7 +27059,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ContentControlCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.ContentControlCollectionData;
     }
     /**
      *
@@ -15563,28 +27074,23 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        key: string;
+        readonly key: string;
         /**
          *
-         * Gets the value type of the custom property. Read only.
+         * Gets the value type of the custom property. Possible values are: String, Number, Date, Boolean. Read only.
          *
          * [Api set: WordApi 1.3]
          */
-        type: string;
+        readonly type: Word.DocumentPropertyType | "String" | "Number" | "Date" | "Boolean";
         /**
          *
-         * Gets or sets the value of the custom property.
+         * Gets or sets the value of the custom property. Note that even though Word Online and the docx file format allow these properties to be arbitrarily long, the desktop version of Word will truncate string values to 255 16-bit chars (possibly creating invalid unicode by breaking up a surrogate pair).
          *
          * [Api set: WordApi 1.3]
          */
         value: any;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.CustomPropertyUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.CustomPropertyUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: CustomProperty): void;
         /**
@@ -15597,7 +27103,12 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.CustomProperty;
+        load(option?: Word.Interfaces.CustomPropertyLoadOptions): Word.CustomProperty;
+        load(option?: string | string[]): Word.CustomProperty;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.CustomProperty;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -15606,11 +27117,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.CustomProperty;
-        toJSON(): {
-            "key": string;
-            "type": string;
-            "value": any;
-        };
+        toJSON(): Word.Interfaces.CustomPropertyData;
     }
     /**
      *
@@ -15620,7 +27127,7 @@ declare namespace Word {
      */
     class CustomPropertyCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.CustomProperty>;
+        readonly items: Word.CustomProperty[];
         /**
          *
          * Creates a new or sets an existing custom property.
@@ -15666,7 +27173,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.CustomPropertyCollection;
+        load(option?: Word.Interfaces.CustomPropertyCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.CustomPropertyCollection;
+        load(option?: string | string[]): Word.CustomPropertyCollection;
+        load(option?: OfficeExtension.LoadOption): Word.CustomPropertyCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -15675,7 +27184,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.CustomPropertyCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.CustomPropertyCollectionData;
     }
     /**
      *
@@ -15690,42 +27199,37 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        body: Word.Body;
+        readonly body: Word.Body;
         /**
          *
-         * Gets the collection of content control objects in the current document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
+         * Gets the collection of content control objects in the document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        contentControls: Word.ContentControlCollection;
+        readonly contentControls: Word.ContentControlCollection;
         /**
          *
-         * Gets the properties of the current document. Read-only.
+         * Gets the properties of the document. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        properties: Word.DocumentProperties;
+        readonly properties: Word.DocumentProperties;
         /**
          *
          * Gets the collection of section objects in the document. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        sections: Word.SectionCollection;
+        readonly sections: Word.SectionCollection;
         /**
          *
          * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        saved: boolean;
+        readonly saved: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.DocumentUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.DocumentUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Document): void;
         /**
@@ -15745,7 +27249,12 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Document;
+        load(option?: Word.Interfaces.DocumentLoadOptions): Word.Document;
+        load(option?: string | string[]): Word.Document;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.Document;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -15754,11 +27263,86 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Document;
-        toJSON(): {
-            "body": Body;
-            "properties": DocumentProperties;
-            "saved": boolean;
-        };
+        toJSON(): Word.Interfaces.DocumentData;
+    }
+    /**
+     *
+     * The DocumentCreated object is the top level object created by Application.CreateDocument. A DocumentCreated object is a special Document object.
+     *
+     * [Api set: WordApi 1.3]
+     */
+    class DocumentCreated extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc.. Read-only.
+         *
+         * [Api set: WordApiHiddenDocument 1.3]
+         */
+        readonly body: Word.Body;
+        /**
+         *
+         * Gets the collection of content control objects in the document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
+         *
+         * [Api set: WordApiHiddenDocument 1.3]
+         */
+        readonly contentControls: Word.ContentControlCollection;
+        /**
+         *
+         * Gets the properties of the document. Read-only.
+         *
+         * [Api set: WordApiHiddenDocument 1.3]
+         */
+        readonly properties: Word.DocumentProperties;
+        /**
+         *
+         * Gets the collection of section objects in the document. Read-only.
+         *
+         * [Api set: WordApiHiddenDocument 1.3]
+         */
+        readonly sections: Word.SectionCollection;
+        /**
+         *
+         * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
+         *
+         * [Api set: WordApiHiddenDocument 1.3]
+         */
+        readonly saved: boolean;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.DocumentCreatedUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: DocumentCreated): void;
+        /**
+         *
+         * Open the document.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        open(): void;
+        /**
+         *
+         * Saves the document. This will use the Word default file naming convention if the document has not been saved before.
+         *
+         * [Api set: WordApiHiddenDocument 1.3]
+         */
+        save(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: Word.Interfaces.DocumentCreatedLoadOptions): Word.DocumentCreated;
+        load(option?: string | string[]): Word.DocumentCreated;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.DocumentCreated;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): Word.DocumentCreated;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): Word.DocumentCreated;
+        toJSON(): Word.Interfaces.DocumentCreatedData;
     }
     /**
      *
@@ -15773,14 +27357,14 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        customProperties: Word.CustomPropertyCollection;
+        readonly customProperties: Word.CustomPropertyCollection;
         /**
          *
          * Gets the application name of the document. Read only.
          *
          * [Api set: WordApi 1.3]
          */
-        applicationName: string;
+        readonly applicationName: string;
         /**
          *
          * Gets or sets the author of the document.
@@ -15815,7 +27399,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        creationDate: Date;
+        readonly creationDate: Date;
         /**
          *
          * Gets or sets the format of the document.
@@ -15836,21 +27420,21 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        lastAuthor: string;
+        readonly lastAuthor: string;
         /**
          *
          * Gets the last print date of the document. Read only.
          *
          * [Api set: WordApi 1.3]
          */
-        lastPrintDate: Date;
+        readonly lastPrintDate: Date;
         /**
          *
          * Gets the last save time of the document. Read only.
          *
          * [Api set: WordApi 1.3]
          */
-        lastSaveTime: Date;
+        readonly lastSaveTime: Date;
         /**
          *
          * Gets or sets the manager of the document.
@@ -15864,14 +27448,14 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        revisionNumber: string;
+        readonly revisionNumber: string;
         /**
          *
          * Gets the security of the document. Read only.
          *
          * [Api set: WordApi 1.3]
          */
-        security: number;
+        readonly security: number;
         /**
          *
          * Gets or sets the subject of the document.
@@ -15885,7 +27469,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        template: string;
+        readonly template: string;
         /**
          *
          * Gets or sets the title of the document.
@@ -15894,18 +27478,18 @@ declare namespace Word {
          */
         title: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.DocumentPropertiesUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.DocumentPropertiesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: DocumentProperties): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.DocumentProperties;
+        load(option?: Word.Interfaces.DocumentPropertiesLoadOptions): Word.DocumentProperties;
+        load(option?: string | string[]): Word.DocumentProperties;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.DocumentProperties;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -15914,25 +27498,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.DocumentProperties;
-        toJSON(): {
-            "applicationName": string;
-            "author": string;
-            "category": string;
-            "comments": string;
-            "company": string;
-            "creationDate": Date;
-            "format": string;
-            "keywords": string;
-            "lastAuthor": string;
-            "lastPrintDate": Date;
-            "lastSaveTime": Date;
-            "manager": string;
-            "revisionNumber": string;
-            "security": number;
-            "subject": string;
-            "template": string;
-            "title": string;
-        };
+        toJSON(): Word.Interfaces.DocumentPropertiesData;
     }
     /**
      *
@@ -16017,20 +27583,20 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        underline: string;
+        underline: Word.UnderlineType | "Mixed" | "None" | "Hidden" | "DotLine" | "Single" | "Word" | "Double" | "Thick" | "Dotted" | "DottedHeavy" | "DashLine" | "DashLineHeavy" | "DashLineLong" | "DashLineLongHeavy" | "DotDashLine" | "DotDashLineHeavy" | "TwoDotDashLine" | "TwoDotDashLineHeavy" | "Wave" | "WaveHeavy" | "WaveDouble";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.FontUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.FontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Font): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Font;
+        load(option?: Word.Interfaces.FontLoadOptions): Word.Font;
+        load(option?: string | string[]): Word.Font;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.Font;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -16039,19 +27605,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Font;
-        toJSON(): {
-            "bold": boolean;
-            "color": string;
-            "doubleStrikeThrough": boolean;
-            "highlightColor": string;
-            "italic": boolean;
-            "name": string;
-            "size": number;
-            "strikeThrough": boolean;
-            "subscript": boolean;
-            "superscript": boolean;
-            "underline": string;
-        };
+        toJSON(): Word.Interfaces.FontData;
     }
     /**
      *
@@ -16066,49 +27620,49 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.2]
          */
-        paragraph: Word.Paragraph;
+        readonly paragraph: Word.Paragraph;
         /**
          *
          * Gets the content control that contains the inline image. Throws if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        parentContentControl: Word.ContentControl;
+        readonly parentContentControl: Word.ContentControl;
         /**
          *
          * Gets the content control that contains the inline image. Returns a null object if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentContentControlOrNullObject: Word.ContentControl;
+        readonly parentContentControlOrNullObject: Word.ContentControl;
         /**
          *
          * Gets the table that contains the inline image. Throws if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTable: Word.Table;
+        readonly parentTable: Word.Table;
         /**
          *
          * Gets the table cell that contains the inline image. Throws if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCell: Word.TableCell;
+        readonly parentTableCell: Word.TableCell;
         /**
          *
          * Gets the table cell that contains the inline image. Returns a null object if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCellOrNullObject: Word.TableCell;
+        readonly parentTableCellOrNullObject: Word.TableCell;
         /**
          *
          * Gets the table that contains the inline image. Returns a null object if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableOrNullObject: Word.Table;
+        readonly parentTableOrNullObject: Word.Table;
         /**
          *
          * Gets or sets a string that represents the alternative text associated with the inline image
@@ -16152,12 +27706,7 @@ declare namespace Word {
          */
         width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.InlinePictureUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.InlinePictureUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: InlinePicture): void;
         /**
@@ -16196,7 +27745,16 @@ declare namespace Word {
          *
          * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
          */
-        getRange(rangeLocation?: string): Word.Range;
+        getRange(rangeLocation?: Word.RangeLocation): Word.Range;
+        /**
+         *
+         * Gets the picture, or the starting or ending point of the picture, as a range.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         */
+        getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
          *
          * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
@@ -16206,7 +27764,17 @@ declare namespace Word {
          * @param breakType Required. The break type to add.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertBreak(breakType: string, insertLocation: string): void;
+        insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param breakType Required. The break type to add.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertBreak(breakType: "Page" | "Next" | "SectionNext" | "SectionContinuous" | "SectionEven" | "SectionOdd" | "Line", insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): void;
         /**
          *
          * Wraps the inline picture with a rich text content control.
@@ -16223,7 +27791,17 @@ declare namespace Word {
          * @param base64File Required. The base64 encoded content of a .docx file.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts a document at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts HTML at the specified location. The insertLocation value can be 'Before' or 'After'.
@@ -16233,7 +27811,17 @@ declare namespace Word {
          * @param html Required. The HTML to be inserted.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertHtml(html: string, insertLocation: string): Word.Range;
+        insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts HTML at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param html Required. The HTML to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before' or 'After'.
@@ -16243,7 +27831,17 @@ declare namespace Word {
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
          */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
+        /**
+         *
+         * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
          * Inserts OOXML at the specified location.  The insertLocation value can be 'Before' or 'After'.
@@ -16253,7 +27851,17 @@ declare namespace Word {
          * @param ooxml Required. The OOXML to be inserted.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param ooxml Required. The OOXML to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
@@ -16263,7 +27871,17 @@ declare namespace Word {
          * @param paragraphText Required. The paragraph text to be inserted.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
          * Inserts text at the specified location. The insertLocation value can be 'Before' or 'After'.
@@ -16273,7 +27891,17 @@ declare namespace Word {
          * @param text Required. Text to be inserted.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertText(text: string, insertLocation: string): Word.Range;
+        insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts text at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Selects the inline picture. This causes Word to scroll to the selection.
@@ -16282,11 +27910,25 @@ declare namespace Word {
          *
          * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
          */
-        select(selectionMode?: string): void;
+        select(selectionMode?: Word.SelectionMode): void;
+        /**
+         *
+         * Selects the inline picture. This causes Word to scroll to the selection.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         */
+        select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.InlinePicture;
+        load(option?: Word.Interfaces.InlinePictureLoadOptions): Word.InlinePicture;
+        load(option?: string | string[]): Word.InlinePicture;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.InlinePicture;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -16295,14 +27937,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.InlinePicture;
-        toJSON(): {
-            "altTextDescription": string;
-            "altTextTitle": string;
-            "height": number;
-            "hyperlink": string;
-            "lockAspectRatio": boolean;
-            "width": number;
-        };
+        toJSON(): Word.Interfaces.InlinePictureData;
     }
     /**
      *
@@ -16312,7 +27947,7 @@ declare namespace Word {
      */
     class InlinePictureCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.InlinePicture>;
+        readonly items: Word.InlinePicture[];
         /**
          *
          * Gets the first inline image in this collection. Throws if this collection is empty.
@@ -16330,7 +27965,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.InlinePictureCollection;
+        load(option?: Word.Interfaces.InlinePictureCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.InlinePictureCollection;
+        load(option?: string | string[]): Word.InlinePictureCollection;
+        load(option?: OfficeExtension.LoadOption): Word.InlinePictureCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -16339,7 +27976,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.InlinePictureCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.InlinePictureCollectionData;
     }
     /**
      *
@@ -16354,28 +27991,28 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        paragraphs: Word.ParagraphCollection;
+        readonly paragraphs: Word.ParagraphCollection;
         /**
          *
          * Gets the list's id.
          *
          * [Api set: WordApi 1.3]
          */
-        id: number;
+        readonly id: number;
         /**
          *
          * Checks whether each of the 9 levels exists in the list. A true value indicates the level exists, which means there is at least one list item at that level. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        levelExistences: Array<boolean>;
+        readonly levelExistences: boolean[];
         /**
          *
          * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        levelTypes: Array<string>;
+        readonly levelTypes: Word.ListLevelType[];
         /**
          *
          * Gets the paragraphs that occur at the specified level in the list.
@@ -16403,7 +28040,17 @@ declare namespace Word {
          * @param paragraphText Required. The paragraph text to be inserted.
          * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
          */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         */
+        insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
          * Sets the alignment of the bullet, number or picture at the specified level in the list.
@@ -16413,7 +28060,17 @@ declare namespace Word {
          * @param level Required. The level in the list.
          * @param alignment Required. The level alignment that can be 'left', 'centered' or 'right'.
          */
-        setLevelAlignment(level: number, alignment: string): void;
+        setLevelAlignment(level: number, alignment: Word.Alignment): void;
+        /**
+         *
+         * Sets the alignment of the bullet, number or picture at the specified level in the list.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param level Required. The level in the list.
+         * @param alignment Required. The level alignment that can be 'left', 'centered' or 'right'.
+         */
+        setLevelAlignment(level: number, alignment: "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified"): void;
         /**
          *
          * Sets the bullet format at the specified level in the list. If the bullet is 'Custom', the charCode is required.
@@ -16425,7 +28082,19 @@ declare namespace Word {
          * @param charCode Optional. The bullet character's code value. Used only if the bullet is 'Custom'.
          * @param fontName Optional. The bullet's font name. Used only if the bullet is 'Custom'.
          */
-        setLevelBullet(level: number, listBullet: string, charCode?: number, fontName?: string): void;
+        setLevelBullet(level: number, listBullet: Word.ListBullet, charCode?: number, fontName?: string): void;
+        /**
+         *
+         * Sets the bullet format at the specified level in the list. If the bullet is 'Custom', the charCode is required.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param level Required. The level in the list.
+         * @param listBullet Required. The bullet.
+         * @param charCode Optional. The bullet character's code value. Used only if the bullet is 'Custom'.
+         * @param fontName Optional. The bullet's font name. Used only if the bullet is 'Custom'.
+         */
+        setLevelBullet(level: number, listBullet: "Custom" | "Solid" | "Hollow" | "Square" | "Diamonds" | "Arrow" | "Checkmark", charCode?: number, fontName?: string): void;
         /**
          *
          * Sets the two indents of the specified level in the list.
@@ -16434,7 +28103,7 @@ declare namespace Word {
          *
          * @param level Required. The level in the list.
          * @param textIndent Required. The text indent in points. It is the same as paragraph left indent.
-         * @param textIndent Required. The relative indent, in points, of the bullet, number or picture. It is the same as paragraph first line indent.
+         * @param bulletNumberPictureIndent Required. The relative indent, in points, of the bullet, number or picture. It is the same as paragraph first line indent.
          */
         setLevelIndents(level: number, textIndent: number, bulletNumberPictureIndent: number): void;
         /**
@@ -16447,7 +28116,18 @@ declare namespace Word {
          * @param listNumbering Required. The ordinal format.
          * @param formatString Optional. The numbering string format defined as an array of strings and/or integers. Each integer is a level of number type that is higher than or equal to this level. For example, an array of ["(", level - 1, ".", level, ")"] can define the format of "(2.c)", where 2 is the parent's item number and c is this level's item number.
          */
-        setLevelNumbering(level: number, listNumbering: string, formatString?: Array<any>): void;
+        setLevelNumbering(level: number, listNumbering: Word.ListNumbering, formatString?: any[]): void;
+        /**
+         *
+         * Sets the numbering format at the specified level in the list.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param level Required. The level in the list.
+         * @param listNumbering Required. The ordinal format.
+         * @param formatString Optional. The numbering string format defined as an array of strings and/or integers. Each integer is a level of number type that is higher than or equal to this level. For example, an array of ["(", level - 1, ".", level, ")"] can define the format of "(2.c)", where 2 is the parent's item number and c is this level's item number.
+         */
+        setLevelNumbering(level: number, listNumbering: "None" | "Arabic" | "UpperRoman" | "LowerRoman" | "UpperLetter" | "LowerLetter", formatString?: any[]): void;
         /**
          *
          * Sets the starting number at the specified level in the list. Default value is 1.
@@ -16461,7 +28141,12 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.List;
+        load(option?: Word.Interfaces.ListLoadOptions): Word.List;
+        load(option?: string | string[]): Word.List;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.List;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -16470,11 +28155,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.List;
-        toJSON(): {
-            "id": number;
-            "levelExistences": boolean[];
-            "levelTypes": string[];
-        };
+        toJSON(): Word.Interfaces.ListData;
     }
     /**
      *
@@ -16484,7 +28165,7 @@ declare namespace Word {
      */
     class ListCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.List>;
+        readonly items: Word.List[];
         /**
          *
          * Gets a list by its identifier. Throws if there isn't a list with the identifier in this collection.
@@ -16529,7 +28210,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ListCollection;
+        load(option?: Word.Interfaces.ListCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.ListCollection;
+        load(option?: string | string[]): Word.ListCollection;
+        load(option?: OfficeExtension.LoadOption): Word.ListCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -16538,7 +28221,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ListCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.ListCollectionData;
     }
     /**
      *
@@ -16560,21 +28243,16 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        listString: string;
+        readonly listString: string;
         /**
          *
          * Gets the list item order number in relation to its siblings. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        siblingIndex: number;
+        readonly siblingIndex: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ListItemUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ListItemUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: ListItem): void;
         /**
@@ -16607,7 +28285,12 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ListItem;
+        load(option?: Word.Interfaces.ListItemLoadOptions): Word.ListItem;
+        load(option?: string | string[]): Word.ListItem;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.ListItem;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -16616,11 +28299,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ListItem;
-        toJSON(): {
-            "level": number;
-            "listString": string;
-            "siblingIndex": number;
-        };
+        toJSON(): Word.Interfaces.ListItemData;
     }
     /**
      *
@@ -16635,105 +28314,105 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        contentControls: Word.ContentControlCollection;
+        readonly contentControls: Word.ContentControlCollection;
         /**
          *
          * Gets the text format of the paragraph. Use this to get and set font name, size, color, and other properties. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        font: Word.Font;
+        readonly font: Word.Font;
         /**
          *
          * Gets the collection of inlinePicture objects in the paragraph. The collection does not include floating images. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        inlinePictures: Word.InlinePictureCollection;
+        readonly inlinePictures: Word.InlinePictureCollection;
         /**
          *
          * Gets the List to which this paragraph belongs. Throws if the paragraph is not in a list. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        list: Word.List;
+        readonly list: Word.List;
         /**
          *
          * Gets the ListItem for the paragraph. Throws if the paragraph is not part of a list. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        listItem: Word.ListItem;
+        readonly listItem: Word.ListItem;
         /**
          *
          * Gets the ListItem for the paragraph. Returns a null object if the paragraph is not part of a list. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        listItemOrNullObject: Word.ListItem;
+        readonly listItemOrNullObject: Word.ListItem;
         /**
          *
          * Gets the List to which this paragraph belongs. Returns a null object if the paragraph is not in a list. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        listOrNullObject: Word.List;
+        readonly listOrNullObject: Word.List;
         /**
          *
          * Gets the parent body of the paragraph. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentBody: Word.Body;
+        readonly parentBody: Word.Body;
         /**
          *
          * Gets the content control that contains the paragraph. Throws if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        parentContentControl: Word.ContentControl;
+        readonly parentContentControl: Word.ContentControl;
         /**
          *
          * Gets the content control that contains the paragraph. Returns a null object if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentContentControlOrNullObject: Word.ContentControl;
+        readonly parentContentControlOrNullObject: Word.ContentControl;
         /**
          *
          * Gets the table that contains the paragraph. Throws if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTable: Word.Table;
+        readonly parentTable: Word.Table;
         /**
          *
          * Gets the table cell that contains the paragraph. Throws if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCell: Word.TableCell;
+        readonly parentTableCell: Word.TableCell;
         /**
          *
          * Gets the table cell that contains the paragraph. Returns a null object if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCellOrNullObject: Word.TableCell;
+        readonly parentTableCellOrNullObject: Word.TableCell;
         /**
          *
          * Gets the table that contains the paragraph. Returns a null object if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableOrNullObject: Word.Table;
+        readonly parentTableOrNullObject: Word.Table;
         /**
          *
          * Gets or sets the alignment for a paragraph. The value can be 'left', 'centered', 'right', or 'justified'.
          *
          * [Api set: WordApi 1.1]
          */
-        alignment: string;
+        alignment: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
         /**
          *
          * Gets or sets the value, in points, for a first line or hanging indent. Use a positive value to set a first-line indent, and use a negative value to set a hanging indent.
@@ -16747,14 +28426,14 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        isLastParagraph: boolean;
+        readonly isLastParagraph: boolean;
         /**
          *
          * Checks whether the paragraph is a list item. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        isListItem: boolean;
+        readonly isListItem: boolean;
         /**
          *
          * Gets or sets the left indent value, in points, for the paragraph.
@@ -16824,28 +28503,23 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        styleBuiltIn: string;
+        styleBuiltIn: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
         /**
          *
          * Gets the level of the paragraph's table. It returns 0 if the paragraph is not in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        tableNestingLevel: number;
+        readonly tableNestingLevel: number;
         /**
          *
          * Gets the text of the paragraph. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        text: string;
+        readonly text: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ParagraphUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.ParagraphUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Paragraph): void;
         /**
@@ -16929,7 +28603,16 @@ declare namespace Word {
          *
          * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
          */
-        getRange(rangeLocation?: string): Word.Range;
+        getRange(rangeLocation?: Word.RangeLocation): Word.Range;
+        /**
+         *
+         * Gets the whole paragraph, or the starting or ending point of the paragraph, as a range.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         */
+        getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
          *
          * Gets the text ranges in the paragraph by using punctuation marks and/or other ending marks.
@@ -16939,7 +28622,7 @@ declare namespace Word {
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
-        getTextRanges(endingMarks: Array<string>, trimSpacing?: boolean): Word.RangeCollection;
+        getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
          *
          * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
@@ -16949,7 +28632,17 @@ declare namespace Word {
          * @param breakType Required. The break type to add to the document.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertBreak(breakType: string, insertLocation: string): void;
+        insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param breakType Required. The break type to add to the document.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertBreak(breakType: "Page" | "Next" | "SectionNext" | "SectionContinuous" | "SectionEven" | "SectionOdd" | "Line", insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): void;
         /**
          *
          * Wraps the paragraph object with a rich text content control.
@@ -16966,7 +28659,17 @@ declare namespace Word {
          * @param base64File Required. The base64 encoded content of a .docx file.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts a document into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -16976,7 +28679,17 @@ declare namespace Word {
          * @param html Required. The HTML to be inserted in the paragraph.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertHtml(html: string, insertLocation: string): Word.Range;
+        insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param html Required. The HTML to be inserted in the paragraph.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -16986,7 +28699,17 @@ declare namespace Word {
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
+        /**
+         *
+         * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
          * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -16996,7 +28719,17 @@ declare namespace Word {
          * @param ooxml Required. The OOXML to be inserted in the paragraph.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param ooxml Required. The OOXML to be inserted in the paragraph.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
@@ -17006,7 +28739,17 @@ declare namespace Word {
          * @param paragraphText Required. The paragraph text to be inserted.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
          * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
@@ -17018,7 +28761,19 @@ declare namespace Word {
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertTable(rowCount: number, columnCount: number, insertLocation: string, values?: Array<Array<string>>): Word.Table;
+        insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
+        /**
+         *
+         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rowCount Required. The number of rows in the table.
+         * @param columnCount Required. The number of columns in the table.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
          * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
@@ -17028,7 +28783,17 @@ declare namespace Word {
          * @param text Required. Text to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
          */
-        insertText(text: string, insertLocation: string): Word.Range;
+        insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         */
+        insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Performs a search with the specified searchOptions on the scope of the paragraph object. The search results are a collection of range objects.
@@ -17055,7 +28820,16 @@ declare namespace Word {
          *
          * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
          */
-        select(selectionMode?: string): void;
+        select(selectionMode?: Word.SelectionMode): void;
+        /**
+         *
+         * Selects and navigates the Word UI to the paragraph.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         */
+        select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          *
          * Splits the paragraph into child ranges by using delimiters.
@@ -17066,7 +28840,7 @@ declare namespace Word {
          * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
-        split(delimiters: Array<string>, trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
+        split(delimiters: string[], trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
         /**
          *
          * Starts a new list with this paragraph. Fails if the paragraph is already a list item.
@@ -17077,7 +28851,12 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Paragraph;
+        load(option?: Word.Interfaces.ParagraphLoadOptions): Word.Paragraph;
+        load(option?: string | string[]): Word.Paragraph;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.Paragraph;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -17086,27 +28865,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Paragraph;
-        toJSON(): {
-            "alignment": string;
-            "firstLineIndent": number;
-            "font": Font;
-            "isLastParagraph": boolean;
-            "isListItem": boolean;
-            "leftIndent": number;
-            "lineSpacing": number;
-            "lineUnitAfter": number;
-            "lineUnitBefore": number;
-            "listItem": ListItem;
-            "listItemOrNullObject": ListItem;
-            "outlineLevel": number;
-            "rightIndent": number;
-            "spaceAfter": number;
-            "spaceBefore": number;
-            "style": string;
-            "styleBuiltIn": string;
-            "tableNestingLevel": number;
-            "text": string;
-        };
+        toJSON(): Word.Interfaces.ParagraphData;
     }
     /**
      *
@@ -17116,7 +28875,7 @@ declare namespace Word {
      */
     class ParagraphCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.Paragraph>;
+        readonly items: Word.Paragraph[];
         /**
          *
          * Gets the first paragraph in this collection. Throws if the collection is empty.
@@ -17148,7 +28907,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.ParagraphCollection;
+        load(option?: Word.Interfaces.ParagraphCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.ParagraphCollection;
+        load(option?: string | string[]): Word.ParagraphCollection;
+        load(option?: OfficeExtension.LoadOption): Word.ParagraphCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -17157,7 +28918,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ParagraphCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.ParagraphCollectionData;
     }
     /**
      *
@@ -17172,91 +28933,91 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        contentControls: Word.ContentControlCollection;
+        readonly contentControls: Word.ContentControlCollection;
         /**
          *
          * Gets the text format of the range. Use this to get and set font name, size, color, and other properties. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        font: Word.Font;
+        readonly font: Word.Font;
         /**
          *
          * Gets the collection of inline picture objects in the range. Read-only.
          *
          * [Api set: WordApi 1.2]
          */
-        inlinePictures: Word.InlinePictureCollection;
+        readonly inlinePictures: Word.InlinePictureCollection;
         /**
          *
          * Gets the collection of list objects in the range. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        lists: Word.ListCollection;
+        readonly lists: Word.ListCollection;
         /**
          *
          * Gets the collection of paragraph objects in the range. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        paragraphs: Word.ParagraphCollection;
+        readonly paragraphs: Word.ParagraphCollection;
         /**
          *
          * Gets the parent body of the range. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentBody: Word.Body;
+        readonly parentBody: Word.Body;
         /**
          *
          * Gets the content control that contains the range. Throws if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        parentContentControl: Word.ContentControl;
+        readonly parentContentControl: Word.ContentControl;
         /**
          *
          * Gets the content control that contains the range. Returns a null object if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentContentControlOrNullObject: Word.ContentControl;
+        readonly parentContentControlOrNullObject: Word.ContentControl;
         /**
          *
          * Gets the table that contains the range. Throws if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTable: Word.Table;
+        readonly parentTable: Word.Table;
         /**
          *
          * Gets the table cell that contains the range. Throws if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCell: Word.TableCell;
+        readonly parentTableCell: Word.TableCell;
         /**
          *
          * Gets the table cell that contains the range. Returns a null object if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCellOrNullObject: Word.TableCell;
+        readonly parentTableCellOrNullObject: Word.TableCell;
         /**
          *
          * Gets the table that contains the range. Returns a null object if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableOrNullObject: Word.Table;
+        readonly parentTableOrNullObject: Word.Table;
         /**
          *
          * Gets the collection of table objects in the range. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        tables: Word.TableCollection;
+        readonly tables: Word.TableCollection;
         /**
          *
          * Gets the first hyperlink in the range, or sets a hyperlink on the range. All hyperlinks in the range are deleted when you set a new hyperlink on the range. Use a '#' to separate the address part from the optional location part.
@@ -17270,7 +29031,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        isEmpty: boolean;
+        readonly isEmpty: boolean;
         /**
          *
          * Gets or sets the style name for the range. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
@@ -17284,21 +29045,16 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        styleBuiltIn: string;
+        styleBuiltIn: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
         /**
          *
          * Gets the text of the range. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
-        text: string;
+        readonly text: string;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.RangeUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.RangeUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Range): void;
         /**
@@ -17316,7 +29072,7 @@ declare namespace Word {
          *
          * @param range Required. The range to compare with this range.
          */
-        compareLocationWith(range: Word.Range): OfficeExtension.ClientResult<string>;
+        compareLocationWith(range: Word.Range): OfficeExtension.ClientResult<Word.LocationRelation>;
         /**
          *
          * Deletes the range and its content from the document.
@@ -17365,7 +29121,7 @@ declare namespace Word {
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the returned range. Default is false which indicates that spacing characters at the start and end of the range are included.
          */
-        getNextTextRange(endingMarks: Array<string>, trimSpacing?: boolean): Word.Range;
+        getNextTextRange(endingMarks: string[], trimSpacing?: boolean): Word.Range;
         /**
          *
          * Gets the next text range by using punctuation marks and/or other ending marks. Returns a null object if this text range is the last one.
@@ -17375,7 +29131,7 @@ declare namespace Word {
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the returned range. Default is false which indicates that spacing characters at the start and end of the range are included.
          */
-        getNextTextRangeOrNullObject(endingMarks: Array<string>, trimSpacing?: boolean): Word.Range;
+        getNextTextRangeOrNullObject(endingMarks: string[], trimSpacing?: boolean): Word.Range;
         /**
          *
          * Gets the OOXML representation of the range object.
@@ -17391,7 +29147,16 @@ declare namespace Word {
          *
          * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
          */
-        getRange(rangeLocation?: string): Word.Range;
+        getRange(rangeLocation?: Word.RangeLocation): Word.Range;
+        /**
+         *
+         * Clones the range, or gets the starting or ending point of the range as a new range.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         */
+        getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
          *
          * Gets the text child ranges in the range by using punctuation marks and/or other ending marks.
@@ -17401,7 +29166,7 @@ declare namespace Word {
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
-        getTextRanges(endingMarks: Array<string>, trimSpacing?: boolean): Word.RangeCollection;
+        getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
          *
          * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
@@ -17411,7 +29176,17 @@ declare namespace Word {
          * @param breakType Required. The break type to add.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertBreak(breakType: string, insertLocation: string): void;
+        insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
+        /**
+         *
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param breakType Required. The break type to add.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertBreak(breakType: "Page" | "Next" | "SectionNext" | "SectionContinuous" | "SectionEven" | "SectionOdd" | "Line", insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): void;
         /**
          *
          * Wraps the range object with a rich text content control.
@@ -17428,7 +29203,17 @@ declare namespace Word {
          * @param base64File Required. The base64 encoded content of a .docx file.
          * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
          */
-        insertFileFromBase64(base64File: string, insertLocation: string): Word.Range;
+        insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts a document at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param base64File Required. The base64 encoded content of a .docx file.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         */
+        insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
@@ -17438,7 +29223,17 @@ declare namespace Word {
          * @param html Required. The HTML to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
          */
-        insertHtml(html: string, insertLocation: string): Word.Range;
+        insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param html Required. The HTML to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         */
+        insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
@@ -17448,7 +29243,17 @@ declare namespace Word {
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
          */
-        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: string): Word.InlinePicture;
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
+        /**
+         *
+         * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.2]
+         *
+         * @param base64EncodedImage Required. The base64 encoded image to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         */
+        insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
          * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
@@ -17458,7 +29263,17 @@ declare namespace Word {
          * @param ooxml Required. The OOXML to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
          */
-        insertOoxml(ooxml: string, insertLocation: string): Word.Range;
+        insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param ooxml Required. The OOXML to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         */
+        insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
@@ -17468,7 +29283,17 @@ declare namespace Word {
          * @param paragraphText Required. The paragraph text to be inserted.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
          * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
@@ -17480,7 +29305,19 @@ declare namespace Word {
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertTable(rowCount: number, columnCount: number, insertLocation: string, values?: Array<Array<string>>): Word.Table;
+        insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
+        /**
+         *
+         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rowCount Required. The number of rows in the table.
+         * @param columnCount Required. The number of columns in the table.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
          * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
@@ -17490,7 +29327,17 @@ declare namespace Word {
          * @param text Required. Text to be inserted.
          * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
          */
-        insertText(text: string, insertLocation: string): Word.Range;
+        insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
+        /**
+         *
+         * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param text Required. Text to be inserted.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         */
+        insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
          * Returns a new range as the intersection of this range with another range. This range is not changed. Throws if the two ranges are not overlapped or adjacent.
@@ -17535,7 +29382,16 @@ declare namespace Word {
          *
          * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
          */
-        select(selectionMode?: string): void;
+        select(selectionMode?: Word.SelectionMode): void;
+        /**
+         *
+         * Selects and navigates the Word UI to the range.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         */
+        select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          *
          * Splits the range into child ranges by using delimiters.
@@ -17547,11 +29403,16 @@ declare namespace Word {
          * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
          * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
-        split(delimiters: Array<string>, multiParagraphs?: boolean, trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
+        split(delimiters: string[], multiParagraphs?: boolean, trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Range;
+        load(option?: Word.Interfaces.RangeLoadOptions): Word.Range;
+        load(option?: string | string[]): Word.Range;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.Range;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -17560,14 +29421,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Range;
-        toJSON(): {
-            "font": Font;
-            "hyperlink": string;
-            "isEmpty": boolean;
-            "style": string;
-            "styleBuiltIn": string;
-            "text": string;
-        };
+        toJSON(): Word.Interfaces.RangeData;
     }
     /**
      *
@@ -17577,7 +29431,7 @@ declare namespace Word {
      */
     class RangeCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.Range>;
+        readonly items: Word.Range[];
         /**
          *
          * Gets the first range in this collection. Throws if this collection is empty.
@@ -17595,7 +29449,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.RangeCollection;
+        load(option?: Word.Interfaces.RangeCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.RangeCollection;
+        load(option?: string | string[]): Word.RangeCollection;
+        load(option?: OfficeExtension.LoadOption): Word.RangeCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -17604,7 +29460,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.RangeCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.RangeCollectionData;
     }
     /**
      *
@@ -17664,31 +29520,23 @@ declare namespace Word {
          */
         matchWildcards: boolean;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.SearchOptionsUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.SearchOptionsUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: SearchOptions): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SearchOptions;
+        load(option?: Word.Interfaces.SearchOptionsLoadOptions): Word.SearchOptions;
+        load(option?: string | string[]): Word.SearchOptions;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.SearchOptions;
         /**
          * Create a new instance of Word.SearchOptions object
          */
         static newObject(context: OfficeExtension.ClientRequestContext): Word.SearchOptions;
-        toJSON(): {
-            "ignorePunct": boolean;
-            "ignoreSpace": boolean;
-            "matchCase": boolean;
-            "matchPrefix": boolean;
-            "matchSuffix": boolean;
-            "matchWholeWord": boolean;
-            "matchWildcards": boolean;
-        };
+        toJSON(): Word.Interfaces.SearchOptionsData;
     }
     /**
      *
@@ -17703,14 +29551,9 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          */
-        body: Word.Body;
+        readonly body: Word.Body;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.SectionUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.SectionUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Section): void;
         /**
@@ -17721,7 +29564,16 @@ declare namespace Word {
          *
          * @param type Required. The type of footer to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
          */
-        getFooter(type: string): Word.Body;
+        getFooter(type: Word.HeaderFooterType): Word.Body;
+        /**
+         *
+         * Gets one of the section's footers.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param type Required. The type of footer to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         */
+        getFooter(type: "Primary" | "FirstPage" | "EvenPages"): Word.Body;
         /**
          *
          * Gets one of the section's headers.
@@ -17730,7 +29582,16 @@ declare namespace Word {
          *
          * @param type Required. The type of header to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
          */
-        getHeader(type: string): Word.Body;
+        getHeader(type: Word.HeaderFooterType): Word.Body;
+        /**
+         *
+         * Gets one of the section's headers.
+         *
+         * [Api set: WordApi 1.1]
+         *
+         * @param type Required. The type of header to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         */
+        getHeader(type: "Primary" | "FirstPage" | "EvenPages"): Word.Body;
         /**
          *
          * Gets the next section. Throws if this section is the last one.
@@ -17748,7 +29609,12 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Section;
+        load(option?: Word.Interfaces.SectionLoadOptions): Word.Section;
+        load(option?: string | string[]): Word.Section;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.Section;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -17757,9 +29623,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Section;
-        toJSON(): {
-            "body": Body;
-        };
+        toJSON(): Word.Interfaces.SectionData;
     }
     /**
      *
@@ -17769,7 +29633,7 @@ declare namespace Word {
      */
     class SectionCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.Section>;
+        readonly items: Word.Section[];
         /**
          *
          * Gets the first section in this collection. Throws if this collection is empty.
@@ -17787,7 +29651,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.SectionCollection;
+        load(option?: Word.Interfaces.SectionCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.SectionCollection;
+        load(option?: string | string[]): Word.SectionCollection;
+        load(option?: OfficeExtension.LoadOption): Word.SectionCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -17796,7 +29662,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.SectionCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.SectionCollectionData;
     }
     /**
      *
@@ -17811,77 +29677,77 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        font: Word.Font;
+        readonly font: Word.Font;
         /**
          *
          * Gets the parent body of the table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentBody: Word.Body;
+        readonly parentBody: Word.Body;
         /**
          *
          * Gets the content control that contains the table. Throws if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentContentControl: Word.ContentControl;
+        readonly parentContentControl: Word.ContentControl;
         /**
          *
          * Gets the content control that contains the table. Returns a null object if there isn't a parent content control. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentContentControlOrNullObject: Word.ContentControl;
+        readonly parentContentControlOrNullObject: Word.ContentControl;
         /**
          *
          * Gets the table that contains this table. Throws if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTable: Word.Table;
+        readonly parentTable: Word.Table;
         /**
          *
          * Gets the table cell that contains this table. Throws if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCell: Word.TableCell;
+        readonly parentTableCell: Word.TableCell;
         /**
          *
          * Gets the table cell that contains this table. Returns a null object if it is not contained in a table cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableCellOrNullObject: Word.TableCell;
+        readonly parentTableCellOrNullObject: Word.TableCell;
         /**
          *
          * Gets the table that contains this table. Returns a null object if it is not contained in a table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTableOrNullObject: Word.Table;
+        readonly parentTableOrNullObject: Word.Table;
         /**
          *
          * Gets all of the table rows. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        rows: Word.TableRowCollection;
+        readonly rows: Word.TableRowCollection;
         /**
          *
          * Gets the child tables nested one level deeper. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        tables: Word.TableCollection;
+        readonly tables: Word.TableCollection;
         /**
          *
          * Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
          *
          * [Api set: WordApi 1.3]
          */
-        alignment: string;
+        alignment: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
         /**
          *
          * Gets and sets the number of header rows.
@@ -17895,28 +29761,28 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        horizontalAlignment: string;
+        horizontalAlignment: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
         /**
          *
          * Indicates whether all of the table rows are uniform. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        isUniform: boolean;
+        readonly isUniform: boolean;
         /**
          *
          * Gets the nesting level of the table. Top-level tables have level 1. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        nestingLevel: number;
+        readonly nestingLevel: number;
         /**
          *
          * Gets the number of rows in the table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        rowCount: number;
+        readonly rowCount: number;
         /**
          *
          * Gets and sets the shading color.
@@ -17951,7 +29817,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        styleBuiltIn: string;
+        styleBuiltIn: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
         /**
          *
          * Gets and sets whether the table has a first column with a special style.
@@ -17979,14 +29845,14 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        values: Array<Array<string>>;
+        values: string[][];
         /**
          *
          * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
          *
          * [Api set: WordApi 1.3]
          */
-        verticalAlignment: string;
+        verticalAlignment: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
         /**
          *
          * Gets and sets the width of the table in points.
@@ -17995,12 +29861,7 @@ declare namespace Word {
          */
         width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TableUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: Table): void;
         /**
@@ -18013,7 +29874,18 @@ declare namespace Word {
          * @param columnCount Required. Number of columns to add.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        addColumns(insertLocation: string, columnCount: number, values?: Array<Array<string>>): void;
+        addColumns(insertLocation: Word.InsertLocation, columnCount: number, values?: string[][]): void;
+        /**
+         *
+         * Adds columns to the start or end of the table, using the first or last existing column as a template. This is applicable to uniform tables. The string values, if specified, are set in the newly inserted rows.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param insertLocation Required. It can be 'Start' or 'End', corresponding to the appropriate side of the table.
+         * @param columnCount Required. Number of columns to add.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        addColumns(insertLocation: "Before" | "After" | "Start" | "End" | "Replace", columnCount: number, values?: string[][]): void;
         /**
          *
          * Adds rows to the start or end of the table, using the first or last existing row as a template. The string values, if specified, are set in the newly inserted rows.
@@ -18024,7 +29896,18 @@ declare namespace Word {
          * @param rowCount Required. Number of rows to add.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        addRows(insertLocation: string, rowCount: number, values?: Array<Array<string>>): Word.TableRowCollection;
+        addRows(insertLocation: Word.InsertLocation, rowCount: number, values?: string[][]): Word.TableRowCollection;
+        /**
+         *
+         * Adds rows to the start or end of the table, using the first or last existing row as a template. The string values, if specified, are set in the newly inserted rows.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param insertLocation Required. It can be 'Start' or 'End'.
+         * @param rowCount Required. Number of rows to add.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        addRows(insertLocation: "Before" | "After" | "Start" | "End" | "Replace", rowCount: number, values?: string[][]): Word.TableRowCollection;
         /**
          *
          * Autofits the table columns to the width of the window.
@@ -18081,7 +29964,16 @@ declare namespace Word {
          *
          * @param borderLocation Required. The border location.
          */
-        getBorder(borderLocation: string): Word.TableBorder;
+        getBorder(borderLocation: Word.BorderLocation): Word.TableBorder;
+        /**
+         *
+         * Gets the border style for the specified border.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param borderLocation Required. The border location.
+         */
+        getBorder(borderLocation: "Top" | "Left" | "Bottom" | "Right" | "InsideHorizontal" | "InsideVertical" | "Inside" | "Outside" | "All"): Word.TableBorder;
         /**
          *
          * Gets the table cell at a specified row and column. Throws if the specified table cell does not exist.
@@ -18110,7 +30002,16 @@ declare namespace Word {
          *
          * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
          */
-        getCellPadding(cellPaddingLocation: string): OfficeExtension.ClientResult<number>;
+        getCellPadding(cellPaddingLocation: Word.CellPaddingLocation): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets cell padding in points.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         */
+        getCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right"): OfficeExtension.ClientResult<number>;
         /**
          *
          * Gets the next table. Throws if this table is the last one.
@@ -18161,7 +30062,16 @@ declare namespace Word {
          *
          * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End' or 'After'.
          */
-        getRange(rangeLocation?: string): Word.Range;
+        getRange(rangeLocation?: Word.RangeLocation): Word.Range;
+        /**
+         *
+         * Gets the range that contains this table, or the range at the start or end of the table.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End' or 'After'.
+         */
+        getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
          *
          * Inserts a content control on the table.
@@ -18178,7 +30088,17 @@ declare namespace Word {
          * @param paragraphText Required. The paragraph text to be inserted.
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          */
-        insertParagraph(paragraphText: string, insertLocation: string): Word.Paragraph;
+        insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
+        /**
+         *
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         */
+        insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
          * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
@@ -18190,7 +30110,19 @@ declare namespace Word {
          * @param insertLocation Required. The value can be 'Before' or 'After'.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertTable(rowCount: number, columnCount: number, insertLocation: string, values?: Array<Array<string>>): Word.Table;
+        insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
+        /**
+         *
+         * Inserts a table with the specified number of rows and columns. The insertLocation value can be 'Before' or 'After'.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param rowCount Required. The number of rows in the table.
+         * @param columnCount Required. The number of columns in the table.
+         * @param insertLocation Required. The value can be 'Before' or 'After'.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
          * Performs a search with the specified searchOptions on the scope of the table object. The search results are a collection of range objects.
@@ -18217,7 +30149,16 @@ declare namespace Word {
          *
          * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
          */
-        select(selectionMode?: string): void;
+        select(selectionMode?: Word.SelectionMode): void;
+        /**
+         *
+         * Selects the table, or the position at the start or end of the table, and navigates the Word UI to it.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         */
+        select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          *
          * Sets cell padding in points.
@@ -18227,11 +30168,26 @@ declare namespace Word {
          * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
-        setCellPadding(cellPaddingLocation: string, cellPadding: number): void;
+        setCellPadding(cellPaddingLocation: Word.CellPaddingLocation, cellPadding: number): void;
+        /**
+         *
+         * Sets cell padding in points.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPadding Required. The cell padding.
+         */
+        setCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right", cellPadding: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.Table;
+        load(option?: Word.Interfaces.TableLoadOptions): Word.Table;
+        load(option?: string | string[]): Word.Table;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.Table;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -18240,26 +30196,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Table;
-        toJSON(): {
-            "alignment": string;
-            "font": Font;
-            "headerRowCount": number;
-            "horizontalAlignment": string;
-            "isUniform": boolean;
-            "nestingLevel": number;
-            "rowCount": number;
-            "shadingColor": string;
-            "style": string;
-            "styleBandedColumns": boolean;
-            "styleBandedRows": boolean;
-            "styleBuiltIn": string;
-            "styleFirstColumn": boolean;
-            "styleLastColumn": boolean;
-            "styleTotalRow": boolean;
-            "values": string[][];
-            "verticalAlignment": string;
-            "width": number;
-        };
+        toJSON(): Word.Interfaces.TableData;
     }
     /**
      *
@@ -18269,7 +30206,7 @@ declare namespace Word {
      */
     class TableCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.Table>;
+        readonly items: Word.Table[];
         /**
          *
          * Gets the first table in this collection. Throws if this collection is empty.
@@ -18287,7 +30224,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.TableCollection;
+        load(option?: Word.Interfaces.TableCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.TableCollection;
+        load(option?: string | string[]): Word.TableCollection;
+        load(option?: OfficeExtension.LoadOption): Word.TableCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -18296,7 +30235,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.TableCollectionData;
     }
     /**
      *
@@ -18311,42 +30250,42 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        cells: Word.TableCellCollection;
+        readonly cells: Word.TableCellCollection;
         /**
          *
          * Gets the font. Use this to get and set font name, size, color, and other properties. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        font: Word.Font;
+        readonly font: Word.Font;
         /**
          *
          * Gets parent table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTable: Word.Table;
+        readonly parentTable: Word.Table;
         /**
          *
          * Gets the number of cells in the row. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        cellCount: number;
+        readonly cellCount: number;
         /**
          *
          * Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
          *
          * [Api set: WordApi 1.3]
          */
-        horizontalAlignment: string;
+        horizontalAlignment: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
         /**
          *
          * Checks whether the row is a header row. Read-only. To set the number of header rows, use HeaderRowCount on the Table object.
          *
          * [Api set: WordApi 1.3]
          */
-        isHeader: boolean;
+        readonly isHeader: boolean;
         /**
          *
          * Gets and sets the preferred height of the row in points.
@@ -18360,7 +30299,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        rowIndex: number;
+        readonly rowIndex: number;
         /**
          *
          * Gets and sets the shading color.
@@ -18374,21 +30313,16 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        values: Array<Array<string>>;
+        values: string[][];
         /**
          *
          * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
          *
          * [Api set: WordApi 1.3]
          */
-        verticalAlignment: string;
+        verticalAlignment: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableRowUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TableRowUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: TableRow): void;
         /**
@@ -18413,7 +30347,16 @@ declare namespace Word {
          *
          * @param borderLocation Required. The border location.
          */
-        getBorder(borderLocation: string): Word.TableBorder;
+        getBorder(borderLocation: Word.BorderLocation): Word.TableBorder;
+        /**
+         *
+         * Gets the border style of the cells in the row.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param borderLocation Required. The border location.
+         */
+        getBorder(borderLocation: "Top" | "Left" | "Bottom" | "Right" | "InsideHorizontal" | "InsideVertical" | "Inside" | "Outside" | "All"): Word.TableBorder;
         /**
          *
          * Gets cell padding in points.
@@ -18422,7 +30365,16 @@ declare namespace Word {
          *
          * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
          */
-        getCellPadding(cellPaddingLocation: string): OfficeExtension.ClientResult<number>;
+        getCellPadding(cellPaddingLocation: Word.CellPaddingLocation): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets cell padding in points.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         */
+        getCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right"): OfficeExtension.ClientResult<number>;
         /**
          *
          * Gets the next row. Throws if this row is the last one.
@@ -18447,7 +30399,18 @@ declare namespace Word {
          * @param rowCount Required. Number of rows to add
          * @param values Optional. Strings to insert in the new rows, specified as a 2D array. The number of cells in each row must not exceed the number of cells in the existing row.
          */
-        insertRows(insertLocation: string, rowCount: number, values?: Array<Array<string>>): Word.TableRowCollection;
+        insertRows(insertLocation: Word.InsertLocation, rowCount: number, values?: string[][]): Word.TableRowCollection;
+        /**
+         *
+         * Inserts rows using this row as a template. If values are specified, inserts the values into the new rows.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param insertLocation Required. Where the new rows should be inserted, relative to the current row. It can be 'Before' or 'After'.
+         * @param rowCount Required. Number of rows to add
+         * @param values Optional. Strings to insert in the new rows, specified as a 2D array. The number of cells in each row must not exceed the number of cells in the existing row.
+         */
+        insertRows(insertLocation: "Before" | "After" | "Start" | "End" | "Replace", rowCount: number, values?: string[][]): Word.TableRowCollection;
         /**
          *
          * Performs a search with the specified searchOptions on the scope of the row. The search results are a collection of range objects.
@@ -18474,7 +30437,16 @@ declare namespace Word {
          *
          * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
          */
-        select(selectionMode?: string): void;
+        select(selectionMode?: Word.SelectionMode): void;
+        /**
+         *
+         * Selects the row and navigates the Word UI to it.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         */
+        select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          *
          * Sets cell padding in points.
@@ -18484,11 +30456,26 @@ declare namespace Word {
          * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
-        setCellPadding(cellPaddingLocation: string, cellPadding: number): void;
+        setCellPadding(cellPaddingLocation: Word.CellPaddingLocation, cellPadding: number): void;
+        /**
+         *
+         * Sets cell padding in points.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPadding Required. The cell padding.
+         */
+        setCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right", cellPadding: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.TableRow;
+        load(option?: Word.Interfaces.TableRowLoadOptions): Word.TableRow;
+        load(option?: string | string[]): Word.TableRow;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.TableRow;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -18497,17 +30484,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableRow;
-        toJSON(): {
-            "cellCount": number;
-            "font": Font;
-            "horizontalAlignment": string;
-            "isHeader": boolean;
-            "preferredHeight": number;
-            "rowIndex": number;
-            "shadingColor": string;
-            "values": string[][];
-            "verticalAlignment": string;
-        };
+        toJSON(): Word.Interfaces.TableRowData;
     }
     /**
      *
@@ -18517,7 +30494,7 @@ declare namespace Word {
      */
     class TableRowCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.TableRow>;
+        readonly items: Word.TableRow[];
         /**
          *
          * Gets the first row in this collection. Throws if this collection is empty.
@@ -18535,7 +30512,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.TableRowCollection;
+        load(option?: Word.Interfaces.TableRowCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.TableRowCollection;
+        load(option?: string | string[]): Word.TableRowCollection;
+        load(option?: OfficeExtension.LoadOption): Word.TableRowCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -18544,7 +30523,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableRowCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.TableRowCollectionData;
     }
     /**
      *
@@ -18559,28 +30538,28 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        body: Word.Body;
+        readonly body: Word.Body;
         /**
          *
          * Gets the parent row of the cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentRow: Word.TableRow;
+        readonly parentRow: Word.TableRow;
         /**
          *
          * Gets the parent table of the cell. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        parentTable: Word.Table;
+        readonly parentTable: Word.Table;
         /**
          *
          * Gets the index of the cell in its row. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        cellIndex: number;
+        readonly cellIndex: number;
         /**
          *
          * Gets and sets the width of the cell's column in points. This is applicable to uniform tables.
@@ -18594,14 +30573,14 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        horizontalAlignment: string;
+        horizontalAlignment: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
         /**
          *
          * Gets the index of the cell's row in the table. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        rowIndex: number;
+        readonly rowIndex: number;
         /**
          *
          * Gets or sets the shading color of the cell. Color is specified in "#RRGGBB" format or by using the color name.
@@ -18622,21 +30601,16 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        verticalAlignment: string;
+        verticalAlignment: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
         /**
          *
          * Gets the width of the cell in points. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
-        width: number;
+        readonly width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableCellUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TableCellUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: TableCell): void;
         /**
@@ -18661,7 +30635,16 @@ declare namespace Word {
          *
          * @param borderLocation Required. The border location.
          */
-        getBorder(borderLocation: string): Word.TableBorder;
+        getBorder(borderLocation: Word.BorderLocation): Word.TableBorder;
+        /**
+         *
+         * Gets the border style for the specified border.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param borderLocation Required. The border location.
+         */
+        getBorder(borderLocation: "Top" | "Left" | "Bottom" | "Right" | "InsideHorizontal" | "InsideVertical" | "Inside" | "Outside" | "All"): Word.TableBorder;
         /**
          *
          * Gets cell padding in points.
@@ -18670,7 +30653,16 @@ declare namespace Word {
          *
          * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
          */
-        getCellPadding(cellPaddingLocation: string): OfficeExtension.ClientResult<number>;
+        getCellPadding(cellPaddingLocation: Word.CellPaddingLocation): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets cell padding in points.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         */
+        getCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right"): OfficeExtension.ClientResult<number>;
         /**
          *
          * Gets the next cell. Throws if this cell is the last one.
@@ -18695,7 +30687,18 @@ declare namespace Word {
          * @param columnCount Required. Number of columns to add
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertColumns(insertLocation: string, columnCount: number, values?: Array<Array<string>>): void;
+        insertColumns(insertLocation: Word.InsertLocation, columnCount: number, values?: string[][]): void;
+        /**
+         *
+         * Adds columns to the left or right of the cell, using the cell's column as a template. This is applicable to uniform tables. The string values, if specified, are set in the newly inserted rows.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param insertLocation Required. It can be 'Before' or 'After'.
+         * @param columnCount Required. Number of columns to add
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertColumns(insertLocation: "Before" | "After" | "Start" | "End" | "Replace", columnCount: number, values?: string[][]): void;
         /**
          *
          * Inserts rows above or below the cell, using the cell's row as a template. The string values, if specified, are set in the newly inserted rows.
@@ -18706,7 +30709,18 @@ declare namespace Word {
          * @param rowCount Required. Number of rows to add.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertRows(insertLocation: string, rowCount: number, values?: Array<Array<string>>): Word.TableRowCollection;
+        insertRows(insertLocation: Word.InsertLocation, rowCount: number, values?: string[][]): Word.TableRowCollection;
+        /**
+         *
+         * Inserts rows above or below the cell, using the cell's row as a template. The string values, if specified, are set in the newly inserted rows.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param insertLocation Required. It can be 'Before' or 'After'.
+         * @param rowCount Required. Number of rows to add.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertRows(insertLocation: "Before" | "After" | "Start" | "End" | "Replace", rowCount: number, values?: string[][]): Word.TableRowCollection;
         /**
          *
          * Sets cell padding in points.
@@ -18716,11 +30730,26 @@ declare namespace Word {
          * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
-        setCellPadding(cellPaddingLocation: string, cellPadding: number): void;
+        setCellPadding(cellPaddingLocation: Word.CellPaddingLocation, cellPadding: number): void;
+        /**
+         *
+         * Sets cell padding in points.
+         *
+         * [Api set: WordApi 1.3]
+         *
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPadding Required. The cell padding.
+         */
+        setCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right", cellPadding: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.TableCell;
+        load(option?: Word.Interfaces.TableCellLoadOptions): Word.TableCell;
+        load(option?: string | string[]): Word.TableCell;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.TableCell;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -18729,17 +30758,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableCell;
-        toJSON(): {
-            "body": Body;
-            "cellIndex": number;
-            "columnWidth": number;
-            "horizontalAlignment": string;
-            "rowIndex": number;
-            "shadingColor": string;
-            "value": string;
-            "verticalAlignment": string;
-            "width": number;
-        };
+        toJSON(): Word.Interfaces.TableCellData;
     }
     /**
      *
@@ -18749,7 +30768,7 @@ declare namespace Word {
      */
     class TableCellCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        items: Array<Word.TableCell>;
+        readonly items: Word.TableCell[];
         /**
          *
          * Gets the first table cell in this collection. Throws if this collection is empty.
@@ -18767,7 +30786,9 @@ declare namespace Word {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.TableCellCollection;
+        load(option?: Word.Interfaces.TableCellCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.TableCellCollection;
+        load(option?: string | string[]): Word.TableCellCollection;
+        load(option?: OfficeExtension.LoadOption): Word.TableCellCollection;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -18776,7 +30797,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableCellCollection;
-        toJSON(): {};
+        toJSON(): Word.Interfaces.TableCellCollectionData;
     }
     /**
      *
@@ -18798,7 +30819,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          */
-        type: string;
+        type: Word.BorderType | "Mixed" | "None" | "Single" | "Double" | "Dotted" | "Dashed" | "DotDashed" | "Dot2Dashed" | "Triple" | "ThinThickSmall" | "ThickThinSmall" | "ThinThickThinSmall" | "ThinThickMed" | "ThickThinMed" | "ThinThickThinMed" | "ThinThickLarge" | "ThickThinLarge" | "ThinThickThinLarge" | "Wave" | "DoubleWave" | "DashedSmall" | "DashDotStroked" | "ThreeDEmboss" | "ThreeDEngrave";
         /**
          *
          * Gets or sets the width, in points, of the table border. Not applicable to table border types that have fixed widths.
@@ -18807,18 +30828,18 @@ declare namespace Word {
          */
         width: number;
         /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableBorderUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        set(properties: Interfaces.TableBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
         set(properties: TableBorder): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): Word.TableBorder;
+        load(option?: Word.Interfaces.TableBorderLoadOptions): Word.TableBorder;
+        load(option?: string | string[]): Word.TableBorder;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Word.TableBorder;
         /**
          * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
          */
@@ -18827,11 +30848,7 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableBorder;
-        toJSON(): {
-            "color": string;
-            "type": string;
-            "width": number;
-        };
+        toJSON(): Word.Interfaces.TableBorderData;
     }
     /**
      *
@@ -18839,24 +30856,24 @@ declare namespace Word {
      *
      * [Api set: WordApi]
      */
-    namespace ContentControlType {
-        var unknown: string;
-        var richTextInline: string;
-        var richTextParagraphs: string;
-        var richTextTableCell: string;
-        var richTextTableRow: string;
-        var richTextTable: string;
-        var plainTextInline: string;
-        var plainTextParagraph: string;
-        var picture: string;
-        var buildingBlockGallery: string;
-        var checkBox: string;
-        var comboBox: string;
-        var dropDownList: string;
-        var datePicker: string;
-        var repeatingSection: string;
-        var richText: string;
-        var plainText: string;
+    enum ContentControlType {
+        unknown = "Unknown",
+        richTextInline = "RichTextInline",
+        richTextParagraphs = "RichTextParagraphs",
+        richTextTableCell = "RichTextTableCell",
+        richTextTableRow = "RichTextTableRow",
+        richTextTable = "RichTextTable",
+        plainTextInline = "PlainTextInline",
+        plainTextParagraph = "PlainTextParagraph",
+        picture = "Picture",
+        buildingBlockGallery = "BuildingBlockGallery",
+        checkBox = "CheckBox",
+        comboBox = "ComboBox",
+        dropDownList = "DropDownList",
+        datePicker = "DatePicker",
+        repeatingSection = "RepeatingSection",
+        richText = "RichText",
+        plainText = "PlainText",
     }
     /**
      *
@@ -18864,10 +30881,10 @@ declare namespace Word {
      *
      * [Api set: WordApi]
      */
-    namespace ContentControlAppearance {
-        var boundingBox: string;
-        var tags: string;
-        var hidden: string;
+    enum ContentControlAppearance {
+        boundingBox = "BoundingBox",
+        tags = "Tags",
+        hidden = "Hidden",
     }
     /**
      *
@@ -18875,36 +30892,36 @@ declare namespace Word {
      *
      * [Api set: WordApi]
      */
-    namespace UnderlineType {
-        var mixed: string;
-        var none: string;
+    enum UnderlineType {
+        mixed = "Mixed",
+        none = "None",
         /**
          *
          * @deprecated Hidden is no longer supported.
          */
-        var hidden: string;
+        hidden = "Hidden",
         /**
          *
          * @deprecated DotLine is no longer supported.
          */
-        var dotLine: string;
-        var single: string;
-        var word: string;
-        var double: string;
-        var thick: string;
-        var dotted: string;
-        var dottedHeavy: string;
-        var dashLine: string;
-        var dashLineHeavy: string;
-        var dashLineLong: string;
-        var dashLineLongHeavy: string;
-        var dotDashLine: string;
-        var dotDashLineHeavy: string;
-        var twoDotDashLine: string;
-        var twoDotDashLineHeavy: string;
-        var wave: string;
-        var waveHeavy: string;
-        var waveDouble: string;
+        dotLine = "DotLine",
+        single = "Single",
+        word = "Word",
+        double = "Double",
+        thick = "Thick",
+        dotted = "Dotted",
+        dottedHeavy = "DottedHeavy",
+        dashLine = "DashLine",
+        dashLineHeavy = "DashLineHeavy",
+        dashLineLong = "DashLineLong",
+        dashLineLongHeavy = "DashLineLongHeavy",
+        dotDashLine = "DotDashLine",
+        dotDashLineHeavy = "DotDashLineHeavy",
+        twoDotDashLine = "TwoDotDashLine",
+        twoDotDashLineHeavy = "TwoDotDashLineHeavy",
+        wave = "Wave",
+        waveHeavy = "WaveHeavy",
+        waveDouble = "WaveDouble",
     }
     /**
      *
@@ -18912,48 +30929,48 @@ declare namespace Word {
      *
      * [Api set: WordApi]
      */
-    namespace BreakType {
+    enum BreakType {
         /**
          *
          * Page break.
          *
          */
-        var page: string;
+        page = "Page",
         /**
          *
          * @deprecated Use sectionNext instead.
          */
-        var next: string;
+        next = "Next",
         /**
          *
          * Section break, with the new section starting on the next page.
          *
          */
-        var sectionNext: string;
+        sectionNext = "SectionNext",
         /**
          *
          * Section break, with the new section starting on the same page.
          *
          */
-        var sectionContinuous: string;
+        sectionContinuous = "SectionContinuous",
         /**
          *
          * Section break, with the new section starting on the next even-numbered page.
          *
          */
-        var sectionEven: string;
+        sectionEven = "SectionEven",
         /**
          *
          * Section break, with the new section starting on the next odd-numbered page.
          *
          */
-        var sectionOdd: string;
+        sectionOdd = "SectionOdd",
         /**
          *
          * Line break.
          *
          */
-        var line: string;
+        line = "Line",
     }
     /**
      *
@@ -18961,422 +30978,446 @@ declare namespace Word {
      *
      * [Api set: WordApi]
      */
-    namespace InsertLocation {
-        var before: string;
-        var after: string;
-        var start: string;
-        var end: string;
-        var replace: string;
+    enum InsertLocation {
+        before = "Before",
+        after = "After",
+        start = "Start",
+        end = "End",
+        replace = "Replace",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace Alignment {
-        var mixed: string;
-        var unknown: string;
-        var left: string;
-        var centered: string;
-        var right: string;
-        var justified: string;
+    enum Alignment {
+        mixed = "Mixed",
+        unknown = "Unknown",
+        left = "Left",
+        centered = "Centered",
+        right = "Right",
+        justified = "Justified",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace HeaderFooterType {
-        var primary: string;
-        var firstPage: string;
-        var evenPages: string;
+    enum HeaderFooterType {
+        primary = "Primary",
+        firstPage = "FirstPage",
+        evenPages = "EvenPages",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace BodyType {
-        var unknown: string;
-        var mainDoc: string;
-        var section: string;
-        var header: string;
-        var footer: string;
-        var tableCell: string;
+    enum BodyType {
+        unknown = "Unknown",
+        mainDoc = "MainDoc",
+        section = "Section",
+        header = "Header",
+        footer = "Footer",
+        tableCell = "TableCell",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace SelectionMode {
-        var select: string;
-        var start: string;
-        var end: string;
+    enum SelectionMode {
+        select = "Select",
+        start = "Start",
+        end = "End",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace ImageFormat {
-        var unsupported: string;
-        var undefined: string;
-        var bmp: string;
-        var jpeg: string;
-        var gif: string;
-        var tiff: string;
-        var png: string;
-        var icon: string;
-        var exif: string;
-        var wmf: string;
-        var emf: string;
-        var pict: string;
-        var pdf: string;
-        var svg: string;
+    enum ImageFormat {
+        unsupported = "Unsupported",
+        undefined = "Undefined",
+        bmp = "Bmp",
+        jpeg = "Jpeg",
+        gif = "Gif",
+        tiff = "Tiff",
+        png = "Png",
+        icon = "Icon",
+        exif = "Exif",
+        wmf = "Wmf",
+        emf = "Emf",
+        pict = "Pict",
+        pdf = "Pdf",
+        svg = "Svg",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace RangeLocation {
-        var whole: string;
-        var start: string;
-        var end: string;
-        var before: string;
-        var after: string;
-        var content: string;
+    enum RangeLocation {
+        whole = "Whole",
+        start = "Start",
+        end = "End",
+        before = "Before",
+        after = "After",
+        content = "Content",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace LocationRelation {
-        var unrelated: string;
-        var equal: string;
-        var containsStart: string;
-        var containsEnd: string;
-        var contains: string;
-        var insideStart: string;
-        var insideEnd: string;
-        var inside: string;
-        var adjacentBefore: string;
-        var overlapsBefore: string;
-        var before: string;
-        var adjacentAfter: string;
-        var overlapsAfter: string;
-        var after: string;
+    enum LocationRelation {
+        unrelated = "Unrelated",
+        equal = "Equal",
+        containsStart = "ContainsStart",
+        containsEnd = "ContainsEnd",
+        contains = "Contains",
+        insideStart = "InsideStart",
+        insideEnd = "InsideEnd",
+        inside = "Inside",
+        adjacentBefore = "AdjacentBefore",
+        overlapsBefore = "OverlapsBefore",
+        before = "Before",
+        adjacentAfter = "AdjacentAfter",
+        overlapsAfter = "OverlapsAfter",
+        after = "After",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace BorderLocation {
-        var top: string;
-        var left: string;
-        var bottom: string;
-        var right: string;
-        var insideHorizontal: string;
-        var insideVertical: string;
-        var inside: string;
-        var outside: string;
-        var all: string;
+    enum BorderLocation {
+        top = "Top",
+        left = "Left",
+        bottom = "Bottom",
+        right = "Right",
+        insideHorizontal = "InsideHorizontal",
+        insideVertical = "InsideVertical",
+        inside = "Inside",
+        outside = "Outside",
+        all = "All",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace CellPaddingLocation {
-        var top: string;
-        var left: string;
-        var bottom: string;
-        var right: string;
+    enum CellPaddingLocation {
+        top = "Top",
+        left = "Left",
+        bottom = "Bottom",
+        right = "Right",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace BorderType {
-        var mixed: string;
-        var none: string;
-        var single: string;
-        var double: string;
-        var dotted: string;
-        var dashed: string;
-        var dotDashed: string;
-        var dot2Dashed: string;
-        var triple: string;
-        var thinThickSmall: string;
-        var thickThinSmall: string;
-        var thinThickThinSmall: string;
-        var thinThickMed: string;
-        var thickThinMed: string;
-        var thinThickThinMed: string;
-        var thinThickLarge: string;
-        var thickThinLarge: string;
-        var thinThickThinLarge: string;
-        var wave: string;
-        var doubleWave: string;
-        var dashedSmall: string;
-        var dashDotStroked: string;
-        var threeDEmboss: string;
-        var threeDEngrave: string;
+    enum BorderType {
+        mixed = "Mixed",
+        none = "None",
+        single = "Single",
+        double = "Double",
+        dotted = "Dotted",
+        dashed = "Dashed",
+        dotDashed = "DotDashed",
+        dot2Dashed = "Dot2Dashed",
+        triple = "Triple",
+        thinThickSmall = "ThinThickSmall",
+        thickThinSmall = "ThickThinSmall",
+        thinThickThinSmall = "ThinThickThinSmall",
+        thinThickMed = "ThinThickMed",
+        thickThinMed = "ThickThinMed",
+        thinThickThinMed = "ThinThickThinMed",
+        thinThickLarge = "ThinThickLarge",
+        thickThinLarge = "ThickThinLarge",
+        thinThickThinLarge = "ThinThickThinLarge",
+        wave = "Wave",
+        doubleWave = "DoubleWave",
+        dashedSmall = "DashedSmall",
+        dashDotStroked = "DashDotStroked",
+        threeDEmboss = "ThreeDEmboss",
+        threeDEngrave = "ThreeDEngrave",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace VerticalAlignment {
-        var mixed: string;
-        var top: string;
-        var center: string;
-        var bottom: string;
+    enum VerticalAlignment {
+        mixed = "Mixed",
+        top = "Top",
+        center = "Center",
+        bottom = "Bottom",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace ListLevelType {
-        var bullet: string;
-        var number: string;
-        var picture: string;
+    enum ListLevelType {
+        bullet = "Bullet",
+        number = "Number",
+        picture = "Picture",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace ListBullet {
-        var custom: string;
-        var solid: string;
-        var hollow: string;
-        var square: string;
-        var diamonds: string;
-        var arrow: string;
-        var checkmark: string;
+    enum ListBullet {
+        custom = "Custom",
+        solid = "Solid",
+        hollow = "Hollow",
+        square = "Square",
+        diamonds = "Diamonds",
+        arrow = "Arrow",
+        checkmark = "Checkmark",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace ListNumbering {
-        var none: string;
-        var arabic: string;
-        var upperRoman: string;
-        var lowerRoman: string;
-        var upperLetter: string;
-        var lowerLetter: string;
+    enum ListNumbering {
+        none = "None",
+        arabic = "Arabic",
+        upperRoman = "UpperRoman",
+        lowerRoman = "LowerRoman",
+        upperLetter = "UpperLetter",
+        lowerLetter = "LowerLetter",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace Style {
+    enum Style {
         /**
          *
          * Mixed styles or other style not in this list.
          *
          */
-        var other: string;
+        other = "Other",
         /**
          *
          * Reset character and paragraph style to default.
          *
          */
-        var normal: string;
-        var heading1: string;
-        var heading2: string;
-        var heading3: string;
-        var heading4: string;
-        var heading5: string;
-        var heading6: string;
-        var heading7: string;
-        var heading8: string;
-        var heading9: string;
+        normal = "Normal",
+        heading1 = "Heading1",
+        heading2 = "Heading2",
+        heading3 = "Heading3",
+        heading4 = "Heading4",
+        heading5 = "Heading5",
+        heading6 = "Heading6",
+        heading7 = "Heading7",
+        heading8 = "Heading8",
+        heading9 = "Heading9",
         /**
          *
          * Table-of-content level 1.
          *
          */
-        var toc1: string;
+        toc1 = "Toc1",
         /**
          *
          * Table-of-content level 2.
          *
          */
-        var toc2: string;
+        toc2 = "Toc2",
         /**
          *
          * Table-of-content level 3.
          *
          */
-        var toc3: string;
+        toc3 = "Toc3",
         /**
          *
          * Table-of-content level 4.
          *
          */
-        var toc4: string;
+        toc4 = "Toc4",
         /**
          *
          * Table-of-content level 5.
          *
          */
-        var toc5: string;
+        toc5 = "Toc5",
         /**
          *
          * Table-of-content level 6.
          *
          */
-        var toc6: string;
+        toc6 = "Toc6",
         /**
          *
          * Table-of-content level 7.
          *
          */
-        var toc7: string;
+        toc7 = "Toc7",
         /**
          *
          * Table-of-content level 8.
          *
          */
-        var toc8: string;
+        toc8 = "Toc8",
         /**
          *
          * Table-of-content level 9.
          *
          */
-        var toc9: string;
-        var footnoteText: string;
-        var header: string;
-        var footer: string;
-        var caption: string;
-        var footnoteReference: string;
-        var endnoteReference: string;
-        var endnoteText: string;
-        var title: string;
-        var subtitle: string;
-        var hyperlink: string;
-        var strong: string;
-        var emphasis: string;
-        var noSpacing: string;
-        var listParagraph: string;
-        var quote: string;
-        var intenseQuote: string;
-        var subtleEmphasis: string;
-        var intenseEmphasis: string;
-        var subtleReference: string;
-        var intenseReference: string;
-        var bookTitle: string;
-        var bibliography: string;
+        toc9 = "Toc9",
+        footnoteText = "FootnoteText",
+        header = "Header",
+        footer = "Footer",
+        caption = "Caption",
+        footnoteReference = "FootnoteReference",
+        endnoteReference = "EndnoteReference",
+        endnoteText = "EndnoteText",
+        title = "Title",
+        subtitle = "Subtitle",
+        hyperlink = "Hyperlink",
+        strong = "Strong",
+        emphasis = "Emphasis",
+        noSpacing = "NoSpacing",
+        listParagraph = "ListParagraph",
+        quote = "Quote",
+        intenseQuote = "IntenseQuote",
+        subtleEmphasis = "SubtleEmphasis",
+        intenseEmphasis = "IntenseEmphasis",
+        subtleReference = "SubtleReference",
+        intenseReference = "IntenseReference",
+        bookTitle = "BookTitle",
+        bibliography = "Bibliography",
         /**
          *
          * Table-of-content heading.
          *
          */
-        var tocHeading: string;
-        var tableGrid: string;
-        var plainTable1: string;
-        var plainTable2: string;
-        var plainTable3: string;
-        var plainTable4: string;
-        var plainTable5: string;
-        var tableGridLight: string;
-        var gridTable1Light: string;
-        var gridTable1Light_Accent1: string;
-        var gridTable1Light_Accent2: string;
-        var gridTable1Light_Accent3: string;
-        var gridTable1Light_Accent4: string;
-        var gridTable1Light_Accent5: string;
-        var gridTable1Light_Accent6: string;
-        var gridTable2: string;
-        var gridTable2_Accent1: string;
-        var gridTable2_Accent2: string;
-        var gridTable2_Accent3: string;
-        var gridTable2_Accent4: string;
-        var gridTable2_Accent5: string;
-        var gridTable2_Accent6: string;
-        var gridTable3: string;
-        var gridTable3_Accent1: string;
-        var gridTable3_Accent2: string;
-        var gridTable3_Accent3: string;
-        var gridTable3_Accent4: string;
-        var gridTable3_Accent5: string;
-        var gridTable3_Accent6: string;
-        var gridTable4: string;
-        var gridTable4_Accent1: string;
-        var gridTable4_Accent2: string;
-        var gridTable4_Accent3: string;
-        var gridTable4_Accent4: string;
-        var gridTable4_Accent5: string;
-        var gridTable4_Accent6: string;
-        var gridTable5Dark: string;
-        var gridTable5Dark_Accent1: string;
-        var gridTable5Dark_Accent2: string;
-        var gridTable5Dark_Accent3: string;
-        var gridTable5Dark_Accent4: string;
-        var gridTable5Dark_Accent5: string;
-        var gridTable5Dark_Accent6: string;
-        var gridTable6Colorful: string;
-        var gridTable6Colorful_Accent1: string;
-        var gridTable6Colorful_Accent2: string;
-        var gridTable6Colorful_Accent3: string;
-        var gridTable6Colorful_Accent4: string;
-        var gridTable6Colorful_Accent5: string;
-        var gridTable6Colorful_Accent6: string;
-        var gridTable7Colorful: string;
-        var gridTable7Colorful_Accent1: string;
-        var gridTable7Colorful_Accent2: string;
-        var gridTable7Colorful_Accent3: string;
-        var gridTable7Colorful_Accent4: string;
-        var gridTable7Colorful_Accent5: string;
-        var gridTable7Colorful_Accent6: string;
-        var listTable1Light: string;
-        var listTable1Light_Accent1: string;
-        var listTable1Light_Accent2: string;
-        var listTable1Light_Accent3: string;
-        var listTable1Light_Accent4: string;
-        var listTable1Light_Accent5: string;
-        var listTable1Light_Accent6: string;
-        var listTable2: string;
-        var listTable2_Accent1: string;
-        var listTable2_Accent2: string;
-        var listTable2_Accent3: string;
-        var listTable2_Accent4: string;
-        var listTable2_Accent5: string;
-        var listTable2_Accent6: string;
-        var listTable3: string;
-        var listTable3_Accent1: string;
-        var listTable3_Accent2: string;
-        var listTable3_Accent3: string;
-        var listTable3_Accent4: string;
-        var listTable3_Accent5: string;
-        var listTable3_Accent6: string;
-        var listTable4: string;
-        var listTable4_Accent1: string;
-        var listTable4_Accent2: string;
-        var listTable4_Accent3: string;
-        var listTable4_Accent4: string;
-        var listTable4_Accent5: string;
-        var listTable4_Accent6: string;
-        var listTable5Dark: string;
-        var listTable5Dark_Accent1: string;
-        var listTable5Dark_Accent2: string;
-        var listTable5Dark_Accent3: string;
-        var listTable5Dark_Accent4: string;
-        var listTable5Dark_Accent5: string;
-        var listTable5Dark_Accent6: string;
-        var listTable6Colorful: string;
-        var listTable6Colorful_Accent1: string;
-        var listTable6Colorful_Accent2: string;
-        var listTable6Colorful_Accent3: string;
-        var listTable6Colorful_Accent4: string;
-        var listTable6Colorful_Accent5: string;
-        var listTable6Colorful_Accent6: string;
-        var listTable7Colorful: string;
-        var listTable7Colorful_Accent1: string;
-        var listTable7Colorful_Accent2: string;
-        var listTable7Colorful_Accent3: string;
-        var listTable7Colorful_Accent4: string;
-        var listTable7Colorful_Accent5: string;
-        var listTable7Colorful_Accent6: string;
+        tocHeading = "TocHeading",
+        tableGrid = "TableGrid",
+        plainTable1 = "PlainTable1",
+        plainTable2 = "PlainTable2",
+        plainTable3 = "PlainTable3",
+        plainTable4 = "PlainTable4",
+        plainTable5 = "PlainTable5",
+        tableGridLight = "TableGridLight",
+        gridTable1Light = "GridTable1Light",
+        gridTable1Light_Accent1 = "GridTable1Light_Accent1",
+        gridTable1Light_Accent2 = "GridTable1Light_Accent2",
+        gridTable1Light_Accent3 = "GridTable1Light_Accent3",
+        gridTable1Light_Accent4 = "GridTable1Light_Accent4",
+        gridTable1Light_Accent5 = "GridTable1Light_Accent5",
+        gridTable1Light_Accent6 = "GridTable1Light_Accent6",
+        gridTable2 = "GridTable2",
+        gridTable2_Accent1 = "GridTable2_Accent1",
+        gridTable2_Accent2 = "GridTable2_Accent2",
+        gridTable2_Accent3 = "GridTable2_Accent3",
+        gridTable2_Accent4 = "GridTable2_Accent4",
+        gridTable2_Accent5 = "GridTable2_Accent5",
+        gridTable2_Accent6 = "GridTable2_Accent6",
+        gridTable3 = "GridTable3",
+        gridTable3_Accent1 = "GridTable3_Accent1",
+        gridTable3_Accent2 = "GridTable3_Accent2",
+        gridTable3_Accent3 = "GridTable3_Accent3",
+        gridTable3_Accent4 = "GridTable3_Accent4",
+        gridTable3_Accent5 = "GridTable3_Accent5",
+        gridTable3_Accent6 = "GridTable3_Accent6",
+        gridTable4 = "GridTable4",
+        gridTable4_Accent1 = "GridTable4_Accent1",
+        gridTable4_Accent2 = "GridTable4_Accent2",
+        gridTable4_Accent3 = "GridTable4_Accent3",
+        gridTable4_Accent4 = "GridTable4_Accent4",
+        gridTable4_Accent5 = "GridTable4_Accent5",
+        gridTable4_Accent6 = "GridTable4_Accent6",
+        gridTable5Dark = "GridTable5Dark",
+        gridTable5Dark_Accent1 = "GridTable5Dark_Accent1",
+        gridTable5Dark_Accent2 = "GridTable5Dark_Accent2",
+        gridTable5Dark_Accent3 = "GridTable5Dark_Accent3",
+        gridTable5Dark_Accent4 = "GridTable5Dark_Accent4",
+        gridTable5Dark_Accent5 = "GridTable5Dark_Accent5",
+        gridTable5Dark_Accent6 = "GridTable5Dark_Accent6",
+        gridTable6Colorful = "GridTable6Colorful",
+        gridTable6Colorful_Accent1 = "GridTable6Colorful_Accent1",
+        gridTable6Colorful_Accent2 = "GridTable6Colorful_Accent2",
+        gridTable6Colorful_Accent3 = "GridTable6Colorful_Accent3",
+        gridTable6Colorful_Accent4 = "GridTable6Colorful_Accent4",
+        gridTable6Colorful_Accent5 = "GridTable6Colorful_Accent5",
+        gridTable6Colorful_Accent6 = "GridTable6Colorful_Accent6",
+        gridTable7Colorful = "GridTable7Colorful",
+        gridTable7Colorful_Accent1 = "GridTable7Colorful_Accent1",
+        gridTable7Colorful_Accent2 = "GridTable7Colorful_Accent2",
+        gridTable7Colorful_Accent3 = "GridTable7Colorful_Accent3",
+        gridTable7Colorful_Accent4 = "GridTable7Colorful_Accent4",
+        gridTable7Colorful_Accent5 = "GridTable7Colorful_Accent5",
+        gridTable7Colorful_Accent6 = "GridTable7Colorful_Accent6",
+        listTable1Light = "ListTable1Light",
+        listTable1Light_Accent1 = "ListTable1Light_Accent1",
+        listTable1Light_Accent2 = "ListTable1Light_Accent2",
+        listTable1Light_Accent3 = "ListTable1Light_Accent3",
+        listTable1Light_Accent4 = "ListTable1Light_Accent4",
+        listTable1Light_Accent5 = "ListTable1Light_Accent5",
+        listTable1Light_Accent6 = "ListTable1Light_Accent6",
+        listTable2 = "ListTable2",
+        listTable2_Accent1 = "ListTable2_Accent1",
+        listTable2_Accent2 = "ListTable2_Accent2",
+        listTable2_Accent3 = "ListTable2_Accent3",
+        listTable2_Accent4 = "ListTable2_Accent4",
+        listTable2_Accent5 = "ListTable2_Accent5",
+        listTable2_Accent6 = "ListTable2_Accent6",
+        listTable3 = "ListTable3",
+        listTable3_Accent1 = "ListTable3_Accent1",
+        listTable3_Accent2 = "ListTable3_Accent2",
+        listTable3_Accent3 = "ListTable3_Accent3",
+        listTable3_Accent4 = "ListTable3_Accent4",
+        listTable3_Accent5 = "ListTable3_Accent5",
+        listTable3_Accent6 = "ListTable3_Accent6",
+        listTable4 = "ListTable4",
+        listTable4_Accent1 = "ListTable4_Accent1",
+        listTable4_Accent2 = "ListTable4_Accent2",
+        listTable4_Accent3 = "ListTable4_Accent3",
+        listTable4_Accent4 = "ListTable4_Accent4",
+        listTable4_Accent5 = "ListTable4_Accent5",
+        listTable4_Accent6 = "ListTable4_Accent6",
+        listTable5Dark = "ListTable5Dark",
+        listTable5Dark_Accent1 = "ListTable5Dark_Accent1",
+        listTable5Dark_Accent2 = "ListTable5Dark_Accent2",
+        listTable5Dark_Accent3 = "ListTable5Dark_Accent3",
+        listTable5Dark_Accent4 = "ListTable5Dark_Accent4",
+        listTable5Dark_Accent5 = "ListTable5Dark_Accent5",
+        listTable5Dark_Accent6 = "ListTable5Dark_Accent6",
+        listTable6Colorful = "ListTable6Colorful",
+        listTable6Colorful_Accent1 = "ListTable6Colorful_Accent1",
+        listTable6Colorful_Accent2 = "ListTable6Colorful_Accent2",
+        listTable6Colorful_Accent3 = "ListTable6Colorful_Accent3",
+        listTable6Colorful_Accent4 = "ListTable6Colorful_Accent4",
+        listTable6Colorful_Accent5 = "ListTable6Colorful_Accent5",
+        listTable6Colorful_Accent6 = "ListTable6Colorful_Accent6",
+        listTable7Colorful = "ListTable7Colorful",
+        listTable7Colorful_Accent1 = "ListTable7Colorful_Accent1",
+        listTable7Colorful_Accent2 = "ListTable7Colorful_Accent2",
+        listTable7Colorful_Accent3 = "ListTable7Colorful_Accent3",
+        listTable7Colorful_Accent4 = "ListTable7Colorful_Accent4",
+        listTable7Colorful_Accent5 = "ListTable7Colorful_Accent5",
+        listTable7Colorful_Accent6 = "ListTable7Colorful_Accent6",
     }
     /**
      * [Api set: WordApi]
      */
-    namespace DocumentPropertyType {
-        var string: string;
-        var number: string;
-        var date: string;
-        var boolean: string;
+    enum DocumentPropertyType {
+        string = "String",
+        number = "Number",
+        date = "Date",
+        boolean = "Boolean",
     }
-    namespace ErrorCodes {
-        var accessDenied: string;
-        var generalException: string;
-        var invalidArgument: string;
-        var itemNotFound: string;
-        var notImplemented: string;
+    /**
+     * [Api set: WordApi]
+     */
+    enum TapObjectType {
+        chart = "Chart",
+        smartArt = "SmartArt",
+        table = "Table",
+        image = "Image",
+        slide = "Slide",
+        ole = "OLE",
+        text = "Text",
     }
-    module Interfaces {
+    /**
+     * [Api set: WordApi]
+     */
+    enum FileContentFormat {
+        base64 = "Base64",
+        html = "Html",
+        ooxml = "Ooxml",
+    }
+    enum ErrorCodes {
+        accessDenied = "AccessDenied",
+        generalException = "GeneralException",
+        invalidArgument = "InvalidArgument",
+        itemNotFound = "ItemNotFound",
+        notImplemented = "NotImplemented",
+    }
+    namespace Interfaces {
+        interface CollectionLoadOptions {
+            $top?: number;
+            $skip?: number;
+        }
         /** An interface for updating data on the Body object, for use in "body.set({ ... })". */
         interface BodyUpdateData {
             /**
@@ -19399,7 +31440,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            styleBuiltIn?: string;
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
         }
         /** An interface for updating data on the ContentControl object, for use in "contentControl.set({ ... })". */
         interface ContentControlUpdateData {
@@ -19416,7 +31457,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.1]
              */
-            appearance?: string;
+            appearance?: Word.ContentControlAppearance | "BoundingBox" | "Tags" | "Hidden";
             /**
              *
              * Gets or sets a value that indicates whether the user can delete the content control. Mutually exclusive with removeWhenEdited.
@@ -19465,7 +31506,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            styleBuiltIn?: string;
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
             /**
              *
              * Gets or sets a tag to identify a content control.
@@ -19481,16 +31522,24 @@ declare namespace Word {
              */
             title?: string;
         }
+        /** An interface for updating data on the ContentControlCollection object, for use in "contentControlCollection.set({ ... })". */
+        interface ContentControlCollectionUpdateData {
+            items?: Word.Interfaces.ContentControlData[];
+        }
         /** An interface for updating data on the CustomProperty object, for use in "customProperty.set({ ... })". */
         interface CustomPropertyUpdateData {
             /**
              *
-             * Gets or sets the value of the custom property.
+             * Gets or sets the value of the custom property. Note that even though Word Online and the docx file format allow these properties to be arbitrarily long, the desktop version of Word will truncate string values to 255 16-bit chars (possibly creating invalid unicode by breaking up a surrogate pair).
              *
              * [Api set: WordApi 1.3]
              */
             value?: any;
         }
+        /** An interface for updating data on the CustomPropertyCollection object, for use in "customPropertyCollection.set({ ... })". */
+        interface CustomPropertyCollectionUpdateData {
+            items?: Word.Interfaces.CustomPropertyData[];
+        }
         /** An interface for updating data on the Document object, for use in "document.set({ ... })". */
         interface DocumentUpdateData {
             /**
@@ -19502,11 +31551,35 @@ declare namespace Word {
             body?: Word.Interfaces.BodyUpdateData;
             /**
             *
-            * Gets the properties of the current document.
+            * Gets the properties of the document.
             *
             * [Api set: WordApi 1.3]
             */
             properties?: Word.Interfaces.DocumentPropertiesUpdateData;
+            /**
+             *
+             * Gets or sets a value that indicates that, when opening a new document, whether it is allowed to close this document even if this document is untitled. True to close, false otherwise.
+             *
+             * [Api set: WordApi]
+             */
+            allowCloseOnUntitled?: boolean;
+        }
+        /** An interface for updating data on the DocumentCreated object, for use in "documentCreated.set({ ... })". */
+        interface DocumentCreatedUpdateData {
+            /**
+            *
+            * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc..
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            body?: Word.Interfaces.BodyUpdateData;
+            /**
+            *
+            * Gets the properties of the document.
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            properties?: Word.Interfaces.DocumentPropertiesUpdateData;
         }
         /** An interface for updating data on the DocumentProperties object, for use in "documentProperties.set({ ... })". */
         interface DocumentPropertiesUpdateData {
@@ -19652,7 +31725,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.1]
              */
-            underline?: string;
+            underline?: Word.UnderlineType | "Mixed" | "None" | "Hidden" | "DotLine" | "Single" | "Word" | "Double" | "Thick" | "Dotted" | "DottedHeavy" | "DashLine" | "DashLineHeavy" | "DashLineLong" | "DashLineLongHeavy" | "DotDashLine" | "DotDashLineHeavy" | "TwoDotDashLine" | "TwoDotDashLineHeavy" | "Wave" | "WaveHeavy" | "WaveDouble";
         }
         /** An interface for updating data on the InlinePicture object, for use in "inlinePicture.set({ ... })". */
         interface InlinePictureUpdateData {
@@ -19699,6 +31772,14 @@ declare namespace Word {
              */
             width?: number;
         }
+        /** An interface for updating data on the InlinePictureCollection object, for use in "inlinePictureCollection.set({ ... })". */
+        interface InlinePictureCollectionUpdateData {
+            items?: Word.Interfaces.InlinePictureData[];
+        }
+        /** An interface for updating data on the ListCollection object, for use in "listCollection.set({ ... })". */
+        interface ListCollectionUpdateData {
+            items?: Word.Interfaces.ListData[];
+        }
         /** An interface for updating data on the ListItem object, for use in "listItem.set({ ... })". */
         interface ListItemUpdateData {
             /**
@@ -19738,7 +31819,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.1]
              */
-            alignment?: string;
+            alignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
             /**
              *
              * Gets or sets the value, in points, for a first line or hanging indent. Use a positive value to set a first-line indent, and use a negative value to set a hanging indent.
@@ -19815,7 +31896,11 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            styleBuiltIn?: string;
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
+        }
+        /** An interface for updating data on the ParagraphCollection object, for use in "paragraphCollection.set({ ... })". */
+        interface ParagraphCollectionUpdateData {
+            items?: Word.Interfaces.ParagraphData[];
         }
         /** An interface for updating data on the Range object, for use in "range.set({ ... })". */
         interface RangeUpdateData {
@@ -19846,7 +31931,11 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            styleBuiltIn?: string;
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
+        }
+        /** An interface for updating data on the RangeCollection object, for use in "rangeCollection.set({ ... })". */
+        interface RangeCollectionUpdateData {
+            items?: Word.Interfaces.RangeData[];
         }
         /** An interface for updating data on the SearchOptions object, for use in "searchOptions.set({ ... })". */
         interface SearchOptionsUpdateData {
@@ -19910,6 +31999,10 @@ declare namespace Word {
             */
             body?: Word.Interfaces.BodyUpdateData;
         }
+        /** An interface for updating data on the SectionCollection object, for use in "sectionCollection.set({ ... })". */
+        interface SectionCollectionUpdateData {
+            items?: Word.Interfaces.SectionData[];
+        }
         /** An interface for updating data on the Table object, for use in "table.set({ ... })". */
         interface TableUpdateData {
             /**
@@ -19925,7 +32018,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            alignment?: string;
+            alignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
             /**
              *
              * Gets and sets the number of header rows.
@@ -19939,7 +32032,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            horizontalAlignment?: string;
+            horizontalAlignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
             /**
              *
              * Gets and sets the shading color.
@@ -19974,7 +32067,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            styleBuiltIn?: string;
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
             /**
              *
              * Gets and sets whether the table has a first column with a special style.
@@ -20002,14 +32095,14 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            values?: Array<Array<string>>;
+            values?: string[][];
             /**
              *
              * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
              *
              * [Api set: WordApi 1.3]
              */
-            verticalAlignment?: string;
+            verticalAlignment?: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
             /**
              *
              * Gets and sets the width of the table in points.
@@ -20018,6 +32111,10 @@ declare namespace Word {
              */
             width?: number;
         }
+        /** An interface for updating data on the TableCollection object, for use in "tableCollection.set({ ... })". */
+        interface TableCollectionUpdateData {
+            items?: Word.Interfaces.TableData[];
+        }
         /** An interface for updating data on the TableRow object, for use in "tableRow.set({ ... })". */
         interface TableRowUpdateData {
             /**
@@ -20033,7 +32130,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            horizontalAlignment?: string;
+            horizontalAlignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
             /**
              *
              * Gets and sets the preferred height of the row in points.
@@ -20054,14 +32151,18 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            values?: Array<Array<string>>;
+            values?: string[][];
             /**
              *
              * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
              *
              * [Api set: WordApi 1.3]
              */
-            verticalAlignment?: string;
+            verticalAlignment?: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
+        }
+        /** An interface for updating data on the TableRowCollection object, for use in "tableRowCollection.set({ ... })". */
+        interface TableRowCollectionUpdateData {
+            items?: Word.Interfaces.TableRowData[];
         }
         /** An interface for updating data on the TableCell object, for use in "tableCell.set({ ... })". */
         interface TableCellUpdateData {
@@ -20085,7 +32186,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            horizontalAlignment?: string;
+            horizontalAlignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
             /**
              *
              * Gets or sets the shading color of the cell. Color is specified in "#RRGGBB" format or by using the color name.
@@ -20106,7 +32207,11 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            verticalAlignment?: string;
+            verticalAlignment?: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
+        }
+        /** An interface for updating data on the TableCellCollection object, for use in "tableCellCollection.set({ ... })". */
+        interface TableCellCollectionUpdateData {
+            items?: Word.Interfaces.TableCellData[];
         }
         /** An interface for updating data on the TableBorder object, for use in "tableBorder.set({ ... })". */
         interface TableBorderUpdateData {
@@ -20123,7 +32228,7 @@ declare namespace Word {
              *
              * [Api set: WordApi 1.3]
              */
-            type?: string;
+            type?: Word.BorderType | "Mixed" | "None" | "Single" | "Double" | "Dotted" | "Dashed" | "DotDashed" | "Dot2Dashed" | "Triple" | "ThinThickSmall" | "ThickThinSmall" | "ThinThickThinSmall" | "ThinThickMed" | "ThickThinMed" | "ThinThickThinMed" | "ThinThickLarge" | "ThickThinLarge" | "ThinThickThinLarge" | "Wave" | "DoubleWave" | "DashedSmall" | "DashDotStroked" | "ThreeDEmboss" | "ThreeDEngrave";
             /**
              *
              * Gets or sets the width, in points, of the table border. Not applicable to table border types that have fixed widths.
@@ -20132,33 +32237,4097 @@ declare namespace Word {
              */
             width?: number;
         }
+        /** An interface describing the data returned by calling "body.toJSON()". */
+        interface BodyData {
+            /**
+            *
+            * Gets the collection of rich text content control objects in the body. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            contentControls?: Word.Interfaces.ContentControlData[];
+            /**
+            *
+            * Gets the text format of the body. Use this to get and set font name, size, color and other properties. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontData;
+            /**
+            *
+            * Gets the collection of inlinePicture objects in the body. The collection does not include floating images. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            inlinePictures?: Word.Interfaces.InlinePictureData[];
+            /**
+            *
+            * Gets the collection of list objects in the body. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            lists?: Word.Interfaces.ListData[];
+            /**
+            *
+            * Gets the collection of paragraph objects in the body. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            paragraphs?: Word.Interfaces.ParagraphData[];
+            /**
+            *
+            * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Throws if there isn't a parent body. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Returns a null object if there isn't a parent body. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBodyOrNullObject?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the content control that contains the body. Throws if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the content control that contains the body. Returns a null object if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the parent section of the body. Throws if there isn't a parent section. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentSection?: Word.Interfaces.SectionData;
+            /**
+            *
+            * Gets the parent section of the body. Returns a null object if there isn't a parent section. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentSectionOrNullObject?: Word.Interfaces.SectionData;
+            /**
+            *
+            * Gets the collection of table objects in the body. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            tables?: Word.Interfaces.TableData[];
+            /**
+             *
+             * Gets or sets the style name for the body. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: string;
+            /**
+             *
+             * Gets or sets the built-in style name for the body. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
+            /**
+             *
+             * Gets the text of the body. Use the insertText method to insert text. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: string;
+            /**
+             *
+             * Gets the type of the body. The type can be 'MainDoc', 'Section', 'Header', 'Footer', or 'TableCell'. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            type?: Word.BodyType | "Unknown" | "MainDoc" | "Section" | "Header" | "Footer" | "TableCell";
+        }
+        /** An interface describing the data returned by calling "contentControl.toJSON()". */
+        interface ContentControlData {
+            /**
+            *
+            * Gets the collection of content control objects in the content control. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            contentControls?: Word.Interfaces.ContentControlData[];
+            /**
+            *
+            * Gets the text format of the content control. Use this to get and set font name, size, color, and other properties. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontData;
+            /**
+            *
+            * Gets the collection of inlinePicture objects in the content control. The collection does not include floating images. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            inlinePictures?: Word.Interfaces.InlinePictureData[];
+            /**
+            *
+            * Gets the collection of list objects in the content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            lists?: Word.Interfaces.ListData[];
+            /**
+            *
+            * Get the collection of paragraph objects in the content control. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            paragraphs?: Word.Interfaces.ParagraphData[];
+            /**
+            *
+            * Gets the parent body of the content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the content control that contains the content control. Throws if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the content control that contains the content control. Returns a null object if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the table that contains the content control. Throws if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets the table cell that contains the content control. Throws if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table cell that contains the content control. Returns a null object if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table that contains the content control. Returns a null object if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets the collection of table objects in the content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            tables?: Word.Interfaces.TableData[];
+            /**
+             *
+             * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            appearance?: Word.ContentControlAppearance | "BoundingBox" | "Tags" | "Hidden";
+            /**
+             *
+             * Gets or sets a value that indicates whether the user can delete the content control. Mutually exclusive with removeWhenEdited.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            cannotDelete?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the user can edit the contents of the content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            cannotEdit?: boolean;
+            /**
+             *
+             * Gets or sets the color of the content control. Color is specified in '#RRGGBB' format or by using the color name.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            color?: string;
+            /**
+             *
+             * Gets an integer that represents the content control identifier. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            id?: number;
+            /**
+             *
+             * Gets or sets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            placeholderText?: string;
+            /**
+             *
+             * Gets or sets a value that indicates whether the content control is removed after it is edited. Mutually exclusive with cannotDelete.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            removeWhenEdited?: boolean;
+            /**
+             *
+             * Gets or sets the style name for the content control. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: string;
+            /**
+             *
+             * Gets or sets the built-in style name for the content control. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
+            /**
+             *
+             * Gets the content control subtype. The subtype can be 'RichTextInline', 'RichTextParagraphs', 'RichTextTableCell', 'RichTextTableRow' and 'RichTextTable' for rich text content controls. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            subtype?: Word.ContentControlType | "Unknown" | "RichTextInline" | "RichTextParagraphs" | "RichTextTableCell" | "RichTextTableRow" | "RichTextTable" | "PlainTextInline" | "PlainTextParagraph" | "Picture" | "BuildingBlockGallery" | "CheckBox" | "ComboBox" | "DropDownList" | "DatePicker" | "RepeatingSection" | "RichText" | "PlainText";
+            /**
+             *
+             * Gets or sets a tag to identify a content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            tag?: string;
+            /**
+             *
+             * Gets the text of the content control. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: string;
+            /**
+             *
+             * Gets or sets the title for a content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            title?: string;
+            /**
+             *
+             * Gets the content control type. Only rich text content controls are supported currently. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            type?: Word.ContentControlType | "Unknown" | "RichTextInline" | "RichTextParagraphs" | "RichTextTableCell" | "RichTextTableRow" | "RichTextTable" | "PlainTextInline" | "PlainTextParagraph" | "Picture" | "BuildingBlockGallery" | "CheckBox" | "ComboBox" | "DropDownList" | "DatePicker" | "RepeatingSection" | "RichText" | "PlainText";
+        }
+        /** An interface describing the data returned by calling "contentControlCollection.toJSON()". */
+        interface ContentControlCollectionData {
+            items?: Word.Interfaces.ContentControlData[];
+        }
+        /** An interface describing the data returned by calling "customProperty.toJSON()". */
+        interface CustomPropertyData {
+            /**
+             *
+             * Gets the key of the custom property. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            key?: string;
+            /**
+             *
+             * Gets the value type of the custom property. Possible values are: String, Number, Date, Boolean. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            type?: Word.DocumentPropertyType | "String" | "Number" | "Date" | "Boolean";
+            /**
+             *
+             * Gets or sets the value of the custom property. Note that even though Word Online and the docx file format allow these properties to be arbitrarily long, the desktop version of Word will truncate string values to 255 16-bit chars (possibly creating invalid unicode by breaking up a surrogate pair).
+             *
+             * [Api set: WordApi 1.3]
+             */
+            value?: any;
+        }
+        /** An interface describing the data returned by calling "customPropertyCollection.toJSON()". */
+        interface CustomPropertyCollectionData {
+            items?: Word.Interfaces.CustomPropertyData[];
+        }
+        /** An interface describing the data returned by calling "document.toJSON()". */
+        interface DocumentData {
+            /**
+            *
+            * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc.. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            body?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the collection of content control objects in the document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            contentControls?: Word.Interfaces.ContentControlData[];
+            /**
+            *
+            * Gets the properties of the document. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            properties?: Word.Interfaces.DocumentPropertiesData;
+            /**
+            *
+            * Gets the collection of section objects in the document. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            sections?: Word.Interfaces.SectionData[];
+            /**
+             *
+             * Gets or sets a value that indicates that, when opening a new document, whether it is allowed to close this document even if this document is untitled. True to close, false otherwise.
+             *
+             * [Api set: WordApi]
+             */
+            allowCloseOnUntitled?: boolean;
+            /**
+             *
+             * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            saved?: boolean;
+        }
+        /** An interface describing the data returned by calling "documentCreated.toJSON()". */
+        interface DocumentCreatedData {
+            /**
+            *
+            * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc.. Read-only.
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            body?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the collection of content control objects in the document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            contentControls?: Word.Interfaces.ContentControlData[];
+            /**
+            *
+            * Gets the properties of the document. Read-only.
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            properties?: Word.Interfaces.DocumentPropertiesData;
+            /**
+            *
+            * Gets the collection of section objects in the document. Read-only.
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            sections?: Word.Interfaces.SectionData[];
+            /**
+             *
+             * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
+             *
+             * [Api set: WordApiHiddenDocument 1.3]
+             */
+            saved?: boolean;
+        }
+        /** An interface describing the data returned by calling "documentProperties.toJSON()". */
+        interface DocumentPropertiesData {
+            /**
+            *
+            * Gets the collection of custom properties of the document. Read only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            customProperties?: Word.Interfaces.CustomPropertyData[];
+            /**
+             *
+             * Gets the application name of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            applicationName?: string;
+            /**
+             *
+             * Gets or sets the author of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            author?: string;
+            /**
+             *
+             * Gets or sets the category of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            category?: string;
+            /**
+             *
+             * Gets or sets the comments of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            comments?: string;
+            /**
+             *
+             * Gets or sets the company of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            company?: string;
+            /**
+             *
+             * Gets the creation date of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            creationDate?: Date;
+            /**
+             *
+             * Gets or sets the format of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            format?: string;
+            /**
+             *
+             * Gets or sets the keywords of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            keywords?: string;
+            /**
+             *
+             * Gets the last author of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            lastAuthor?: string;
+            /**
+             *
+             * Gets the last print date of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            lastPrintDate?: Date;
+            /**
+             *
+             * Gets the last save time of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            lastSaveTime?: Date;
+            /**
+             *
+             * Gets or sets the manager of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            manager?: string;
+            /**
+             *
+             * Gets the revision number of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            revisionNumber?: string;
+            /**
+             *
+             * Gets the security of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            security?: number;
+            /**
+             *
+             * Gets or sets the subject of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            subject?: string;
+            /**
+             *
+             * Gets the template of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            template?: string;
+            /**
+             *
+             * Gets or sets the title of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            title?: string;
+        }
+        /** An interface describing the data returned by calling "font.toJSON()". */
+        interface FontData {
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is bold. True if the font is formatted as bold, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            bold?: boolean;
+            /**
+             *
+             * Gets or sets the color for the specified font. You can provide the value in the '#RRGGBB' format or the color name.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            color?: string;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            doubleStrikeThrough?: boolean;
+            /**
+             *
+             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, or an empty string for mixed highlight colors, or null for no highlight color.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            highlightColor?: string;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is italicized. True if the font is italicized, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Gets or sets a value that represents the name of the font.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * Gets or sets a value that represents the font size in points.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            size?: number;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            strikeThrough?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is a subscript. True if the font is formatted as subscript, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            subscript?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is a superscript. True if the font is formatted as superscript, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            superscript?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates the font's underline type. 'None' if the font is not underlined.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            underline?: Word.UnderlineType | "Mixed" | "None" | "Hidden" | "DotLine" | "Single" | "Word" | "Double" | "Thick" | "Dotted" | "DottedHeavy" | "DashLine" | "DashLineHeavy" | "DashLineLong" | "DashLineLongHeavy" | "DotDashLine" | "DotDashLineHeavy" | "TwoDotDashLine" | "TwoDotDashLineHeavy" | "Wave" | "WaveHeavy" | "WaveDouble";
+        }
+        /** An interface describing the data returned by calling "inlinePicture.toJSON()". */
+        interface InlinePictureData {
+            /**
+            *
+            * Gets the parent paragraph that contains the inline image. Read-only.
+            *
+            * [Api set: WordApi 1.2]
+            */
+            paragraph?: Word.Interfaces.ParagraphData;
+            /**
+            *
+            * Gets the content control that contains the inline image. Throws if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the content control that contains the inline image. Returns a null object if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the table that contains the inline image. Throws if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets the table cell that contains the inline image. Throws if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table cell that contains the inline image. Returns a null object if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table that contains the inline image. Returns a null object if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableData;
+            /**
+             *
+             * Gets or sets a string that represents the alternative text associated with the inline image
+             *
+             * [Api set: WordApi 1.1]
+             */
+            altTextDescription?: string;
+            /**
+             *
+             * Gets or sets a string that contains the title for the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            altTextTitle?: string;
+            /**
+             *
+             * Gets or sets a number that describes the height of the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            height?: number;
+            /**
+             *
+             * Gets or sets a hyperlink on the image. Use a '#' to separate the address part from the optional location part.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            hyperlink?: string;
+            /**
+             *
+             * Gets or sets a value that indicates whether the inline image retains its original proportions when you resize it.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lockAspectRatio?: boolean;
+            /**
+             *
+             * Gets or sets a number that describes the width of the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "inlinePictureCollection.toJSON()". */
+        interface InlinePictureCollectionData {
+            items?: Word.Interfaces.InlinePictureData[];
+        }
+        /** An interface describing the data returned by calling "list.toJSON()". */
+        interface ListData {
+            /**
+            *
+            * Gets paragraphs in the list. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            paragraphs?: Word.Interfaces.ParagraphData[];
+            /**
+             *
+             * Gets the list's id.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            id?: number;
+            /**
+             *
+             * Checks whether each of the 9 levels exists in the list. A true value indicates the level exists, which means there is at least one list item at that level. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            levelExistences?: boolean[];
+            /**
+             *
+             * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            levelTypes?: Word.ListLevelType[];
+        }
+        /** An interface describing the data returned by calling "listCollection.toJSON()". */
+        interface ListCollectionData {
+            items?: Word.Interfaces.ListData[];
+        }
+        /** An interface describing the data returned by calling "listItem.toJSON()". */
+        interface ListItemData {
+            /**
+             *
+             * Gets or sets the level of the item in the list.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            level?: number;
+            /**
+             *
+             * Gets the list item bullet, number or picture as a string. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            listString?: string;
+            /**
+             *
+             * Gets the list item order number in relation to its siblings. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            siblingIndex?: number;
+        }
+        /** An interface describing the data returned by calling "paragraph.toJSON()". */
+        interface ParagraphData {
+            /**
+            *
+            * Gets the collection of content control objects in the paragraph. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            contentControls?: Word.Interfaces.ContentControlData[];
+            /**
+            *
+            * Gets the text format of the paragraph. Use this to get and set font name, size, color, and other properties. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontData;
+            /**
+            *
+            * Gets the collection of inlinePicture objects in the paragraph. The collection does not include floating images. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            inlinePictures?: Word.Interfaces.InlinePictureData[];
+            /**
+            *
+            * Gets the List to which this paragraph belongs. Throws if the paragraph is not in a list. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            list?: Word.Interfaces.ListData;
+            /**
+            *
+            * Gets the ListItem for the paragraph. Throws if the paragraph is not part of a list. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listItem?: Word.Interfaces.ListItemData;
+            /**
+            *
+            * Gets the ListItem for the paragraph. Returns a null object if the paragraph is not part of a list. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listItemOrNullObject?: Word.Interfaces.ListItemData;
+            /**
+            *
+            * Gets the List to which this paragraph belongs. Returns a null object if the paragraph is not in a list. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listOrNullObject?: Word.Interfaces.ListData;
+            /**
+            *
+            * Gets the parent body of the paragraph. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the content control that contains the paragraph. Throws if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the content control that contains the paragraph. Returns a null object if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the table that contains the paragraph. Throws if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets the table cell that contains the paragraph. Throws if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table cell that contains the paragraph. Returns a null object if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table that contains the paragraph. Returns a null object if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableData;
+            /**
+             *
+             * Gets or sets the alignment for a paragraph. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            alignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
+            /**
+             *
+             * Gets or sets the value, in points, for a first line or hanging indent. Use a positive value to set a first-line indent, and use a negative value to set a hanging indent.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            firstLineIndent?: number;
+            /**
+             *
+             * Indicates the paragraph is the last one inside its parent body. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isLastParagraph?: boolean;
+            /**
+             *
+             * Checks whether the paragraph is a list item. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isListItem?: boolean;
+            /**
+             *
+             * Gets or sets the left indent value, in points, for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            leftIndent?: number;
+            /**
+             *
+             * Gets or sets the line spacing, in points, for the specified paragraph. In the Word UI, this value is divided by 12.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineSpacing?: number;
+            /**
+             *
+             * Gets or sets the amount of spacing, in grid lines. after the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineUnitAfter?: number;
+            /**
+             *
+             * Gets or sets the amount of spacing, in grid lines, before the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineUnitBefore?: number;
+            /**
+             *
+             * Gets or sets the outline level for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            outlineLevel?: number;
+            /**
+             *
+             * Gets or sets the right indent value, in points, for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            rightIndent?: number;
+            /**
+             *
+             * Gets or sets the spacing, in points, after the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            spaceAfter?: number;
+            /**
+             *
+             * Gets or sets the spacing, in points, before the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            spaceBefore?: number;
+            /**
+             *
+             * Gets or sets the style name for the paragraph. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: string;
+            /**
+             *
+             * Gets or sets the built-in style name for the paragraph. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
+            /**
+             *
+             * Gets the level of the paragraph's table. It returns 0 if the paragraph is not in a table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            tableNestingLevel?: number;
+            /**
+             *
+             * Gets the text of the paragraph. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: string;
+        }
+        /** An interface describing the data returned by calling "paragraphCollection.toJSON()". */
+        interface ParagraphCollectionData {
+            items?: Word.Interfaces.ParagraphData[];
+        }
+        /** An interface describing the data returned by calling "range.toJSON()". */
+        interface RangeData {
+            /**
+            *
+            * Gets the collection of content control objects in the range. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            contentControls?: Word.Interfaces.ContentControlData[];
+            /**
+            *
+            * Gets the text format of the range. Use this to get and set font name, size, color, and other properties. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontData;
+            /**
+            *
+            * Gets the collection of inline picture objects in the range. Read-only.
+            *
+            * [Api set: WordApi 1.2]
+            */
+            inlinePictures?: Word.Interfaces.InlinePictureData[];
+            /**
+            *
+            * Gets the collection of list objects in the range. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            lists?: Word.Interfaces.ListData[];
+            /**
+            *
+            * Gets the collection of paragraph objects in the range. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            paragraphs?: Word.Interfaces.ParagraphData[];
+            /**
+            *
+            * Gets the parent body of the range. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the content control that contains the range. Throws if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the content control that contains the range. Returns a null object if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the table that contains the range. Throws if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets the table cell that contains the range. Throws if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table cell that contains the range. Returns a null object if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table that contains the range. Returns a null object if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets the collection of table objects in the range. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            tables?: Word.Interfaces.TableData[];
+            /**
+             *
+             * Gets the first hyperlink in the range, or sets a hyperlink on the range. All hyperlinks in the range are deleted when you set a new hyperlink on the range. Use a '#' to separate the address part from the optional location part.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            hyperlink?: string;
+            /**
+             *
+             * Checks whether the range length is zero. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isEmpty?: boolean;
+            /**
+             *
+             * Gets or sets the style name for the range. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: string;
+            /**
+             *
+             * Gets or sets the built-in style name for the range. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
+            /**
+             *
+             * Gets the text of the range. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: string;
+        }
+        /** An interface describing the data returned by calling "rangeCollection.toJSON()". */
+        interface RangeCollectionData {
+            items?: Word.Interfaces.RangeData[];
+        }
+        /** An interface describing the data returned by calling "searchOptions.toJSON()". */
+        interface SearchOptionsData {
+            /**
+             *
+             * Gets or sets a value that indicates whether to ignore all punctuation characters between words. Corresponds to the Ignore punctuation check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            ignorePunct?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to ignore all whitespace between words. Corresponds to the Ignore whitespace characters check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            ignoreSpace?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchCase?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to match words that begin with the search string. Corresponds to the Match prefix check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchPrefix?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to match words that end with the search string. Corresponds to the Match suffix check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchSuffix?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to find operation only entire words, not text that is part of a larger word. Corresponds to the Find whole words only check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchWholeWord?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the search will be performed using special search operators. Corresponds to the Use wildcards check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchWildcards?: boolean;
+        }
+        /** An interface describing the data returned by calling "section.toJSON()". */
+        interface SectionData {
+            /**
+            *
+            * Gets the body object of the section. This does not include the header/footer and other section metadata. Read-only.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            body?: Word.Interfaces.BodyData;
+        }
+        /** An interface describing the data returned by calling "sectionCollection.toJSON()". */
+        interface SectionCollectionData {
+            items?: Word.Interfaces.SectionData[];
+        }
+        /** An interface describing the data returned by calling "table.toJSON()". */
+        interface TableData {
+            /**
+            *
+            * Gets the font. Use this to get and set font name, size, color, and other properties. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            font?: Word.Interfaces.FontData;
+            /**
+            *
+            * Gets the parent body of the table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the content control that contains the table. Throws if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the content control that contains the table. Returns a null object if there isn't a parent content control. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
+            /**
+            *
+            * Gets the table that contains this table. Throws if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets the table cell that contains this table. Throws if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table cell that contains this table. Returns a null object if it is not contained in a table cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the table that contains this table. Returns a null object if it is not contained in a table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableData;
+            /**
+            *
+            * Gets all of the table rows. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            rows?: Word.Interfaces.TableRowData[];
+            /**
+            *
+            * Gets the child tables nested one level deeper. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            tables?: Word.Interfaces.TableData[];
+            /**
+             *
+             * Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            alignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
+            /**
+             *
+             * Gets and sets the number of header rows.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            headerRowCount?: number;
+            /**
+             *
+             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
+            /**
+             *
+             * Indicates whether all of the table rows are uniform. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isUniform?: boolean;
+            /**
+             *
+             * Gets the nesting level of the table. Top-level tables have level 1. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            nestingLevel?: number;
+            /**
+             *
+             * Gets the number of rows in the table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowCount?: number;
+            /**
+             *
+             * Gets and sets the shading color.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: string;
+            /**
+             *
+             * Gets or sets the style name for the table. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            style?: string;
+            /**
+             *
+             * Gets and sets whether the table has banded columns.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBandedColumns?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has banded rows.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBandedRows?: boolean;
+            /**
+             *
+             * Gets or sets the built-in style name for the table. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: Word.Style | "Other" | "Normal" | "Heading1" | "Heading2" | "Heading3" | "Heading4" | "Heading5" | "Heading6" | "Heading7" | "Heading8" | "Heading9" | "Toc1" | "Toc2" | "Toc3" | "Toc4" | "Toc5" | "Toc6" | "Toc7" | "Toc8" | "Toc9" | "FootnoteText" | "Header" | "Footer" | "Caption" | "FootnoteReference" | "EndnoteReference" | "EndnoteText" | "Title" | "Subtitle" | "Hyperlink" | "Strong" | "Emphasis" | "NoSpacing" | "ListParagraph" | "Quote" | "IntenseQuote" | "SubtleEmphasis" | "IntenseEmphasis" | "SubtleReference" | "IntenseReference" | "BookTitle" | "Bibliography" | "TocHeading" | "TableGrid" | "PlainTable1" | "PlainTable2" | "PlainTable3" | "PlainTable4" | "PlainTable5" | "TableGridLight" | "GridTable1Light" | "GridTable1Light_Accent1" | "GridTable1Light_Accent2" | "GridTable1Light_Accent3" | "GridTable1Light_Accent4" | "GridTable1Light_Accent5" | "GridTable1Light_Accent6" | "GridTable2" | "GridTable2_Accent1" | "GridTable2_Accent2" | "GridTable2_Accent3" | "GridTable2_Accent4" | "GridTable2_Accent5" | "GridTable2_Accent6" | "GridTable3" | "GridTable3_Accent1" | "GridTable3_Accent2" | "GridTable3_Accent3" | "GridTable3_Accent4" | "GridTable3_Accent5" | "GridTable3_Accent6" | "GridTable4" | "GridTable4_Accent1" | "GridTable4_Accent2" | "GridTable4_Accent3" | "GridTable4_Accent4" | "GridTable4_Accent5" | "GridTable4_Accent6" | "GridTable5Dark" | "GridTable5Dark_Accent1" | "GridTable5Dark_Accent2" | "GridTable5Dark_Accent3" | "GridTable5Dark_Accent4" | "GridTable5Dark_Accent5" | "GridTable5Dark_Accent6" | "GridTable6Colorful" | "GridTable6Colorful_Accent1" | "GridTable6Colorful_Accent2" | "GridTable6Colorful_Accent3" | "GridTable6Colorful_Accent4" | "GridTable6Colorful_Accent5" | "GridTable6Colorful_Accent6" | "GridTable7Colorful" | "GridTable7Colorful_Accent1" | "GridTable7Colorful_Accent2" | "GridTable7Colorful_Accent3" | "GridTable7Colorful_Accent4" | "GridTable7Colorful_Accent5" | "GridTable7Colorful_Accent6" | "ListTable1Light" | "ListTable1Light_Accent1" | "ListTable1Light_Accent2" | "ListTable1Light_Accent3" | "ListTable1Light_Accent4" | "ListTable1Light_Accent5" | "ListTable1Light_Accent6" | "ListTable2" | "ListTable2_Accent1" | "ListTable2_Accent2" | "ListTable2_Accent3" | "ListTable2_Accent4" | "ListTable2_Accent5" | "ListTable2_Accent6" | "ListTable3" | "ListTable3_Accent1" | "ListTable3_Accent2" | "ListTable3_Accent3" | "ListTable3_Accent4" | "ListTable3_Accent5" | "ListTable3_Accent6" | "ListTable4" | "ListTable4_Accent1" | "ListTable4_Accent2" | "ListTable4_Accent3" | "ListTable4_Accent4" | "ListTable4_Accent5" | "ListTable4_Accent6" | "ListTable5Dark" | "ListTable5Dark_Accent1" | "ListTable5Dark_Accent2" | "ListTable5Dark_Accent3" | "ListTable5Dark_Accent4" | "ListTable5Dark_Accent5" | "ListTable5Dark_Accent6" | "ListTable6Colorful" | "ListTable6Colorful_Accent1" | "ListTable6Colorful_Accent2" | "ListTable6Colorful_Accent3" | "ListTable6Colorful_Accent4" | "ListTable6Colorful_Accent5" | "ListTable6Colorful_Accent6" | "ListTable7Colorful" | "ListTable7Colorful_Accent1" | "ListTable7Colorful_Accent2" | "ListTable7Colorful_Accent3" | "ListTable7Colorful_Accent4" | "ListTable7Colorful_Accent5" | "ListTable7Colorful_Accent6";
+            /**
+             *
+             * Gets and sets whether the table has a first column with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleFirstColumn?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has a last column with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleLastColumn?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has a total (last) row with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleTotalRow?: boolean;
+            /**
+             *
+             * Gets and sets the text values in the table, as a 2D Javascript array.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            values?: string[][];
+            /**
+             *
+             * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
+            /**
+             *
+             * Gets and sets the width of the table in points.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "tableCollection.toJSON()". */
+        interface TableCollectionData {
+            items?: Word.Interfaces.TableData[];
+        }
+        /** An interface describing the data returned by calling "tableRow.toJSON()". */
+        interface TableRowData {
+            /**
+            *
+            * Gets cells. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            cells?: Word.Interfaces.TableCellData[];
+            /**
+            *
+            * Gets the font. Use this to get and set font name, size, color, and other properties. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            font?: Word.Interfaces.FontData;
+            /**
+            *
+            * Gets parent table. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableData;
+            /**
+             *
+             * Gets the number of cells in the row. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            cellCount?: number;
+            /**
+             *
+             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
+            /**
+             *
+             * Checks whether the row is a header row. Read-only. To set the number of header rows, use HeaderRowCount on the Table object.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isHeader?: boolean;
+            /**
+             *
+             * Gets and sets the preferred height of the row in points.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            preferredHeight?: number;
+            /**
+             *
+             * Gets the index of the row in its parent table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowIndex?: number;
+            /**
+             *
+             * Gets and sets the shading color.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: string;
+            /**
+             *
+             * Gets and sets the text values in the row, as a 2D Javascript array.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            values?: string[][];
+            /**
+             *
+             * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
+        }
+        /** An interface describing the data returned by calling "tableRowCollection.toJSON()". */
+        interface TableRowCollectionData {
+            items?: Word.Interfaces.TableRowData[];
+        }
+        /** An interface describing the data returned by calling "tableCell.toJSON()". */
+        interface TableCellData {
+            /**
+            *
+            * Gets the body object of the cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            body?: Word.Interfaces.BodyData;
+            /**
+            *
+            * Gets the parent row of the cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentRow?: Word.Interfaces.TableRowData;
+            /**
+            *
+            * Gets the parent table of the cell. Read-only.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableData;
+            /**
+             *
+             * Gets the index of the cell in its row. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            cellIndex?: number;
+            /**
+             *
+             * Gets and sets the width of the cell's column in points. This is applicable to uniform tables.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            columnWidth?: number;
+            /**
+             *
+             * Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
+            /**
+             *
+             * Gets the index of the cell's row in the table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowIndex?: number;
+            /**
+             *
+             * Gets or sets the shading color of the cell. Color is specified in "#RRGGBB" format or by using the color name.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: string;
+            /**
+             *
+             * Gets and sets the text of the cell.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            value?: string;
+            /**
+             *
+             * Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
+            /**
+             *
+             * Gets the width of the cell in points. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "tableCellCollection.toJSON()". */
+        interface TableCellCollectionData {
+            items?: Word.Interfaces.TableCellData[];
+        }
+        /** An interface describing the data returned by calling "tableBorder.toJSON()". */
+        interface TableBorderData {
+            /**
+             *
+             * Gets or sets the table border color, as a hex value or name.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            color?: string;
+            /**
+             *
+             * Gets or sets the type of the table border.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            type?: Word.BorderType | "Mixed" | "None" | "Single" | "Double" | "Dotted" | "Dashed" | "DotDashed" | "Dot2Dashed" | "Triple" | "ThinThickSmall" | "ThickThinSmall" | "ThinThickThinSmall" | "ThinThickMed" | "ThickThinMed" | "ThinThickThinMed" | "ThinThickLarge" | "ThickThinLarge" | "ThinThickThinLarge" | "Wave" | "DoubleWave" | "DashedSmall" | "DashDotStroked" | "ThreeDEmboss" | "ThreeDEngrave";
+            /**
+             *
+             * Gets or sets the width, in points, of the table border. Not applicable to table border types that have fixed widths.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: number;
+        }
+        /**
+         *
+         * Represents the body of a document or a section.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface BodyLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the text format of the body. Use this to get and set font name, size, color and other properties.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Throws if there isn't a parent body.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Returns a null object if there isn't a parent body.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBodyOrNullObject?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the body. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the body. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the parent section of the body. Throws if there isn't a parent section.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentSection?: Word.Interfaces.SectionLoadOptions;
+            /**
+            *
+            * Gets the parent section of the body. Returns a null object if there isn't a parent section.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentSectionOrNullObject?: Word.Interfaces.SectionLoadOptions;
+            /**
+             *
+             * Gets or sets the style name for the body. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * Gets or sets the built-in style name for the body. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * Gets the text of the body. Use the insertText method to insert text. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: boolean;
+            /**
+             *
+             * Gets the type of the body. The type can be 'MainDoc', 'Section', 'Header', 'Footer', or 'TableCell'. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents a content control. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface ContentControlLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the text format of the content control. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * Gets the parent body of the content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the content control. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the content control. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the table that contains the content control. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the content control. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the content control. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table that contains the content control. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            appearance?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the user can delete the content control. Mutually exclusive with removeWhenEdited.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            cannotDelete?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the user can edit the contents of the content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            cannotEdit?: boolean;
+            /**
+             *
+             * Gets or sets the color of the content control. Color is specified in '#RRGGBB' format or by using the color name.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * Gets an integer that represents the content control identifier. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets or sets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            placeholderText?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the content control is removed after it is edited. Mutually exclusive with cannotDelete.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            removeWhenEdited?: boolean;
+            /**
+             *
+             * Gets or sets the style name for the content control. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * Gets or sets the built-in style name for the content control. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * Gets the content control subtype. The subtype can be 'RichTextInline', 'RichTextParagraphs', 'RichTextTableCell', 'RichTextTableRow' and 'RichTextTable' for rich text content controls. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            subtype?: boolean;
+            /**
+             *
+             * Gets or sets a tag to identify a content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            tag?: boolean;
+            /**
+             *
+             * Gets the text of the content control. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: boolean;
+            /**
+             *
+             * Gets or sets the title for a content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            title?: boolean;
+            /**
+             *
+             * Gets the content control type. Only rich text content controls are supported currently. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of [contentControl](contentControl.md) objects. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface ContentControlCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the text format of the content control. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent body of the content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the content control. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the content control. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the content control. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the content control. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the content control. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the content control. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            appearance?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a value that indicates whether the user can delete the content control. Mutually exclusive with removeWhenEdited.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            cannotDelete?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a value that indicates whether the user can edit the contents of the content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            cannotEdit?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the color of the content control. Color is specified in '#RRGGBB' format or by using the color name.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets an integer that represents the content control identifier. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            placeholderText?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a value that indicates whether the content control is removed after it is edited. Mutually exclusive with cannotDelete.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            removeWhenEdited?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the style name for the content control. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the built-in style name for the content control. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the content control subtype. The subtype can be 'RichTextInline', 'RichTextParagraphs', 'RichTextTableCell', 'RichTextTableRow' and 'RichTextTable' for rich text content controls. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            subtype?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a tag to identify a content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            tag?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the text of the content control. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the title for a content control.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            title?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the content control type. Only rich text content controls are supported currently. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents a custom property.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface CustomPropertyLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the key of the custom property. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            key?: boolean;
+            /**
+             *
+             * Gets the value type of the custom property. Possible values are: String, Number, Date, Boolean. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            type?: boolean;
+            /**
+             *
+             * Gets or sets the value of the custom property. Note that even though Word Online and the docx file format allow these properties to be arbitrarily long, the desktop version of Word will truncate string values to 255 16-bit chars (possibly creating invalid unicode by breaking up a surrogate pair).
+             *
+             * [Api set: WordApi 1.3]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * Contains the collection of [customProperty](customProperty.md) objects.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface CustomPropertyCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the key of the custom property. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            key?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the value type of the custom property. Possible values are: String, Number, Date, Boolean. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            type?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the value of the custom property. Note that even though Word Online and the docx file format allow these properties to be arbitrarily long, the desktop version of Word will truncate string values to 255 16-bit chars (possibly creating invalid unicode by breaking up a surrogate pair).
+             *
+             * [Api set: WordApi 1.3]
+             */
+            value?: boolean;
+        }
+        /**
+         *
+         * The Document object is the top level object. A Document object contains one or more sections, content controls, and the body that contains the contents of the document.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface DocumentLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc..
+            *
+            * [Api set: WordApi 1.1]
+            */
+            body?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the properties of the document.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            properties?: Word.Interfaces.DocumentPropertiesLoadOptions;
+            /**
+             *
+             * Gets or sets a value that indicates that, when opening a new document, whether it is allowed to close this document even if this document is untitled. True to close, false otherwise.
+             *
+             * [Api set: WordApi]
+             */
+            allowCloseOnUntitled?: boolean;
+            /**
+             *
+             * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            saved?: boolean;
+        }
+        /**
+         *
+         * The DocumentCreated object is the top level object created by Application.CreateDocument. A DocumentCreated object is a special Document object.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface DocumentCreatedLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc..
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            body?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the properties of the document.
+            *
+            * [Api set: WordApiHiddenDocument 1.3]
+            */
+            properties?: Word.Interfaces.DocumentPropertiesLoadOptions;
+            /**
+             *
+             * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
+             *
+             * [Api set: WordApiHiddenDocument 1.3]
+             */
+            saved?: boolean;
+        }
+        /**
+         *
+         * Represents document properties.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface DocumentPropertiesLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the application name of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            applicationName?: boolean;
+            /**
+             *
+             * Gets or sets the author of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            author?: boolean;
+            /**
+             *
+             * Gets or sets the category of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            category?: boolean;
+            /**
+             *
+             * Gets or sets the comments of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            comments?: boolean;
+            /**
+             *
+             * Gets or sets the company of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            company?: boolean;
+            /**
+             *
+             * Gets the creation date of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            creationDate?: boolean;
+            /**
+             *
+             * Gets or sets the format of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            format?: boolean;
+            /**
+             *
+             * Gets or sets the keywords of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            keywords?: boolean;
+            /**
+             *
+             * Gets the last author of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            lastAuthor?: boolean;
+            /**
+             *
+             * Gets the last print date of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            lastPrintDate?: boolean;
+            /**
+             *
+             * Gets the last save time of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            lastSaveTime?: boolean;
+            /**
+             *
+             * Gets or sets the manager of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            manager?: boolean;
+            /**
+             *
+             * Gets the revision number of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            revisionNumber?: boolean;
+            /**
+             *
+             * Gets the security of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            security?: boolean;
+            /**
+             *
+             * Gets or sets the subject of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            subject?: boolean;
+            /**
+             *
+             * Gets the template of the document. Read only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            template?: boolean;
+            /**
+             *
+             * Gets or sets the title of the document.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            title?: boolean;
+        }
+        /**
+         *
+         * Represents a font.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface FontLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is bold. True if the font is formatted as bold, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            bold?: boolean;
+            /**
+             *
+             * Gets or sets the color for the specified font. You can provide the value in the '#RRGGBB' format or the color name.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            color?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            doubleStrikeThrough?: boolean;
+            /**
+             *
+             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, or an empty string for mixed highlight colors, or null for no highlight color.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            highlightColor?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is italicized. True if the font is italicized, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            italic?: boolean;
+            /**
+             *
+             * Gets or sets a value that represents the name of the font.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * Gets or sets a value that represents the font size in points.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            size?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            strikeThrough?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is a subscript. True if the font is formatted as subscript, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            subscript?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the font is a superscript. True if the font is formatted as superscript, otherwise, false.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            superscript?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates the font's underline type. 'None' if the font is not underlined.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            underline?: boolean;
+        }
+        /**
+         *
+         * Represents an inline picture.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface InlinePictureLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the parent paragraph that contains the inline image.
+            *
+            * [Api set: WordApi 1.2]
+            */
+            paragraph?: Word.Interfaces.ParagraphLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the inline image. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the inline image. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the table that contains the inline image. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the inline image. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the inline image. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table that contains the inline image. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets or sets a string that represents the alternative text associated with the inline image
+             *
+             * [Api set: WordApi 1.1]
+             */
+            altTextDescription?: boolean;
+            /**
+             *
+             * Gets or sets a string that contains the title for the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            altTextTitle?: boolean;
+            /**
+             *
+             * Gets or sets a number that describes the height of the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            height?: boolean;
+            /**
+             *
+             * Gets or sets a hyperlink on the image. Use a '#' to separate the address part from the optional location part.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            hyperlink?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the inline image retains its original proportions when you resize it.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lockAspectRatio?: boolean;
+            /**
+             *
+             * Gets or sets a number that describes the width of the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of [inlinePicture](inlinePicture.md) objects.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface InlinePictureCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent paragraph that contains the inline image.
+            *
+            * [Api set: WordApi 1.2]
+            */
+            paragraph?: Word.Interfaces.ParagraphLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the inline image. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the inline image. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the inline image. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the inline image. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the inline image. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the inline image. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a string that represents the alternative text associated with the inline image
+             *
+             * [Api set: WordApi 1.1]
+             */
+            altTextDescription?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a string that contains the title for the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            altTextTitle?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a number that describes the height of the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            height?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a hyperlink on the image. Use a '#' to separate the address part from the optional location part.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            hyperlink?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a value that indicates whether the inline image retains its original proportions when you resize it.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lockAspectRatio?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets a number that describes the width of the inline image.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of [paragraph](paragraph.md) objects.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface ListLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the list's id.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            id?: boolean;
+            /**
+             *
+             * Checks whether each of the 9 levels exists in the list. A true value indicates the level exists, which means there is at least one list item at that level. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            levelExistences?: boolean;
+            /**
+             *
+             * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            levelTypes?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of [list](list.md) objects.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface ListCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the list's id.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Checks whether each of the 9 levels exists in the list. A true value indicates the level exists, which means there is at least one list item at that level. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            levelExistences?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            levelTypes?: boolean;
+        }
+        /**
+         *
+         * Represents the paragraph list item format.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface ListItemLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets or sets the level of the item in the list.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            level?: boolean;
+            /**
+             *
+             * Gets the list item bullet, number or picture as a string. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            listString?: boolean;
+            /**
+             *
+             * Gets the list item order number in relation to its siblings. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            siblingIndex?: boolean;
+        }
+        /**
+         *
+         * Represents a single paragraph in a selection, range, content control, or document body.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface ParagraphLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the text format of the paragraph. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * Gets the List to which this paragraph belongs. Throws if the paragraph is not in a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            list?: Word.Interfaces.ListLoadOptions;
+            /**
+            *
+            * Gets the ListItem for the paragraph. Throws if the paragraph is not part of a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listItem?: Word.Interfaces.ListItemLoadOptions;
+            /**
+            *
+            * Gets the ListItem for the paragraph. Returns a null object if the paragraph is not part of a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listItemOrNullObject?: Word.Interfaces.ListItemLoadOptions;
+            /**
+            *
+            * Gets the List to which this paragraph belongs. Returns a null object if the paragraph is not in a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listOrNullObject?: Word.Interfaces.ListLoadOptions;
+            /**
+            *
+            * Gets the parent body of the paragraph.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the paragraph. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the paragraph. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the table that contains the paragraph. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the paragraph. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the paragraph. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table that contains the paragraph. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets or sets the alignment for a paragraph. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            alignment?: boolean;
+            /**
+             *
+             * Gets or sets the value, in points, for a first line or hanging indent. Use a positive value to set a first-line indent, and use a negative value to set a hanging indent.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            firstLineIndent?: boolean;
+            /**
+             *
+             * Indicates the paragraph is the last one inside its parent body. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isLastParagraph?: boolean;
+            /**
+             *
+             * Checks whether the paragraph is a list item. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isListItem?: boolean;
+            /**
+             *
+             * Gets or sets the left indent value, in points, for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            leftIndent?: boolean;
+            /**
+             *
+             * Gets or sets the line spacing, in points, for the specified paragraph. In the Word UI, this value is divided by 12.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineSpacing?: boolean;
+            /**
+             *
+             * Gets or sets the amount of spacing, in grid lines. after the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineUnitAfter?: boolean;
+            /**
+             *
+             * Gets or sets the amount of spacing, in grid lines, before the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineUnitBefore?: boolean;
+            /**
+             *
+             * Gets or sets the outline level for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            outlineLevel?: boolean;
+            /**
+             *
+             * Gets or sets the right indent value, in points, for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            rightIndent?: boolean;
+            /**
+             *
+             * Gets or sets the spacing, in points, after the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            spaceAfter?: boolean;
+            /**
+             *
+             * Gets or sets the spacing, in points, before the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            spaceBefore?: boolean;
+            /**
+             *
+             * Gets or sets the style name for the paragraph. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * Gets or sets the built-in style name for the paragraph. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * Gets the level of the paragraph's table. It returns 0 if the paragraph is not in a table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            tableNestingLevel?: boolean;
+            /**
+             *
+             * Gets the text of the paragraph. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of [paragraph](paragraph.md) objects.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface ParagraphCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the text format of the paragraph. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the List to which this paragraph belongs. Throws if the paragraph is not in a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            list?: Word.Interfaces.ListLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the ListItem for the paragraph. Throws if the paragraph is not part of a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listItem?: Word.Interfaces.ListItemLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the ListItem for the paragraph. Returns a null object if the paragraph is not part of a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listItemOrNullObject?: Word.Interfaces.ListItemLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the List to which this paragraph belongs. Returns a null object if the paragraph is not in a list.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            listOrNullObject?: Word.Interfaces.ListLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent body of the paragraph.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the paragraph. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the paragraph. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the paragraph. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the paragraph. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the paragraph. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the paragraph. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the alignment for a paragraph. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            alignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the value, in points, for a first line or hanging indent. Use a positive value to set a first-line indent, and use a negative value to set a hanging indent.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            firstLineIndent?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates the paragraph is the last one inside its parent body. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isLastParagraph?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Checks whether the paragraph is a list item. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isListItem?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the left indent value, in points, for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            leftIndent?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the line spacing, in points, for the specified paragraph. In the Word UI, this value is divided by 12.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineSpacing?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the amount of spacing, in grid lines. after the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineUnitAfter?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the amount of spacing, in grid lines, before the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            lineUnitBefore?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the outline level for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            outlineLevel?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the right indent value, in points, for the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            rightIndent?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the spacing, in points, after the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            spaceAfter?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the spacing, in points, before the paragraph.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            spaceBefore?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the style name for the paragraph. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the built-in style name for the paragraph. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the level of the paragraph's table. It returns 0 if the paragraph is not in a table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            tableNestingLevel?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the text of the paragraph. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Represents a contiguous area in a document.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface RangeLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the text format of the range. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * Gets the parent body of the range.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the range. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the range. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the table that contains the range. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the range. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains the range. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table that contains the range. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets the first hyperlink in the range, or sets a hyperlink on the range. All hyperlinks in the range are deleted when you set a new hyperlink on the range. Use a '#' to separate the address part from the optional location part.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            hyperlink?: boolean;
+            /**
+             *
+             * Checks whether the range length is zero. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isEmpty?: boolean;
+            /**
+             *
+             * Gets or sets the style name for the range. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * Gets or sets the built-in style name for the range. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * Gets the text of the range. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of [range](range.md) objects.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface RangeCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the text format of the range. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent body of the range.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the range. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the range. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the range. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the range. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains the range. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains the range. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the first hyperlink in the range, or sets a hyperlink on the range. All hyperlinks in the range are deleted when you set a new hyperlink on the range. Use a '#' to separate the address part from the optional location part.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            hyperlink?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Checks whether the range length is zero. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isEmpty?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the style name for the range. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            style?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the built-in style name for the range. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the text of the range. Read-only.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Specifies the options to be included in a search operation.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface SearchOptionsLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to ignore all punctuation characters between words. Corresponds to the Ignore punctuation check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            ignorePunct?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to ignore all whitespace between words. Corresponds to the Ignore whitespace characters check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            ignoreSpace?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchCase?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to match words that begin with the search string. Corresponds to the Match prefix check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchPrefix?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to match words that end with the search string. Corresponds to the Match suffix check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchSuffix?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether to find operation only entire words, not text that is part of a larger word. Corresponds to the Find whole words only check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchWholeWord?: boolean;
+            /**
+             *
+             * Gets or sets a value that indicates whether the search will be performed using special search operators. Corresponds to the Use wildcards check box in the Find and Replace dialog box.
+             *
+             * [Api set: WordApi 1.1]
+             */
+            matchWildcards?: boolean;
+        }
+        /**
+         *
+         * Represents a section in a Word document.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface SectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the body object of the section. This does not include the header/footer and other section metadata.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            body?: Word.Interfaces.BodyLoadOptions;
+        }
+        /**
+         *
+         * Contains the collection of the document's [section](section.md) objects.
+         *
+         * [Api set: WordApi 1.1]
+         */
+        interface SectionCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the body object of the section. This does not include the header/footer and other section metadata.
+            *
+            * [Api set: WordApi 1.1]
+            */
+            body?: Word.Interfaces.BodyLoadOptions;
+        }
+        /**
+         *
+         * Represents a table in a Word document.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface TableLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the font. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * Gets the parent body of the table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the table. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the content control that contains the table. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * Gets the table that contains this table. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains this table. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table cell that contains this table. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the table that contains this table. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            alignment?: boolean;
+            /**
+             *
+             * Gets and sets the number of header rows.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            headerRowCount?: boolean;
+            /**
+             *
+             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * Indicates whether all of the table rows are uniform. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isUniform?: boolean;
+            /**
+             *
+             * Gets the nesting level of the table. Top-level tables have level 1. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            nestingLevel?: boolean;
+            /**
+             *
+             * Gets the number of rows in the table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowCount?: boolean;
+            /**
+             *
+             * Gets and sets the shading color.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: boolean;
+            /**
+             *
+             * Gets or sets the style name for the table. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            style?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has banded columns.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBandedColumns?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has banded rows.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBandedRows?: boolean;
+            /**
+             *
+             * Gets or sets the built-in style name for the table. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has a first column with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleFirstColumn?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has a last column with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleLastColumn?: boolean;
+            /**
+             *
+             * Gets and sets whether the table has a total (last) row with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleTotalRow?: boolean;
+            /**
+             *
+             * Gets and sets the text values in the table, as a 2D Javascript array.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            values?: boolean;
+            /**
+             *
+             * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * Gets and sets the width of the table in points.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Contains the collection of the document's Table objects.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface TableCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the font. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent body of the table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentBody?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the table. Throws if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControl?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the content control that contains the table. Returns a null object if there isn't a parent content control.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentContentControlOrNullObject?: Word.Interfaces.ContentControlLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains this table. Throws if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains this table. Throws if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCell?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table cell that contains this table. Returns a null object if it is not contained in a table cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableCellOrNullObject?: Word.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the table that contains this table. Returns a null object if it is not contained in a table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            alignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the number of header rows.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            headerRowCount?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Indicates whether all of the table rows are uniform. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isUniform?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the nesting level of the table. Top-level tables have level 1. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            nestingLevel?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the number of rows in the table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowCount?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the shading color.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the style name for the table. Use this property for custom styles and localized style names. To use the built-in styles that are portable between locales, see the "styleBuiltIn" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            style?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets whether the table has banded columns.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBandedColumns?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets whether the table has banded rows.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBandedRows?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the built-in style name for the table. Use this property for built-in styles that are portable between locales. To use custom styles or localized style names, see the "style" property.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleBuiltIn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets whether the table has a first column with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleFirstColumn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets whether the table has a last column with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleLastColumn?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets whether the table has a total (last) row with a special style.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            styleTotalRow?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the text values in the table, as a 2D Javascript array.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            values?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the width of the table in points.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Represents a row in a Word document.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface TableRowLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the font. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * Gets parent table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets the number of cells in the row. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            cellCount?: boolean;
+            /**
+             *
+             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * Checks whether the row is a header row. Read-only. To set the number of header rows, use HeaderRowCount on the Table object.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isHeader?: boolean;
+            /**
+             *
+             * Gets and sets the preferred height of the row in points.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            preferredHeight?: boolean;
+            /**
+             *
+             * Gets the index of the row in its parent table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowIndex?: boolean;
+            /**
+             *
+             * Gets and sets the shading color.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: boolean;
+            /**
+             *
+             * Gets and sets the text values in the row, as a 2D Javascript array.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            values?: boolean;
+            /**
+             *
+             * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: boolean;
+        }
+        /**
+         *
+         * Contains the collection of the document's TableRow objects.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface TableRowCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the font. Use this to get and set font name, size, color, and other properties.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            font?: Word.Interfaces.FontLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets parent table.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the number of cells in the row. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            cellCount?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Checks whether the row is a header row. Read-only. To set the number of header rows, use HeaderRowCount on the Table object.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            isHeader?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the preferred height of the row in points.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            preferredHeight?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the index of the row in its parent table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowIndex?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the shading color.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the text values in the row, as a 2D Javascript array.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            values?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: boolean;
+        }
+        /**
+         *
+         * Represents a table cell in a Word document.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface TableCellLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the body object of the cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            body?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * Gets the parent row of the cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentRow?: Word.Interfaces.TableRowLoadOptions;
+            /**
+            *
+            * Gets the parent table of the cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets the index of the cell in its row. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            cellIndex?: boolean;
+            /**
+             *
+             * Gets and sets the width of the cell's column in points. This is applicable to uniform tables.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            columnWidth?: boolean;
+            /**
+             *
+             * Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * Gets the index of the cell's row in the table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowIndex?: boolean;
+            /**
+             *
+             * Gets or sets the shading color of the cell. Color is specified in "#RRGGBB" format or by using the color name.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: boolean;
+            /**
+             *
+             * Gets and sets the text of the cell.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            value?: boolean;
+            /**
+             *
+             * Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * Gets the width of the cell in points. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Contains the collection of the document's TableCell objects.
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface TableCellCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the body object of the cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            body?: Word.Interfaces.BodyLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent row of the cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentRow?: Word.Interfaces.TableRowLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent table of the cell.
+            *
+            * [Api set: WordApi 1.3]
+            */
+            parentTable?: Word.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the index of the cell in its row. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            cellIndex?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the width of the cell's column in points. This is applicable to uniform tables.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            columnWidth?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            horizontalAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the index of the cell's row in the table. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            rowIndex?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the shading color of the cell. Color is specified in "#RRGGBB" format or by using the color name.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            shadingColor?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the text of the cell.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            value?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            verticalAlignment?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the width of the cell in points. Read-only.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Specifies the border style
+         *
+         * [Api set: WordApi 1.3]
+         */
+        interface TableBorderLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets or sets the table border color, as a hex value or name.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            color?: boolean;
+            /**
+             *
+             * Gets or sets the type of the table border.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            type?: boolean;
+            /**
+             *
+             * Gets or sets the width, in points, of the table border. Not applicable to table border types that have fixed widths.
+             *
+             * [Api set: WordApi 1.3]
+             */
+            width?: boolean;
+        }
     }
 }
-declare module Word {
+declare namespace Word {
     /**
      * The RequestContext object facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the request context is required to get access to the Word object model from the add-in.
      */
-    class RequestContext extends OfficeExtension.ClientRequestContext {
+    class RequestContext extends OfficeCore.RequestContext {
         constructor(url?: string);
-        document: Document;
+        readonly document: Document;
+        readonly application: Application;
     }
     /**
      * Executes a batch script that performs actions on the Word object model, using a new RequestContext. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the RequestContext is required to get access to the Word object model from the add-in.
      */
-    function run<T>(batch: (context: Word.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(batch: (context: Word.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Word object model, using the RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param object - A previously-created API object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the RequestContext is required to get access to the Word object model from the add-in.
      */
-    function run<T>(object: OfficeExtension.ClientObject, batch: (context: Word.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(object: OfficeExtension.ClientObject, batch: (context: Word.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Word object model, using the RequestContext of previously-created API objects.
      * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the RequestContext is required to get access to the Word object model from the add-in.
      */
-    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Word.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Word.RequestContext) => Promise<T>): Promise<T>;
 }
 
 
@@ -20178,7 +36347,6 @@ declare module Word {
 ////////////////////// Begin OneNote APIs //////////////////////
 ////////////////////////////////////////////////////////////////
 
-
 declare namespace OneNote {
     /**
      *
@@ -20187,14 +36355,13 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Application extends OfficeExtension.ClientObject {
-        private m_notebooks;
         /**
          *
          * Gets the collection of notebooks that are open in the OneNote application instance. In OneNote Online, only one notebook at a time is open in the application instance. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        notebooks: OneNote.NotebookCollection;
+        readonly notebooks: OneNote.NotebookCollection;
         /**
          *
          * Gets the active notebook if one exists. If no notebook is active, throws ItemNotFound.
@@ -20237,6 +36404,20 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         getActivePageOrNull(): OneNote.Page;
+        /**
+         *
+         * Gets the active Paragraph if one exists, If no Paragraph is active, throws ItemNotFound.
+         *
+         * [Api set: OneNoteApi]
+         */
+        getActiveParagraph(): OneNote.Paragraph;
+        /**
+         *
+         * Gets the active Paragraph if one exists, otherwise returns null.
+         *
+         * [Api set: OneNoteApi]
+         */
+        getActiveParagraphOrNull(): OneNote.Paragraph;
         /**
          *
          * Gets the active section if one exists. If no section is active, throws ItemNotFound.
@@ -20253,26 +36434,41 @@ declare namespace OneNote {
         getActiveSectionOrNull(): OneNote.Section;
         /**
          *
-         * Opens the specified page in the application instance.
-         *
-         * @param page The page to open.
+         * The collection of pages in the section. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
+        getSelectedPages(): OneNote.PageCollection;
+        getWindowSize(): OfficeExtension.ClientResult<Array<number>>;
+        insertHtmlAtCurrentPosition(html: string): void;
+        /**
+         *
+         * Opens the specified page in the application instance.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param page The page to open.
+         */
         navigateToPage(page: OneNote.Page): void;
         /**
          *
          * Gets the specified page, and opens it in the application instance.
          *
-         * @param url The client url of the page to open.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param url The client url of the page to open.
          */
         navigateToPageWithClientUrl(url: string): OneNote.Page;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Application;
+        load(option?: OneNote.Interfaces.ApplicationLoadOptions): OneNote.Application;
+        load(option?: string | string[]): OneNote.Application;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Application;
+        toJSON(): OneNote.Interfaces.ApplicationData;
     }
     /**
      *
@@ -20281,35 +36477,54 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkAnalysis extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_page;
-        private m_paragraphs;
-        private m__ReferenceId;
         /**
          *
          * Gets the parent page object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        page: OneNote.Page;
+        readonly page: OneNote.Page;
         /**
          *
          * Gets the ink analysis paragraphs in this page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraphs: OneNote.InkAnalysisParagraphCollection;
+        readonly paragraphs: OneNote.InkAnalysisParagraphCollection;
         /**
          *
          * Gets the ID of the InkAnalysis object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.InkAnalysisUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: InkAnalysis): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkAnalysis;
+        load(option?: OneNote.Interfaces.InkAnalysisLoadOptions): OneNote.InkAnalysis;
+        load(option?: string | string[]): OneNote.InkAnalysis;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.InkAnalysis;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkAnalysis;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkAnalysis;
+        toJSON(): OneNote.Interfaces.InkAnalysisData;
     }
     /**
      *
@@ -20318,35 +36533,54 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkAnalysisParagraph extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_inkAnalysis;
-        private m_lines;
-        private m__ReferenceId;
         /**
          *
          * Reference to the parent InkAnalysisPage. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        inkAnalysis: OneNote.InkAnalysis;
+        readonly inkAnalysis: OneNote.InkAnalysis;
         /**
          *
          * Gets the ink analysis lines in this ink analysis paragraph. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        lines: OneNote.InkAnalysisLineCollection;
+        readonly lines: OneNote.InkAnalysisLineCollection;
         /**
          *
          * Gets the ID of the InkAnalysisParagraph object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.InkAnalysisParagraphUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: InkAnalysisParagraph): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkAnalysisParagraph;
+        load(option?: OneNote.Interfaces.InkAnalysisParagraphLoadOptions): OneNote.InkAnalysisParagraph;
+        load(option?: string | string[]): OneNote.InkAnalysisParagraph;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.InkAnalysisParagraph;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkAnalysisParagraph;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkAnalysisParagraph;
+        toJSON(): OneNote.Interfaces.InkAnalysisParagraphData;
     }
     /**
      *
@@ -20355,40 +36589,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkAnalysisParagraphCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.InkAnalysisParagraph>;
+        readonly items: Array<OneNote.InkAnalysisParagraph>;
         /**
          *
          * Returns the number of InkAnalysisParagraphs in the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a InkAnalysisParagraph object by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the InkAnalysisParagraph object, or the index location of the InkAnalysisParagraph object in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the InkAnalysisParagraph object, or the index location of the InkAnalysisParagraph object in the collection.
          */
         getItem(index: number | string): OneNote.InkAnalysisParagraph;
         /**
          *
          * Gets a InkAnalysisParagraph on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.InkAnalysisParagraph;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkAnalysisParagraphCollection;
+        load(option?: OneNote.Interfaces.InkAnalysisParagraphCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkAnalysisParagraphCollection;
+        load(option?: string | string[]): OneNote.InkAnalysisParagraphCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.InkAnalysisParagraphCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkAnalysisParagraphCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkAnalysisParagraphCollection;
+        toJSON(): OneNote.Interfaces.InkAnalysisParagraphCollectionData;
     }
     /**
      *
@@ -20397,35 +36639,54 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkAnalysisLine extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_paragraph;
-        private m_words;
-        private m__ReferenceId;
         /**
          *
          * Reference to the parent InkAnalysisParagraph. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraph: OneNote.InkAnalysisParagraph;
+        readonly paragraph: OneNote.InkAnalysisParagraph;
         /**
          *
          * Gets the ink analysis words in this ink analysis line. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        words: OneNote.InkAnalysisWordCollection;
+        readonly words: OneNote.InkAnalysisWordCollection;
         /**
          *
          * Gets the ID of the InkAnalysisLine object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.InkAnalysisLineUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: InkAnalysisLine): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkAnalysisLine;
+        load(option?: OneNote.Interfaces.InkAnalysisLineLoadOptions): OneNote.InkAnalysisLine;
+        load(option?: string | string[]): OneNote.InkAnalysisLine;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.InkAnalysisLine;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkAnalysisLine;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkAnalysisLine;
+        toJSON(): OneNote.Interfaces.InkAnalysisLineData;
     }
     /**
      *
@@ -20434,40 +36695,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkAnalysisLineCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.InkAnalysisLine>;
+        readonly items: Array<OneNote.InkAnalysisLine>;
         /**
          *
          * Returns the number of InkAnalysisLines in the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a InkAnalysisLine object by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the InkAnalysisLine object, or the index location of the InkAnalysisLine object in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the InkAnalysisLine object, or the index location of the InkAnalysisLine object in the collection.
          */
         getItem(index: number | string): OneNote.InkAnalysisLine;
         /**
          *
          * Gets a InkAnalysisLine on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.InkAnalysisLine;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkAnalysisLineCollection;
+        load(option?: OneNote.Interfaces.InkAnalysisLineCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkAnalysisLineCollection;
+        load(option?: string | string[]): OneNote.InkAnalysisLineCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.InkAnalysisLineCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkAnalysisLineCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkAnalysisLineCollection;
+        toJSON(): OneNote.Interfaces.InkAnalysisLineCollectionData;
     }
     /**
      *
@@ -20476,51 +36745,68 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkAnalysisWord extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_languageId;
-        private m_line;
-        private m_strokePointers;
-        private m_wordAlternates;
-        private m__ReferenceId;
         /**
          *
          * Reference to the parent InkAnalysisLine. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        line: OneNote.InkAnalysisLine;
+        readonly line: OneNote.InkAnalysisLine;
         /**
          *
          * Gets the ID of the InkAnalysisWord object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * The id of the recognized language in this inkAnalysisWord. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        languageId: string;
+        readonly languageId: string;
         /**
          *
          * Weak references to the ink strokes that were recognized as part of this ink analysis word. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        strokePointers: Array<OneNote.InkStrokePointer>;
+        readonly strokePointers: Array<OneNote.InkStrokePointer>;
         /**
          *
          * The words that were recognized in this ink word, in order of likelihood. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        wordAlternates: Array<string>;
+        readonly wordAlternates: Array<string>;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.InkAnalysisWordUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: InkAnalysisWord): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkAnalysisWord;
+        load(option?: OneNote.Interfaces.InkAnalysisWordLoadOptions): OneNote.InkAnalysisWord;
+        load(option?: string | string[]): OneNote.InkAnalysisWord;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.InkAnalysisWord;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkAnalysisWord;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkAnalysisWord;
+        toJSON(): OneNote.Interfaces.InkAnalysisWordData;
     }
     /**
      *
@@ -20529,40 +36815,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkAnalysisWordCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.InkAnalysisWord>;
+        readonly items: Array<OneNote.InkAnalysisWord>;
         /**
          *
          * Returns the number of InkAnalysisWords in the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a InkAnalysisWord object by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the InkAnalysisWord object, or the index location of the InkAnalysisWord object in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the InkAnalysisWord object, or the index location of the InkAnalysisWord object in the collection.
          */
         getItem(index: number | string): OneNote.InkAnalysisWord;
         /**
          *
          * Gets a InkAnalysisWord on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.InkAnalysisWord;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkAnalysisWordCollection;
+        load(option?: OneNote.Interfaces.InkAnalysisWordCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkAnalysisWordCollection;
+        load(option?: string | string[]): OneNote.InkAnalysisWordCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.InkAnalysisWordCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkAnalysisWordCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkAnalysisWordCollection;
+        toJSON(): OneNote.Interfaces.InkAnalysisWordCollectionData;
     }
     /**
      *
@@ -20571,35 +36865,45 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class FloatingInk extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_inkStrokes;
-        private m_pageContent;
-        private m__ReferenceId;
         /**
          *
          * Gets the strokes of the FloatingInk object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        inkStrokes: OneNote.InkStrokeCollection;
+        readonly inkStrokes: OneNote.InkStrokeCollection;
         /**
          *
          * Gets the PageContent parent of the FloatingInk object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        pageContent: OneNote.PageContent;
+        readonly pageContent: OneNote.PageContent;
         /**
          *
          * Gets the ID of the FloatingInk object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.FloatingInk;
+        load(option?: OneNote.Interfaces.FloatingInkLoadOptions): OneNote.FloatingInk;
+        load(option?: string | string[]): OneNote.FloatingInk;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.FloatingInk;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.FloatingInk;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.FloatingInk;
+        toJSON(): OneNote.Interfaces.FloatingInkData;
     }
     /**
      *
@@ -20608,27 +36912,38 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkStroke extends OfficeExtension.ClientObject {
-        private m_floatingInk;
-        private m_id;
-        private m__ReferenceId;
         /**
          *
          * Gets the ID of the InkStroke object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        floatingInk: OneNote.FloatingInk;
+        readonly floatingInk: OneNote.FloatingInk;
         /**
          *
          * Gets the ID of the InkStroke object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkStroke;
+        load(option?: OneNote.Interfaces.InkStrokeLoadOptions): OneNote.InkStroke;
+        load(option?: string | string[]): OneNote.InkStroke;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.InkStroke;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkStroke;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkStroke;
+        toJSON(): OneNote.Interfaces.InkStrokeData;
     }
     /**
      *
@@ -20637,40 +36952,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkStrokeCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.InkStroke>;
+        readonly items: Array<OneNote.InkStroke>;
         /**
          *
          * Returns the number of InkStrokes in the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a InkStroke object by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the InkStroke object, or the index location of the InkStroke object in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the InkStroke object, or the index location of the InkStroke object in the collection.
          */
         getItem(index: number | string): OneNote.InkStroke;
         /**
          *
          * Gets a InkStroke on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.InkStroke;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkStrokeCollection;
+        load(option?: OneNote.Interfaces.InkStrokeCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkStrokeCollection;
+        load(option?: string | string[]): OneNote.InkStrokeCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.InkStrokeCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkStrokeCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkStrokeCollection;
+        toJSON(): OneNote.Interfaces.InkStrokeCollectionData;
     }
     /**
      *
@@ -20679,43 +37002,52 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkWord extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_languageId;
-        private m_paragraph;
-        private m_wordAlternates;
-        private m__ReferenceId;
         /**
          *
          * The parent paragraph containing the ink word. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraph: OneNote.Paragraph;
+        readonly paragraph: OneNote.Paragraph;
         /**
          *
          * Gets the ID of the InkWord object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * The id of the recognized language in this ink word. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        languageId: string;
+        readonly languageId: string;
         /**
          *
          * The words that were recognized in this ink word, in order of likelihood. Read-only.
          *
          * [Api set: OneNoteApi]
          */
-        wordAlternates: Array<string>;
+        readonly wordAlternates: Array<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkWord;
+        load(option?: OneNote.Interfaces.InkWordLoadOptions): OneNote.InkWord;
+        load(option?: string | string[]): OneNote.InkWord;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.InkWord;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkWord;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkWord;
+        toJSON(): OneNote.Interfaces.InkWordData;
     }
     /**
      *
@@ -20724,40 +37056,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class InkWordCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.InkWord>;
+        readonly items: Array<OneNote.InkWord>;
         /**
          *
          * Returns the number of InkWords in the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a InkWord object by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the InkWord object, or the index location of the InkWord object in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the InkWord object, or the index location of the InkWord object in the collection.
          */
         getItem(index: number | string): OneNote.InkWord;
         /**
          *
          * Gets a InkWord on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.InkWord;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.InkWordCollection;
+        load(option?: OneNote.Interfaces.InkWordCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkWordCollection;
+        load(option?: string | string[]): OneNote.InkWordCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.InkWordCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.InkWordCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.InkWordCollection;
+        toJSON(): OneNote.Interfaces.InkWordCollectionData;
     }
     /**
      *
@@ -20766,69 +37106,91 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Notebook extends OfficeExtension.ClientObject {
-        private m_clientUrl;
-        private m_id;
-        private m_name;
-        private m_sectionGroups;
-        private m_sections;
-        private m__ReferenceId;
         /**
          *
          * The section groups in the notebook. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        sectionGroups: OneNote.SectionGroupCollection;
+        readonly sectionGroups: OneNote.SectionGroupCollection;
         /**
          *
          * The the sections of the notebook. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        sections: OneNote.SectionCollection;
+        readonly sections: OneNote.SectionCollection;
+        /**
+         *
+         * The url of the site that this notebook is located. Read only
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        readonly baseUrl: string;
         /**
          *
          * The client url of the notebook. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        clientUrl: string;
+        readonly clientUrl: string;
         /**
          *
          * Gets the ID of the notebook. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the name of the notebook. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        name: string;
+        readonly name: string;
         /**
          *
          * Adds a new section to the end of the notebook.
          *
-         * @param name The name of the new section.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param name The name of the new section.
          */
         addSection(name: string): OneNote.Section;
         /**
          *
          * Adds a new section group to the end of the notebook.
          *
-         * @param name The name of the new section.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param name The name of the new section.
          */
         addSectionGroup(name: string): OneNote.SectionGroup;
+        /**
+         *
+         * Gets the REST API ID.
+         *
+         * [Api set: OneNoteApi]
+         */
+        getRestApiId(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Notebook;
+        load(option?: OneNote.Interfaces.NotebookLoadOptions): OneNote.Notebook;
+        load(option?: string | string[]): OneNote.Notebook;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Notebook;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.Notebook;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.Notebook;
+        toJSON(): OneNote.Interfaces.NotebookData;
     }
     /**
      *
@@ -20837,49 +37199,57 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class NotebookCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.Notebook>;
+        readonly items: Array<OneNote.Notebook>;
         /**
          *
          * Returns the number of notebooks in the collection. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets the collection of notebooks with the specified name that are open in the application instance.
          *
-         * @param name The name of the notebook.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param name The name of the notebook.
          */
         getByName(name: string): OneNote.NotebookCollection;
         /**
          *
          * Gets a notebook by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the notebook, or the index location of the notebook in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the notebook, or the index location of the notebook in the collection.
          */
         getItem(index: number | string): OneNote.Notebook;
         /**
          *
          * Gets a notebook on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.Notebook;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.NotebookCollection;
+        load(option?: OneNote.Interfaces.NotebookCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.NotebookCollection;
+        load(option?: string | string[]): OneNote.NotebookCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.NotebookCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.NotebookCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.NotebookCollection;
+        toJSON(): OneNote.Interfaces.NotebookCollectionData;
     }
     /**
      *
@@ -20888,93 +37258,105 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class SectionGroup extends OfficeExtension.ClientObject {
-        private m_clientUrl;
-        private m_id;
-        private m_name;
-        private m_notebook;
-        private m_parentSectionGroup;
-        private m_parentSectionGroupOrNull;
-        private m_sectionGroups;
-        private m_sections;
-        private m__ReferenceId;
         /**
          *
          * Gets the notebook that contains the section group. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        notebook: OneNote.Notebook;
+        readonly notebook: OneNote.Notebook;
         /**
          *
          * Gets the section group that contains the section group. Throws ItemNotFound if the section group is a direct child of the notebook. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentSectionGroup: OneNote.SectionGroup;
+        readonly parentSectionGroup: OneNote.SectionGroup;
         /**
          *
          * Gets the section group that contains the section group. Returns null if the section group is a direct child of the notebook. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentSectionGroupOrNull: OneNote.SectionGroup;
+        readonly parentSectionGroupOrNull: OneNote.SectionGroup;
         /**
          *
          * The collection of section groups in the section group. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        sectionGroups: OneNote.SectionGroupCollection;
+        readonly sectionGroups: OneNote.SectionGroupCollection;
         /**
          *
          * The collection of sections in the section group. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        sections: OneNote.SectionCollection;
+        readonly sections: OneNote.SectionCollection;
         /**
          *
          * The client url of the section group. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        clientUrl: string;
+        readonly clientUrl: string;
         /**
          *
          * Gets the ID of the section group. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the name of the section group. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        name: string;
+        readonly name: string;
         /**
          *
          * Adds a new section to the end of the section group.
          *
-         * @param title The name of the new section.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param title The name of the new section.
          */
         addSection(title: string): OneNote.Section;
         /**
          *
          * Adds a new section group to the end of this sectionGroup.
          *
-         * @param name The name of the new section.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param name The name of the new section.
          */
         addSectionGroup(name: string): OneNote.SectionGroup;
+        /**
+         *
+         * Gets the REST API ID.
+         *
+         * [Api set: OneNoteApi]
+         */
+        getRestApiId(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.SectionGroup;
+        load(option?: OneNote.Interfaces.SectionGroupLoadOptions): OneNote.SectionGroup;
+        load(option?: string | string[]): OneNote.SectionGroup;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.SectionGroup;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.SectionGroup;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.SectionGroup;
+        toJSON(): OneNote.Interfaces.SectionGroupData;
     }
     /**
      *
@@ -20983,49 +37365,57 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class SectionGroupCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.SectionGroup>;
+        readonly items: Array<OneNote.SectionGroup>;
         /**
          *
          * Returns the number of section groups in the collection. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets the collection of section groups with the specified name.
          *
-         * @param name The name of the section group.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param name The name of the section group.
          */
         getByName(name: string): OneNote.SectionGroupCollection;
         /**
          *
          * Gets a section group by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the section group, or the index location of the section group in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the section group, or the index location of the section group in the collection.
          */
         getItem(index: number | string): OneNote.SectionGroup;
         /**
          *
          * Gets a section group on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.SectionGroup;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.SectionGroupCollection;
+        load(option?: OneNote.Interfaces.SectionGroupCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.SectionGroupCollection;
+        load(option?: string | string[]): OneNote.SectionGroupCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.SectionGroupCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.SectionGroupCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.SectionGroupCollection;
+        toJSON(): OneNote.Interfaces.SectionGroupCollectionData;
     }
     /**
      *
@@ -21034,104 +37424,124 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Section extends OfficeExtension.ClientObject {
-        private m_clientUrl;
-        private m_id;
-        private m_name;
-        private m_notebook;
-        private m_pages;
-        private m_parentSectionGroup;
-        private m_parentSectionGroupOrNull;
-        private m__ReferenceId;
         /**
          *
          * Gets the notebook that contains the section. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        notebook: OneNote.Notebook;
+        readonly notebook: OneNote.Notebook;
         /**
          *
          * The collection of pages in the section. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        pages: OneNote.PageCollection;
+        readonly pages: OneNote.PageCollection;
         /**
          *
          * Gets the section group that contains the section. Throws ItemNotFound if the section is a direct child of the notebook. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentSectionGroup: OneNote.SectionGroup;
+        readonly parentSectionGroup: OneNote.SectionGroup;
         /**
          *
          * Gets the section group that contains the section. Returns null if the section is a direct child of the notebook. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentSectionGroupOrNull: OneNote.SectionGroup;
+        readonly parentSectionGroupOrNull: OneNote.SectionGroup;
         /**
          *
          * The client url of the section. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        clientUrl: string;
+        readonly clientUrl: string;
         /**
          *
          * Gets the ID of the section. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the name of the section. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        name: string;
+        readonly name: string;
+        /**
+         *
+         * The web url of the page. Read only
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        readonly webUrl: string;
         /**
          *
          * Adds a new page to the end of the section.
          *
-         * @param title The title of the new page.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param title The title of the new page.
          */
         addPage(title: string): OneNote.Page;
         /**
          *
          * Copies this section to specified notebook.
          *
-         * @param destinationNotebook The notebook to copy this section to.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param destinationNotebook The notebook to copy this section to.
          */
         copyToNotebook(destinationNotebook: OneNote.Notebook): OneNote.Section;
         /**
          *
          * Copies this section to specified section group.
          *
-         * @param destinationSectionGroup The section group to copy this section to.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param destinationSectionGroup The section group to copy this section to.
          */
         copyToSectionGroup(destinationSectionGroup: OneNote.SectionGroup): OneNote.Section;
+        /**
+         *
+         * Gets the REST API ID.
+         *
+         * [Api set: OneNoteApi]
+         */
+        getRestApiId(): OfficeExtension.ClientResult<string>;
         /**
          *
          * Inserts a new section before or after the current section.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param location The location of the new section relative to the current section.
          * @param title The name of the new section.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertSectionAsSibling(location: string, title: string): OneNote.Section;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Section;
+        load(option?: OneNote.Interfaces.SectionLoadOptions): OneNote.Section;
+        load(option?: string | string[]): OneNote.Section;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Section;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.Section;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.Section;
+        toJSON(): OneNote.Interfaces.SectionData;
     }
     /**
      *
@@ -21140,49 +37550,57 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class SectionCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.Section>;
+        readonly items: Array<OneNote.Section>;
         /**
          *
          * Returns the number of sections in the collection. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets the collection of sections with the specified name.
          *
-         * @param name The name of the section.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param name The name of the section.
          */
         getByName(name: string): OneNote.SectionCollection;
         /**
          *
          * Gets a section by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the section, or the index location of the section in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the section, or the index location of the section in the collection.
          */
         getItem(index: number | string): OneNote.Section;
         /**
          *
          * Gets a section on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.Section;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.SectionCollection;
+        load(option?: OneNote.Interfaces.SectionCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.SectionCollection;
+        load(option?: string | string[]): OneNote.SectionCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.SectionCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.SectionCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.SectionCollection;
+        toJSON(): OneNote.Interfaces.SectionCollectionData;
     }
     /**
      *
@@ -21191,50 +37609,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Page extends OfficeExtension.ClientObject {
-        private m_clientUrl;
-        private m_contents;
-        private m_id;
-        private m_inkAnalysisOrNull;
-        private m_pageLevel;
-        private m_parentSection;
-        private m_title;
-        private m_webUrl;
-        private m__ReferenceId;
         /**
          *
          * The collection of PageContent objects on the page. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        contents: OneNote.PageContentCollection;
+        readonly contents: OneNote.PageContentCollection;
         /**
          *
          * Text interpretation for the ink on the page. Returns null if there is no ink analysis information. Read only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        inkAnalysisOrNull: OneNote.InkAnalysis;
+        readonly inkAnalysisOrNull: OneNote.InkAnalysis;
         /**
          *
          * Gets the section that contains the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentSection: OneNote.Section;
+        readonly parentSection: OneNote.Section;
+        /**
+         *
+         * Gets the ClassNotebookPageSource to the page.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        readonly classNotebookPageSource: string;
         /**
          *
          * The client url of the page. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        clientUrl: string;
+        readonly clientUrl: string;
         /**
          *
          * Gets the ID of the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets or sets the indentation level of the page.
@@ -21255,41 +37671,101 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        webUrl: string;
+        readonly webUrl: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.PageUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Page): void;
         /**
          *
          * Adds an Outline to the page at the specified position.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param left The left position of the top, left corner of the Outline.
          * @param top The top position of the top, left corner of the Outline.
          * @param html An HTML string that describes the visual presentation of the Outline. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         addOutline(left: number, top: number, html: string): OneNote.Outline;
         /**
          *
-         * Copies this page to specified section.
+         * Return a json string with node id and content in html format.
          *
-         * @param destinationSection The section to copy this page to.
+         * [Api set: OneNoteApi]
+         */
+        analyzePage(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Inserts a new page with translated content.
          *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param translatedContent Translated content of the page
+         */
+        applyTranslation(translatedContent: string): void;
+        /**
+         *
+         * Copies this page to specified section.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param destinationSection The section to copy this page to.
          */
         copyToSection(destinationSection: OneNote.Section): OneNote.Page;
+        /**
+         *
+         * Copies this page to specified section and sets ClassNotebookPageSource.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        copyToSectionAndSetClassNotebookPageSource(destinationSection: OneNote.Section): OneNote.Page;
+        /**
+         *
+         * Gets the REST API ID.
+         *
+         * [Api set: OneNoteApi]
+         */
+        getRestApiId(): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Does the page has content title.
+         *
+         * [Api set: OneNoteApi]
+         */
+        hasTitleContent(): OfficeExtension.ClientResult<boolean>;
         /**
          *
          * Inserts a new page before or after the current page.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param location The location of the new page relative to the current page.
          * @param title The title of the new page.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertPageAsSibling(location: string, title: string): OneNote.Page;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Page;
+        load(option?: OneNote.Interfaces.PageLoadOptions): OneNote.Page;
+        load(option?: string | string[]): OneNote.Page;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Page;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.Page;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.Page;
+        toJSON(): OneNote.Interfaces.PageData;
     }
     /**
      *
@@ -21298,49 +37774,57 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class PageCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.Page>;
+        readonly items: Array<OneNote.Page>;
         /**
          *
          * Returns the number of pages in the collection. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets the collection of pages with the specified title.
          *
-         * @param title The title of the page.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param title The title of the page.
          */
         getByTitle(title: string): OneNote.PageCollection;
         /**
          *
          * Gets a page by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the page, or the index location of the page in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the page, or the index location of the page in the collection.
          */
         getItem(index: number | string): OneNote.Page;
         /**
          *
          * Gets a page on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.Page;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.PageCollection;
+        load(option?: OneNote.Interfaces.PageCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.PageCollection;
+        load(option?: string | string[]): OneNote.PageCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.PageCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.PageCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.PageCollection;
+        toJSON(): OneNote.Interfaces.PageCollectionData;
     }
     /**
      *
@@ -21349,50 +37833,41 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class PageContent extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_image;
-        private m_ink;
-        private m_left;
-        private m_outline;
-        private m_parentPage;
-        private m_top;
-        private m_type;
-        private m__ReferenceId;
         /**
          *
          * Gets the Image in the PageContent object. Throws an exception if PageContentType is not Image.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        image: OneNote.Image;
+        readonly image: OneNote.Image;
         /**
          *
          * Gets the ink in the PageContent object. Throws an exception if PageContentType is not Ink.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        ink: OneNote.FloatingInk;
+        readonly ink: OneNote.FloatingInk;
         /**
          *
          * Gets the Outline in the PageContent object. Throws an exception if PageContentType is not Outline.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        outline: OneNote.Outline;
+        readonly outline: OneNote.Outline;
         /**
          *
          * Gets the page that contains the PageContent object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentPage: OneNote.Page;
+        readonly parentPage: OneNote.Page;
         /**
          *
          * Gets the ID of the PageContent object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets or sets the left (X-axis) position of the PageContent object.
@@ -21413,7 +37888,16 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        type: string;
+        readonly type: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.PageContentUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: PageContent): void;
         /**
          *
          * Deletes the PageContent object.
@@ -21424,7 +37908,21 @@ declare namespace OneNote {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.PageContent;
+        load(option?: OneNote.Interfaces.PageContentLoadOptions): OneNote.PageContent;
+        load(option?: string | string[]): OneNote.PageContent;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.PageContent;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.PageContent;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.PageContent;
+        toJSON(): OneNote.Interfaces.PageContentData;
     }
     /**
      *
@@ -21433,40 +37931,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class PageContentCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.PageContent>;
+        readonly items: Array<OneNote.PageContent>;
         /**
          *
          * Returns the number of page contents in the collection. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a PageContent object by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the PageContent object, or the index location of the PageContent object in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the PageContent object, or the index location of the PageContent object in the collection.
          */
         getItem(index: number | string): OneNote.PageContent;
         /**
          *
          * Gets a page content on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.PageContent;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.PageContentCollection;
+        load(option?: OneNote.Interfaces.PageContentCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.PageContentCollection;
+        load(option?: string | string[]): OneNote.PageContentCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.PageContentCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.PageContentCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.PageContentCollection;
+        toJSON(): OneNote.Interfaces.PageContentCollectionData;
     }
     /**
      *
@@ -21475,75 +37981,92 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Outline extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_pageContent;
-        private m_paragraphs;
-        private m__ReferenceId;
         /**
          *
          * Gets the PageContent object that contains the Outline. This object defines the position of the Outline on the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        pageContent: OneNote.PageContent;
+        readonly pageContent: OneNote.PageContent;
         /**
          *
          * Gets the collection of Paragraph objects in the Outline. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraphs: OneNote.ParagraphCollection;
+        readonly paragraphs: OneNote.ParagraphCollection;
         /**
          *
          * Gets the ID of the Outline object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Adds the specified HTML to the bottom of the Outline.
          *
-         * @param html The HTML string to append. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param html The HTML string to append. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
          */
         appendHtml(html: string): void;
         /**
          *
          * Adds the specified image to the bottom of the Outline.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param base64EncodedImage HTML string to append.
          * @param width Optional. Width in the unit of Points. The default value is null and image width will be respected.
          * @param height Optional. Height in the unit of Points. The default value is null and image height will be respected.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         appendImage(base64EncodedImage: string, width: number, height: number): OneNote.Image;
         /**
          *
          * Adds the specified text to the bottom of the Outline.
          *
-         * @param paragraphText HTML string to append.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param paragraphText HTML string to append.
          */
         appendRichText(paragraphText: string): OneNote.RichText;
         /**
          *
          * Adds a table with the specified number of rows and columns to the bottom of the outline.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param rowCount Required. The number of rows in the table.
          * @param columnCount Required. The number of columns in the table.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         appendTable(rowCount: number, columnCount: number, values?: Array<Array<string>>): OneNote.Table;
+        /**
+         *
+         * Check if the outline is title outline.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        isTitle(): OfficeExtension.ClientResult<boolean>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Outline;
+        load(option?: OneNote.Interfaces.OutlineLoadOptions): OneNote.Outline;
+        load(option?: string | string[]): OneNote.Outline;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Outline;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.Outline;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.Outline;
+        toJSON(): OneNote.Interfaces.OutlineData;
     }
     /**
      *
@@ -21552,103 +38075,109 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Paragraph extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_image;
-        private m_inkWords;
-        private m_outline;
-        private m_paragraphs;
-        private m_parentParagraph;
-        private m_parentParagraphOrNull;
-        private m_parentTableCell;
-        private m_parentTableCellOrNull;
-        private m_richText;
-        private m_table;
-        private m_type;
-        private m__ReferenceId;
         /**
          *
          * Gets the Image object in the Paragraph. Throws an exception if ParagraphType is not Image. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        image: OneNote.Image;
+        readonly image: OneNote.Image;
         /**
          *
          * Gets the Ink collection in the Paragraph. Throws an exception if ParagraphType is not Ink. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        inkWords: OneNote.InkWordCollection;
+        readonly inkWords: OneNote.InkWordCollection;
         /**
          *
          * Gets the Outline object that contains the Paragraph. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        outline: OneNote.Outline;
+        readonly outline: OneNote.Outline;
         /**
          *
          * The collection of paragraphs under this paragraph. Read only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraphs: OneNote.ParagraphCollection;
+        readonly paragraphs: OneNote.ParagraphCollection;
         /**
          *
          * Gets the parent paragraph object. Throws if a parent paragraph does not exist. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentParagraph: OneNote.Paragraph;
+        readonly parentParagraph: OneNote.Paragraph;
         /**
          *
          * Gets the parent paragraph object. Returns null if a parent paragraph does not exist. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentParagraphOrNull: OneNote.Paragraph;
+        readonly parentParagraphOrNull: OneNote.Paragraph;
         /**
          *
          * Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, throws ItemNotFound. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentTableCell: OneNote.TableCell;
+        readonly parentTableCell: OneNote.TableCell;
         /**
          *
          * Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, returns null. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentTableCellOrNull: OneNote.TableCell;
+        readonly parentTableCellOrNull: OneNote.TableCell;
         /**
          *
          * Gets the RichText object in the Paragraph. Throws an exception if ParagraphType is not RichText. Read-only
          *
          * [Api set: OneNoteApi 1.1]
          */
-        richText: OneNote.RichText;
+        readonly richText: OneNote.RichText;
         /**
          *
          * Gets the Table object in the Paragraph. Throws an exception if ParagraphType is not Table. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        table: OneNote.Table;
+        readonly table: OneNote.Table;
         /**
          *
          * Gets the ID of the Paragraph object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the type of the Paragraph object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        type: string;
+        readonly type: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ParagraphUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Paragraph): void;
+        /**
+         *
+         * Add NoteTag to the paragraph.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param type The type of the NoteTag.
+         * @param status The status of the NoteTag.
+         */
+        addNoteTag(type: string, status: string): OneNote.NoteTag;
         /**
          *
          * Deletes the paragraph
@@ -21656,54 +38185,75 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         delete(): void;
+        /**
+         *
+         * Get list information of paragraph
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        getParagraphInfo(): OfficeExtension.ClientResult<OneNote.ParagraphInfo>;
         /**
          *
          * Inserts the specified HTML content
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param insertLocation The location of new contents relative to the current Paragraph.
          * @param html An HTML string that describes the visual presentation of the content. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertHtmlAsSibling(insertLocation: string, html: string): void;
         /**
          *
          * Inserts the image at the specified insert location..
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param insertLocation The location of the table relative to the current Paragraph.
          * @param base64EncodedImage HTML string to append.
          * @param width Optional. Width in the unit of Points. The default value is null and image width will be respected.
          * @param height Optional. Height in the unit of Points. The default value is null and image height will be respected.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertImageAsSibling(insertLocation: string, base64EncodedImage: string, width: number, height: number): OneNote.Image;
         /**
          *
          * Inserts the paragraph text at the specifiec insert location.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param insertLocation The location of the table relative to the current Paragraph.
          * @param paragraphText HTML string to append.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertRichTextAsSibling(insertLocation: string, paragraphText: string): OneNote.RichText;
         /**
          *
          * Adds a table with the specified number of rows and columns before or after the current paragraph.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param insertLocation The location of the table relative to the current Paragraph.
          * @param rowCount The number of rows in the table.
          * @param columnCount The number of columns in the table.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertTableAsSibling(insertLocation: string, rowCount: number, columnCount: number, values?: Array<Array<string>>): OneNote.Table;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Paragraph;
+        load(option?: OneNote.Interfaces.ParagraphLoadOptions): OneNote.Paragraph;
+        load(option?: string | string[]): OneNote.Paragraph;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Paragraph;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.Paragraph;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.Paragraph;
+        toJSON(): OneNote.Interfaces.ParagraphData;
     }
     /**
      *
@@ -21712,40 +38262,95 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class ParagraphCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.Paragraph>;
+        readonly items: Array<OneNote.Paragraph>;
         /**
          *
          * Returns the number of paragraphs in the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a Paragraph object by ID or by its index in the collection. Read-only.
          *
-         * @param index The ID of the Paragraph object, or the index location of the Paragraph object in the collection.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index The ID of the Paragraph object, or the index location of the Paragraph object in the collection.
          */
         getItem(index: number | string): OneNote.Paragraph;
         /**
          *
          * Gets a paragraph on its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.Paragraph;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.ParagraphCollection;
+        load(option?: OneNote.Interfaces.ParagraphCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.ParagraphCollection;
+        load(option?: string | string[]): OneNote.ParagraphCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.ParagraphCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.ParagraphCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.ParagraphCollection;
+        toJSON(): OneNote.Interfaces.ParagraphCollectionData;
+    }
+    /**
+     *
+     * A container for the NoteTag in a paragraph.
+     *
+     * [Api set: OneNoteApi 1.1]
+     */
+    class NoteTag extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Gets the Id of the NoteTag object. Read-only.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        readonly id: string;
+        /**
+         *
+         * Gets the status of the NoteTag object. Read-only.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        readonly status: string;
+        /**
+         *
+         * Gets the type of the NoteTag object. Read-only.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        readonly type: string;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: OneNote.Interfaces.NoteTagLoadOptions): OneNote.NoteTag;
+        load(option?: string | string[]): OneNote.NoteTag;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.NoteTag;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.NoteTag;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.NoteTag;
+        toJSON(): OneNote.Interfaces.NoteTagData;
     }
     /**
      *
@@ -21754,35 +38359,60 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class RichText extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_paragraph;
-        private m_text;
-        private m__ReferenceId;
         /**
          *
          * Gets the Paragraph object that contains the RichText object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraph: OneNote.Paragraph;
+        readonly paragraph: OneNote.Paragraph;
         /**
          *
          * Gets the ID of the RichText object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
+        /**
+         *
+         * The language id of the text. Read-only.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        readonly languageId: string;
         /**
          *
          * Gets the text content of the RichText object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        text: string;
+        readonly text: string;
+        /**
+         *
+         * Get the HTML of the rich text
+         *
+         * [Api set: OneNoteApi]
+         * @returns The html of the rich text
+         */
+        getHtml(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.RichText;
+        load(option?: OneNote.Interfaces.RichTextLoadOptions): OneNote.RichText;
+        load(option?: string | string[]): OneNote.RichText;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.RichText;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.RichText;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.RichText;
+        toJSON(): OneNote.Interfaces.RichTextData;
     }
     /**
      *
@@ -21791,29 +38421,20 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Image extends OfficeExtension.ClientObject {
-        private m_description;
-        private m_height;
-        private m_hyperlink;
-        private m_id;
-        private m_ocrData;
-        private m_pageContent;
-        private m_paragraph;
-        private m_width;
-        private m__ReferenceId;
         /**
          *
          * Gets the PageContent object that contains the Image. Throws if the Image is not a direct child of a PageContent. This object defines the position of the Image on the page. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        pageContent: OneNote.PageContent;
+        readonly pageContent: OneNote.PageContent;
         /**
          *
          * Gets the Paragraph object that contains the Image. Throws if the Image is not a direct child of a Paragraph. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraph: OneNote.Paragraph;
+        readonly paragraph: OneNote.Paragraph;
         /**
          *
          * Gets or sets the description of the Image.
@@ -21841,14 +38462,14 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the data obtained by OCR (Optical Character Recognition) of this Image, such as OCR text and language.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        ocrData: OneNote.ImageOcrData;
+        readonly ocrData: OneNote.ImageOcrData;
         /**
          *
          * Gets or sets the width of the Image layout.
@@ -21856,6 +38477,15 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         width: number;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.ImageUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Image): void;
         /**
          *
          * Gets the base64-encoded binary representation of the Image.
@@ -21867,7 +38497,21 @@ declare namespace OneNote {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Image;
+        load(option?: OneNote.Interfaces.ImageLoadOptions): OneNote.Image;
+        load(option?: string | string[]): OneNote.Image;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Image;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.Image;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.Image;
+        toJSON(): OneNote.Interfaces.ImageData;
     }
     /**
      *
@@ -21876,27 +38520,20 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class Table extends OfficeExtension.ClientObject {
-        private m_borderVisible;
-        private m_columnCount;
-        private m_id;
-        private m_paragraph;
-        private m_rowCount;
-        private m_rows;
-        private m__ReferenceId;
         /**
          *
          * Gets the Paragraph object that contains the Table object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraph: OneNote.Paragraph;
+        readonly paragraph: OneNote.Paragraph;
         /**
          *
          * Gets all of the table rows. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        rows: OneNote.TableRowCollection;
+        readonly rows: OneNote.TableRowCollection;
         /**
          *
          * Gets or sets whether the borders are visible or not. True if they are visible, false if they are hidden.
@@ -21910,37 +38547,46 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        columnCount: number;
+        readonly columnCount: number;
         /**
          *
          * Gets the ID of the table. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the number of rows in the table.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        rowCount: number;
+        readonly rowCount: number;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.TableUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Table): void;
         /**
          *
          * Adds a column to the end of the table. Values, if specified, are set in the new column. Otherwise the column is empty.
          *
-         * @param values Optional. Strings to insert in the new column, specified as an array. Must not have more values than rows in the table.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param values Optional. Strings to insert in the new column, specified as an array. Must not have more values than rows in the table.
          */
         appendColumn(values?: Array<string>): void;
         /**
          *
          * Adds a row to the end of the table. Values, if specified, are set in the new row. Otherwise the row is empty.
          *
-         * @param values Optional. Strings to insert in the new row, specified as an array. Must not have more values than columns in the table.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param values Optional. Strings to insert in the new row, specified as an array. Must not have more values than columns in the table.
          */
         appendRow(values?: Array<string>): OneNote.TableRow;
         /**
@@ -21954,37 +38600,51 @@ declare namespace OneNote {
          *
          * Gets the table cell at a specified row and column.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param rowIndex The index of the row.
          * @param cellIndex The index of the cell in the row.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         getCell(rowIndex: number, cellIndex: number): OneNote.TableCell;
         /**
          *
          * Inserts a column at the given index in the table. Values, if specified, are set in the new column. Otherwise the column is empty.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param index Index where the column will be inserted in the table.
          * @param values Optional. Strings to insert in the new column, specified as an array. Must not have more values than rows in the table.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertColumn(index: number, values?: Array<string>): void;
         /**
          *
          * Inserts a row at the given index in the table. Values, if specified, are set in the new row. Otherwise the row is empty.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param index Index where the row will be inserted in the table.
          * @param values Optional. Strings to insert in the new row, specified as an array. Must not have more values than columns in the table.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertRow(index: number, values?: Array<string>): OneNote.TableRow;
         setShadingColor(colorCode: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.Table;
+        load(option?: OneNote.Interfaces.TableLoadOptions): OneNote.Table;
+        load(option?: string | string[]): OneNote.Table;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.Table;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.Table;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.Table;
+        toJSON(): OneNote.Interfaces.TableData;
     }
     /**
      *
@@ -21993,47 +38653,41 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class TableRow extends OfficeExtension.ClientObject {
-        private m_cellCount;
-        private m_cells;
-        private m_id;
-        private m_parentTable;
-        private m_rowIndex;
-        private m__ReferenceId;
         /**
          *
          * Gets the cells in the row. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        cells: OneNote.TableCellCollection;
+        readonly cells: OneNote.TableCellCollection;
         /**
          *
          * Gets the parent table. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentTable: OneNote.Table;
+        readonly parentTable: OneNote.Table;
         /**
          *
          * Gets the number of cells in the row. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        cellCount: number;
+        readonly cellCount: number;
         /**
          *
          * Gets the ID of the row. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the index of the row in its parent table. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        rowIndex: number;
+        readonly rowIndex: number;
         /**
          *
          * Clears the contents of the row.
@@ -22045,17 +38699,31 @@ declare namespace OneNote {
          *
          * Inserts a row before or after the current row.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param insertLocation Where the new rows should be inserted relative to the current row.
          * @param values Strings to insert in the new row, specified as an array. Must not have more cells than in the current row. Optional.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         insertRowAsSibling(insertLocation: string, values?: Array<string>): OneNote.TableRow;
         setShadingColor(colorCode: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.TableRow;
+        load(option?: OneNote.Interfaces.TableRowLoadOptions): OneNote.TableRow;
+        load(option?: string | string[]): OneNote.TableRow;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.TableRow;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.TableRow;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.TableRow;
+        toJSON(): OneNote.Interfaces.TableRowData;
     }
     /**
      *
@@ -22064,40 +38732,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class TableRowCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.TableRow>;
+        readonly items: Array<OneNote.TableRow>;
         /**
          *
          * Returns the number of table rows in this collection. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a table row object by ID or by its index in the collection. Read-only.
          *
-         * @param index A number that identifies the index location of a table row object.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index A number that identifies the index location of a table row object.
          */
         getItem(index: number | string): OneNote.TableRow;
         /**
          *
          * Gets a table row at its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.TableRow;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.TableRowCollection;
+        load(option?: OneNote.Interfaces.TableRowCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.TableRowCollection;
+        load(option?: string | string[]): OneNote.TableRowCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.TableRowCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.TableRowCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.TableRowCollection;
+        toJSON(): OneNote.Interfaces.TableRowCollectionData;
     }
     /**
      *
@@ -22106,48 +38782,41 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class TableCell extends OfficeExtension.ClientObject {
-        private m_cellIndex;
-        private m_id;
-        private m_paragraphs;
-        private m_parentRow;
-        private m_rowIndex;
-        private m_shadingColor;
-        private m__ReferenceId;
         /**
          *
          * Gets the collection of Paragraph objects in the TableCell. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        paragraphs: OneNote.ParagraphCollection;
+        readonly paragraphs: OneNote.ParagraphCollection;
         /**
          *
          * Gets the parent row of the cell. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        parentRow: OneNote.TableRow;
+        readonly parentRow: OneNote.TableRow;
         /**
          *
          * Gets the index of the cell in its row. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        cellIndex: number;
+        readonly cellIndex: number;
         /**
          *
          * Gets the ID of the cell. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        id: string;
+        readonly id: string;
         /**
          *
          * Gets the index of the cell's row in the table. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        rowIndex: number;
+        readonly rowIndex: number;
         /**
          *
          * Gets and sets the shading color of the cell
@@ -22155,44 +38824,53 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         shadingColor: string;
+        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        set(properties: Interfaces.TableCellUpdateData, options?: {
+            /**
+             * Throw an error if the passed-in property list includes read-only properties (default = true).
+             */
+            throwOnReadOnly?: boolean;
+        }): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: TableCell): void;
         /**
          *
          * Adds the specified HTML to the bottom of the TableCell.
          *
-         * @param html The HTML string to append. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param html The HTML string to append. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
          */
         appendHtml(html: string): void;
         /**
          *
          * Adds the specified image to table cell.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param base64EncodedImage HTML string to append.
          * @param width Optional. Width in the unit of Points. The default value is null and image width will be respected.
          * @param height Optional. Height in the unit of Points. The default value is null and image height will be respected.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         appendImage(base64EncodedImage: string, width: number, height: number): OneNote.Image;
         /**
          *
          * Adds the specified text to table cell.
          *
-         * @param paragraphText HTML string to append.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param paragraphText HTML string to append.
          */
         appendRichText(paragraphText: string): OneNote.RichText;
         /**
          *
          * Adds a table with the specified number of rows and columns to table cell.
          *
+         * [Api set: OneNoteApi 1.1]
+         *
          * @param rowCount Required. The number of rows in the table.
          * @param columnCount Required. The number of columns in the table.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
-         *
-         * [Api set: OneNoteApi 1.1]
          */
         appendTable(rowCount: number, columnCount: number, values?: Array<Array<string>>): OneNote.Table;
         /**
@@ -22205,7 +38883,21 @@ declare namespace OneNote {
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.TableCell;
+        load(option?: OneNote.Interfaces.TableCellLoadOptions): OneNote.TableCell;
+        load(option?: string | string[]): OneNote.TableCell;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): OneNote.TableCell;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.TableCell;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.TableCell;
+        toJSON(): OneNote.Interfaces.TableCellData;
     }
     /**
      *
@@ -22214,40 +38906,48 @@ declare namespace OneNote {
      * [Api set: OneNoteApi 1.1]
      */
     class TableCellCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__ReferenceId;
-        private m__items;
         /** Gets the loaded child items in this collection. */
-        items: Array<OneNote.TableCell>;
+        readonly items: Array<OneNote.TableCell>;
         /**
          *
          * Returns the number of tablecells in this collection. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        count: number;
+        readonly count: number;
         /**
          *
          * Gets a table cell object by ID or by its index in the collection. Read-only.
          *
-         * @param index A number that identifies the index location of a table cell object.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index A number that identifies the index location of a table cell object.
          */
         getItem(index: number | string): OneNote.TableCell;
         /**
          *
          * Gets a tablecell at its position in the collection.
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
-         *
          * [Api set: OneNoteApi 1.1]
+         *
+         * @param index Index value of the object to be retrieved. Zero-indexed.
          */
         getItemAt(index: number): OneNote.TableCell;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
-        load(option?: string | string[] | OfficeExtension.LoadOption): OneNote.TableCellCollection;
+        load(option?: OneNote.Interfaces.TableCellCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.TableCellCollection;
+        load(option?: string | string[]): OneNote.TableCellCollection;
+        load(option?: OfficeExtension.LoadOption): OneNote.TableCellCollection;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): OneNote.TableCellCollection;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): OneNote.TableCellCollection;
+        toJSON(): OneNote.Interfaces.TableCellCollectionData;
     }
     /**
      *
@@ -22293,17 +38993,208 @@ declare namespace OneNote {
          */
         inkStrokeId: string;
     }
+    /**
+     *
+     * Service token for Application::_GetServiceToken.
+     *
+     * [Api set: OneNoteApi 1.1]
+     */
+    interface ServiceToken {
+        /**
+         *
+         * Account type
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        accountType: string;
+        /**
+         *
+         * //
+            Header name of the service token
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        headerName: string;
+        /**
+         *
+         * Header value of the service token
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        headerValue: string;
+    }
+    /**
+     *
+     * Account information.
+     *
+     * [Api set: OneNoteApi 1.1]
+     */
+    interface AccountInfo {
+        /**
+         *
+         * Account type
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        accountType: string;
+        /**
+         *
+         * Account email
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        email: string;
+        /**
+         *
+         * //
+            Account user name
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        userName: string;
+    }
+    /**
+     *
+     * List information for paragraph.
+     *
+     * [Api set: OneNoteApi 1.1]
+     */
+    interface ParagraphInfo {
+        /**
+         *
+         * //
+            Bullet list type of paragraph
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        bulletType: string;
+        /**
+         *
+         * //
+            Index of paragraph in list
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        index: number;
+        /**
+         *
+         * //
+            Type of list in paragraph
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        listType: string;
+        /**
+         *
+         * //
+            number list type of paragraph
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        numberType: string;
+    }
+    /**
+     *
+     * Account information.
+     *
+     * [Api set: OneNoteApi 1.1]
+     */
+    interface LoggingInfo {
+        /**
+         *
+         * //
+            Correlation Id
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        correlationId: string;
+        /**
+         *
+         * //
+            UI Language
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        market: string;
+        /**
+         *
+         * //
+            Session Id
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        sessionId: string;
+        /**
+         *
+         * //
+            UI Language
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        uiLanguage: string;
+        /**
+         *
+         * //
+            User Id
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        userId: string;
+    }
+    /**
+     *
+     * Account information.
+     *
+     * [Api set: OneNoteApi 1.1]
+     */
+    interface LogData {
+        /**
+         *
+         * //
+            None PII
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        isNonPII: boolean;
+        /**
+         *
+         * //
+            data tag
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        tag: string;
+        /**
+         *
+         * //
+            data value
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        value: string;
+    }
     /**
      * [Api set: OneNoteApi]
      */
-    module InsertLocation {
+    namespace InsertLocation {
         var before: string;
         var after: string;
     }
     /**
      * [Api set: OneNoteApi]
      */
-    module Alignment {
+    namespace Platform {
+        var other: string;
+        var web: string;
+        var uwp: string;
+        var win32: string;
+        var mac: string;
+        var ios: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace Alignment {
         var left: string;
         var centered: string;
         var right: string;
@@ -22312,7 +39203,7 @@ declare namespace OneNote {
     /**
      * [Api set: OneNoteApi]
      */
-    module Selected {
+    namespace Selected {
         var notSelected: string;
         var partialSelected: string;
         var selected: string;
@@ -22320,7 +39211,7 @@ declare namespace OneNote {
     /**
      * [Api set: OneNoteApi]
      */
-    module PageContentType {
+    namespace PageContentType {
         var outline: string;
         var image: string;
         var ink: string;
@@ -22329,28 +39220,2957 @@ declare namespace OneNote {
     /**
      * [Api set: OneNoteApi]
      */
-    module ParagraphType {
+    namespace ParagraphType {
         var richText: string;
         var image: string;
         var table: string;
         var ink: string;
         var other: string;
     }
-    module ErrorCodes {
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace NoteTagType {
+        var unknown: string;
+        var toDo: string;
+        var important: string;
+        var question: string;
+        var contact: string;
+        var address: string;
+        var phoneNumber: string;
+        var website: string;
+        var idea: string;
+        var critical: string;
+        var toDoPriority1: string;
+        var toDoPriority2: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace NoteTagStatus {
+        var unknown: string;
+        var normal: string;
+        var completed: string;
+        var disabled: string;
+        var outlookTask: string;
+        var taskNotSyncedYet: string;
+        var taskRemoved: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace ServiceId {
+        var form: string;
+        var entity: string;
+        var graph: string;
+        var oneService: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace IdentityFilter {
+        var selection: string;
+        var activeProfile: string;
+        var liveId: string;
+        var orgId: string;
+        var adal: string;
+        var notebook: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace ListType {
+        var none: string;
+        var number: string;
+        var bullet: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace AccountType {
+        var other: string;
+        var liveId: string;
+        var orgId: string;
+        var adal: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace LogLevel {
+        var trace: string;
+        var data: string;
+        var exception: string;
+        var warning: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace EventFlag {
+        /**
+         *
+         * DefaultEventFlags
+         *
+         */
+        var defaultFlag: string;
+        /**
+         *
+         * CriticalDataEventFlags
+         *
+         */
+        var criticalFlag: string;
+        /**
+         *
+         * MeasureDataEventFlags
+         *
+         */
+        var measureFlag: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace NumberType {
+        var none: string;
+        var arabic: string;
+        var ucroman: string;
+        var lcroman: string;
+        var ucletter: string;
+        var lcletter: string;
+        var ordinal: string;
+        var cardtext: string;
+        var ordtext: string;
+        var hex: string;
+        var chiManSty: string;
+        var dbNum1: string;
+        var dbNum2: string;
+        var aiueo: string;
+        var iroha: string;
+        var dbChar: string;
+        var sbChar: string;
+        var dbNum3: string;
+        var dbNum4: string;
+        var circlenum: string;
+        var darabic: string;
+        var daiueo: string;
+        var diroha: string;
+        var arabicLZ: string;
+        var bullet: string;
+        var ganada: string;
+        var chosung: string;
+        var gb1: string;
+        var gb2: string;
+        var gb3: string;
+        var gb4: string;
+        var zodiac1: string;
+        var zodiac2: string;
+        var zodiac3: string;
+        var tpeDbNum1: string;
+        var tpeDbNum2: string;
+        var tpeDbNum3: string;
+        var tpeDbNum4: string;
+        var chnDbNum1: string;
+        var chnDbNum2: string;
+        var chnDbNum3: string;
+        var chnDbNum4: string;
+        var korDbNum1: string;
+        var korDbNum2: string;
+        var korDbNum3: string;
+        var korDbNum4: string;
+        var hebrew1: string;
+        var arabic1: string;
+        var hebrew2: string;
+        var arabic2: string;
+        var hindi1: string;
+        var hindi2: string;
+        var hindi3: string;
+        var thai1: string;
+        var thai2: string;
+        var numInDash: string;
+        var lcrus: string;
+        var ucrus: string;
+        var lcgreek: string;
+        var ucgreek: string;
+        var lim: string;
+        var custom: string;
+    }
+    /**
+     * [Api set: OneNoteApi]
+     */
+    namespace ControlId {
+        var preinstallClassNotebook: string;
+        var distributePageId: string;
+        var distributeSection: string;
+        var reviewStudentWork: string;
+        var openTabForCreateClassNotebook: string;
+        var openTabForManageStudent: string;
+        var openTabForManageTeacher: string;
+        var openTabForGetNotebookLink: string;
+        var openTabForTeacherTraining: string;
+        var openTabForAddinGuide: string;
+        var openTabForEducationBlog: string;
+        var openTabForEducatorCommunity: string;
+        var openTabToSendFeedback: string;
+        var openTabForViewKnowledgeBase: string;
+        var openTabForSuggestingFeature: string;
+        var createAssignment: string;
+        var connections: string;
+        var mapClassNotebooks: string;
+        var mapStudents: string;
+        var manageClasses: string;
+    }
+    namespace ErrorCodes {
         var generalException: string;
     }
+    namespace Interfaces {
+        interface CollectionLoadOptions {
+            $top?: number;
+            $skip?: number;
+        }
+        /** An interface for updating data on the InkAnalysis object, for use in "inkAnalysis.set({ ... })". */
+        interface InkAnalysisUpdateData {
+            /**
+            *
+            * Gets the parent page object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            page?: OneNote.Interfaces.PageUpdateData;
+        }
+        /** An interface for updating data on the InkAnalysisParagraph object, for use in "inkAnalysisParagraph.set({ ... })". */
+        interface InkAnalysisParagraphUpdateData {
+            /**
+            *
+            * Reference to the parent InkAnalysisPage.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysis?: OneNote.Interfaces.InkAnalysisUpdateData;
+        }
+        /** An interface for updating data on the InkAnalysisParagraphCollection object, for use in "inkAnalysisParagraphCollection.set({ ... })". */
+        interface InkAnalysisParagraphCollectionUpdateData {
+            items?: OneNote.Interfaces.InkAnalysisParagraphData[];
+        }
+        /** An interface for updating data on the InkAnalysisLine object, for use in "inkAnalysisLine.set({ ... })". */
+        interface InkAnalysisLineUpdateData {
+            /**
+            *
+            * Reference to the parent InkAnalysisParagraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.InkAnalysisParagraphUpdateData;
+        }
+        /** An interface for updating data on the InkAnalysisLineCollection object, for use in "inkAnalysisLineCollection.set({ ... })". */
+        interface InkAnalysisLineCollectionUpdateData {
+            items?: OneNote.Interfaces.InkAnalysisLineData[];
+        }
+        /** An interface for updating data on the InkAnalysisWord object, for use in "inkAnalysisWord.set({ ... })". */
+        interface InkAnalysisWordUpdateData {
+            /**
+            *
+            * Reference to the parent InkAnalysisLine.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            line?: OneNote.Interfaces.InkAnalysisLineUpdateData;
+        }
+        /** An interface for updating data on the InkAnalysisWordCollection object, for use in "inkAnalysisWordCollection.set({ ... })". */
+        interface InkAnalysisWordCollectionUpdateData {
+            items?: OneNote.Interfaces.InkAnalysisWordData[];
+        }
+        /** An interface for updating data on the InkStrokeCollection object, for use in "inkStrokeCollection.set({ ... })". */
+        interface InkStrokeCollectionUpdateData {
+            items?: OneNote.Interfaces.InkStrokeData[];
+        }
+        /** An interface for updating data on the InkWordCollection object, for use in "inkWordCollection.set({ ... })". */
+        interface InkWordCollectionUpdateData {
+            items?: OneNote.Interfaces.InkWordData[];
+        }
+        /** An interface for updating data on the NotebookCollection object, for use in "notebookCollection.set({ ... })". */
+        interface NotebookCollectionUpdateData {
+            items?: OneNote.Interfaces.NotebookData[];
+        }
+        /** An interface for updating data on the SectionGroupCollection object, for use in "sectionGroupCollection.set({ ... })". */
+        interface SectionGroupCollectionUpdateData {
+            items?: OneNote.Interfaces.SectionGroupData[];
+        }
+        /** An interface for updating data on the SectionCollection object, for use in "sectionCollection.set({ ... })". */
+        interface SectionCollectionUpdateData {
+            items?: OneNote.Interfaces.SectionData[];
+        }
+        /** An interface for updating data on the Page object, for use in "page.set({ ... })". */
+        interface PageUpdateData {
+            /**
+            *
+            * Text interpretation for the ink on the page. Returns null if there is no ink analysis information. Read only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysisOrNull?: OneNote.Interfaces.InkAnalysisUpdateData;
+            /**
+             *
+             * Gets or sets the indentation level of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            pageLevel?: number;
+            /**
+             *
+             * Gets or sets the title of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            title?: string;
+        }
+        /** An interface for updating data on the PageCollection object, for use in "pageCollection.set({ ... })". */
+        interface PageCollectionUpdateData {
+            items?: OneNote.Interfaces.PageData[];
+        }
+        /** An interface for updating data on the PageContent object, for use in "pageContent.set({ ... })". */
+        interface PageContentUpdateData {
+            /**
+            *
+            * Gets the Image in the PageContent object. Throws an exception if PageContentType is not Image.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageUpdateData;
+            /**
+             *
+             * Gets or sets the left (X-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            left?: number;
+            /**
+             *
+             * Gets or sets the top (Y-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            top?: number;
+        }
+        /** An interface for updating data on the PageContentCollection object, for use in "pageContentCollection.set({ ... })". */
+        interface PageContentCollectionUpdateData {
+            items?: OneNote.Interfaces.PageContentData[];
+        }
+        /** An interface for updating data on the Paragraph object, for use in "paragraph.set({ ... })". */
+        interface ParagraphUpdateData {
+            /**
+            *
+            * Gets the Image object in the Paragraph. Throws an exception if ParagraphType is not Image.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageUpdateData;
+            /**
+            *
+            * Gets the Table object in the Paragraph. Throws an exception if ParagraphType is not Table.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            table?: OneNote.Interfaces.TableUpdateData;
+        }
+        /** An interface for updating data on the ParagraphCollection object, for use in "paragraphCollection.set({ ... })". */
+        interface ParagraphCollectionUpdateData {
+            items?: OneNote.Interfaces.ParagraphData[];
+        }
+        /** An interface for updating data on the Image object, for use in "image.set({ ... })". */
+        interface ImageUpdateData {
+            /**
+             *
+             * Gets or sets the description of the Image.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            description?: string;
+            /**
+             *
+             * Gets or sets the height of the Image layout.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            height?: number;
+            /**
+             *
+             * Gets or sets the hyperlink of the Image.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            hyperlink?: string;
+            /**
+             *
+             * Gets or sets the width of the Image layout.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            width?: number;
+        }
+        /** An interface for updating data on the Table object, for use in "table.set({ ... })". */
+        interface TableUpdateData {
+            /**
+             *
+             * Gets or sets whether the borders are visible or not. True if they are visible, false if they are hidden.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            borderVisible?: boolean;
+        }
+        /** An interface for updating data on the TableRowCollection object, for use in "tableRowCollection.set({ ... })". */
+        interface TableRowCollectionUpdateData {
+            items?: OneNote.Interfaces.TableRowData[];
+        }
+        /** An interface for updating data on the TableCell object, for use in "tableCell.set({ ... })". */
+        interface TableCellUpdateData {
+            /**
+             *
+             * Gets and sets the shading color of the cell
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            shadingColor?: string;
+        }
+        /** An interface for updating data on the TableCellCollection object, for use in "tableCellCollection.set({ ... })". */
+        interface TableCellCollectionUpdateData {
+            items?: OneNote.Interfaces.TableCellData[];
+        }
+        /** An interface describing the data returned by calling "application.toJSON()". */
+        interface ApplicationData {
+            /**
+            *
+            * Gets the collection of notebooks that are open in the OneNote application instance. In OneNote Online, only one notebook at a time is open in the application instance. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebooks?: OneNote.Interfaces.NotebookData[];
+        }
+        /** An interface describing the data returned by calling "inkAnalysis.toJSON()". */
+        interface InkAnalysisData {
+            /**
+            *
+            * Gets the parent page object. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            page?: OneNote.Interfaces.PageData;
+            /**
+            *
+            * Gets the ink analysis paragraphs in this page. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.InkAnalysisParagraphData[];
+            /**
+             *
+             * Gets the ID of the InkAnalysis object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+        }
+        /** An interface describing the data returned by calling "inkAnalysisParagraph.toJSON()". */
+        interface InkAnalysisParagraphData {
+            /**
+            *
+            * Reference to the parent InkAnalysisPage. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysis?: OneNote.Interfaces.InkAnalysisData;
+            /**
+            *
+            * Gets the ink analysis lines in this ink analysis paragraph. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            lines?: OneNote.Interfaces.InkAnalysisLineData[];
+            /**
+             *
+             * Gets the ID of the InkAnalysisParagraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+        }
+        /** An interface describing the data returned by calling "inkAnalysisParagraphCollection.toJSON()". */
+        interface InkAnalysisParagraphCollectionData {
+            items?: OneNote.Interfaces.InkAnalysisParagraphData[];
+        }
+        /** An interface describing the data returned by calling "inkAnalysisLine.toJSON()". */
+        interface InkAnalysisLineData {
+            /**
+            *
+            * Reference to the parent InkAnalysisParagraph. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.InkAnalysisParagraphData;
+            /**
+            *
+            * Gets the ink analysis words in this ink analysis line. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            words?: OneNote.Interfaces.InkAnalysisWordData[];
+            /**
+             *
+             * Gets the ID of the InkAnalysisLine object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+        }
+        /** An interface describing the data returned by calling "inkAnalysisLineCollection.toJSON()". */
+        interface InkAnalysisLineCollectionData {
+            items?: OneNote.Interfaces.InkAnalysisLineData[];
+        }
+        /** An interface describing the data returned by calling "inkAnalysisWord.toJSON()". */
+        interface InkAnalysisWordData {
+            /**
+            *
+            * Reference to the parent InkAnalysisLine. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            line?: OneNote.Interfaces.InkAnalysisLineData;
+            /**
+             *
+             * Gets the ID of the InkAnalysisWord object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * The id of the recognized language in this inkAnalysisWord. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: string;
+            /**
+             *
+             * Weak references to the ink strokes that were recognized as part of this ink analysis word. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            strokePointers?: Array<OneNote.InkStrokePointer>;
+            /**
+             *
+             * The words that were recognized in this ink word, in order of likelihood. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            wordAlternates?: Array<string>;
+        }
+        /** An interface describing the data returned by calling "inkAnalysisWordCollection.toJSON()". */
+        interface InkAnalysisWordCollectionData {
+            items?: OneNote.Interfaces.InkAnalysisWordData[];
+        }
+        /** An interface describing the data returned by calling "floatingInk.toJSON()". */
+        interface FloatingInkData {
+            /**
+            *
+            * Gets the strokes of the FloatingInk object. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkStrokes?: OneNote.Interfaces.InkStrokeData[];
+            /**
+            *
+            * Gets the PageContent parent of the FloatingInk object. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pageContent?: OneNote.Interfaces.PageContentData;
+            /**
+             *
+             * Gets the ID of the FloatingInk object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+        }
+        /** An interface describing the data returned by calling "inkStroke.toJSON()". */
+        interface InkStrokeData {
+            /**
+            *
+            * Gets the ID of the InkStroke object. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            floatingInk?: OneNote.Interfaces.FloatingInkData;
+            /**
+             *
+             * Gets the ID of the InkStroke object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+        }
+        /** An interface describing the data returned by calling "inkStrokeCollection.toJSON()". */
+        interface InkStrokeCollectionData {
+            items?: OneNote.Interfaces.InkStrokeData[];
+        }
+        /** An interface describing the data returned by calling "inkWord.toJSON()". */
+        interface InkWordData {
+            /**
+            *
+            * The parent paragraph containing the ink word. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphData;
+            /**
+             *
+             * Gets the ID of the InkWord object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * The id of the recognized language in this ink word. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: string;
+            /**
+             *
+             * The words that were recognized in this ink word, in order of likelihood. Read-only.
+             *
+             * [Api set: OneNoteApi]
+             */
+            wordAlternates?: Array<string>;
+        }
+        /** An interface describing the data returned by calling "inkWordCollection.toJSON()". */
+        interface InkWordCollectionData {
+            items?: OneNote.Interfaces.InkWordData[];
+        }
+        /** An interface describing the data returned by calling "notebook.toJSON()". */
+        interface NotebookData {
+            /**
+            *
+            * The section groups in the notebook. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sectionGroups?: OneNote.Interfaces.SectionGroupData[];
+            /**
+            *
+            * The the sections of the notebook. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sections?: OneNote.Interfaces.SectionData[];
+            /**
+             *
+             * The url of the site that this notebook is located. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            baseUrl?: string;
+            /**
+             *
+             * The client url of the notebook. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: string;
+            /**
+             *
+             * Gets the ID of the notebook. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the name of the notebook. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: string;
+        }
+        /** An interface describing the data returned by calling "notebookCollection.toJSON()". */
+        interface NotebookCollectionData {
+            items?: OneNote.Interfaces.NotebookData[];
+        }
+        /** An interface describing the data returned by calling "sectionGroup.toJSON()". */
+        interface SectionGroupData {
+            /**
+            *
+            * Gets the notebook that contains the section group. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebook?: OneNote.Interfaces.NotebookData;
+            /**
+            *
+            * Gets the section group that contains the section group. Throws ItemNotFound if the section group is a direct child of the notebook. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroup?: OneNote.Interfaces.SectionGroupData;
+            /**
+            *
+            * Gets the section group that contains the section group. Returns null if the section group is a direct child of the notebook. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroupOrNull?: OneNote.Interfaces.SectionGroupData;
+            /**
+            *
+            * The collection of section groups in the section group. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sectionGroups?: OneNote.Interfaces.SectionGroupData[];
+            /**
+            *
+            * The collection of sections in the section group. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sections?: OneNote.Interfaces.SectionData[];
+            /**
+             *
+             * The client url of the section group. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: string;
+            /**
+             *
+             * Gets the ID of the section group. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the name of the section group. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: string;
+        }
+        /** An interface describing the data returned by calling "sectionGroupCollection.toJSON()". */
+        interface SectionGroupCollectionData {
+            items?: OneNote.Interfaces.SectionGroupData[];
+        }
+        /** An interface describing the data returned by calling "section.toJSON()". */
+        interface SectionData {
+            /**
+            *
+            * Gets the notebook that contains the section. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebook?: OneNote.Interfaces.NotebookData;
+            /**
+            *
+            * The collection of pages in the section. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pages?: OneNote.Interfaces.PageData[];
+            /**
+            *
+            * Gets the section group that contains the section. Throws ItemNotFound if the section is a direct child of the notebook. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroup?: OneNote.Interfaces.SectionGroupData;
+            /**
+            *
+            * Gets the section group that contains the section. Returns null if the section is a direct child of the notebook. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroupOrNull?: OneNote.Interfaces.SectionGroupData;
+            /**
+             *
+             * The client url of the section. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: string;
+            /**
+             *
+             * Gets the ID of the section. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the name of the section. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: string;
+            /**
+             *
+             * The web url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            webUrl?: string;
+        }
+        /** An interface describing the data returned by calling "sectionCollection.toJSON()". */
+        interface SectionCollectionData {
+            items?: OneNote.Interfaces.SectionData[];
+        }
+        /** An interface describing the data returned by calling "page.toJSON()". */
+        interface PageData {
+            /**
+            *
+            * The collection of PageContent objects on the page. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            contents?: OneNote.Interfaces.PageContentData[];
+            /**
+            *
+            * Text interpretation for the ink on the page. Returns null if there is no ink analysis information. Read only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysisOrNull?: OneNote.Interfaces.InkAnalysisData;
+            /**
+            *
+            * Gets the section that contains the page. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSection?: OneNote.Interfaces.SectionData;
+            /**
+             *
+             * Gets the ClassNotebookPageSource to the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            classNotebookPageSource?: string;
+            /**
+             *
+             * The client url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: string;
+            /**
+             *
+             * Gets the ID of the page. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets or sets the indentation level of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            pageLevel?: number;
+            /**
+             *
+             * Gets or sets the title of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            title?: string;
+            /**
+             *
+             * The web url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            webUrl?: string;
+        }
+        /** An interface describing the data returned by calling "pageCollection.toJSON()". */
+        interface PageCollectionData {
+            items?: OneNote.Interfaces.PageData[];
+        }
+        /** An interface describing the data returned by calling "pageContent.toJSON()". */
+        interface PageContentData {
+            /**
+            *
+            * Gets the Image in the PageContent object. Throws an exception if PageContentType is not Image.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageData;
+            /**
+            *
+            * Gets the ink in the PageContent object. Throws an exception if PageContentType is not Ink.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            ink?: OneNote.Interfaces.FloatingInkData;
+            /**
+            *
+            * Gets the Outline in the PageContent object. Throws an exception if PageContentType is not Outline.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            outline?: OneNote.Interfaces.OutlineData;
+            /**
+            *
+            * Gets the page that contains the PageContent object. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentPage?: OneNote.Interfaces.PageData;
+            /**
+             *
+             * Gets the ID of the PageContent object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets or sets the left (X-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            left?: number;
+            /**
+             *
+             * Gets or sets the top (Y-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            top?: number;
+            /**
+             *
+             * Gets the type of the PageContent object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: string;
+        }
+        /** An interface describing the data returned by calling "pageContentCollection.toJSON()". */
+        interface PageContentCollectionData {
+            items?: OneNote.Interfaces.PageContentData[];
+        }
+        /** An interface describing the data returned by calling "outline.toJSON()". */
+        interface OutlineData {
+            /**
+            *
+            * Gets the PageContent object that contains the Outline. This object defines the position of the Outline on the page. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pageContent?: OneNote.Interfaces.PageContentData;
+            /**
+            *
+            * Gets the collection of Paragraph objects in the Outline. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphData[];
+            /**
+             *
+             * Gets the ID of the Outline object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+        }
+        /** An interface describing the data returned by calling "paragraph.toJSON()". */
+        interface ParagraphData {
+            /**
+            *
+            * Gets the Image object in the Paragraph. Throws an exception if ParagraphType is not Image. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageData;
+            /**
+            *
+            * Gets the Ink collection in the Paragraph. Throws an exception if ParagraphType is not Ink. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkWords?: OneNote.Interfaces.InkWordData[];
+            /**
+            *
+            * Gets the Outline object that contains the Paragraph. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            outline?: OneNote.Interfaces.OutlineData;
+            /**
+            *
+            * The collection of paragraphs under this paragraph. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphData[];
+            /**
+            *
+            * Gets the parent paragraph object. Throws if a parent paragraph does not exist. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentParagraph?: OneNote.Interfaces.ParagraphData;
+            /**
+            *
+            * Gets the parent paragraph object. Returns null if a parent paragraph does not exist. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentParagraphOrNull?: OneNote.Interfaces.ParagraphData;
+            /**
+            *
+            * Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, throws ItemNotFound. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTableCell?: OneNote.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, returns null. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTableCellOrNull?: OneNote.Interfaces.TableCellData;
+            /**
+            *
+            * Gets the RichText object in the Paragraph. Throws an exception if ParagraphType is not RichText. Read-only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            richText?: OneNote.Interfaces.RichTextData;
+            /**
+            *
+            * Gets the Table object in the Paragraph. Throws an exception if ParagraphType is not Table. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            table?: OneNote.Interfaces.TableData;
+            /**
+             *
+             * Gets the ID of the Paragraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the type of the Paragraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: string;
+        }
+        /** An interface describing the data returned by calling "paragraphCollection.toJSON()". */
+        interface ParagraphCollectionData {
+            items?: OneNote.Interfaces.ParagraphData[];
+        }
+        /** An interface describing the data returned by calling "noteTag.toJSON()". */
+        interface NoteTagData {
+            /**
+             *
+             * Gets the Id of the NoteTag object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the status of the NoteTag object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            status?: string;
+            /**
+             *
+             * Gets the type of the NoteTag object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: string;
+        }
+        /** An interface describing the data returned by calling "richText.toJSON()". */
+        interface RichTextData {
+            /**
+            *
+            * Gets the Paragraph object that contains the RichText object. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphData;
+            /**
+             *
+             * Gets the ID of the RichText object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * The language id of the text. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: string;
+            /**
+             *
+             * Gets the text content of the RichText object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            text?: string;
+        }
+        /** An interface describing the data returned by calling "image.toJSON()". */
+        interface ImageData {
+            /**
+            *
+            * Gets the PageContent object that contains the Image. Throws if the Image is not a direct child of a PageContent. This object defines the position of the Image on the page. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pageContent?: OneNote.Interfaces.PageContentData;
+            /**
+            *
+            * Gets the Paragraph object that contains the Image. Throws if the Image is not a direct child of a Paragraph. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphData;
+            /**
+             *
+             * Gets or sets the description of the Image.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            description?: string;
+            /**
+             *
+             * Gets or sets the height of the Image layout.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            height?: number;
+            /**
+             *
+             * Gets or sets the hyperlink of the Image.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            hyperlink?: string;
+            /**
+             *
+             * Gets the ID of the Image object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the data obtained by OCR (Optical Character Recognition) of this Image, such as OCR text and language.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            ocrData?: OneNote.ImageOcrData;
+            /**
+             *
+             * Gets or sets the width of the Image layout.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            width?: number;
+        }
+        /** An interface describing the data returned by calling "table.toJSON()". */
+        interface TableData {
+            /**
+            *
+            * Gets the Paragraph object that contains the Table object. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphData;
+            /**
+            *
+            * Gets all of the table rows. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            rows?: OneNote.Interfaces.TableRowData[];
+            /**
+             *
+             * Gets or sets whether the borders are visible or not. True if they are visible, false if they are hidden.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            borderVisible?: boolean;
+            /**
+             *
+             * Gets the number of columns in the table.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            columnCount?: number;
+            /**
+             *
+             * Gets the ID of the table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the number of rows in the table.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowCount?: number;
+        }
+        /** An interface describing the data returned by calling "tableRow.toJSON()". */
+        interface TableRowData {
+            /**
+            *
+            * Gets the cells in the row. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            cells?: OneNote.Interfaces.TableCellData[];
+            /**
+            *
+            * Gets the parent table. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTable?: OneNote.Interfaces.TableData;
+            /**
+             *
+             * Gets the number of cells in the row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            cellCount?: number;
+            /**
+             *
+             * Gets the ID of the row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the index of the row in its parent table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowIndex?: number;
+        }
+        /** An interface describing the data returned by calling "tableRowCollection.toJSON()". */
+        interface TableRowCollectionData {
+            items?: OneNote.Interfaces.TableRowData[];
+        }
+        /** An interface describing the data returned by calling "tableCell.toJSON()". */
+        interface TableCellData {
+            /**
+            *
+            * Gets the collection of Paragraph objects in the TableCell. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphData[];
+            /**
+            *
+            * Gets the parent row of the cell. Read-only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentRow?: OneNote.Interfaces.TableRowData;
+            /**
+             *
+             * Gets the index of the cell in its row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            cellIndex?: number;
+            /**
+             *
+             * Gets the ID of the cell. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: string;
+            /**
+             *
+             * Gets the index of the cell's row in the table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowIndex?: number;
+            /**
+             *
+             * Gets and sets the shading color of the cell
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            shadingColor?: string;
+        }
+        /** An interface describing the data returned by calling "tableCellCollection.toJSON()". */
+        interface TableCellCollectionData {
+            items?: OneNote.Interfaces.TableCellData[];
+        }
+        /**
+         *
+         * Represents the top-level object that contains all globally addressable OneNote objects such as notebooks, the active notebook, and the active section.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface ApplicationLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the collection of notebooks that are open in the OneNote application instance. In OneNote Online, only one notebook at a time is open in the application instance.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebooks?: OneNote.Interfaces.NotebookCollectionLoadOptions;
+        }
+        /**
+         *
+         * Represents ink analysis data for a given set of ink strokes.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkAnalysisLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the parent page object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            page?: OneNote.Interfaces.PageLoadOptions;
+            /**
+            *
+            * Gets the ink analysis paragraphs in this page.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.InkAnalysisParagraphCollectionLoadOptions;
+            /**
+             *
+             * Gets the ID of the InkAnalysis object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * Represents ink analysis data for an identified paragraph formed by ink strokes.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkAnalysisParagraphLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Reference to the parent InkAnalysisPage.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysis?: OneNote.Interfaces.InkAnalysisLoadOptions;
+            /**
+            *
+            * Gets the ink analysis lines in this ink analysis paragraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            lines?: OneNote.Interfaces.InkAnalysisLineCollectionLoadOptions;
+            /**
+             *
+             * Gets the ID of the InkAnalysisParagraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of InkAnalysisParagraph objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkAnalysisParagraphCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Reference to the parent InkAnalysisPage.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysis?: OneNote.Interfaces.InkAnalysisLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the ink analysis lines in this ink analysis paragraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            lines?: OneNote.Interfaces.InkAnalysisLineCollectionLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the InkAnalysisParagraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * Represents ink analysis data for an identified text line formed by ink strokes.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkAnalysisLineLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Reference to the parent InkAnalysisParagraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.InkAnalysisParagraphLoadOptions;
+            /**
+            *
+            * Gets the ink analysis words in this ink analysis line.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            words?: OneNote.Interfaces.InkAnalysisWordCollectionLoadOptions;
+            /**
+             *
+             * Gets the ID of the InkAnalysisLine object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of InkAnalysisLine objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkAnalysisLineCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Reference to the parent InkAnalysisParagraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.InkAnalysisParagraphLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the ink analysis words in this ink analysis line.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            words?: OneNote.Interfaces.InkAnalysisWordCollectionLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the InkAnalysisLine object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * Represents ink analysis data for an identified word formed by ink strokes.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkAnalysisWordLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Reference to the parent InkAnalysisLine.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            line?: OneNote.Interfaces.InkAnalysisLineLoadOptions;
+            /**
+             *
+             * Gets the ID of the InkAnalysisWord object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * The id of the recognized language in this inkAnalysisWord. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: boolean;
+            /**
+             *
+             * Weak references to the ink strokes that were recognized as part of this ink analysis word. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            strokePointers?: boolean;
+            /**
+             *
+             * The words that were recognized in this ink word, in order of likelihood. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            wordAlternates?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of InkAnalysisWord objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkAnalysisWordCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Reference to the parent InkAnalysisLine.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            line?: OneNote.Interfaces.InkAnalysisLineLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the InkAnalysisWord object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The id of the recognized language in this inkAnalysisWord. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Weak references to the ink strokes that were recognized as part of this ink analysis word. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            strokePointers?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The words that were recognized in this ink word, in order of likelihood. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            wordAlternates?: boolean;
+        }
+        /**
+         *
+         * Represents a group of ink strokes.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface FloatingInkLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the strokes of the FloatingInk object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkStrokes?: OneNote.Interfaces.InkStrokeCollectionLoadOptions;
+            /**
+            *
+            * Gets the PageContent parent of the FloatingInk object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pageContent?: OneNote.Interfaces.PageContentLoadOptions;
+            /**
+             *
+             * Gets the ID of the FloatingInk object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * Represents a single stroke of ink.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkStrokeLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the ID of the InkStroke object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            floatingInk?: OneNote.Interfaces.FloatingInkLoadOptions;
+            /**
+             *
+             * Gets the ID of the InkStroke object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of InkStroke objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkStrokeCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the ID of the InkStroke object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            floatingInk?: OneNote.Interfaces.FloatingInkLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the InkStroke object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * A container for the ink in a word in a paragraph.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkWordLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * The parent paragraph containing the ink word.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+             *
+             * Gets the ID of the InkWord object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * The id of the recognized language in this ink word. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: boolean;
+            /**
+             *
+             * The words that were recognized in this ink word, in order of likelihood. Read-only.
+             *
+             * [Api set: OneNoteApi]
+             */
+            wordAlternates?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of InkWord objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface InkWordCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: The parent paragraph containing the ink word.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the InkWord object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The id of the recognized language in this ink word. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The words that were recognized in this ink word, in order of likelihood. Read-only.
+             *
+             * [Api set: OneNoteApi]
+             */
+            wordAlternates?: boolean;
+        }
+        /**
+         *
+         * Represents a OneNote notebook. Notebooks contain section groups and sections.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface NotebookLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * The section groups in the notebook. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sectionGroups?: OneNote.Interfaces.SectionGroupCollectionLoadOptions;
+            /**
+            *
+            * The the sections of the notebook. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sections?: OneNote.Interfaces.SectionCollectionLoadOptions;
+            /**
+             *
+             * The url of the site that this notebook is located. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            baseUrl?: boolean;
+            /**
+             *
+             * The client url of the notebook. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * Gets the ID of the notebook. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the name of the notebook. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of notebooks.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface NotebookCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: The section groups in the notebook. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sectionGroups?: OneNote.Interfaces.SectionGroupCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The the sections of the notebook. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sections?: OneNote.Interfaces.SectionCollectionLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: The url of the site that this notebook is located. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            baseUrl?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The client url of the notebook. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the notebook. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the name of the notebook. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: boolean;
+        }
+        /**
+         *
+         * Represents a OneNote section group. Section groups can contain sections and other section groups.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface SectionGroupLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the notebook that contains the section group.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebook?: OneNote.Interfaces.NotebookLoadOptions;
+            /**
+            *
+            * Gets the section group that contains the section group. Throws ItemNotFound if the section group is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroup?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+            *
+            * Gets the section group that contains the section group. Returns null if the section group is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroupOrNull?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+            *
+            * The collection of section groups in the section group. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sectionGroups?: OneNote.Interfaces.SectionGroupCollectionLoadOptions;
+            /**
+            *
+            * The collection of sections in the section group. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sections?: OneNote.Interfaces.SectionCollectionLoadOptions;
+            /**
+             *
+             * The client url of the section group. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * Gets the ID of the section group. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the name of the section group. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of section groups.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface SectionGroupCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the notebook that contains the section group.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebook?: OneNote.Interfaces.NotebookLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the section group that contains the section group. Throws ItemNotFound if the section group is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroup?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the section group that contains the section group. Returns null if the section group is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroupOrNull?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The collection of section groups in the section group. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sectionGroups?: OneNote.Interfaces.SectionGroupCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The collection of sections in the section group. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            sections?: OneNote.Interfaces.SectionCollectionLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: The client url of the section group. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the section group. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the name of the section group. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: boolean;
+        }
+        /**
+         *
+         * Represents a OneNote section. Sections can contain pages.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface SectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the notebook that contains the section.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebook?: OneNote.Interfaces.NotebookLoadOptions;
+            /**
+            *
+            * The collection of pages in the section. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pages?: OneNote.Interfaces.PageCollectionLoadOptions;
+            /**
+            *
+            * Gets the section group that contains the section. Throws ItemNotFound if the section is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroup?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+            *
+            * Gets the section group that contains the section. Returns null if the section is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroupOrNull?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+             *
+             * The client url of the section. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * Gets the ID of the section. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the name of the section. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * The web url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            webUrl?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of sections.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface SectionCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the notebook that contains the section.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            notebook?: OneNote.Interfaces.NotebookLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The collection of pages in the section. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pages?: OneNote.Interfaces.PageCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the section group that contains the section. Throws ItemNotFound if the section is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroup?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the section group that contains the section. Returns null if the section is a direct child of the notebook.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSectionGroupOrNull?: OneNote.Interfaces.SectionGroupLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: The client url of the section. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the section. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the name of the section. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The web url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            webUrl?: boolean;
+        }
+        /**
+         *
+         * Represents a OneNote page.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface PageLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * The collection of PageContent objects on the page. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            contents?: OneNote.Interfaces.PageContentCollectionLoadOptions;
+            /**
+            *
+            * Text interpretation for the ink on the page. Returns null if there is no ink analysis information. Read only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysisOrNull?: OneNote.Interfaces.InkAnalysisLoadOptions;
+            /**
+            *
+            * Gets the section that contains the page.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSection?: OneNote.Interfaces.SectionLoadOptions;
+            /**
+             *
+             * Gets the ClassNotebookPageSource to the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            classNotebookPageSource?: boolean;
+            /**
+             *
+             * The client url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * Gets the ID of the page. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets or sets the indentation level of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            pageLevel?: boolean;
+            /**
+             *
+             * Gets or sets the title of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            title?: boolean;
+            /**
+             *
+             * The web url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            webUrl?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of pages.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface PageCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: The collection of PageContent objects on the page. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            contents?: OneNote.Interfaces.PageContentCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Text interpretation for the ink on the page. Returns null if there is no ink analysis information. Read only.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkAnalysisOrNull?: OneNote.Interfaces.InkAnalysisLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the section that contains the page.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentSection?: OneNote.Interfaces.SectionLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ClassNotebookPageSource to the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            classNotebookPageSource?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The client url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            clientUrl?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the page. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the indentation level of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            pageLevel?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the title of the page.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            title?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: The web url of the page. Read only
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            webUrl?: boolean;
+        }
+        /**
+         *
+         * Represents a region on a page that contains top-level content types such as Outline or Image. A PageContent object can be assigned an XY position.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface PageContentLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the Image in the PageContent object. Throws an exception if PageContentType is not Image.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageLoadOptions;
+            /**
+            *
+            * Gets the ink in the PageContent object. Throws an exception if PageContentType is not Ink.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            ink?: OneNote.Interfaces.FloatingInkLoadOptions;
+            /**
+            *
+            * Gets the Outline in the PageContent object. Throws an exception if PageContentType is not Outline.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            outline?: OneNote.Interfaces.OutlineLoadOptions;
+            /**
+            *
+            * Gets the page that contains the PageContent object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentPage?: OneNote.Interfaces.PageLoadOptions;
+            /**
+             *
+             * Gets the ID of the PageContent object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets or sets the left (X-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            left?: boolean;
+            /**
+             *
+             * Gets or sets the top (Y-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            top?: boolean;
+            /**
+             *
+             * Gets the type of the PageContent object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents the contents of a page, as a collection of PageContent objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface PageContentCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the Image in the PageContent object. Throws an exception if PageContentType is not Image.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the ink in the PageContent object. Throws an exception if PageContentType is not Ink.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            ink?: OneNote.Interfaces.FloatingInkLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the Outline in the PageContent object. Throws an exception if PageContentType is not Outline.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            outline?: OneNote.Interfaces.OutlineLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the page that contains the PageContent object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentPage?: OneNote.Interfaces.PageLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the PageContent object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the left (X-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            left?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets or sets the top (Y-axis) position of the PageContent object.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            top?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the type of the PageContent object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents a container for Paragraph objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface OutlineLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the PageContent object that contains the Outline. This object defines the position of the Outline on the page.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pageContent?: OneNote.Interfaces.PageContentLoadOptions;
+            /**
+            *
+            * Gets the collection of Paragraph objects in the Outline.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphCollectionLoadOptions;
+            /**
+             *
+             * Gets the ID of the Outline object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+        }
+        /**
+         *
+         * A container for the visible content on a page. A Paragraph can contain any one ParagraphType type of content.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface ParagraphLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the Image object in the Paragraph. Throws an exception if ParagraphType is not Image.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageLoadOptions;
+            /**
+            *
+            * Gets the Ink collection in the Paragraph. Throws an exception if ParagraphType is not Ink.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkWords?: OneNote.Interfaces.InkWordCollectionLoadOptions;
+            /**
+            *
+            * Gets the Outline object that contains the Paragraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            outline?: OneNote.Interfaces.OutlineLoadOptions;
+            /**
+            *
+            * The collection of paragraphs under this paragraph. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphCollectionLoadOptions;
+            /**
+            *
+            * Gets the parent paragraph object. Throws if a parent paragraph does not exist.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentParagraph?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+            *
+            * Gets the parent paragraph object. Returns null if a parent paragraph does not exist.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentParagraphOrNull?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+            *
+            * Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, throws ItemNotFound.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTableCell?: OneNote.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, returns null.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTableCellOrNull?: OneNote.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * Gets the RichText object in the Paragraph. Throws an exception if ParagraphType is not RichText.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            richText?: OneNote.Interfaces.RichTextLoadOptions;
+            /**
+            *
+            * Gets the Table object in the Paragraph. Throws an exception if ParagraphType is not Table.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            table?: OneNote.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets the ID of the Paragraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the type of the Paragraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of Paragraph objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface ParagraphCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the Image object in the Paragraph. Throws an exception if ParagraphType is not Image.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            image?: OneNote.Interfaces.ImageLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the Ink collection in the Paragraph. Throws an exception if ParagraphType is not Ink.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            inkWords?: OneNote.Interfaces.InkWordCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the Outline object that contains the Paragraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            outline?: OneNote.Interfaces.OutlineLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: The collection of paragraphs under this paragraph. Read only
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent paragraph object. Throws if a parent paragraph does not exist.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentParagraph?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent paragraph object. Returns null if a parent paragraph does not exist.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentParagraphOrNull?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, throws ItemNotFound.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTableCell?: OneNote.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the TableCell object that contains the Paragraph if one exists. If parent is not a TableCell, returns null.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTableCellOrNull?: OneNote.Interfaces.TableCellLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the RichText object in the Paragraph. Throws an exception if ParagraphType is not RichText.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            richText?: OneNote.Interfaces.RichTextLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the Table object in the Paragraph. Throws an exception if ParagraphType is not Table.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            table?: OneNote.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the Paragraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the type of the Paragraph object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * A container for the NoteTag in a paragraph.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface NoteTagLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the Id of the NoteTag object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the status of the NoteTag object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            status?: boolean;
+            /**
+             *
+             * Gets the type of the NoteTag object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            type?: boolean;
+        }
+        /**
+         *
+         * Represents a RichText object in a Paragraph.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface RichTextLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the Paragraph object that contains the RichText object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+             *
+             * Gets the ID of the RichText object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * The language id of the text. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            languageId?: boolean;
+            /**
+             *
+             * Gets the text content of the RichText object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            text?: boolean;
+        }
+        /**
+         *
+         * Represents an Image. An Image can be a direct child of a PageContent object or a Paragraph object.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface ImageLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the PageContent object that contains the Image. Throws if the Image is not a direct child of a PageContent. This object defines the position of the Image on the page.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            pageContent?: OneNote.Interfaces.PageContentLoadOptions;
+            /**
+            *
+            * Gets the Paragraph object that contains the Image. Throws if the Image is not a direct child of a Paragraph.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+             *
+             * Gets or sets the description of the Image.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            description?: boolean;
+            /**
+             *
+             * Gets or sets the height of the Image layout.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            height?: boolean;
+            /**
+             *
+             * Gets or sets the hyperlink of the Image.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            hyperlink?: boolean;
+            /**
+             *
+             * Gets the ID of the Image object. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the data obtained by OCR (Optical Character Recognition) of this Image, such as OCR text and language.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            ocrData?: boolean;
+            /**
+             *
+             * Gets or sets the width of the Image layout.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            width?: boolean;
+        }
+        /**
+         *
+         * Represents a table in a OneNote page.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface TableLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the Paragraph object that contains the Table object.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraph?: OneNote.Interfaces.ParagraphLoadOptions;
+            /**
+            *
+            * Gets all of the table rows.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            rows?: OneNote.Interfaces.TableRowCollectionLoadOptions;
+            /**
+             *
+             * Gets or sets whether the borders are visible or not. True if they are visible, false if they are hidden.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            borderVisible?: boolean;
+            /**
+             *
+             * Gets the number of columns in the table.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            columnCount?: boolean;
+            /**
+             *
+             * Gets the ID of the table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the number of rows in the table.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowCount?: boolean;
+        }
+        /**
+         *
+         * Represents a row in a table.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface TableRowLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the cells in the row.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            cells?: OneNote.Interfaces.TableCellCollectionLoadOptions;
+            /**
+            *
+            * Gets the parent table.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTable?: OneNote.Interfaces.TableLoadOptions;
+            /**
+             *
+             * Gets the number of cells in the row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            cellCount?: boolean;
+            /**
+             *
+             * Gets the ID of the row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the index of the row in its parent table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowIndex?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of TableRow objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface TableRowCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the cells in the row.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            cells?: OneNote.Interfaces.TableCellCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent table.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentTable?: OneNote.Interfaces.TableLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the number of cells in the row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            cellCount?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the index of the row in its parent table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowIndex?: boolean;
+        }
+        /**
+         *
+         * Represents a cell in a OneNote table.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface TableCellLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * Gets the collection of Paragraph objects in the TableCell.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphCollectionLoadOptions;
+            /**
+            *
+            * Gets the parent row of the cell.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentRow?: OneNote.Interfaces.TableRowLoadOptions;
+            /**
+             *
+             * Gets the index of the cell in its row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            cellIndex?: boolean;
+            /**
+             *
+             * Gets the ID of the cell. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * Gets the index of the cell's row in the table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowIndex?: boolean;
+            /**
+             *
+             * Gets and sets the shading color of the cell
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            shadingColor?: boolean;
+        }
+        /**
+         *
+         * Contains a collection of TableCell objects.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
+        interface TableCellCollectionLoadOptions {
+            $all?: boolean;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the collection of Paragraph objects in the TableCell.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            paragraphs?: OneNote.Interfaces.ParagraphCollectionLoadOptions;
+            /**
+            *
+            * For EACH ITEM in the collection: Gets the parent row of the cell.
+            *
+            * [Api set: OneNoteApi 1.1]
+            */
+            parentRow?: OneNote.Interfaces.TableRowLoadOptions;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the index of the cell in its row. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            cellIndex?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the ID of the cell. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the index of the cell's row in the table. Read-only.
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            rowIndex?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets and sets the shading color of the cell
+             *
+             * [Api set: OneNoteApi 1.1]
+             */
+            shadingColor?: boolean;
+        }
+    }
 }
 declare namespace OneNote {
     class RequestContext extends OfficeExtension.ClientRequestContext {
-        private m_onenote;
         constructor(url?: string);
-        application: Application;
+        readonly application: Application;
     }
     /**
- * Executes a batch script that performs actions on the OneNote object model. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
- * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the OneNote application. Since the Office add-in and the WoOneNote application run in two different processes, the request context is required to get access to the OneNote object model from the add-in.
- */
-    function run<T>(batch: (context: OneNote.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+     * Executes a batch script that performs actions on the OneNote object model, using a new request context. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param batch - A function that takes in an OneNote.RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the OneNote application. Since the Office add-in and the OneNote application run in two different processes, the request context is required to get access to the OneNote object model from the add-in.
+     */
+    function run<T>(batch: (context: OneNote.RequestContext) => Promise<T>): Promise<T>;
+    /**
+     * Executes a batch script that performs actions on the OneNote object model, using the request context of a previously-created API object.
+     * @param object - A previously-created API object. The batch will use the same request context as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
+     * @param batch - A function that takes in an OneNote.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     */
+    function run<T>(object: OfficeExtension.ClientObject, batch: (context: OneNote.RequestContext) => Promise<T>): Promise<T>;
+    /**
+     * Executes a batch script that performs actions on the OneNote object model, using the request context of previously-created API objects.
+     * @param object - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared request context, which means that any changes applied to these objects will be picked up by "context.sync()".
+     * @param batch - A function that takes in an OneNote.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     */
+    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: OneNote.RequestContext) => Promise<T>): Promise<T>;
 }
 
 
@@ -22368,8 +42188,6 @@ declare namespace OneNote {
 /////////////////////// Begin Visio APIs ///////////////////////
 ////////////////////////////////////////////////////////////////
 
-
-
 declare namespace Visio {
     /**
      *
@@ -23560,7 +43378,7 @@ declare namespace Visio {
         var notImplemented: string;
         var unsupportedOperation: string;
     }
-    module Interfaces {
+    namespace Interfaces {
         interface CollectionLoadOptions {
             $top?: number;
             $skip?: number;
@@ -24576,7 +44394,7 @@ declare namespace Visio {
         }
     }
 }
-declare module Visio {
+declare namespace Visio {
     /**
      * The RequestContext object facilitates requests to the Visio application. Since the Office add-in and the Visio application run in two different processes, the request context is required to get access to the Visio object model from the add-in.
      */
@@ -24588,29 +44406,28 @@ declare module Visio {
      * Executes a batch script that performs actions on the Visio object model, using a new request context. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param batch - A function that takes in an Visio.RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Visio application. Since the Office add-in and the Visio application run in two different processes, the request context is required to get access to the Visio object model from the add-in.
      */
-    function run<T>(batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Visio object model, using the request context of a previously-created API object.
      * @param object - A previously-created API object. The batch will use the same request context as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
      * @param batch - A function that takes in an Visio.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      */
-    function run<T>(object: OfficeExtension.ClientObject | OfficeExtension.EmbeddedSession, batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(object: OfficeExtension.ClientObject | OfficeExtension.EmbeddedSession, batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Visio object model, using the RequestContext of a previously-created object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param contextObject - A previously-created Visio.RequestContext. This context will get re-used by the batch function (instead of having a new context created). This means that the batch will be able to pick up changes made to existing API objects, if those objects were derived from this same context.
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Visio application. Since the Office add-in and the Visio application run in two different processes, the RequestContext is required to get access to the Visio object model from the add-in.
      */
-    function run<T>(contextObject: OfficeExtension.ClientRequestContext, batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(contextObject: OfficeExtension.ClientRequestContext, batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Visio object model, using the request context of previously-created API objects.
      * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared request context, which means that any changes applied to these objects will be picked up by "context.sync()".
      * @param batch - A function that takes in a Visio.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      */
-    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Visio.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;
 }
 
 
-
 ////////////////////////////////////////////////////////////////
 //////////////////////// End Visio APIs ////////////////////////
-////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/types/office-js/office-js-tests.ts b/types/office-js/office-js-tests.ts
index f96873fe90..f6ebe63a96 100644
--- a/types/office-js/office-js-tests.ts
+++ b/types/office-js/office-js-tests.ts
@@ -37,7 +37,7 @@ function test_excel() {
 			["Female", 14]
 		];
 
-		var chart = sheet.charts.add(Excel.ChartType._3DColumn, range, "auto");
+		var chart = sheet.charts.add(Excel.ChartType._3DColumn, range, "Auto");
 
 		chart.format.fill.setSolidColor("F8F8FF");
 
@@ -46,7 +46,7 @@ function test_excel() {
 		chart.title.format.font.size = 18;
 		chart.title.format.font.color = "568568";
 
-		chart.legend.position = "right";
+		chart.legend.position = "Right";
 		chart.legend.format.font.name = "Algerian";
 		chart.legend.format.font.size = 13;
 
@@ -165,9 +165,9 @@ function test_word() {
 		myContentControl.tag = 'Customer-Address';
 		myContentControl.title = 'Enter Customer Address Here:';
 		myContentControl.style = 'Heading 2';
-		myContentControl.insertText('One Microsoft Way, Redmond, WA 98052', 'replace');
+		myContentControl.insertText('One Microsoft Way, Redmond, WA 98052', 'Replace');
 		myContentControl.cannotEdit = true;
-		myContentControl.appearance = 'tags';
+		myContentControl.appearance = 'Tags';
 
 		// Queue a command to load the id property for the content control you created.
 		context.load(myContentControl, 'id');
@@ -265,3 +265,54 @@ function test_shared() {
 		}
 	);
 }
+
+async function test_visio() {
+	const url = "someurl";
+
+	try {
+		const session = new OfficeExtension.EmbeddedSession(url, { id: "embed-iframe", container: document.getElementById("iframeHost") });
+		await session.init();
+		await Visio.run(session, async context => {
+			const eventResult = context.document.onPageLoadComplete.add(async args => {
+				console.log(Date.now() + ": Page Load Complete Event: " + JSON.stringify(args));
+			});
+			await context.sync();
+			console.log("Success");
+		});
+	} catch (error) {
+		if (error instanceof OfficeExtension.Error) {
+			console.log("Debug info: " + JSON.stringify(error.debugInfo));
+		}
+	}
+}
+
+function test_OfficePromise() {
+	let p1: Promise<any> = Excel.run(async () => { return 10 });
+	let p2: Promise<any> = new OfficeExtension.Promise(resolve => setTimeout(resolve, 1000));
+	let p3: Promise<any> = new Office.Promise(resolve => setTimeout(resolve, 1000));
+	let p4: OfficeExtension.IPromise<any> = new OfficeExtension.Promise(resolve => setTimeout(resolve, 1000));
+}
+
+async function test_interfaces() {
+	await Excel.run(async context => {
+		let range = context.workbook.getSelectedRange();
+		range.set({
+			values: [["Hi"]],
+			format: {
+				fill: {
+					color: "red"
+				}
+			}
+		});
+
+		let rangeSettables: Excel.Interfaces.RangeUpdateData = {
+			values: [["Hi"]],
+			format: {
+				fill: {
+					color: "red"
+				}
+			}
+		};
+		range.set(rangeSettables);
+	});
+}

From 01d6a921e3a17548c0133ec5c738fb8eed5dccde Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Fri, 11 May 2018 22:19:24 +0300
Subject: [PATCH 0211/1124] webpack: Fix some problems introduced in #25566
 (#25691)

---
 types/webpack/index.d.ts       | 114 +++++++++++++++------------------
 types/webpack/webpack-tests.ts |  34 ++++++++++
 2 files changed, 84 insertions(+), 64 deletions(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 05113ea6d4..5be4abdcbd 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -253,7 +253,7 @@ declare namespace webpack {
          * Defaults to `["browser", "module", "main"]` or `["module", "main"]`,
          * depending on the value of the `target` `Configuration` value.
          */
-        mainFields?: string[];
+        mainFields?: string[] | string[][];
 
         /**
          * A list of fields in a package description object to try to parse
@@ -264,7 +264,7 @@ declare namespace webpack {
          *
          * @see alias
          */
-        aliasFields?: string[];
+        aliasFields?: string[] | string[][];
 
         /**
          * A list of file names to search for when requiring directories that
@@ -368,15 +368,16 @@ declare namespace webpack {
         system?: boolean;
     }
 
-    type RuleSetCondition = string
-        | {
-            [k: string]: any;
-        }
+    type RuleSetCondition =
+        | RegExp
+        | string
+        | ((path: string) => boolean)
+        | RuleSetConditions
         | {
             /**
              * Logical AND
              */
-            and?: RuleSetConditions;
+            and?: RuleSetCondition[];
             /**
              * Exclude all modules matching any of these conditions
              */
@@ -388,17 +389,19 @@ declare namespace webpack {
             /**
              * Logical NOT
              */
-            not?: RuleSetConditions;
+            not?: RuleSetCondition[];
             /**
              * Logical OR
              */
-            or?: RuleSetConditions;
+            or?: RuleSetCondition[];
             /**
              * Exclude all modules matching any of these conditions
              */
             test?: RuleSetCondition;
         };
-    type RuleSetConditions = RuleSetCondition[];
+
+    // A hack around circular type referencing
+    interface RuleSetConditions extends Array<RuleSetCondition> {}
 
     interface RuleSetRule {
         /**
@@ -408,25 +411,19 @@ declare namespace webpack {
         /**
          * Shortcut for resource.exclude
          */
-        exclude?: RuleSetCondition & {
-            [k: string]: any;
-        };
+        exclude?: RuleSetCondition;
         /**
          * Shortcut for resource.include
          */
-        include?: RuleSetCondition & {
-            [k: string]: any;
-        };
+        include?: RuleSetCondition;
         /**
          * Match the issuer of the module (The module pointing to this module)
          */
-        issuer?: RuleSetCondition & {
-            [k: string]: any;
-        };
+        issuer?: RuleSetCondition;
         /**
          * Shortcut for use.loader
          */
-        loader?: RuleSetLoader | RuleSetUse;
+        loader?: RuleSetUse;
         /**
          * Shortcut for use.loader
          */
@@ -434,7 +431,7 @@ declare namespace webpack {
         /**
          * Only execute the first matching rule in this array
          */
-        oneOf?: RuleSetRules;
+        oneOf?: RuleSetRule[];
         /**
          * Shortcut for use.options
          */
@@ -442,9 +439,7 @@ declare namespace webpack {
         /**
          * Options for parsing
          */
-        parser?: {
-            [k: string]: any;
-        };
+        parser?: { [k: string]: any };
         /**
          * Options for the resolver
          */
@@ -464,9 +459,7 @@ declare namespace webpack {
         /**
          * Match the resource path of the module
          */
-        resource?: RuleSetCondition & {
-            [k: string]: any;
-        };
+        resource?: RuleSetCondition;
         /**
          * Match the resource query of the module
          */
@@ -478,56 +471,49 @@ declare namespace webpack {
         /**
          * Match and execute these rules when this rule is matched
          */
-        rules?: RuleSetRules;
+        rules?: RuleSetRule[];
         /**
          * Shortcut for resource.test
          */
-        test?: RuleSetCondition & {
-            [k: string]: any;
-        };
+        test?: RuleSetCondition;
         /**
          * Modifiers applied to the module when rule is matched
          */
         use?: RuleSetUse;
     }
-    type RuleSetLoader = string;
+
     type RuleSetUse =
         | RuleSetUseItem
-        | {
-            [k: string]: any;
-        }
-        | RuleSetUseItem[];
+        | RuleSetUseItem[]
+        | ((data: any) => RuleSetUseItem | RuleSetUseItem[]);
+
+    interface RuleSetLoader {
+        /**
+         * Loader name
+         */
+        loader?: string;
+        /**
+         * Loader options
+         */
+        options?: RuleSetQuery;
+        /**
+         * Unique loader identifier
+         */
+        ident?: string;
+        /**
+         * Loader query
+         */
+        query?: RuleSetQuery;
+    }
+
     type RuleSetUseItem =
+        | string
         | RuleSetLoader
-        | {
-            [k: string]: any;
-        }
-        | {
-            /**
-             * Loader name
-             */
-            loader?: RuleSetLoader;
-            /**
-             * Loader options
-             */
-            options?: RuleSetQuery;
-            /**
-             * Unique loader identifier
-             */
-            ident?: string;
-            /**
-             * Loader query
-             */
-            query?: RuleSetQuery;
-        };
+        | ((data: any) => string | RuleSetLoader);
+
     type RuleSetQuery =
-        | {
-            [k: string]: any;
-        }
-        | string;
-    type CommonArrayOfStringOrStringArrayValues = Array<(string | string[])>;
-    type CommonArrayOfStringValues = string[];
-    type RuleSetRules = RuleSetRule[];
+        | string
+        | { [k: string]: any };
 
     /**
      * @deprecated Use RuleSetCondition instead
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 803e227c4a..b42d836c0c 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -698,3 +698,37 @@ configuration = {
         ]
     }
 };
+
+configuration = {
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                include: '/foo/bar',
+                exclude: path => path.startsWith('/foo'),
+                resourceQuery: ['foo', 'bar'],
+                resolve: {
+                    mainFields: ['foo'],
+                    aliasFields: [['bar']],
+                },
+                loader: 'foo-loader',
+                loaders: [
+                    'foo-loader',
+                    {
+                        loader: 'bar-loader',
+                        query: 'baz'
+                    }
+                ],
+                use: () => ([
+                    'foo-loader',
+                    {
+                        loader: 'bar-loader',
+                        query: {
+                            baz: 'qux'
+                        }
+                    },
+                ])
+            }
+        ]
+    }
+};

From ca6596df7aa5d3d529666f3874aee232f6f8c635 Mon Sep 17 00:00:00 2001
From: Steven Zeck <steven.zeck@gmail.com>
Date: Fri, 11 May 2018 14:20:42 -0500
Subject: [PATCH 0212/1124] [cosmiconfig] update definitions for v5 (#25624)

* [cosmiconfig] update definitions for v5

* Move v4 files into v4 directory

* Make recommended changes, use exported interfaces and functions

* Remove sample-config.json file

* Change config from type to interface
---
 types/cosmiconfig/cosmiconfig-tests.ts    | 52 +++++---------
 types/cosmiconfig/index.d.ts              | 87 +++++++++++------------
 types/cosmiconfig/v4/cosmiconfig-tests.ts | 41 +++++++++++
 types/cosmiconfig/v4/index.d.ts           | 63 ++++++++++++++++
 types/cosmiconfig/v4/tsconfig.json        | 19 +++++
 types/cosmiconfig/v4/tslint.json          |  1 +
 6 files changed, 182 insertions(+), 81 deletions(-)
 create mode 100644 types/cosmiconfig/v4/cosmiconfig-tests.ts
 create mode 100644 types/cosmiconfig/v4/index.d.ts
 create mode 100644 types/cosmiconfig/v4/tsconfig.json
 create mode 100644 types/cosmiconfig/v4/tslint.json

diff --git a/types/cosmiconfig/cosmiconfig-tests.ts b/types/cosmiconfig/cosmiconfig-tests.ts
index 2676c58407..632569c6f9 100644
--- a/types/cosmiconfig/cosmiconfig-tests.ts
+++ b/types/cosmiconfig/cosmiconfig-tests.ts
@@ -1,41 +1,23 @@
-import cosmiconfig = require("cosmiconfig");
+import cosmiconfig, { CosmiconfigResult } from "cosmiconfig";
+import * as path from "path";
 
-const asyncExplorer = cosmiconfig("yourModuleName", {
-    packageProp: "yourModuleName",
-    rc: ".yourModuleNamerc",
-    js: "yourModuleName.config.js",
-    rcStrictJson: false,
-    rcExtensions: false,
-    stopDir: "someDir",
-    cache: true,
-    sync: false,
-    transform: ({ config, filePath }) => ({ config, filePath }),
-    format: "js"
+const explorer = cosmiconfig("yourModuleName", {
+  searchPlaces: [],
+  loaders: {},
+  packageProp: "yourModuleName",
+  stopDir: "someDir",
+  cache: true,
+  transform: (result: CosmiconfigResult) => result,
+  ignoreEmptySearchPlaces: false,
 });
 
 Promise.all([
-    asyncExplorer.load(),
-    asyncExplorer.load("start/search/here"),
-    asyncExplorer.load(null, "load/this/file.json")
+  explorer.search(path.join(__dirname)),
+  explorer.searchSync(path.join(__dirname)),
+  explorer.load(path.join(__dirname, "sample-config.json")),
+  explorer.loadSync(path.join(__dirname, "sample-config.json")),
 ]).then(result => result);
 
-asyncExplorer.load().then(({ config, filePath }) => ({ config, filePath }));
-
-asyncExplorer.clearFileCache();
-asyncExplorer.clearDirectoryCache();
-asyncExplorer.clearCaches();
-
-const syncExplorer = cosmiconfig("yourModuleName", {
-    packageProp: "yourModuleName",
-    rc: ".yourModuleNamerc",
-    js: "yourModuleName.config.js",
-    rcStrictJson: false,
-    rcExtensions: false,
-    stopDir: "someDir",
-    cache: true,
-    sync: true,
-    transform: ({ config, filePath }) => ({ config, filePath }),
-    format: "js"
-});
-
-const { config, filePath } = syncExplorer.load();
+explorer.clearLoadCache();
+explorer.clearSearchCache();
+explorer.clearCaches();
diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index 032f570d6f..bdafc922ec 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -1,63 +1,58 @@
-// Type definitions for cosmiconfig 4.0
+// Type definitions for cosmiconfig 5.0
 // Project: https://github.com/davidtheclark/cosmiconfig
 // Definitions by: ozum <https://github.com/ozum>
+//                 szeck87 <https://github.com/szeck87>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-interface Result {
-    config: object;
-    filePath: string;
+/// <reference types="node" />
+
+export interface Config {
+  [key: string]: any;
 }
 
-interface Options {
-    packageProp?: string | false;
-    rc?: string | false;
-    js?: string | false;
-    rcStrictJson?: boolean;
-    rcExtensions?: boolean;
-    stopDir?: string;
-    cache?: boolean;
-    transform?: (result: Result) => Promise<Result> | Result;
-    configPath?: string;
-    format?: "json" | "yaml" | "js";
+export type CosmiconfigResult = {
+  config: Config;
+  filePath: string;
+  isEmpty?: boolean;
+} | null;
+
+export interface LoaderResult {
+  config: Config | null;
+  filepath: string;
 }
 
-// Default is false and makes load() method async
-interface AsyncOptions extends Options {
-    sync?: false;
+export type SyncLoader = (filepath: string, content: string) => Config | null;
+export type AsyncLoader = (filepath: string, content: string) => Config | null | Promise<object | null>;
+
+export interface LoaderEntry {
+  sync?: SyncLoader;
+  async?: AsyncLoader;
 }
 
-// Makes load() method sync
-interface SyncOptions extends Options {
-    sync: true;
+export interface Loaders {
+  [key: string]: LoaderEntry;
 }
 
-interface Explorer {
-    clearFileCache(): void;
-    clearDirectoryCache(): void;
-    clearCaches(): void;
+export interface Explorer {
+  search(searchFrom: string): Promise<null | CosmiconfigResult>;
+  searchSync(searchFrom: string): null | CosmiconfigResult;
+  load(loadPath: string): Promise<CosmiconfigResult>;
+  loadSync(loadPath: string): CosmiconfigResult;
+  clearLoadCache(): void;
+  clearSearchCache(): void;
+  clearCaches(): void;
 }
 
-interface AsyncExplorer extends Explorer {
-    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
-    load(searchPath?: string): Promise<Result>;
-    load(searchPath: null | undefined, configPath?: string): Promise<Result>;
+// These are the user options with defaults applied.
+export interface ExplorerOptions {
+  stopDir?: string;
+  cache?: boolean;
+  transform?: (result: CosmiconfigResult) => Promise<CosmiconfigResult> | CosmiconfigResult;
+  packageProp?: string;
+  loaders?: Loaders;
+  searchPlaces?: string[];
+  ignoreEmptySearchPlaces?: boolean;
 }
 
-interface SyncExplorer extends Explorer {
-    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
-    load(searchPath?: string): Result;
-    load(searchPath: null | undefined, configPath?: string): Result;
-}
-
-declare function cosmiconfig(
-    moduleName: string,
-    options: SyncOptions
-): SyncExplorer;
-
-declare function cosmiconfig(
-    moduleName: string,
-    options?: AsyncOptions
-): AsyncExplorer;
-
-export = cosmiconfig;
+export default function cosmiconfig(moduleName: string, options: ExplorerOptions): Explorer;
diff --git a/types/cosmiconfig/v4/cosmiconfig-tests.ts b/types/cosmiconfig/v4/cosmiconfig-tests.ts
new file mode 100644
index 0000000000..2676c58407
--- /dev/null
+++ b/types/cosmiconfig/v4/cosmiconfig-tests.ts
@@ -0,0 +1,41 @@
+import cosmiconfig = require("cosmiconfig");
+
+const asyncExplorer = cosmiconfig("yourModuleName", {
+    packageProp: "yourModuleName",
+    rc: ".yourModuleNamerc",
+    js: "yourModuleName.config.js",
+    rcStrictJson: false,
+    rcExtensions: false,
+    stopDir: "someDir",
+    cache: true,
+    sync: false,
+    transform: ({ config, filePath }) => ({ config, filePath }),
+    format: "js"
+});
+
+Promise.all([
+    asyncExplorer.load(),
+    asyncExplorer.load("start/search/here"),
+    asyncExplorer.load(null, "load/this/file.json")
+]).then(result => result);
+
+asyncExplorer.load().then(({ config, filePath }) => ({ config, filePath }));
+
+asyncExplorer.clearFileCache();
+asyncExplorer.clearDirectoryCache();
+asyncExplorer.clearCaches();
+
+const syncExplorer = cosmiconfig("yourModuleName", {
+    packageProp: "yourModuleName",
+    rc: ".yourModuleNamerc",
+    js: "yourModuleName.config.js",
+    rcStrictJson: false,
+    rcExtensions: false,
+    stopDir: "someDir",
+    cache: true,
+    sync: true,
+    transform: ({ config, filePath }) => ({ config, filePath }),
+    format: "js"
+});
+
+const { config, filePath } = syncExplorer.load();
diff --git a/types/cosmiconfig/v4/index.d.ts b/types/cosmiconfig/v4/index.d.ts
new file mode 100644
index 0000000000..032f570d6f
--- /dev/null
+++ b/types/cosmiconfig/v4/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for cosmiconfig 4.0
+// Project: https://github.com/davidtheclark/cosmiconfig
+// Definitions by: ozum <https://github.com/ozum>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+interface Result {
+    config: object;
+    filePath: string;
+}
+
+interface Options {
+    packageProp?: string | false;
+    rc?: string | false;
+    js?: string | false;
+    rcStrictJson?: boolean;
+    rcExtensions?: boolean;
+    stopDir?: string;
+    cache?: boolean;
+    transform?: (result: Result) => Promise<Result> | Result;
+    configPath?: string;
+    format?: "json" | "yaml" | "js";
+}
+
+// Default is false and makes load() method async
+interface AsyncOptions extends Options {
+    sync?: false;
+}
+
+// Makes load() method sync
+interface SyncOptions extends Options {
+    sync: true;
+}
+
+interface Explorer {
+    clearFileCache(): void;
+    clearDirectoryCache(): void;
+    clearCaches(): void;
+}
+
+interface AsyncExplorer extends Explorer {
+    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
+    load(searchPath?: string): Promise<Result>;
+    load(searchPath: null | undefined, configPath?: string): Promise<Result>;
+}
+
+interface SyncExplorer extends Explorer {
+    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
+    load(searchPath?: string): Result;
+    load(searchPath: null | undefined, configPath?: string): Result;
+}
+
+declare function cosmiconfig(
+    moduleName: string,
+    options: SyncOptions
+): SyncExplorer;
+
+declare function cosmiconfig(
+    moduleName: string,
+    options?: AsyncOptions
+): AsyncExplorer;
+
+export = cosmiconfig;
diff --git a/types/cosmiconfig/v4/tsconfig.json b/types/cosmiconfig/v4/tsconfig.json
new file mode 100644
index 0000000000..f0c8707c16
--- /dev/null
+++ b/types/cosmiconfig/v4/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": ["../../"],
+        "paths": {
+          "cosmiconfig": [ "cosmiconfig/v4" ]          
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "cosmiconfig-tests.ts"]
+}
diff --git a/types/cosmiconfig/v4/tslint.json b/types/cosmiconfig/v4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cosmiconfig/v4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 11a43248e5e3469025d164c00e18edf4188b9c39 Mon Sep 17 00:00:00 2001
From: TheAppleFreak <theapplefreak@gmail.com>
Date: Fri, 11 May 2018 15:21:21 -0400
Subject: [PATCH 0213/1124] @types/snoowrap - Make RedditContent thenable
 (#25683)

* Makes RedditContent derivatives Thenable

* Makes RedditContent thenable

* Added test
---
 types/snoowrap/dist/objects/RedditContent.d.ts | 2 +-
 types/snoowrap/index.d.ts                      | 3 ++-
 types/snoowrap/snoowrap-tests.ts               | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/snoowrap/dist/objects/RedditContent.d.ts b/types/snoowrap/dist/objects/RedditContent.d.ts
index 9efd97822b..30f82ab72b 100644
--- a/types/snoowrap/dist/objects/RedditContent.d.ts
+++ b/types/snoowrap/dist/objects/RedditContent.d.ts
@@ -1,6 +1,6 @@
 import * as Snoowrap from '../..';
 
-export default class RedditContent<T> {
+export default class RedditContent<T> extends Promise<T> {
   created_utc: number;
   created: number;
   id: string;
diff --git a/types/snoowrap/index.d.ts b/types/snoowrap/index.d.ts
index e80814d6f9..a2a36ff58e 100644
--- a/types/snoowrap/index.d.ts
+++ b/types/snoowrap/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for snoowrap 1.14
+// Type definitions for snoowrap 1.15
 // Project: https://github.com/not-an-aardvark/snoowrap
 // Definitions by: Vito Samson <https://github.com/vitosamson>
+//                 TheAppleFreak <https://github.com/TheAppleFreak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/snoowrap/snoowrap-tests.ts b/types/snoowrap/snoowrap-tests.ts
index afa9a46fa2..dac5233653 100644
--- a/types/snoowrap/snoowrap-tests.ts
+++ b/types/snoowrap/snoowrap-tests.ts
@@ -50,3 +50,7 @@ export function wiki(subreddit: string, page: string): WikiPage {
 export function getNewComments(subreddit: string): Listing<Comment> {
   return r.getNewComments(subreddit);
 }
+
+export function thenable(): Promise<string> {
+  return r.getMe().then(me => me.name);
+}

From 3e13aec055cd43183dd0ddc62434389cb376fb45 Mon Sep 17 00:00:00 2001
From: Ifiok Jr <ifiokotung@gmail.com>
Date: Fri, 11 May 2018 20:27:17 +0100
Subject: [PATCH 0214/1124] add type definition for react-native-indicators
 (#25612)

---
 types/react-native-indicators/index.d.ts      | 211 ++++++++++++++++++
 .../react-native-indicators-tests.tsx         |  14 ++
 types/react-native-indicators/tsconfig.json   |  24 ++
 types/react-native-indicators/tslint.json     |   1 +
 4 files changed, 250 insertions(+)
 create mode 100644 types/react-native-indicators/index.d.ts
 create mode 100644 types/react-native-indicators/react-native-indicators-tests.tsx
 create mode 100644 types/react-native-indicators/tsconfig.json
 create mode 100644 types/react-native-indicators/tslint.json

diff --git a/types/react-native-indicators/index.d.ts b/types/react-native-indicators/index.d.ts
new file mode 100644
index 0000000000..ee4a13a4c2
--- /dev/null
+++ b/types/react-native-indicators/index.d.ts
@@ -0,0 +1,211 @@
+// Type definitions for react-native-indicators 0.13
+// Project: https://github.com/n4kz/react-native-indicators#readme
+// Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { Component } from 'react';
+import { Animated, EasingFunction } from 'react-native';
+export interface BaseIndicatorProps {
+    /**
+     * Animation easing function
+     * @default Easing.linear
+     */
+    animationEasing?: EasingFunction;
+
+    /**
+     * Animation duration in ms
+     * @default1200
+     */
+    animationDuration?: number;
+}
+
+export interface UIActivityIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+    /**
+     * Component count
+     * @default 12
+     */
+    count?: number;
+    /**
+     * Base component size
+     * @default 40
+     */
+    size?: number;
+}
+
+export class UIActivityIndicator extends Component<
+    UIActivityIndicatorProps
+> {}
+
+export interface BallIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+    /**
+     * Component count
+     * @default 8
+     */
+    count?: number;
+    /**
+     * Base component size
+     * @default 40
+     */
+    size?: number;
+}
+
+export class BallIndicator extends Component<BallIndicatorProps> {}
+
+export interface BarIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+    /**
+     * Component count
+     * @default 3
+     */
+    count?: number;
+    /**
+     * Base component size
+     * @default 40
+     */
+    size?: number;
+}
+
+export class BarIndicator extends Component<BarIndicatorProps> {}
+
+export interface DotIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+    /**
+     * Component count
+     * @default 4
+     */
+    count?: number;
+    /**
+     * Base component size
+     * @default 16
+     */
+    size?: number;
+}
+
+export class DotIndicator extends Component<DotIndicatorProps> {}
+
+export interface MaterialIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+
+    /**
+     * Base component size
+     * @default 40
+     */
+    size?: number;
+}
+
+export class MaterialIndicator extends Component<MaterialIndicatorProps> {}
+
+export interface PulseIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+
+    /**
+     * Base component size
+     * @default 40
+     */
+    size?: number;
+}
+
+export class PulseIndicator extends Component<PulseIndicatorProps> {}
+
+export interface PacmanIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+
+    /**
+     * Base component size
+     * @default 48
+     */
+    size?: number;
+}
+
+export class PacmanIndicator extends Component<PacmanIndicatorProps> {}
+
+export interface SkypeIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+    /**
+     * Component count
+     * @default 5
+     */
+    count?: number;
+    /**
+     * Base component size
+     * @default 40
+     */
+    size?: number;
+    /**
+     * Minimum component scale
+     * @default 0.2
+     */
+    minScale?: number;
+    /**
+     * Maximum component scale
+     * @default 1.0
+     */
+    maxScale?: number;
+}
+
+export class SkypeIndicator extends Component<SkypeIndicatorProps> {}
+
+export interface WaveIndicatorProps extends BaseIndicatorProps {
+    /**
+     * Component color
+     * @default 'rgb(0, 0, 0)'
+     */
+    color?: string;
+    /**
+     * Component count
+     * @default 4
+     */
+    count?: number;
+    /**
+     * Base component size
+     * @default 40
+     */
+    size?: number;
+    /**
+     * Minimum component scale
+     * @default 0.54
+     */
+    waveFactor?: number;
+    /**
+     * Maximum component scale
+     * @default 'fill'
+     */
+    waveMode?: 'fill' | 'outline';
+}
+
+export class WaveIndicator extends Component<WaveIndicatorProps> {}
diff --git a/types/react-native-indicators/react-native-indicators-tests.tsx b/types/react-native-indicators/react-native-indicators-tests.tsx
new file mode 100644
index 0000000000..c3b11151f3
--- /dev/null
+++ b/types/react-native-indicators/react-native-indicators-tests.tsx
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import {
+  DotIndicator,
+} from 'react-native-indicators';
+
+class Example extends React.Component {
+  render() {
+    return (
+        <React.Fragment>
+            <DotIndicator color='white' />
+        </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-native-indicators/tsconfig.json b/types/react-native-indicators/tsconfig.json
new file mode 100644
index 0000000000..ee6af547c4
--- /dev/null
+++ b/types/react-native-indicators/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-indicators-tests.tsx"
+    ]
+}
diff --git a/types/react-native-indicators/tslint.json b/types/react-native-indicators/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-indicators/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9a7ca607f53f7e84c9004ae38a985fb4817f58b6 Mon Sep 17 00:00:00 2001
From: Saffa Shujah <saffashujah2249@gmail.com>
Date: Sat, 12 May 2018 00:29:30 +0500
Subject: [PATCH 0215/1124] Update index.d.ts (#25675)

Avatar and Image type are diff but the styling is different and the alt attribute is required for Image type.
---
 types/rebass/index.d.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index 9a4dbb34e5..53ec01bf87 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -48,6 +48,14 @@ export interface AvatarProps extends BaseProps<AvatarClass> {
 type AvatarClass = React.StatelessComponent<AvatarProps>
 export declare const Avatar: AvatarClass;
 
+export interface ImageProps extends BaseProps<ImageClass> {
+    size?: number;
+    src?: string;
+    alt?: string;
+}
+type ImageClass = React.StatelessComponent<ImageProps>
+export declare const Image: ImageClass;
+
 export interface BadgeProps extends BaseProps<BadgeClass> {
     theme?: "primary" | "secondary" | "default" | "info" | "success" | "warning" | "error";
     rounded?: boolean | "top" | "right" | "bottom" | "left";

From 30208d0b82d0f6799d19c625437dfabfc99a268b Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Sat, 12 May 2018 03:41:43 +0800
Subject: [PATCH 0216/1124] feat(lazy-value): initial commit (#25699)

* feat(lazy-value): initial commit

* docs: add docs
---
 types/lazy-value/index.d.ts          | 15 +++++++++++++++
 types/lazy-value/lazy-value-tests.ts |  8 ++++++++
 types/lazy-value/tsconfig.json       | 23 +++++++++++++++++++++++
 types/lazy-value/tslint.json         |  3 +++
 4 files changed, 49 insertions(+)
 create mode 100644 types/lazy-value/index.d.ts
 create mode 100644 types/lazy-value/lazy-value-tests.ts
 create mode 100644 types/lazy-value/tsconfig.json
 create mode 100644 types/lazy-value/tslint.json

diff --git a/types/lazy-value/index.d.ts b/types/lazy-value/index.d.ts
new file mode 100644
index 0000000000..4f9ff7b564
--- /dev/null
+++ b/types/lazy-value/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for lazy-value 1.0
+// Project: https://github.com/sindresorhus/lazy-value
+// Definitions by: Ika <https://github.com/ikatyang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Create a [lazily evaluated](https://en.wikipedia.org/wiki/Lazy_evaluation) value.
+ *
+ * Useful when a value is expensive to generate, so you want to delay the computation until the value is needed.
+ * For example, improving startup performance by deferring nonessential operations.
+ *
+ * @param fn Expected to return a value.
+ */
+declare function lazyValue<T extends () => any>(fn: T): T;
+export = lazyValue;
diff --git a/types/lazy-value/lazy-value-tests.ts b/types/lazy-value/lazy-value-tests.ts
new file mode 100644
index 0000000000..46413ff915
--- /dev/null
+++ b/types/lazy-value/lazy-value-tests.ts
@@ -0,0 +1,8 @@
+import lazyValue = require("lazy-value");
+
+declare function expensiveComputation(): string;
+declare function doSomething(x: string): void;
+
+const val = lazyValue(expensiveComputation);
+
+doSomething(val());
diff --git a/types/lazy-value/tsconfig.json b/types/lazy-value/tsconfig.json
new file mode 100644
index 0000000000..e2e784e24f
--- /dev/null
+++ b/types/lazy-value/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "lazy-value-tests.ts"
+    ]
+}
diff --git a/types/lazy-value/tslint.json b/types/lazy-value/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/lazy-value/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From cb5a7de8895bb5dd54c1d32c377d3cf4987ed3e0 Mon Sep 17 00:00:00 2001
From: khanhas <xuankhanh963@gmail.com>
Date: Sat, 12 May 2018 02:45:05 +0700
Subject: [PATCH 0217/1124] [@types/proton-native] Add types for proton-native
 (#25705)

* Add types for proton-native

* Fixed `export`
---
 types/proton-native/index.d.ts     | 838 +++++++++++++++++++++++++++++
 types/proton-native/test/index.tsx |  72 +++
 types/proton-native/tsconfig.json  |  24 +
 types/proton-native/tslint.json    |   3 +
 4 files changed, 937 insertions(+)
 create mode 100644 types/proton-native/index.d.ts
 create mode 100644 types/proton-native/test/index.tsx
 create mode 100644 types/proton-native/tsconfig.json
 create mode 100644 types/proton-native/tslint.json

diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
new file mode 100644
index 0000000000..bf06ad879c
--- /dev/null
+++ b/types/proton-native/index.d.ts
@@ -0,0 +1,838 @@
+// Type definitions for proton-native 0.55
+// Project: https://github.com/kusti8/proton-native
+// Definitions by: Nguyen Xuan Khanh <https://github.com/khanhas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+export interface AppProps {
+    /**
+     * Called when the quit menu item is called, right before the entire app quits.
+     */
+    onShouldQuit?: () => void;
+}
+
+/**
+ * The app is the container for the entire program and holds Windows and Menus.
+ */
+export class App extends React.Component<AppProps> { }
+
+export interface AreaBaseProps {
+    /**
+     * The fill color for the component.
+     */
+    fill?: string;
+    /**
+     * The opacity of the fill (between 0 and 1). Gets multiplied with the fill colors alpha value.
+     */
+    fillOpacity?: number;
+    /**
+     * The stroke (line) color for the component.
+     */
+    stroke?: string;
+
+    strokeLinecap?: 'flat' | 'round' | 'bevel';
+
+    strokeLinejoin?: 'miter' | 'round' | 'bevel';
+    /**
+     * How far to extend the stroke at a sharp corner when using `strokeLinejoin='miter'`
+     * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/stroke-miterlimit
+     * for a more detailed explanation.
+     */
+    strokeMiterlimit?: number;
+    /**
+     * The opacity of the stroke (between 0 and 1). Gets multiplied with the stroke colors alpha value.
+     */
+    strokeOpacity?: number;
+
+    strokeWidth?: number;
+    /**
+     * List of transformations to apply to the component (are quite similar to SVG transformations). Example for multiple transformations: `transform="translate(100, 100) rotate(90)"`.
+     *
+     * All x and y coordinates specified in a transformation are relative _to the component itself_, meaning that `translate(-50%, 0)` will translate the component by 50% of it's own width to left.
+     */
+    transform?: string;
+}
+
+export interface AreaRectangleProps extends AreaBaseProps {
+    /**
+     * The height of the rectangle.
+     */
+    height: number | string;
+    /**
+     * The width of the rectangle.
+     */
+    width: number | string;
+    /**
+     * The x coordinate of the rectangles top left corner.
+     */
+    x: number | string;
+    /**
+     * The y coordinate of the rectangles top left corner.
+     */
+    y: number | string;
+}
+
+/**
+ * A rectangle to be displayed in an Area component.
+ */
+export class AreaRectangle extends React.Component<AreaRectangleProps> { }
+
+export interface AreaLineProps extends AreaBaseProps {
+    /**
+     * The x coordinate of the line's start point.
+     */
+    x1: number | string;
+    /**
+     * The x coordinate of the line's end point.
+     */
+    x2: number | string;
+    /**
+     * The y coordinate of the line's start point.
+     */
+    y1: number | string;
+    /**
+     * The y coordinate of the line's end point.
+     */
+    y2: number | string;
+}
+
+export class AreaLine extends React.Component<AreaLineProps> { }
+
+export interface AreaCircleProps extends AreaBaseProps {
+    /**
+     * The circle's radius. Percentage values use the Area's width.
+     */
+    r: number | string;
+    /**
+     * The x coordinate of the center of the cirle.
+     */
+    x: number | string;
+    /**
+     * The y coordinate of the center of the cirle.
+     */
+    y: number | string;
+}
+
+export class AreaCircle extends React.Component<AreaCircleProps> { }
+
+export interface AreaBezierProps extends AreaBaseProps {
+    /**
+     * The x coordinate of the curve's control point at the start.
+     */
+    cx1: number | string;
+    /**
+     * The x coordinate of the curve's control point at the end.
+     */
+    cx2: number | string;
+    /**
+     * The y coordinate of the curve's control point at the start.
+     */
+    cy1: number | string;
+    /**
+     * The y coordinate of the curve's control point at the end.
+     */
+    cy2: number | string;
+    /**
+     * The x coordinate of the curve's start point.
+     */
+    x1: number | string;
+    /**
+     * The x coordinate of the curve's end point.
+     */
+    x2: number | string;
+    /**
+     * The y coordinate of the curve's start point.
+     */
+    y1: number | string;
+    /**
+     * The y coordinate of the curve's end point.
+     */
+    y2: number | string;
+}
+
+export class AreaBezier extends React.Component<AreaBezierProps> { }
+
+export interface AreaPathProps extends AreaBaseProps {
+    /**
+     * A string describing the path (uses SVG's path syntax, explanation @see https://developer.mozilla.org/en-US/docs/Web/SVG/Tutorial/Paths).
+     *
+     * A warning is displayed whan an unimplemented shaped are used (Quadratic Beziers and Arcs).
+     */
+    d: string;
+    /**
+     * Sets the methods how to determine wheter to fill a path. Explanation @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/fill-rule.
+     */
+    fillMode: 'nonzero' | 'evenodd';
+}
+
+export class AreaPath extends React.Component<AreaPathProps> { }
+
+export interface MouseEvent {
+    button: number;
+    height: number;
+    width: number;
+    x: number;
+    y: number;
+}
+
+export interface KeyboardEvent {
+    extKey: number;
+    key: string;
+    modifierKey: number;
+    modifiers: number;
+}
+
+export interface AreaProps extends AreaBaseProps {
+    /**
+     * Called when releasing a key. Return `true` to signal that this event got handled (always returning true will disable any menu accelerators).
+     */
+    onKeyDown?: (event: KeyboardEvent) => boolean;
+    /**
+     * Called when pressing a key. Return `true` to signal that this event got handled (always returning true will disable any menu accelerators).
+     */
+    onKeyUp?: (event: KeyboardEvent) => boolean;
+    /**
+     * Whether the area can be seen.
+     */
+    onMouseDown?: (event: MouseEvent) => void;
+    /**
+     * Called when the mouse enters the area.
+     */
+    onMouseEnter?: () => void;
+    /**
+     * Called when the mouse leaves the area.
+     */
+    onMouseLeave?: () => void;
+    /**
+     * Called when the mouse is moved over the area
+     */
+    onMouseMove?: (event: {
+        buttons: ReadonlyArray<string>;
+        height: number;
+        width: number;
+        x: number;
+        y: number;
+    }) => void;
+    /**
+     * **Not working at the moment.**
+     *
+     * Called when releasing a mouse button over the area.
+     */
+    onMouseUp?: (event: MouseEvent) => void;
+    /**
+     * Whether the area can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A component onto which area components like rectangles or circles can be drawn.
+ *
+ * Some props can be applied to all area components (including Area itself and children)
+ * @see https://proton-native.js.org/#/area_props.
+ */
+export class Area extends React.Component<AreaProps> {
+    /**
+     * A Bezier curve to be displayed in an Area component.
+     */
+    static Bezier: typeof AreaBezier;
+    /**
+     * A circle to be displayed in an Area component.
+     */
+    static Circle: typeof AreaCircle;
+    /**
+     * A straigt line to be displayed in an Area component.
+     */
+    static Line: typeof AreaLine;
+    /**
+     * A component describing a path to be displayed in an Area component.
+     *
+     * To be able to use percentage values in transforms, the props `width` and `height` need to be specified (they have no graphical effect).
+     */
+    static Path: typeof AreaPath;
+    /**
+     * A rectangle to be displayed in an Area component.
+     */
+    static Rectangle: typeof AreaRectangle;
+}
+
+/**
+ * Undocumented
+ */
+export class AreaInternal extends React.Component { }
+
+export interface BoxProps {
+    /**
+     * Whether the Box is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Whether there is extra space between the children in the Box.
+     */
+    padded?: boolean;
+    /**
+     * Whether the Box arranges its children vertically or horizontally.
+     */
+    vertical?: boolean;
+    /**
+     * Whether the Box and its children can be seen.
+     */
+    visible?: boolean;
+}
+
+export class Box extends React.Component<BoxProps> { }
+
+export interface ButtonProps {
+    /**
+     * Whether the button can be clicked.
+     */
+    enabled?: boolean;
+    /**
+     * Called when the button is clicked.
+     */
+    onClick?: () => void;
+    /**
+     * Whether the button can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A container for multiple components that are ordered vertically or horizontally. Similar to React Native's `View`.
+ */
+export class Button extends React.Component<ButtonProps> { }
+
+export interface CheckboxProps {
+    /**
+     * Whether the checkbox can be used.
+     */
+    enabled?: boolean;
+    /**
+     * Whether the checkbox is checked or not.
+     */
+    checked?: boolean;
+    /**
+     * Called when the checkbox is clicked. The current checkbox state is passed as an argument.
+     */
+    onToggle?: (checked: boolean) => void;
+    /**
+     * Whether the checkbox can be seen.
+     */
+    visible?: boolean;
+}
+
+export class Checkbox extends React.Component<CheckboxProps> { }
+
+export interface ColorButtonProps {
+    /**
+     * The initial color for the ColorButton. Can be passed as standard color seen in CSS (a color name, hex, rgb, rgba, hsl, hsla).
+     */
+    color?: string;
+    /**
+     * Called when the color is changed for the ColorButton. The current color is passed as an object of RGBA.
+     */
+    onClick?: (color: {
+        r: number,
+        g: number,
+        b: number,
+        a: number
+    }) => void;
+}
+
+/**
+ * A button that allows the user to choose a color.
+ */
+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 {
+    /**
+     * Whether the Form is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Whether there is padding between the components
+     */
+    padded?: boolean;
+    /**
+     * Whether the Form can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A container where there is a label on the left and a component on the right.
+ *
+ * Each form component has a single prop, `label` which sets the label to its left. It is required.
+ */
+export class Form extends React.Component<FormProps> { }
+
+export interface GridChildrenProps {
+    /**
+     * Whether the component is aligned with the other components in the column/row.
+     */
+    align?: {
+        h: boolean;
+        v: boolean;
+    };
+    /**
+     * What column the component resides in.
+     */
+    column?: number;
+    /**
+     * Whether the component can expand in the direction.
+     */
+    expand?: {
+        h: boolean;
+        v: boolean;
+    };
+    /**
+     * What row the component resides in.
+     */
+    row?: number;
+}
+
+export interface GridProps {
+    /**
+     * Whether the Grid is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Whether there is padding between the components
+     */
+    padded?: boolean;
+    /**
+     * Whether the Grid can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A grid where components can be placed in rows and columns.
+ */
+export class Grid extends React.Component<GridProps> { }
+
+export interface GroupProps {
+    /**
+     * Whether the Group is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Whether there is a margin inside the group.
+     */
+    margined?: boolean;
+    /**
+     * The name of the group.
+     */
+    title?: string;
+    /**
+     * Whether the Grid can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A named group of components.
+ */
+export class Group extends React.Component<GroupProps> { }
+
+/**
+ * Undocumented
+ */
+export class HorizontalBox extends React.Component { }
+
+/**
+ * Undocumented
+ */
+export class HorizontalSeparator extends React.Component { }
+
+export interface MenuProps {
+    /**
+     * The name of the menu.
+     */
+    label?: string;
+}
+
+export interface MenuItemProps {
+    /**
+     * How the menu item is displayed.
+     *
+     * - `Check` - a checkable option in the menu.
+     * - `Quit` - a Quit button. This accepts no text.
+     * - `About` - an About button. This accepts no text.
+     * - `Preferences` - a Preferences button. This accepts no text.
+     * - `Separator` - a Separator between menu items. This accepts no text.
+     * - `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;
+}
+
+export class MenuItem extends React.Component<MenuItemProps> { }
+
+/**
+ * The top bar on a window that can have multiple options.
+ *
+ * The menu must come outside and before the Window for it to take effect. It is made up of Menu.Items. Menus can be embedded inside eachother to make sub-menus.
+ */
+export class Menu extends React.Component<MenuProps> {
+    /**
+     * A single item in a Menu.
+     */
+    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 {
+    /**
+     * Whether the user can enter their own custom text in addition to the drop down menu.
+     */
+    editable?: boolean;
+    /**
+     * Whether the Picker is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * When an *editable* Picker is changed. The current text is passed as an argument.
+     */
+    onChange?: (text: string) => void;
+    /**
+     * When a *non-editable* Picker is changed. The current selection is passed as an argument.
+     */
+    onSelect?: (selection: string) => void;
+    /**
+     * What element is selected if the picker *is not* editable.
+     */
+    selected?: boolean;
+    /**
+     * What text is selected/typed if the picker *is* editable.
+     */
+    text?: boolean;
+    /**
+     * Whether the Picker can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A drop down menu where the user can pick different values.
+ */
+export class Picker extends React.Component<PickerProps> { }
+
+export interface ProgressBarProps {
+    /**
+     * Whether the ProgressBar is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * The current value of the ProgressBar (0-100). A value of -1 indicates an indeterminate progressbar.
+     */
+    value?: number;
+    /**
+     * Whether the ProgressBar can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A bar that shows the progress in a certain task, 0-100.
+ */
+export class ProgressBar extends React.Component<ProgressBarProps> { }
+
+/**
+ * Undocumented
+ */
+export class RadioButton extends React.Component { }
+
+export class RadioButtonItem extends React.Component { }
+
+export interface RadioButtonsProps {
+    /**
+     * Whether the RadioButtons can be used.
+     */
+    enabled?: boolean;
+    /**
+     * Called when a RadioButton is selected. The number selected is passed as an argument.
+     */
+    onSelect?: (selected: boolean) => void;
+    /**
+     * What RadioButton is selected, zero-indexed. -1 means nothing is selected.
+     */
+    selected?: number;
+    /**
+     * Whether the RadioButtons can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A choice between multiple options.
+ *
+ * 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;
+}
+
+export interface SeparatorProps {
+    /**
+     * Whether the Separator is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Whether the line is vertical or horizontal.
+     */
+    vertical?: boolean;
+    /**
+     * Whether the Separator can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A line to separate two components, commonly used in a Box.
+ */
+export class Separator extends React.Component<SeparatorProps> { }
+
+export interface SliderProps {
+    /**
+     * Whether the Slider is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Called when the value of the slider is changed. The current value is passed as an argument.
+     */
+    onChange?: (value: number) => void;
+    /**
+     * The current value of the Slider (0-100).
+     */
+    value?: number;
+    /**
+     * Whether the Slider can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A bar that can be dragged by the user from 0-100.
+ */
+export class Slider extends React.Component<SliderProps> { }
+
+export interface SpinBoxProps {
+    /**
+     * Whether the Spinbox is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * When the Spinbox value is changed. The current value is passed as a parameter.
+     */
+    onChange?: (value: number) => void;
+    /**
+     * What the value of the Spinbox is set to.
+     */
+    value?: number;
+    /**
+     * Whether the Spinbox can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A location for the user to choose a number.
+ */
+export class SpinBox extends React.Component<SpinBoxProps> { }
+
+export interface TabProps {
+    /**
+     * Whether the Tab is enabled.
+     */
+    enabled?: boolean;
+    /**
+     * Whether the Tab can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A component with different named tabs containing other components.
+ *
+ * Each child is required to have a label prop that is displayed at the top and names the tab.
+ */
+export class Tab extends React.Component<TabProps> { }
+
+/**
+ * Displays some text.
+ */
+export class Text extends React.Component { }
+
+export interface TextInputProps {
+    /**
+     * Whether the TextInput can be used.
+     */
+    enabled?: boolean;
+    /**
+     * Whether multiple lines can be inputted into the TextInput.
+     */
+    multiline?: boolean;
+    /**
+     * Called when the TextInput text is changed. The new text is passed as an argument.
+     */
+    onChange?: (text: string) => void;
+    /**
+     * Whether the TextInput can be written to by the user.
+     */
+    readOnly?: boolean;
+    /**
+     * Whether characters are hidden in the TextInput. Commonly used for passwords.
+     */
+    secure?: boolean;
+    /**
+     * Whether the TextInput can be seen.
+     */
+    visible?: boolean;
+}
+
+/**
+ * A place for the user to type in a string.
+ */
+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;
+    /**
+     * Whether the window is closed. If set to closed, then the window will be closed.
+     */
+    closed?: boolean;
+    /**
+     * Whether the window will be fullscreen on start.
+     */
+    fullscreen?: boolean;
+    /**
+     * Whether the window is the last window. If set to `true`, then the program will quit once the window is closed.
+     */
+    lastWindow?: boolean;
+    /**
+     * Whether all children will have a margin around them and the outer edge of the window.
+     */
+    margined?: boolean;
+    /**
+     * Whether a menubar will be shown on the top of the window.
+     */
+    menuBar?: boolean;
+    /**
+     * Called when the window is closed.
+     */
+    onClose?: () => void;
+    /**
+     * Called when the window size is changed by the user. The new size is passed as an argument, in an object.
+     */
+    onContentSizeChange?: (size: {
+        h: number,
+        y: number
+    }) => void;
+    /**
+     * How big the window is when the application is first started.
+     */
+    size?: {
+        h: number,
+        w: number
+    };
+    /**
+     * The title of the window. Will be shown at the top left ribbon.
+     */
+    title?: string;
+}
+
+/**
+ * The window is the basis where all other components reside.
+ */
+export class Window extends React.Component<WindowProps> { }
+
+export function render(element: JSX.Element): React.ReactNode;
+
+/**
+ * A method to display an alert, or a dialog to save or open a file.
+ * @param type What type the dialog is. The current types are:
+ * - Message - a simple message
+ * - Error - an error message
+ * - Open - open a file
+ * - Save - save a file
+ * @param options Options for the title and description if it is a Message or Error.
+ * Required one of title and description (if it is Message or Error)
+ */
+export function Dialog(
+    type: 'Message' | 'Error' | 'Open' | 'Save',
+    options?: {
+        title: string,
+        description?: string
+    }
+    | {
+        title?: string,
+        description: string
+    }
+): void;
diff --git a/types/proton-native/test/index.tsx b/types/proton-native/test/index.tsx
new file mode 100644
index 0000000000..1b12be9894
--- /dev/null
+++ b/types/proton-native/test/index.tsx
@@ -0,0 +1,72 @@
+import * as React from "react";
+import {
+    render,
+    App,
+    Area,
+    Group,
+    Menu,
+    RadioButtons,
+    Window,
+} from "proton-native";
+
+class ExampleApp extends React.Component {
+    render() {
+        return (
+            <App>
+                <Window title="Example" size={{ w: 500, h: 500 }} />
+            </App>
+        );
+    }
+}
+
+class MenuTest extends React.Component {
+    render() {
+      return (
+        <App>
+          <Window title="Example" size={{ w: 500, h: 500 }}>
+            <App>
+                <Menu label="HI">
+                <Menu.Item>Hi</Menu.Item>
+                </Menu>
+                <Window title="Example" size={{w: 500, h: 500}} />
+            </App>
+          </Window>
+        </App>
+      );
+    }
+}
+
+class RadioTest extends React.Component {
+    render() {
+      return (
+        <App>
+            <Window title="Example" size={{w: 500, h: 500}}>
+                <RadioButtons enabled={true}>
+                    <RadioButtons.Item>Option 1</RadioButtons.Item>
+                    <RadioButtons.Item>Option 2</RadioButtons.Item>
+                </RadioButtons>
+            </Window>
+        </App>
+      );
+    }
+}
+
+class RectangleTest extends React.Component {
+    render() {
+        return (
+            <App>
+                <Window title="Example" size={{ w: 500, h: 500 }}>
+                <Area>
+                    <Area.Rectangle
+                    x="10"
+                    y="10"
+                    width="100"
+                    height="200"
+                    fill="blue"
+                    />
+                </Area>
+                </Window>
+            </App>
+        );
+    }
+}
diff --git a/types/proton-native/tsconfig.json b/types/proton-native/tsconfig.json
new file mode 100644
index 0000000000..4a1d2fd61c
--- /dev/null
+++ b/types/proton-native/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",
+        "test/index.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/proton-native/tslint.json b/types/proton-native/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/proton-native/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 52aaa6bc5c675a05164bb0722ae0b418b4434916 Mon Sep 17 00:00:00 2001
From: Ifiok Jr <ifiokotung@gmail.com>
Date: Fri, 11 May 2018 21:00:21 +0100
Subject: [PATCH 0218/1124] react-native-htmlview types added (#25713)

---
 types/react-native-htmlview/index.d.ts        | 83 +++++++++++++++++++
 .../react-native-htmlview-tests.tsx           | 40 +++++++++
 types/react-native-htmlview/tsconfig.json     | 24 ++++++
 types/react-native-htmlview/tslint.json       |  1 +
 4 files changed, 148 insertions(+)
 create mode 100644 types/react-native-htmlview/index.d.ts
 create mode 100644 types/react-native-htmlview/react-native-htmlview-tests.tsx
 create mode 100644 types/react-native-htmlview/tsconfig.json
 create mode 100644 types/react-native-htmlview/tslint.json

diff --git a/types/react-native-htmlview/index.d.ts b/types/react-native-htmlview/index.d.ts
new file mode 100644
index 0000000000..5bef0c8583
--- /dev/null
+++ b/types/react-native-htmlview/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for react-native-htmlview 0.12
+// Project: https://github.com/jsdf/react-native-htmlview
+// Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { Component, ComponentType, ReactNode } from 'react';
+import { StyleProp, TextProperties, TextStyle, ViewStyle, ImageStyle } from 'react-native';
+
+export interface HTMLViewNode {
+    data?: string;
+    type?: string;
+    name?: string;
+    attribs: { [key: string]: string };
+}
+export interface HTMLViewProps {
+    /**
+     * a string of HTML content to render
+     */
+    value: string;
+
+    stylesheet?: {
+        [key: string]: StyleProp<ViewStyle | TextStyle | ImageStyle>;
+    };
+
+    onLinkPress?(url: string): void;
+
+    onLinkLongPress?(url: string): void;
+
+    /**
+     *
+     * A custom function to render HTML nodes however you see fit. If the function returns undefined (not null), the
+     * default renderer will be used for that node. The function takes the following arguments:
+     *
+     *  - defaultRenderer the default rendering implementation, so you can use the normal rendering logic for some subtree. defaultRenderer takes the following arguments:
+     *     - node the node to render with the default rendering logic
+     *     - parent the parent of node of node
+     *
+     * @param node the html node as parsed by htmlparser2
+     * @param index position of the node in parent node's children
+     * @param siblings parent node's children (including current node)
+     * @param parent parent node
+     * @param defaultRenderer the default rendering implementation, so you can use the normal rendering logic for some subtree:
+     */
+    renderNode?(
+    node: HTMLViewNode,
+    index: number,
+    siblings: HTMLViewNode,
+    parent: HTMLViewNode,
+    defaultRenderer: (node: HTMLViewNode, parent: HTMLViewNode) => ReactNode,
+    ): ReactNode;
+
+    /**
+     * Text which is rendered before every li inside a ul
+     */
+    bullet?: string;
+
+    /**
+     * Text which appears after every p element
+     */
+    paragraphBreak?: string;
+
+    /**
+     * Text which appears after text elements which create a new line (br, headings)
+     */
+    lineBreak?: string;
+
+    /**
+     *  When explicitly false, effectively sets paragraphBreak and lineBreak to null
+     */
+    addLineBreaks?: boolean;
+
+    /*
+     * TODO Add futher customisization props
+     * https://github.com/jsdf/react-native-htmlview#customizing-things-even-further
+     */
+
+    TextComponent?: ComponentType;
+
+    textComponentProps?: TextProperties;
+}
+
+export default class HTMLView extends Component<HTMLViewProps> {}
diff --git a/types/react-native-htmlview/react-native-htmlview-tests.tsx b/types/react-native-htmlview/react-native-htmlview-tests.tsx
new file mode 100644
index 0000000000..086b1287e9
--- /dev/null
+++ b/types/react-native-htmlview/react-native-htmlview-tests.tsx
@@ -0,0 +1,40 @@
+import * as React from 'react';
+import { Text, StyleSheet } from 'react-native';
+import HTMLView from 'react-native-htmlview';
+
+const styles = StyleSheet.create({
+  strong: {},
+  a: {},
+  p: {},
+  h1: {},
+  h2: {},
+  h3: {},
+  h4: {},
+  h5: {},
+  h6: {},
+});
+
+const defaultTextProps = {
+  style: {
+    fontSize: 14,
+  },
+};
+
+class Simple extends React.Component {
+    onPressLink = () => {
+        // Do someting
+    }
+
+    render() {
+        return (
+            <HTMLView
+                TextComponent={Text}
+                textComponentProps={defaultTextProps}
+                value="<br><b>This is html</b><div><p>Yo P</p></p>"
+                addLineBreaks={false}
+                stylesheet={styles}
+                onLinkPress={this.onPressLink}
+            />
+        );
+    }
+}
diff --git a/types/react-native-htmlview/tsconfig.json b/types/react-native-htmlview/tsconfig.json
new file mode 100644
index 0000000000..bf651665bd
--- /dev/null
+++ b/types/react-native-htmlview/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-htmlview-tests.tsx"
+    ]
+}
diff --git a/types/react-native-htmlview/tslint.json b/types/react-native-htmlview/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-htmlview/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0219/1124] 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 2909ac3accf4982cb7fdceadcb7e16c7bae76ca4 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@etrog.net.il>
Date: Sat, 12 May 2018 00:22:21 +0300
Subject: [PATCH 0220/1124] Split activex-interop from windows-script-host;
 replace activex-iwshruntimelibrary (#25695)

* Interop definitions -
 https://github.com/Microsoft/TypeScript/issues/21440

* WSH definitions

* Merge IWshRuntimeLibrary; -Object methods use ActiveXObjectNameMap

* WshNamed, WshUnnamed and default properties

* Merge activex-iwshruntimelibrary into windows-script-host

* WScript.Echo optional parameter

* Deleted package.json
---
 .../activex-interop/activex-interop-tests.ts  |  49 +++
 types/activex-interop/index.d.ts              | 111 +++++++
 types/activex-interop/tsconfig.json           |  21 ++
 .../tslint.json                               |   0
 types/activex-iwshruntimelibrary/package.json |   6 -
 .../index.d.ts                                | 306 ++++++++++++++++--
 .../tsconfig.json                             |   7 +-
 types/windows-script-host/tslint.json         |   6 +
 .../windows-script-host-tests.ts}             |  31 ++
 9 files changed, 493 insertions(+), 44 deletions(-)
 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
 rename types/{activex-iwshruntimelibrary => activex-interop}/tslint.json (100%)
 delete mode 100644 types/activex-iwshruntimelibrary/package.json
 rename types/{activex-iwshruntimelibrary => windows-script-host}/index.d.ts (61%)
 rename types/{activex-iwshruntimelibrary => windows-script-host}/tsconfig.json (82%)
 create mode 100644 types/windows-script-host/tslint.json
 rename types/{activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts => windows-script-host/windows-script-host-tests.ts} (67%)

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..caa74fff38
--- /dev/null
+++ b/types/activex-interop/index.d.ts
@@ -0,0 +1,111 @@
+// 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-iwshruntimelibrary/tslint.json b/types/activex-interop/tslint.json
similarity index 100%
rename from types/activex-iwshruntimelibrary/tslint.json
rename to types/activex-interop/tslint.json
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/index.d.ts b/types/windows-script-host/index.d.ts
similarity index 61%
rename from types/activex-iwshruntimelibrary/index.d.ts
rename to types/windows-script-host/index.d.ts
index d5b052eaae..50f0c52216 100644
--- a/types/activex-iwshruntimelibrary/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -1,14 +1,15 @@
-// Type definitions for Windows Script Host Object Model - IWshRuntimeLibrary 1.0
-// Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k(v=vs.84).aspx
+// 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.6
+// 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;
 
-    // tslint:disable-next-line no-const-enum
     const enum ButtonType {
         OK,
         OKCancel,
@@ -19,7 +20,6 @@ declare namespace IWshRuntimeLibrary {
         CancelTryagainContinue
     }
 
-    // tslint:disable-next-line no-const-enum
     const enum EventType {
         AuditFailure = 5,
         AuditSuccess = 4,
@@ -29,7 +29,6 @@ declare namespace IWshRuntimeLibrary {
         Warning = 2
     }
 
-    // tslint:disable-next-line no-const-enum
     const enum IconType {
         Stop = 16,
         QuestionMark = 32,
@@ -37,7 +36,6 @@ declare namespace IWshRuntimeLibrary {
         InformationMark = 64,
     }
 
-    // tslint:disable-next-line no-const-enum
     const enum PopupType {
         SecondButtonDefault = 256,
         ThirdButtonDefault = 512,
@@ -46,7 +44,6 @@ declare namespace IWshRuntimeLibrary {
         RTL = 1048576,
     }
 
-    // tslint:disable-next-line no-const-enum
     const enum PopupSelection {
         NoButton = -1,
         OK = 1,
@@ -60,14 +57,12 @@ declare namespace IWshRuntimeLibrary {
         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,
@@ -77,24 +72,108 @@ declare namespace IWshRuntimeLibrary {
         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;
+    class TextStreamBase {
+        /**
+         * The column number of the current character position in an input stream.
+         */
+        Column: number;
 
-        /** @param string [Text=''] */
-        WriteLine(Text?: string): void;
+        /**
+         * 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 */
@@ -109,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;
     }
@@ -121,12 +200,25 @@ declare namespace IWshRuntimeLibrary {
         readonly ExitCode: number;
         readonly ProcessID: number;
         readonly Status: WshExecStatus;
-        readonly StdErr: TextStream;
-        readonly StdIn: TextStream;
-        readonly StdOut: TextStream;
+        readonly StdErr: TextStreamWriter;
+        readonly StdIn: TextStreamReader;
+        readonly StdOut: TextStreamWriter;
         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;
@@ -326,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;
@@ -337,12 +437,150 @@ declare namespace IWshRuntimeLibrary {
     }
 }
 
-interface ActiveXObject {
-    set(obj: IWshRuntimeLibrary.WshEnvironment, propertyName: 'Item', parameterTypes: [string], newValue: string): void;
-    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
+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: IWshRuntimeLibrary.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;
+
+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/windows-script-host/tsconfig.json
similarity index 82%
rename from types/activex-iwshruntimelibrary/tsconfig.json
rename to types/windows-script-host/tsconfig.json
index 1fa5abc39b..d53dad8a20 100644
--- a/types/activex-iwshruntimelibrary/tsconfig.json
+++ b/types/windows-script-host/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -19,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "activex-iwshruntimelibrary-tests.ts"
+        "windows-script-host-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/windows-script-host/tslint.json b/types/windows-script-host/tslint.json
new file mode 100644
index 0000000000..ed91c31f9c
--- /dev/null
+++ b/types/windows-script-host/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/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts b/types/windows-script-host/windows-script-host-tests.ts
similarity index 67%
rename from types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
rename to types/windows-script-host/windows-script-host-tests.ts
index 14a90f9a8a..c6b3449482 100644
--- a/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
+++ b/types/windows-script-host/windows-script-host-tests.ts
@@ -1,3 +1,34 @@
+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)}`);
+}
+
 const wshn = new ActiveXObject('WScript.Network');
 
 // https://msdn.microsoft.com/en-us/library/s6wt333f(v=vs.84).aspx

From af5dd8fe0f69f1a9f5c714dd682fbb93c6c641d3 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@outlook.com>
Date: Fri, 11 May 2018 14:49:57 -0700
Subject: [PATCH 0221/1124] Change node 6 to target es5 (#25719)

---
 types/node/v6/index.d.ts    | 15 +++++++++++++++
 types/node/v6/tsconfig.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 92e6fe75ad..9d2ea9ea00 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -56,6 +56,21 @@ interface WeakMapConstructor { }
 interface SetConstructor { }
 interface WeakSetConstructor { }
 
+// Forward-declare needed types from lib.es2015.d.ts (in case users are using `--lib es5`)
+interface Iterable<T> { }
+interface Iterator<T> {
+    next(value?: any): IteratorResult<T>;
+}
+
+interface IteratorResult<T> { }
+interface AsyncIterableIterator<T> {}
+interface SymbolConstructor {
+    readonly iterator: symbol;
+    readonly asyncIterator: symbol;
+}
+
+declare var Symbol: SymbolConstructor;
+
 /************************************************
 *                                               *
 *                   GLOBAL                      *
diff --git a/types/node/v6/tsconfig.json b/types/node/v6/tsconfig.json
index 8fc9488eac..3ebee98552 100644
--- a/types/node/v6/tsconfig.json
+++ b/types/node/v6/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From a68f617d89e164fd042ca08029f6efa2df3ab818 Mon Sep 17 00:00:00 2001
From: Nate Mara <natemara@gmail.com>
Date: Fri, 11 May 2018 18:01:23 -0400
Subject: [PATCH 0222/1124] fix(unzipper): update promise and buffer to be
 functions, not properties (#25685)

---
 types/unzipper/index.d.ts        | 154 ++++++++++++++++---------------
 types/unzipper/unzipper-tests.ts |  77 ++++++++--------
 2 files changed, 118 insertions(+), 113 deletions(-)

diff --git a/types/unzipper/index.d.ts b/types/unzipper/index.d.ts
index 5af7bbddf7..865660bd76 100644
--- a/types/unzipper/index.d.ts
+++ b/types/unzipper/index.d.ts
@@ -1,109 +1,115 @@
 // Type definitions for unzipper 0.8
 // Project: https://github.com/ZJONSSON/node-unzipper#readme
 // Definitions by: s73obrien <https://github.com/s73obrien>
+//                 Nate <https://github.com/natemara>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 /// <reference types="node" />
 
 import { Readable, Stream, PassThrough, Duplex } from "stream";
 import { ClientRequest, RequestOptions } from "http";
 
 export interface PullStream extends Duplex {
-	stream(eof: number | string, includeEof: boolean): PassThrough;
-	pull(eof: number | string, includeEof: boolean): Promise<Buffer>;
+    stream(eof: number | string, includeEof: boolean): PassThrough;
+    pull(eof: number | string, includeEof: boolean): Promise<Buffer>;
 }
 
 export interface Entry extends PassThrough {
-	autodrain(): Promise<void>;
-	buffer: Promise<Buffer>;
-	path: string;
+    autodrain(): Promise<void>;
+    buffer(): Promise<Buffer>;
+    path: string;
 
-	props: {
-		path: string;
-	};
+    props: {
+        path: string;
+    };
 
-	type: string;
-	vars: {
-		signature?: number;
-		versionsNeededToExtract: number;
-		flags: number;
-		compressionMethod: number;
-		lastModifiedTime: number;
-		crc32: number;
-		compressedSize: number;
-		fileNameLength: number;
-		extraFieldLength: number;
-	};
+    type: string;
+    vars: {
+        signature?: number;
+        versionsNeededToExtract: number;
+        flags: number;
+        compressionMethod: number;
+        lastModifiedTime: number;
+        crc32: number;
+        compressedSize: number;
+        fileNameLength: number;
+        extraFieldLength: number;
+    };
 
-	extra: {
-		signature: number;
-		partsize: number;
-		uncompressedSize: number;
-		compressedSize: number;
-		offset: number;
-		disknum: number;
-	};
+    extra: {
+        signature: number;
+        partsize: number;
+        uncompressedSize: number;
+        compressedSize: number;
+        offset: number;
+        disknum: number;
+    };
 }
 
 export function unzip(
-	source: {
-		stream: Readable;
-		size: Promise<number>
-	},
-	offset: number,
-	_password: string): Entry;
+    source: {
+        stream: Readable;
+        size: Promise<number>;
+    },
+    offset: number,
+    _password: string
+): Entry;
 
 export namespace Open {
-	function file(filename: string): CentralDirectory;
-	function url(request: ClientRequest, opt: string | RequestOptions): CentralDirectory;
-	function s3(client: any, params: any): CentralDirectory;
+    function file(filename: string): CentralDirectory;
+    function url(
+        request: ClientRequest,
+        opt: string | RequestOptions
+    ): CentralDirectory;
+    function s3(client: any, params: any): CentralDirectory;
 }
 
 export function BufferStream(entry: Entry): Promise<Buffer>;
 
 export interface CentralDirectory {
-	signature: number;
-	diskNumber: number;
-	diskStart: number;
-	numberOfRecordsOnDisk: number;
-	numberOfRecords: number;
-	sizeOfCentralDirectory: number;
-	offsetToStartOfCentralDirectory: number;
-	commentLength: number;
-	files: [
-		{
-			signature: number;
-			versionMadeBy: number;
-			versionsNeededToExtract: number;
-			flags: number;
-			compressionMethod: number;
-			lastModifiedTime: number;
-			lastModifiedDate: number;
-			crc32: number;
-			compressedSize: number;
-			uncompressedSize: number;
-			fileNameLength: number;
-			extraFieldLength: number;
-			fileCommentLength: number;
-			diskNumber: number;
-			internalFileAttributes: number;
-			externalFileAttributes: number;
-			offsetToLocalFileHeader: number;
-			path: string;
-			comment: string;
-			stream: Entry;
-			buffer: Promise<Buffer>;
-		}
-	];
+    signature: number;
+    diskNumber: number;
+    diskStart: number;
+    numberOfRecordsOnDisk: number;
+    numberOfRecords: number;
+    sizeOfCentralDirectory: number;
+    offsetToStartOfCentralDirectory: number;
+    commentLength: number;
+    files: [
+        {
+            signature: number;
+            versionMadeBy: number;
+            versionsNeededToExtract: number;
+            flags: number;
+            compressionMethod: number;
+            lastModifiedTime: number;
+            lastModifiedDate: number;
+            crc32: number;
+            compressedSize: number;
+            uncompressedSize: number;
+            fileNameLength: number;
+            extraFieldLength: number;
+            fileCommentLength: number;
+            diskNumber: number;
+            internalFileAttributes: number;
+            externalFileAttributes: number;
+            offsetToLocalFileHeader: number;
+            path: string;
+            comment: string;
+            stream: Entry;
+            buffer: Promise<Buffer>;
+        }
+    ];
 }
 
 export class ParseOptions {
-	verbose?: boolean;
-	path?: string;
-	// more options?
+    verbose?: boolean;
+    path?: string;
+    // more options?
 }
 
 export type ParseStream = PullStream & {
-	promise: Promise<void>
+    promise(): Promise<void>;
 };
 
 export function Parse(opts?: ParseOptions): ParseStream;
diff --git a/types/unzipper/unzipper-tests.ts b/types/unzipper/unzipper-tests.ts
index 295b5541db..e5d06f6055 100644
--- a/types/unzipper/unzipper-tests.ts
+++ b/types/unzipper/unzipper-tests.ts
@@ -1,44 +1,43 @@
-import {
-	Parse,
-	Open,
-	Entry,
-	CentralDirectory
-} from 'unzipper';
+import { Parse, Open, Entry, CentralDirectory } from "unzipper";
 
-import { createReadStream } from 'fs';
+import { createReadStream } from "fs";
 
-import { get } from 'http';
+import { get } from "http";
 
-createReadStream(
-	'http://example.org/path/to/archive.zip'
-).pipe(
-	Parse()
-).on('entry', (entry: Entry) => {
-	entry.buffer.then((b1: Buffer) => {});
-	const s1: string = entry.path;
-	const s2: string = entry.type;
-	const o1: {
-		signature?: number;
-		versionsNeededToExtract: number;
-		flags: number;
-		compressionMethod: number;
-		lastModifiedTime: number;
-		crc32: number;
-		compressedSize: number;
-		fileNameLength: number;
-		extraFieldLength: number;
-	} = entry.vars;
+createReadStream("http://example.org/path/to/archive.zip")
+    .pipe(Parse())
+    .on("entry", (entry: Entry) => {
+        entry.buffer().then((b1: Buffer) => {});
+        const s1: string = entry.path;
+        const s2: string = entry.type;
+        const o1: {
+            signature?: number;
+            versionsNeededToExtract: number;
+            flags: number;
+            compressionMethod: number;
+            lastModifiedTime: number;
+            crc32: number;
+            compressedSize: number;
+            fileNameLength: number;
+            extraFieldLength: number;
+        } =
+            entry.vars;
 
-	const o2: {
-		signature: number;
-		partsize: number;
-		uncompressedSize: number;
-		compressedSize: number;
-		offset: number;
-		disknum: number;
-	} = entry.extra;
-});
+        const o2: {
+            signature: number;
+            partsize: number;
+            uncompressedSize: number;
+            compressedSize: number;
+            offset: number;
+            disknum: number;
+        } =
+            entry.extra;
+    })
+    .promise()
+    .then(() => {
+        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: 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");

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 0223/1124] 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 0224/1124] 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 0225/1124] 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 0226/1124] 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 0227/1124] 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 b4518ea734b64d0a486b07b8e5c68268834cc2f9 Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Sat, 12 May 2018 15:30:51 +0800
Subject: [PATCH 0228/1124] upgrade jsreport-html-to-xlsx to 2.0

---
 types/jsreport-html-to-xlsx/index.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/jsreport-html-to-xlsx/index.d.ts b/types/jsreport-html-to-xlsx/index.d.ts
index 84b37480aa..83ac765c1f 100644
--- a/types/jsreport-html-to-xlsx/index.d.ts
+++ b/types/jsreport-html-to-xlsx/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jsreport-html-to-xlsx 1.4
+// Type definitions for jsreport-html-to-xlsx 2.0
 // Project: https://github.com/jsreport/jsreport-html-to-xlsx
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,7 +8,9 @@ import { ExtensionDefinition } from 'jsreport-core';
 import { Options as BaseOptions } from 'jsreport-xlsx';
 
 declare module 'jsreport-core' {
+	type htmlEngine = 'phantom' | 'chrome';
 	interface Template {
+		htmlToXlsx: { htmlEngine: htmlEngine; };
 		recipe: 'html-to-xlsx' | string;
 	}
 }

From e41dcf12be9a34a251ecaec0c7a87b1aa0b9958d Mon Sep 17 00:00:00 2001
From: "Anders E. Andersen" <andersa@ellenshoej.dk>
Date: Sat, 12 May 2018 09:47:57 +0200
Subject: [PATCH 0229/1124] Support stricter covariant contravariant checks

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

diff --git a/types/node-red/index.d.ts b/types/node-red/index.d.ts
index 4c9a1f093a..bc58257e2c 100644
--- a/types/node-red/index.d.ts
+++ b/types/node-red/index.d.ts
@@ -215,5 +215,6 @@ export interface Nodes {
      * @param constructor - the constructor function for this node type
      * @param opts - optional additional options for the node
      */
-    registerType(type: string, constructor: (props: NodeProperties) => any, opts?: any): void;
+    // tslint:disable-next-line no-unnecessary-generics
+    registerType<T extends NodeProperties>(type: string, constructor: (props: T) => any, opts?: any): void;
 }

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 0230/1124] 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 0231/1124] 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 0232/1124] 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 0233/1124] 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 0234/1124] 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 0235/1124] 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 0236/1124] 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 0237/1124] 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 9d85152b0c31868a4adf4d06e62a310fc18080a5 Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.e.parker@gmail.com>
Date: Sat, 12 May 2018 15:41:54 +0100
Subject: [PATCH 0238/1124] Glue - Fixed compose to return promise

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

diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index f347e69746..71c7714827 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -28,4 +28,4 @@ export interface Manifest {
   };
 }
 
-export function compose(manifest: Manifest, options?: Options): Server;
+export function compose(manifest: Manifest, options?: Options): Promise<Server>;

From 64d8a682dc73cd0932e8c889a08169ed9a4cb201 Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.e.parker@gmail.com>
Date: Sat, 12 May 2018 15:47:07 +0100
Subject: [PATCH 0239/1124] Glue - Updated Test

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

diff --git a/types/glue/glue-tests.ts b/types/glue/glue-tests.ts
index 7ac309352c..577434661a 100644
--- a/types/glue/glue-tests.ts
+++ b/types/glue/glue-tests.ts
@@ -7,6 +7,7 @@ const manifest: Glue.Manifest = {
   },
   register: {
     plugins: [
+      "test-plugin",
       {
         plugin: "./test",
         routes: {

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 0240/1124] 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 fc3ff10ba010411871da782f24a5b2d4b5286d6c Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.e.parker@gmail.com>
Date: Sat, 12 May 2018 17:16:18 +0100
Subject: [PATCH 0241/1124] Glue - Added union types for plugins

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

diff --git a/types/glue/glue-tests.ts b/types/glue/glue-tests.ts
index 577434661a..dd400697e6 100644
--- a/types/glue/glue-tests.ts
+++ b/types/glue/glue-tests.ts
@@ -7,9 +7,9 @@ const manifest: Glue.Manifest = {
   },
   register: {
     plugins: [
-      "test-plugin",
+      "./test-plugin.js",
       {
-        plugin: "./test",
+        plugin: "./test.js",
         routes: {
           prefix: "test"
         }
diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index 71c7714827..060d729d66 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -24,7 +24,7 @@ export interface Plugin {
 export interface Manifest {
   server: ServerOptions;
   register?: {
-    plugins: string[] | Plugin[]
+    plugins: string[] | Plugin[] | Array<(string|Plugin)>
   };
 }
 

From f85390fff4d1b7145f7de7019a860a06b00b6df7 Mon Sep 17 00:00:00 2001
From: Justin Stanley <justin.stanley@gmail.com>
Date: Sat, 12 May 2018 12:20:39 -0500
Subject: [PATCH 0242/1124] Added allowFontScaling prop to TextInputProps

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 756ef2b340..b0a0f89010 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1088,6 +1088,14 @@ export type ReturnKeyTypeOptions = ReturnKeyType | ReturnKeyTypeAndroid | Return
  */
 export interface TextInputProps
     extends ViewProps, TextInputIOSProps, TextInputAndroidProps, AccessibilityProps {
+    /**
+     * Specifies whether fonts should scale to respect Text Size accessibility settings.
+     * The default is true.
+     *
+     * https://facebook.github.io/react-native/docs/textinput.html#allowfontscaling
+     */
+    allowFontScaling?: boolean;
+
     /**
      * Can tell TextInput to automatically capitalize certain characters.
      *      characters: all characters,

From ec90482869920fd2482d34a94328ba23be3f5698 Mon Sep 17 00:00:00 2001
From: Justin Stanley <justin.stanley@gmail.com>
Date: Sat, 12 May 2018 12:29:56 -0500
Subject: [PATCH 0243/1124] Moved allowFontScaling from TextPropsIOS to
 TextProps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- `allowFontScaling` is not an iOS-only prop on Text.
-  also removed the link to `allowFontScaling` for TextInput as there’s already a link to the TextInput docs above the interface declaration.
---
 types/react-native/index.d.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index b0a0f89010..83266b6383 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -800,12 +800,6 @@ export interface TextStyle extends TextStyleIOS, TextStyleAndroid, ViewStyle {
 }
 
 export interface TextPropsIOS {
-    /**
-     * Specifies whether fonts should scale to respect Text Size accessibility setting on iOS. The
-     * default is `true`.
-     */
-    allowFontScaling?: boolean;
-
     /**
      * Specifies whether font should be scaled down automatically to fit given style constraints.
      */
@@ -843,6 +837,12 @@ export interface TextPropsAndroid {
 
 // https://facebook.github.io/react-native/docs/text.html#props
 export interface TextProps extends TextPropsIOS, TextPropsAndroid, AccessibilityProps {
+    /**
+     * Specifies whether fonts should scale to respect Text Size accessibility settings.
+     * The default is `true`.
+     */
+    allowFontScaling?: boolean;
+
     /**
      * This can be one of the following values:
      *
@@ -1090,9 +1090,7 @@ export interface TextInputProps
     extends ViewProps, TextInputIOSProps, TextInputAndroidProps, AccessibilityProps {
     /**
      * Specifies whether fonts should scale to respect Text Size accessibility settings.
-     * The default is true.
-     *
-     * https://facebook.github.io/react-native/docs/textinput.html#allowfontscaling
+     * The default is `true`.
      */
     allowFontScaling?: boolean;
 

From e8e62acb43e9705dcdca8838ece885cfd10c8c36 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Sat, 12 May 2018 17:34:11 +0000
Subject: [PATCH 0244/1124] Replace some string[] arguments by
 ReadonlyArray<string>

`spawnSync`, `execFile`, ... take `string[]` as arguments which makes it inconvenient to pass a ReadonlyArray
---
 types/node/index.d.ts | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index d228742629..b90c17fa0a 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2253,33 +2253,33 @@ declare module "child_process" {
 
     export function execFile(file: string): ChildProcess;
     export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
+    export function execFile(file: string, args?: ReadonlyArray<string> | null): ChildProcess;
+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null): ChildProcess;
 
     // no `options` definitely means stdout/stderr are `string`.
     export function execFile(file: string, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
 
     // `options` with `"buffer"` or `null` for `encoding` means stdout/stderr are definitely `Buffer`.
     export function execFile(file: string, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptionsWithBufferEncoding, callback: (error: Error | null, stdout: Buffer, stderr: Buffer) => void): ChildProcess;
 
     // `options` with well known `encoding` means stdout/stderr are definitely `string`.
     export function execFile(file: string, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptionsWithStringEncoding, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
 
     // `options` with an `encoding` whose type is `string` means stdout/stderr could either be `Buffer` or `string`.
     // There is no guarantee the `encoding` is unknown as `string` is a superset of `BufferEncoding`.
     export function execFile(file: string, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptionsWithOtherEncoding, callback: (error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void): ChildProcess;
 
     // `options` without an `encoding` means stdout/stderr are definitely `string`.
     export function execFile(file: string, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ExecFileOptions, callback: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
 
     // fallback if nothing else matches. Worst case is always `string | Buffer`.
     export function execFile(file: string, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
-    export function execFile(file: string, args: string[] | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
+    export function execFile(file: string, args: ReadonlyArray<string> | undefined | null, options: ({ encoding?: string | null } & ExecFileOptions) | undefined | null, callback: ((error: Error | null, stdout: string | Buffer, stderr: string | Buffer) => void) | undefined | null): ChildProcess;
 
     // NOTE: This namespace provides design-time support for util.promisify. Exported members do not exist at runtime.
     export namespace execFile {
@@ -2308,7 +2308,7 @@ declare module "child_process" {
         gid?: number;
         windowsVerbatimArguments?: boolean;
     }
-    export function fork(modulePath: string, args?: string[], options?: ForkOptions): ChildProcess;
+    export function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
 
     export interface SpawnSyncOptions {
         cwd?: string;
@@ -2344,9 +2344,9 @@ declare module "child_process" {
     export function spawnSync(command: string, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
     export function spawnSync(command: string, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
     export function spawnSync(command: string, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
-    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
-    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
-    export function spawnSync(command: string, args?: string[], options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithStringEncoding): SpawnSyncReturns<string>;
+    export function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptionsWithBufferEncoding): SpawnSyncReturns<Buffer>;
+    export function spawnSync(command: string, args?: ReadonlyArray<string>, options?: SpawnSyncOptions): SpawnSyncReturns<Buffer>;
 
     export interface ExecSyncOptions {
         cwd?: string;
@@ -2396,9 +2396,9 @@ declare module "child_process" {
     export function execFileSync(command: string, options?: ExecFileSyncOptionsWithStringEncoding): string;
     export function execFileSync(command: string, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
     export function execFileSync(command: string, options?: ExecFileSyncOptions): Buffer;
-    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithStringEncoding): string;
-    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
-    export function execFileSync(command: string, args?: string[], options?: ExecFileSyncOptions): Buffer;
+    export function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithStringEncoding): string;
+    export function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
+    export function execFileSync(command: string, args?: ReadonlyArray<string>, options?: ExecFileSyncOptions): Buffer;
 }
 
 declare module "url" {

From 57c2a02c4d732fcf535d79b113ecd0d78eaab5d4 Mon Sep 17 00:00:00 2001
From: Matthew Tebbs <matthew@muddytummy.com>
Date: Sat, 12 May 2018 11:30:33 -0700
Subject: [PATCH 0245/1124] Add missing dispose() method type.

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

diff --git a/types/three/three-trackballcontrols.d.ts b/types/three/three-trackballcontrols.d.ts
index 88770ef79f..f5fb324079 100644
--- a/types/three/three-trackballcontrols.d.ts
+++ b/types/three/three-trackballcontrols.d.ts
@@ -31,6 +31,8 @@ export class TrackballControls extends EventDispatcher {
 
     reset(): void;
 
+    dispose(): void;
+
     checkDistances(): void;
 
     zoomCamera(): void;

From 83e3a609f0280150301905490e4fa50674b2467d Mon Sep 17 00:00:00 2001
From: Ivan Akulov <gxoptg@gmail.com>
Date: Sat, 12 May 2018 21:55:45 +0300
Subject: [PATCH 0246/1124] [read-package-tree] Add the missing `name` field

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

diff --git a/types/read-package-tree/index.d.ts b/types/read-package-tree/index.d.ts
index e67083ffca..c4c4112aa9 100644
--- a/types/read-package-tree/index.d.ts
+++ b/types/read-package-tree/index.d.ts
@@ -9,6 +9,7 @@ declare function rpt(root: string, filterWith: (node: rpt.Node, kidName: string)
 declare namespace rpt {
     class Node {
         id: number;
+        name: string;
         package: any;
         children: Node[];
         parent: Node | null;

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 0247/1124] [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 0248/1124] [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 fb0c888f4ed49e531e3ec5f2f50b5936e50ba1d4 Mon Sep 17 00:00:00 2001
From: Ivan Akulov <gxoptg@gmail.com>
Date: Sat, 12 May 2018 23:12:13 +0300
Subject: [PATCH 0249/1124] Bump the package version

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

diff --git a/types/read-package-tree/index.d.ts b/types/read-package-tree/index.d.ts
index c4c4112aa9..9a5d66214c 100644
--- a/types/read-package-tree/index.d.ts
+++ b/types/read-package-tree/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for read-package-tree 5.1
+// Type definitions for read-package-tree 5.2
 // Project: https://github.com/npm/read-package-tree
 // Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

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 0250/1124] [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 3438d5214117cec848384d9d3def034f440fd13e Mon Sep 17 00:00:00 2001
From: knuthelgesen <knut.helgesen@bouvet.no>
Date: Sat, 12 May 2018 22:31:04 +0200
Subject: [PATCH 0251/1124] Added the method "get()" from the Croppie library
 so it's possible to read crop data (points, zoom and orientation) Added an
 interface for the crop data

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

diff --git a/types/croppie/croppie-tests.ts b/types/croppie/croppie-tests.ts
index 581d01435d..a82b04fabb 100644
--- a/types/croppie/croppie-tests.ts
+++ b/types/croppie/croppie-tests.ts
@@ -22,4 +22,6 @@ c.result({ type: 'blob' }).then(blob => {
     x = blob;
 });
 
+c.get();
+
 c.destroy();
diff --git a/types/croppie/index.d.ts b/types/croppie/index.d.ts
index 97f53f84c8..a8b53c54e5 100644
--- a/types/croppie/index.d.ts
+++ b/types/croppie/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Connor Peet <https://github.com/connor4312>
 //                 dklmuc <https://github.com/dklmuc>
 //                 Sarun Intaralawan <https://github.com/sarunint>
+//                 Knut Erik Helgesen <https://github.com/knuthelgesen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace Croppie;
@@ -26,6 +27,8 @@ declare class Croppie {
     result(options: Croppie.ResultOptions & { type: 'rawcanvas' }): Promise<HTMLCanvasElement>;
     result(options?: Croppie.ResultOptions): Promise<HTMLCanvasElement>;
 
+    get(): Croppie.CropData;
+
     rotate(degrees: 90 | 180 | 270 | -90 | -180 | -270): void;
 
     setZoom(zoom: number): void;
@@ -59,4 +62,10 @@ declare namespace Croppie {
         showZoomer?: boolean;
         viewport?: { width: number, height: number, type?: CropType };
     }
+
+    interface CropData {
+        points?: number[];
+        orientation?: number;
+        zoom?: number;
+    }
 }

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 0252/1124] [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 9028a63234ef076b85dfabe89607e898ce720947 Mon Sep 17 00:00:00 2001
From: Dominique Rau <domi.github@gmail.com>
Date: Sat, 12 May 2018 22:58:25 +0200
Subject: [PATCH 0253/1124] state can be typed (#25640)

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

diff --git a/types/noble/index.d.ts b/types/noble/index.d.ts
index ee4fbf1654..41704bef05 100644
--- a/types/noble/index.d.ts
+++ b/types/noble/index.d.ts
@@ -42,7 +42,7 @@ export declare class Peripheral extends events.EventEmitter {
     advertisement: Advertisement;
     rssi:          number;
     services:      Service[];
-    state:         string;
+    state:         'error' | 'connecting' | 'connected' | 'disconnecting' | 'disconnected';
 
     connect(callback?: (error: string) => void): void;
     disconnect(callback?: () => void): void;

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 0254/1124] 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 0255/1124] 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 0256/1124] 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 0257/1124] 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 6c416c39c3275591fa6954e81cd2fc71d10084d9 Mon Sep 17 00:00:00 2001
From: Shude Li <lishude@aliyun.com>
Date: Sun, 13 May 2018 18:56:18 +0800
Subject: [PATCH 0258/1124] fix: add witness field to interface In

https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/src/transaction.js#L111
---
 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 920df43d6e..e36a05dbca 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -23,6 +23,7 @@ export interface In {
     hash: Buffer;
     index: number;
     sequence: number;
+    witness: string[];
 }
 
 export interface Network {

From 58379cb18044fb284e89be52a47d4876725a3bff Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Sun, 13 May 2018 19:13:40 +0800
Subject: [PATCH 0259/1124] feat(node9&10): add `TextDecoder` and `TextEncoder`
 for `util` module

---
 types/node/index.d.ts       | 33 +++++++++++++++++++++++++++++++++
 types/node/node-tests.ts    | 29 +++++++++++++++++++++++++++++
 types/node/v9/index.d.ts    | 33 +++++++++++++++++++++++++++++++++
 types/node/v9/node-tests.ts | 29 +++++++++++++++++++++++++++++
 4 files changed, 124 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index d228742629..09f8498359 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -23,6 +23,7 @@
 //                 Mohsen Azimi <https://github.com/mohsen1>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 //                 Alexander T. <https://github.com/a-tarasyuk>
+//                 Lishude <https://github.com/islishude>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -6220,6 +6221,38 @@ declare module "util" {
         export function isWeakSet(object: any): object is WeakSet<any>;
         export function isWebAssemblyCompiledModule(object: any): boolean;
     }
+
+    export class TextDecoder {
+        readonly encoding: string;
+        readonly fatal: boolean;
+        readonly ignoreBOM: boolean;
+        constructor(
+          encoding?: string,
+          options?: { fatal?: boolean; ignoreBOM?: boolean }
+        );
+        decode(
+          input?:
+            | Int8Array
+            | Int16Array
+            | Int32Array
+            | Uint8Array
+            | Uint16Array
+            | Uint32Array
+            | Uint8ClampedArray
+            | Float32Array
+            | Float64Array
+            | DataView
+            | ArrayBuffer
+            | null,
+          options?: { stream?: boolean }
+        ): string;
+    }
+
+    export class TextEncoder {
+        readonly encoding: string;
+        constructor();
+        encode(input?: string): Uint8Array;
+    }
 }
 
 declare module "assert" {
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index d428cf8753..e5d7576fce 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -857,6 +857,35 @@ namespace util_tests {
 
         // util.isDeepStrictEqual
         util.isDeepStrictEqual({foo: 'bar'}, {foo: 'bar'});
+
+        // util.TextDecoder()
+        var td = new util.TextDecoder();
+        new util.TextDecoder("utf-8");
+        new util.TextDecoder("utf-8", { fatal: true });
+        new util.TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
+        var ignoreBom: boolean = td.ignoreBOM;
+        var fatal: boolean = td.fatal;
+        var encoding: string = td.encoding;
+        td.decode(new Int8Array(1));
+        td.decode(new Int16Array(1));
+        td.decode(new Int32Array(1));
+        td.decode(new Uint8Array(1));
+        td.decode(new Uint16Array(1));
+        td.decode(new Uint32Array(1));
+        td.decode(new Uint8ClampedArray(1));
+        td.decode(new Float32Array(1));
+        td.decode(new Float64Array(1));
+        td.decode(new DataView(new Int8Array(1).buffer));
+        td.decode(new ArrayBuffer(1));
+        td.decode(null);
+        td.decode(null, { stream: true });
+        td.decode(new Int8Array(1), { stream: true });
+        var decode: string = td.decode(new Int8Array(1));
+
+        // util.TextEncoder()
+        var te = new util.TextEncoder();
+        var teEncoding: string = te.encoding;
+        var teEncodeRes: Uint8Array = te.encode("TextEncoder");
     }
 }
 
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 5a76e4cc45..65c55878cd 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -24,6 +24,7 @@
 //                 Mohsen Azimi <https://github.com/mohsen1>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 //                 Alexander T. <https://github.com/a-tarasyuk>
+//                 Lishude <https://github.com/islishude>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -5659,6 +5660,38 @@ declare module "util" {
     export namespace promisify {
         const custom: symbol;
     }
+
+    export class TextDecoder {
+        readonly encoding: string;
+        readonly fatal: boolean;
+        readonly ignoreBOM: boolean;
+        constructor(
+          encoding?: string,
+          options?: { fatal?: boolean; ignoreBOM?: boolean }
+        );
+        decode(
+          input?:
+            | Int8Array
+            | Int16Array
+            | Int32Array
+            | Uint8Array
+            | Uint16Array
+            | Uint32Array
+            | Uint8ClampedArray
+            | Float32Array
+            | Float64Array
+            | DataView
+            | ArrayBuffer
+            | null,
+          options?: { stream?: boolean }
+        ): string;
+    }
+
+    export class TextEncoder {
+        readonly encoding: string;
+        constructor();
+        encode(input?: string): Uint8Array;
+    }
 }
 
 declare module "assert" {
diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts
index d6751541b9..b7c7471fe1 100644
--- a/types/node/v9/node-tests.ts
+++ b/types/node/v9/node-tests.ts
@@ -854,6 +854,35 @@ namespace util_tests {
 
         // util.isDeepStrictEqual
         util.isDeepStrictEqual({foo: 'bar'}, {foo: 'bar'});
+
+        // util.TextDecoder()
+        var td = new util.TextDecoder();
+        new util.TextDecoder("utf-8");
+        new util.TextDecoder("utf-8", { fatal: true });
+        new util.TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
+        var ignoreBom: boolean = td.ignoreBOM;
+        var fatal: boolean = td.fatal;
+        var encoding: string = td.encoding;
+        td.decode(new Int8Array(1));
+        td.decode(new Int16Array(1));
+        td.decode(new Int32Array(1));
+        td.decode(new Uint8Array(1));
+        td.decode(new Uint16Array(1));
+        td.decode(new Uint32Array(1));
+        td.decode(new Uint8ClampedArray(1));
+        td.decode(new Float32Array(1));
+        td.decode(new Float64Array(1));
+        td.decode(new DataView(new Int8Array(1).buffer));
+        td.decode(new ArrayBuffer(1));
+        td.decode(null);
+        td.decode(null, { stream: true });
+        td.decode(new Int8Array(1), { stream: true });
+        var decode: string = td.decode(new Int8Array(1));
+
+        // util.TextEncoder()
+        var te = new util.TextEncoder();
+        var teEncoding: string = te.encoding;
+        var teEncodeRes: Uint8Array = te.encode("TextEncoder");
     }
 }
 

From 797b4c362207ca5ed8ddbde29ac1561fc891559a Mon Sep 17 00:00:00 2001
From: wind-rider <hansmbakker+github@gmail.com>
Date: Sun, 13 May 2018 14:17:43 +0200
Subject: [PATCH 0260/1124] Remove myself from Noble authors list

---
 .github/CODEOWNERS     | 2 +-
 types/noble/index.d.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3938bc24d1..f9324d1bdd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2639,7 +2639,7 @@
 /types/nightmare/                               @horiuchi @samyang-au @Bleser92
 /types/nightwatch/                              @rkavalap @schlesiger
 /types/nivo-slider/                             @AndersonFriaca
-/types/noble/                                   @swook @wind-rider @shantanubhadoria @lukel99 @bioball @keton @thegecko
+/types/noble/                                   @swook @shantanubhadoria @lukel99 @bioball @keton @thegecko
 /types/nock/                                    @bonnici @horiuchi @afharo @mastermatt @damour
 /types/nodal/                                   @charrondev
 /types/node/v4/                                 @eps1lon
diff --git a/types/noble/index.d.ts b/types/noble/index.d.ts
index 41704bef05..61ca1f2113 100644
--- a/types/noble/index.d.ts
+++ b/types/noble/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for noble
 // Project: https://github.com/sandeepmistry/noble
 // Definitions by: Seon-Wook Park <https://github.com/swook>
-//                 Hans Bakker <https://github.com/wind-rider>
 //                 Shantanu Bhadoria <https://github.com/shantanubhadoria>
 //                 Luke Libraro <https://github.com/lukel99>
 //                 Dan Chao <https://github.com/bioball>

From fc2b440fc80f049792a9c76b41ef3059465d196b Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Sun, 13 May 2018 20:32:31 +0800
Subject: [PATCH 0261/1124] fix: fix ts version

---
 types/node/index.d.ts    | 1 +
 types/node/v9/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 09f8498359..f6b25c85c5 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6222,6 +6222,7 @@ declare module "util" {
         export function isWebAssemblyCompiledModule(object: any): boolean;
     }
 
+    // TypeScript Version: 2.1
     export class TextDecoder {
         readonly encoding: string;
         readonly fatal: boolean;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 65c55878cd..def77c2337 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -5660,7 +5660,7 @@ declare module "util" {
     export namespace promisify {
         const custom: symbol;
     }
-
+    // TypeScript Version: 2.1
     export class TextDecoder {
         readonly encoding: string;
         readonly fatal: boolean;

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 0262/1124] 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 0263/1124] 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 0264/1124] 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 0265/1124] 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 0266/1124] 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 0267/1124] @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 f31b54d5b7b33b8d5385a87c7db5fd8a69c915fc Mon Sep 17 00:00:00 2001
From: Saad Quadri <saad@saadq.com>
Date: Sun, 13 May 2018 17:09:06 -0400
Subject: [PATCH 0268/1124] cosmiconfig options should be optional

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

diff --git a/types/cosmiconfig/cosmiconfig-tests.ts b/types/cosmiconfig/cosmiconfig-tests.ts
index 632569c6f9..73010d01ac 100644
--- a/types/cosmiconfig/cosmiconfig-tests.ts
+++ b/types/cosmiconfig/cosmiconfig-tests.ts
@@ -11,6 +11,8 @@ const explorer = cosmiconfig("yourModuleName", {
   ignoreEmptySearchPlaces: false,
 });
 
+const explorer2 = cosmiconfig("yourModuleName");
+
 Promise.all([
   explorer.search(path.join(__dirname)),
   explorer.searchSync(path.join(__dirname)),
diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index bdafc922ec..e8fd3fed17 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/davidtheclark/cosmiconfig
 // Definitions by: ozum <https://github.com/ozum>
 //                 szeck87 <https://github.com/szeck87>
+//                 saadq <https://github.com/saadq>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -55,4 +56,4 @@ export interface ExplorerOptions {
   ignoreEmptySearchPlaces?: boolean;
 }
 
-export default function cosmiconfig(moduleName: string, options: ExplorerOptions): Explorer;
+export default function cosmiconfig(moduleName: string, options?: ExplorerOptions): Explorer;

From 835021372fbd4124ed4166c6150ff1145a376122 Mon Sep 17 00:00:00 2001
From: Sam Walsh <web@samwalsh.co.nz>
Date: Mon, 14 May 2018 09:26:27 +1200
Subject: [PATCH 0269/1124] Fix double quotes autoformatting

---
 types/react-content-loader/index.d.ts         | 27 ++++---------------
 .../react-content-loader-tests.tsx            |  6 ++---
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index 508d3eb719..6762de7274 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -5,11 +5,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import * as React from "react";
+import * as React from 'react';
 
 export interface ContentLoaderProps {
     style?: React.CSSProperties;
-    type?: "facebook" | "instagram" | "list" | "bullet-list" | "code";
+    type?: 'facebook' | 'instagram' | 'list' | 'bullet-list' | 'code';
     speed?: number;
     width?: number;
     height?: number;
@@ -17,26 +17,9 @@ export interface ContentLoaderProps {
     secondaryColor?: string;
     primaryOpacity?: number;
     secondaryOpacity?: number;
-    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";
+    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';
     className?: string;
 }
 export default class ContentLoader extends React.Component<
diff --git a/types/react-content-loader/react-content-loader-tests.tsx b/types/react-content-loader/react-content-loader-tests.tsx
index 7ec300639c..22e3dbaa7d 100644
--- a/types/react-content-loader/react-content-loader-tests.tsx
+++ b/types/react-content-loader/react-content-loader-tests.tsx
@@ -1,10 +1,10 @@
-import * as React from "react";
-import ContentLoader from "react-content-loader";
+import * as React from 'react';
+import ContentLoader from 'react-content-loader';
 
 const CustomComponent = () => {
     return (
         <ContentLoader
-            style={{ borderBottom: "1px solid" }}
+            style={{ borderBottom: '1px solid' }}
             speed={1}
             height={100}
             width={100}

From db0f6c533b4a7ad7cb71028fdf6c97e4cdfa11aa Mon Sep 17 00:00:00 2001
From: Sam Walsh <web@samwalsh.co.nz>
Date: Mon, 14 May 2018 09:28:56 +1200
Subject: [PATCH 0270/1124] More code formatting fixes

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

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index 6762de7274..da2cee32b1 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -17,11 +17,9 @@ export interface ContentLoaderProps {
     secondaryColor?: string;
     primaryOpacity?: number;
     secondaryOpacity?: number;
-    preserveAspectRatio?: | 'none' | 'xMinYMin meet' | 'xMidYMin meet' | 'xMaxYMin meet' | 'xMinYMid meet' | 'xMidYMid meet' | 'xMaxYMid meet' |
+    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';
     className?: string;
 }
-export default class ContentLoader extends React.Component<
-    ContentLoaderProps
-> {}
+export default class ContentLoader extends React.Component<ContentLoaderProps> {}

From b16ee314f5cb78241832cae5fcc0d3f86a336c62 Mon Sep 17 00:00:00 2001
From: Sam Walsh <web@samwalsh.co.nz>
Date: Mon, 14 May 2018 09:29:27 +1200
Subject: [PATCH 0271/1124] The last of code formatting fixes

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

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index da2cee32b1..d0e23901cc 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -22,4 +22,4 @@ export interface ContentLoaderProps {
     'xMidYMid slice' | 'xMaxYMid slice' | 'xMinYMax slice' | 'xMidYMax slice' | 'xMaxYMax slice';
     className?: string;
 }
-export default class ContentLoader extends React.Component<ContentLoaderProps> {}
+export default class ContentLoader extends React.Component<ContentLoaderProps> { }

From aaaa2a08e657edcf3fd953b9ec8c1583627650c5 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <mazimi@lyft.com>
Date: Sun, 13 May 2018 14:32:32 -0700
Subject: [PATCH 0272/1124] Add typing for webpack profiling plugin

---
 types/webpack/index.d.ts       | 21 +++++++++++++++++++++
 types/webpack/webpack-tests.ts |  7 +++++++
 2 files changed, 28 insertions(+)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 5be4abdcbd..403036d378 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -648,6 +648,27 @@ declare namespace webpack {
             portableRecords?: boolean;
         }
     }
+
+    namespace debug {
+        interface ProfilingPluginOptions {
+            /** A relative path to a custom output file (json) */
+            outputPath?: string;
+        }
+        /**
+         * Generate Chrome profile file which includes timings of plugins execution. Outputs `events.json` file by
+         * default. It is possible to provide custom file path using `outputPath` option.
+         *
+         * In order to view the profile file:
+         * * Run webpack with ProfilingPlugin.
+         * * Go to Chrome, open the Profile Tab.
+         * * Drag and drop generated file (events.json by default) into the profiler.
+         *
+         * It will then display timeline stats and calls per plugin!
+         */
+        class ProfilingPlugin extends Plugin {
+            constructor(options?: ProfilingPluginOptions);
+        }
+    }
     namespace compilation {
         class Asset {
         }
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index b42d836c0c..ec5d0236a8 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -732,3 +732,10 @@ configuration = {
         ]
     }
 };
+
+let profiling = new webpack.debug.ProfilingPlugin();
+profiling = new webpack.debug.ProfilingPlugin({ outputPath: './path.json' });
+
+configuration = {
+    plugins: [profiling]
+};

From e3cfa5348b8cc1b1afcf28de4cf1f03801de9c50 Mon Sep 17 00:00:00 2001
From: saadq <saad@saadq.com>
Date: Sun, 13 May 2018 17:53:05 -0400
Subject: [PATCH 0273/1124] add optional types to other explorer methods

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

diff --git a/types/cosmiconfig/cosmiconfig-tests.ts b/types/cosmiconfig/cosmiconfig-tests.ts
index 73010d01ac..508ad00aa0 100644
--- a/types/cosmiconfig/cosmiconfig-tests.ts
+++ b/types/cosmiconfig/cosmiconfig-tests.ts
@@ -14,7 +14,9 @@ const explorer = cosmiconfig("yourModuleName", {
 const explorer2 = cosmiconfig("yourModuleName");
 
 Promise.all([
+  explorer.search(),
   explorer.search(path.join(__dirname)),
+  explorer.searchSync(),
   explorer.searchSync(path.join(__dirname)),
   explorer.load(path.join(__dirname, "sample-config.json")),
   explorer.loadSync(path.join(__dirname, "sample-config.json")),
diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index e8fd3fed17..eb876b6ef2 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -36,8 +36,8 @@ export interface Loaders {
 }
 
 export interface Explorer {
-  search(searchFrom: string): Promise<null | CosmiconfigResult>;
-  searchSync(searchFrom: string): null | CosmiconfigResult;
+  search(searchFrom?: string): Promise<null | CosmiconfigResult>;
+  searchSync(searchFrom?: string): null | CosmiconfigResult;
   load(loadPath: string): Promise<CosmiconfigResult>;
   loadSync(loadPath: string): CosmiconfigResult;
   clearLoadCache(): void;

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 0274/1124] 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 ed35a5e5f291c1dfb53fd1f8c88b44258bc98ad3 Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Mon, 14 May 2018 07:47:28 +0800
Subject: [PATCH 0275/1124] fix: fix witness type

---
 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 e36a05dbca..1e8255e7ef 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -23,7 +23,7 @@ export interface In {
     hash: Buffer;
     index: number;
     sequence: number;
-    witness: string[];
+    witness: Buffer[];
 }
 
 export interface Network {

From 626ba446b85d7a57caf2070a62b09d046f7f7269 Mon Sep 17 00:00:00 2001
From: Wang Zishi <ynh.2@outlook.com>
Date: Mon, 14 May 2018 10:46:43 +0800
Subject: [PATCH 0276/1124] fix missing protected _oauth2 property

---
 types/passport-oauth2/index.d.ts               |  9 +++++++++
 types/passport-oauth2/passport-oauth2-tests.ts | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts
index 5dd811f342..323d39853d 100644
--- a/types/passport-oauth2/index.d.ts
+++ b/types/passport-oauth2/index.d.ts
@@ -1,15 +1,24 @@
 // Type definitions for passport-oauth2 1.4
 // Project: https://github.com/jaredhanson/passport-oauth2#readme
 // Definitions by: Pasi Eronen <https://github.com/pasieronen>
+//                 Wang Zishi <https://github.com/WangZishi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import { Request } from 'express';
 import { Strategy } from 'passport';
+import { OAuth2 } from 'oauth';
 
 declare class OAuth2Strategy extends Strategy {
     name: string;
 
+    /**
+     *   NOTE: The _oauth2 property is considered "protected".  Subclasses are
+     *         allowed to use it when making protected resource requests to retrieve
+     *         the user profile.
+     */
+    protected _oauth2: OAuth2;
+
     constructor(options: OAuth2Strategy.StrategyOptions, verify: OAuth2Strategy.VerifyFunction);
     constructor(options: OAuth2Strategy.StrategyOptionsWithRequest, verify: OAuth2Strategy.VerifyFunctionWithRequest);
 
diff --git a/types/passport-oauth2/passport-oauth2-tests.ts b/types/passport-oauth2/passport-oauth2-tests.ts
index bfedf67dad..57568ff452 100644
--- a/types/passport-oauth2/passport-oauth2-tests.ts
+++ b/types/passport-oauth2/passport-oauth2-tests.ts
@@ -24,11 +24,11 @@ const strategy1: OAuth2Strategy = new OAuth2Strategy(strategyOptions1, verifyFun
 const strategy2: Strategy = new OAuth2Strategy(strategyOptions1, verifyFunction2);
 
 function verifyFunction3(_req: Request, _accessToken: string, _refreshToken: string, _profile: any, verifyCallback: VerifyCallback) {
-    verifyCallback(undefined, {userid: '1'});
+    verifyCallback(undefined, { userid: '1' });
 }
 
 function verifyFunction4(_req: Request, _accessToken: string, _refreshToken: string, _results: any, _profile: any, verifyCallback: VerifyCallback) {
-    verifyCallback(undefined, {userid: '1'});
+    verifyCallback(undefined, { userid: '1' });
 }
 
 const strategyOptions2: StrategyOptionsWithRequest = {
@@ -49,3 +49,9 @@ const err1 = new AuthorizationError('Description', 'invalid_request', undefined)
 const err2 = new TokenError(undefined, 'invalid_request', undefined);
 
 const err3 = new InternalOAuthError('Hello', {});
+
+class MyStrategy extends OAuth2Strategy {
+    useProtectedMethod() {
+        this._oauth2.get('http://www.example.com/profile', 'token', 'http://www.example.com/callback');
+    }
+}

From 8a1acc010fdf4f46eec21a91636774f0dbe85b19 Mon Sep 17 00:00:00 2001
From: Wang Zishi <ynh.2@outlook.com>
Date: Mon, 14 May 2018 10:50:53 +0800
Subject: [PATCH 0277/1124] fix test

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

diff --git a/types/passport-oauth2/passport-oauth2-tests.ts b/types/passport-oauth2/passport-oauth2-tests.ts
index 57568ff452..133bf5ec4e 100644
--- a/types/passport-oauth2/passport-oauth2-tests.ts
+++ b/types/passport-oauth2/passport-oauth2-tests.ts
@@ -51,7 +51,7 @@ const err2 = new TokenError(undefined, 'invalid_request', undefined);
 const err3 = new InternalOAuthError('Hello', {});
 
 class MyStrategy extends OAuth2Strategy {
-    useProtectedMethod() {
+    useProtectedProperty() {
         this._oauth2.get('http://www.example.com/profile', 'token', 'http://www.example.com/callback');
     }
 }

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 0278/1124] 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 0279/1124] 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 0280/1124] 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 0281/1124] [@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 0282/1124] 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 0283/1124] 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 0284/1124] 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 0d1ee2470cdf7883f8d5cc074aef97d9450c9081 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 14 May 2018 13:21:16 +0200
Subject: [PATCH 0285/1124] fix(algolia): correct signature of copyIndex

the scope is optional
---
 types/algoliasearch/index.d.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 87c1f79a0e..74fa64d0d5 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -88,7 +88,16 @@ declare namespace algoliasearch {
      */
     deleteIndex(name: string): Promise<Task>;
     /**
-     * Copy an  index from a specific index to a new one
+     * Copy an index from a specific index to a new one
+     * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
+     */
+    copyIndex(
+      from: string,
+      to: string,
+      cb: (err: Error, res: Task) => void
+    ): void;
+    /**
+     * Copy settings of an index from a specific index to a new one
      * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
      */
     copyIndex(
@@ -98,13 +107,13 @@ declare namespace algoliasearch {
       cb: (err: Error, res: Task) => void
     ): void;
     /**
-     * Copy an  index from a specific index to a new one
+     * Copy settings of an index from a specific index to a new one
      * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
      */
     copyIndex(
       from: string,
       to: string,
-      scope: ('settings' | 'synonyms' | 'rules')[]
+      scope?: ('settings' | 'synonyms' | 'rules')[]
     ): Promise<Task>;
     /**
      * Move index to a new one (and will overwrite the original one)
@@ -230,6 +239,7 @@ declare namespace algoliasearch {
    * Interface for the index algolia object
    */
   interface Index {
+    indexName: string;
     /**
      * Gets a specific object
      * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects

From a77cf124c2b2681a5494dec6ead7e8ae39bc05f3 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 14 May 2018 13:27:42 +0200
Subject: [PATCH 0286/1124] chore: add tests

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

diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index 2898f889fc..dcc1fdcc9e 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -10,6 +10,7 @@ import {
   IndexSettings,
   QueryParameters,
 } from 'algoliasearch';
+import { Client } from './lite';
 
 let _algoliaResponse: Response = {
   hits: [{}, {}],
@@ -147,6 +148,7 @@ let _algoliaQueryParameters: QueryParameters = {
   minProximity: 0,
 };
 
+let client: Client = algoliasearch('', '');
 let index: Index = algoliasearch('', '').initIndex('');
 
 let search = index.search({ query: '' });
@@ -164,3 +166,12 @@ index.partialUpdateObjects([{}], () => {});
 index.partialUpdateObjects([{}], false, () => {});
 index.partialUpdateObjects([{}]).then(() => {});
 index.partialUpdateObjects([{}], false).then(() => {});
+
+let indexName : string = index.indexName;
+
+// complete copy
+algoliasearch('','').copyIndex('from', 'to').then(()=>{})
+algoliasearch('','').copyIndex('from', 'to', ()=> {})
+// with scope
+algoliasearch('','').copyIndex('from', 'to', ['settings']).then(()=>{})
+algoliasearch('','').copyIndex('from', 'to', ['synonyms', 'rules'], ()=> {})

From 0d005626d507a2e482dfeb5cd546eaef9357828a Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 14 May 2018 13:30:37 +0200
Subject: [PATCH 0287/1124] fix: correct import

---
 types/algoliasearch/algoliasearch-tests.ts | 12 ++++++------
 types/algoliasearch/lite/index.d.ts        |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index dcc1fdcc9e..2a3fcd2eb2 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -9,8 +9,8 @@ import {
   Response,
   IndexSettings,
   QueryParameters,
+  Client
 } from 'algoliasearch';
-import { Client } from './lite';
 
 let _algoliaResponse: Response = {
   hits: [{}, {}],
@@ -149,7 +149,7 @@ let _algoliaQueryParameters: QueryParameters = {
 };
 
 let client: Client = algoliasearch('', '');
-let index: Index = algoliasearch('', '').initIndex('');
+let index: Index = client.initIndex('');
 
 let search = index.search({ query: '' });
 
@@ -170,8 +170,8 @@ index.partialUpdateObjects([{}], false).then(() => {});
 let indexName : string = index.indexName;
 
 // complete copy
-algoliasearch('','').copyIndex('from', 'to').then(()=>{})
-algoliasearch('','').copyIndex('from', 'to', ()=> {})
+client.copyIndex('from', 'to').then(()=>{})
+client.copyIndex('from', 'to', ()=> {})
 // with scope
-algoliasearch('','').copyIndex('from', 'to', ['settings']).then(()=>{})
-algoliasearch('','').copyIndex('from', 'to', ['synonyms', 'rules'], ()=> {})
+client.copyIndex('from', 'to', ['settings']).then(()=>{})
+client.copyIndex('from', 'to', ['synonyms', 'rules'], ()=> {})
diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index 588e2ac543..1bb8254de9 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -67,6 +67,7 @@ declare namespace algoliasearch {
    * Interface for the index algolia object
    */
   interface Index {
+    indexName: string;
     /**
      * Gets a specific object
      * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects

From 7dcbb8074cd747ae7e5095b91e1121d56371a1b5 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 14 May 2018 13:32:57 +0200
Subject: [PATCH 0288/1124] feat: add Sam

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

diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 74fa64d0d5..b2e8f95663 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Baptiste Coquelle <https://github.com/cbaptiste>
 //                 Haroen Viaene <https://github.com/haroenv>
 //                 Aurélien Hervé <https://github.com/aherve>
+//                 Samuel Vaillant <https://github.com/samouss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index 1bb8254de9..b9932f1346 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Baptiste Coquelle <https://github.com/cbaptiste>
 //                 Haroen Viaene <https://github.com/haroenv>
 //                 Aurélien Hervé <https://github.com/aherve>
+//                 Samuel Vaillant <https://github.com/samouss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From 44b53c0f1e75b1ca625962af3aa8fb87d6315a20 Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 14 May 2018 13:43:08 +0200
Subject: [PATCH 0289/1124] chore: add more info about tasks

---
 types/algoliasearch/index.d.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index b2e8f95663..21ad90e665 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -340,7 +340,7 @@ declare namespace algoliasearch {
      * Wait for an indexing task to be compete
      * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
      */
-    waitTask(taskID: number, cb: (err: Error, res: any) => void): void;
+    waitTask(taskID: number, cb: (err: Error, res: TaskStatus) => void): void;
     /**
      * Get an index settings
      * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
@@ -572,7 +572,7 @@ declare namespace algoliasearch {
      * Wait for an indexing task to be compete
      * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
      */
-    waitTask(taskID: number): Promise<any>;
+    waitTask(taskID: number): Promise<TaskStatus>;
     /**
      * Get an index settings
      * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
@@ -1492,6 +1492,13 @@ declare namespace algoliasearch {
 
   interface Task {
     taskID: number;
+    createdAt: string;
+    objectID?: string; 
+  }
+
+  interface TaskStatus {
+    status: 'published' | 'notPublished',
+    pendingTask: boolean,
   }
 
   interface IndexSettings {

From a36bb6891a65c87b7b35be5240db1106594c2c8d Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Mon, 14 May 2018 13:48:42 +0200
Subject: [PATCH 0290/1124] chore: stricter settings type

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

diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index 2a3fcd2eb2..96270b31eb 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -79,7 +79,7 @@ let _algoliaIndexSettings: IndexSettings = {
   ignorePlurals: false,
   disableTypoToleranceOnAttributes: '',
   separatorsToIndex: '',
-  queryType: '',
+  queryType: 'prefixAll',
   removeWordsIfNoResults: '',
   advancedSyntax: false,
   optionalWords: [''],
@@ -87,7 +87,7 @@ let _algoliaIndexSettings: IndexSettings = {
   disablePrefixOnAttributes: [''],
   disableExactOnAttributes: [''],
   exactOnSingleWordQuery: '',
-  alternativesAsExact: false,
+  alternativesAsExact: ['ignorePlurals'],
   attributeForDistinct: '',
   distinct: false,
   numericAttributesToIndex: [''],
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 21ad90e665..ba46f37ce6 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -1619,7 +1619,7 @@ declare namespace algoliasearch {
      * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
      * https://github.com/algolia/algoliasearch-client-js#typotolerance
      */
-    typoTolerance?: any;
+    typoTolerance?: boolean | 'min' | 'strict';
     /**
      * If set to false, disables typo tolerance on numeric tokens (numbers).
      * default: true
@@ -1652,7 +1652,7 @@ declare namespace algoliasearch {
      * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
      * https://github.com/algolia/algoliasearch-client-js#querytype
      */
-    queryType?: any;
+    queryType?: 'prefixAll' | 'prefixLast' | 'prefixNone';
     /**
      * This option is used to select a strategy in order to avoid having an empty result page
      * default: 'none'
@@ -1718,7 +1718,10 @@ declare namespace algoliasearch {
      * 'multiWordsSynonym': multiple-words synonym
      * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
      */
-    alternativesAsExact?: any;
+    alternativesAsExact?: (
+      | "ignorePlurals"
+      | "singleWordSynonym"
+      | "multiWordsSynonym")[];
     /**
      * The name of the attribute used for the Distinct feature
      * default: null
@@ -1729,7 +1732,7 @@ declare namespace algoliasearch {
      * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
      * https://github.com/algolia/algoliasearch-client-js#distinct
      */
-    distinct?: any;
+    distinct?: boolean | number;
     /**
      * All numerical attributes are automatically indexed as numerical filters
      * default ''

From c31b37eb1699801d42bcc24f790858c6820798eb Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Mon, 14 May 2018 21:00:14 +0800
Subject: [PATCH 0291/1124] fix: fix typos

---
 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 f6b25c85c5..96416a4529 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6233,7 +6233,7 @@ declare module "util" {
         );
         decode(
           input?:
-            | Int8Array
+            Int8Array
             | Int16Array
             | Int32Array
             | Uint8Array
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 45f1c85b64..32530306c2 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -5588,7 +5588,7 @@ declare module "util" {
         );
         decode(
           input?:
-            | Int8Array
+            Int8Array
             | Int16Array
             | Int32Array
             | Uint8Array
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index def77c2337..cd8d58c6b9 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -5671,7 +5671,7 @@ declare module "util" {
         );
         decode(
           input?:
-            | Int8Array
+            Int8Array
             | Int16Array
             | Int32Array
             | Uint8Array

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 0292/1124] 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 f615387b62ff7edb6422a419bce50ea1c9568132 Mon Sep 17 00:00:00 2001
From: Otto Paaso <otto.paaso@reaktor.com>
Date: Mon, 14 May 2018 16:05:22 +0300
Subject: [PATCH 0293/1124] Add keepAlive configuration option

Introduced to pg in https://github.com/brianc/node-postgres/pull/1058
---
 types/pg/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 7437976d44..ffb2379a7c 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -16,6 +16,7 @@ export interface ConnectionConfig {
     port?: number;
     host?: string;
     connectionString?: string;
+    keepAlive?: boolean;
 }
 
 export interface Defaults extends ConnectionConfig {

From ee6b647dbb7c2601fa25f5a4a11b2df58cd9e3fa Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Mon, 14 May 2018 21:15:04 +0800
Subject: [PATCH 0294/1124] chore: remove ts version statements

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 96416a4529..64834338b8 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6222,7 +6222,6 @@ declare module "util" {
         export function isWebAssemblyCompiledModule(object: any): boolean;
     }
 
-    // TypeScript Version: 2.1
     export class TextDecoder {
         readonly encoding: string;
         readonly fatal: boolean;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index cd8d58c6b9..e7112daa25 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -5660,7 +5660,7 @@ declare module "util" {
     export namespace promisify {
         const custom: symbol;
     }
-    // TypeScript Version: 2.1
+
     export class TextDecoder {
         readonly encoding: string;
         readonly fatal: boolean;

From 7ad5c037366a4fd03ced4d9cf605804a7233ac8f Mon Sep 17 00:00:00 2001
From: Otto Paaso <otto.paaso@reaktor.com>
Date: Mon, 14 May 2018 16:15:14 +0300
Subject: [PATCH 0295/1124] Use keepAlive config in tests

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

diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts
index ae60f1bb6f..5051447667 100644
--- a/types/pg/pg-tests.ts
+++ b/types/pg/pg-tests.ts
@@ -9,6 +9,7 @@ const client = new Client({
   port: 5334,
   user: 'database-user',
   password: 'secretpassword!!',
+  keepAlive: true,
 });
 client.connect(err => {
     if (err) {
@@ -125,6 +126,7 @@ const pool = new Pool({
   max: 20,
   idleTimeoutMillis: 30000,
   connectionTimeoutMillis: 2000,
+  keepAlive: false,
 });
 console.log(pool.totalCount);
 pool.connect((err, client, done) => {

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 0296/1124] 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 ae6cbcf39298ad2c3f0a476d3b7e66b95176b9c4 Mon Sep 17 00:00:00 2001
From: Armands Baurovskis <baurovskis.armands@gmail.com>
Date: Mon, 14 May 2018 17:04:46 +0300
Subject: [PATCH 0297/1124] = SectionList missing methods

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 83266b6383..0ad2e8279f 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3843,6 +3843,19 @@ export interface SectionListProps<ItemT> extends ScrollViewProps {
      */
     initialNumToRender?: number;
 
+    /**
+     * Called once when the scroll position gets within onEndReachedThreshold of the rendered content.
+     */
+    onEndReached?: ((info: { distanceFromEnd: number }) => void) | null;
+
+    /**
+     * How far from the end (in units of visible length of the list) the bottom edge of the
+     * list must be from the end of the content to trigger the `onEndReached` callback.
+     * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
+     * within half the visible length of the list.
+     */
+    onEndReachedThreshold?: number | null;
+
     /**
      * Used to extract a unique key for a given item at the specified index. Key is used for caching
      * and as the react key to track item re-ordering. The default extractor checks `item.key`, then

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 0298/1124] 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 0299/1124] 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 020bc733828004eb1ec1864f2dbc197d4548e5c7 Mon Sep 17 00:00:00 2001
From: AylaJK <26681805+AylaJK@users.noreply.github.com>
Date: Mon, 14 May 2018 12:11:35 -0600
Subject: [PATCH 0300/1124] Add express-socket.io-session types (#25673)

* Add express-socket.io-session

* Reverting to defalut tslint config
---
 .../express-socket.io-session-tests.ts        | 28 +++++++++++++++++++
 types/express-socket.io-session/index.d.ts    | 28 +++++++++++++++++++
 types/express-socket.io-session/tsconfig.json | 23 +++++++++++++++
 types/express-socket.io-session/tslint.json   |  1 +
 4 files changed, 80 insertions(+)
 create mode 100644 types/express-socket.io-session/express-socket.io-session-tests.ts
 create mode 100644 types/express-socket.io-session/index.d.ts
 create mode 100644 types/express-socket.io-session/tsconfig.json
 create mode 100644 types/express-socket.io-session/tslint.json

diff --git a/types/express-socket.io-session/express-socket.io-session-tests.ts b/types/express-socket.io-session/express-socket.io-session-tests.ts
new file mode 100644
index 0000000000..46dd000882
--- /dev/null
+++ b/types/express-socket.io-session/express-socket.io-session-tests.ts
@@ -0,0 +1,28 @@
+/**
+ * Create by AylaJK on 05/09/2018
+ */
+import express = require('express');
+const app = express();
+
+import http = require('http');
+const server = http.createServer(app);
+
+import expresssession = require('express-session');
+const session = expresssession({
+    secret: 'my-secret',
+    resave: true,
+    saveUninitialized: true,
+});
+
+import cookieparser = require('cookie-parser');
+const cookieParser = cookieparser('my-secret');
+
+import socketio = require('socket.io');
+const io = socketio(server);
+
+import sharedsession = require('express-socket.io-session');
+
+io.use(sharedsession(session));
+io.use(sharedsession(session, { autoSave: true, saveUninitialized: true }));
+io.use(sharedsession(session, cookieParser));
+io.use(sharedsession(session, cookieParser, { autoSave: true, saveUninitialized: true }));
diff --git a/types/express-socket.io-session/index.d.ts b/types/express-socket.io-session/index.d.ts
new file mode 100644
index 0000000000..39a1fb4ff6
--- /dev/null
+++ b/types/express-socket.io-session/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for express-socket.io-session 1.3
+// Project: https://github.com/oskosk/express-socket.io-session
+// Definitions by: AylaJK <https://github.com/AylaJK>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import socketio = require('socket.io');
+import express = require('express');
+
+declare function sharedsession(
+    expressSessionMiddleware: express.RequestHandler,
+    cookieParserMiddleware: express.RequestHandler,
+    options?: sharedsession.SharedSessionOptions): sharedsession.SocketIoSharedSessionMiddleware;
+
+declare function sharedsession(
+    expressSessionMiddleware: express.RequestHandler,
+    options?: sharedsession.SharedSessionOptions): sharedsession.SocketIoSharedSessionMiddleware;
+
+declare namespace sharedsession {
+    interface SharedSessionOptions {
+        autoSave?: boolean;
+        saveUninitialized?: boolean;
+    }
+
+    type SocketIoSharedSessionMiddleware = (socket: socketio.Socket, next: (err?: any) => void) => void;
+}
+
+export = sharedsession;
diff --git a/types/express-socket.io-session/tsconfig.json b/types/express-socket.io-session/tsconfig.json
new file mode 100644
index 0000000000..6d4aca9e90
--- /dev/null
+++ b/types/express-socket.io-session/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-socket.io-session-tests.ts"
+    ]
+}
diff --git a/types/express-socket.io-session/tslint.json b/types/express-socket.io-session/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-socket.io-session/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0c564acdc07ae3750c9bdab62dffd4cd5a7acee5 Mon Sep 17 00:00:00 2001
From: Nate Mara <natemara@gmail.com>
Date: Mon, 14 May 2018 14:12:35 -0400
Subject: [PATCH 0301/1124] Add express-correlation-id and correlation-id
 packages (#25710)

* feat(correlation-id & express-correlation-id): Add express-correlation-id and correlation-id packages

* fix(correlation-id) Update type of bindID function
---
 types/correlation-id/correlation-id-tests.ts  | 21 +++++++++++++++++++
 types/correlation-id/index.d.ts               | 12 +++++++++++
 types/correlation-id/tsconfig.json            | 16 ++++++++++++++
 types/correlation-id/tslint.json              |  3 +++
 .../express-correlation-id-tests.ts           |  9 ++++++++
 types/express-correlation-id/index.d.ts       | 14 +++++++++++++
 types/express-correlation-id/tsconfig.json    | 16 ++++++++++++++
 types/express-correlation-id/tslint.json      |  1 +
 8 files changed, 92 insertions(+)
 create mode 100644 types/correlation-id/correlation-id-tests.ts
 create mode 100644 types/correlation-id/index.d.ts
 create mode 100644 types/correlation-id/tsconfig.json
 create mode 100644 types/correlation-id/tslint.json
 create mode 100644 types/express-correlation-id/express-correlation-id-tests.ts
 create mode 100644 types/express-correlation-id/index.d.ts
 create mode 100644 types/express-correlation-id/tsconfig.json
 create mode 100644 types/express-correlation-id/tslint.json

diff --git a/types/correlation-id/correlation-id-tests.ts b/types/correlation-id/correlation-id-tests.ts
new file mode 100644
index 0000000000..36bf65c27d
--- /dev/null
+++ b/types/correlation-id/correlation-id-tests.ts
@@ -0,0 +1,21 @@
+import { withId, bindId, getId } from "correlation-id";
+
+withId("my-id", () => {
+    const id: string = getId() || "";
+});
+
+withId(() => {
+    const id: string = getId() || "";
+});
+
+const x: string = bindId("my-id", (foo: string, bar: number): string => {
+    const id: string = getId() || "";
+
+    return foo + bar + id;
+})("foo", 12);
+
+const y: string = bindId((foo: string, bar: number): string => {
+    const id: string = getId() || "";
+
+    return foo + bar + id;
+})("foo", 12);
diff --git a/types/correlation-id/index.d.ts b/types/correlation-id/index.d.ts
new file mode 100644
index 0000000000..f765765409
--- /dev/null
+++ b/types/correlation-id/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for correlation-id 2.1
+// Project: https://github.com/toboid/correlation-id#readme
+// Definitions by: Nate <https://github.com/natemara>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function withId(id: string, work: () => void): void;
+export function withId(work: () => void): void;
+
+export function bindId<T extends (...p: any[]) => any>(id: string, work: T): T;
+export function bindId<T extends (...p: any[]) => any>(work: T): T;
+
+export function getId(): string | undefined;
diff --git a/types/correlation-id/tsconfig.json b/types/correlation-id/tsconfig.json
new file mode 100644
index 0000000000..eda38b5e28
--- /dev/null
+++ b/types/correlation-id/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", "correlation-id-tests.ts"]
+}
diff --git a/types/correlation-id/tslint.json b/types/correlation-id/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/correlation-id/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/express-correlation-id/express-correlation-id-tests.ts b/types/express-correlation-id/express-correlation-id-tests.ts
new file mode 100644
index 0000000000..20c9b872de
--- /dev/null
+++ b/types/express-correlation-id/express-correlation-id-tests.ts
@@ -0,0 +1,9 @@
+import * as express from "express";
+import correlator from "express-correlation-id";
+
+const app = express();
+app.use(correlator());
+app.use(correlator({}));
+app.use(correlator({ header: "x-correlation-id" }));
+
+const x: string = correlator.getId() || "";
diff --git a/types/express-correlation-id/index.d.ts b/types/express-correlation-id/index.d.ts
new file mode 100644
index 0000000000..fa09b65071
--- /dev/null
+++ b/types/express-correlation-id/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for express-correlation-id 1.2
+// Project: https://github.com/toboid/express-correlation-id#readme
+// Definitions by: Nate <https://github.com/natemara>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { RequestHandler } from "express-serve-static-core";
+
+declare const correlator: {
+    (options?: { header?: string }): RequestHandler;
+    getId(): string | undefined;
+};
+
+export default correlator;
diff --git a/types/express-correlation-id/tsconfig.json b/types/express-correlation-id/tsconfig.json
new file mode 100644
index 0000000000..bcfa9423b6
--- /dev/null
+++ b/types/express-correlation-id/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", "express-correlation-id-tests.ts"]
+}
diff --git a/types/express-correlation-id/tslint.json b/types/express-correlation-id/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-correlation-id/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 03a4f2840fa327207575dbae02fcc6291f484ad4 Mon Sep 17 00:00:00 2001
From: Saffa Shujah <saffashujah2249@gmail.com>
Date: Mon, 14 May 2018 23:13:07 +0500
Subject: [PATCH 0302/1124]  [@types/rebass] Missing Link Type Added (#25704)

Missing Link Type Added
---
 types/rebass/index.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index 53ec01bf87..f50691e116 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -264,6 +264,13 @@ export interface HeadingLinkProps extends BaseProps<HeadingLinkClass> {
 type HeadingLinkClass = React.StatelessComponent<HeadingLinkProps>
 export declare const HeadingLink: HeadingLinkClass;
 
+export interface LinkProps extends BaseProps<LinkClass> {
+    is?: string | Object | Function;
+    href?: string;
+}
+type LinkClass = React.StatelessComponent<LinkProps>
+export declare const Link: LinkClass;
+
 export interface InlineFormProps extends BaseProps<InlineFormClass> {
     label?: string;
     name?: string;

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 0303/1124] 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 0304/1124] 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 0305/1124] 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 0306/1124] 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 0307/1124] 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 0308/1124] 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 0309/1124] 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 0310/1124] 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 0311/1124] 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 0312/1124] 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 0313/1124] 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 0314/1124] 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 0315/1124] 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 0316/1124] 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 0317/1124] 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 0318/1124] 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 92c29516cf7f91ffabe35199a411b46581038fef Mon Sep 17 00:00:00 2001
From: Gal Talmor <galtalmor@gmail.com>
Date: Mon, 14 May 2018 16:53:24 -0700
Subject: [PATCH 0319/1124] Fix stripe ICharge interface with missing fields
 and optional null values

---
 types/stripe/index.d.ts | 89 ++++++++++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 24 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 418525d38f..884cbacc06 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -8,6 +8,7 @@
 //                 Kyle Kamperschroer <https://github.com/kkamperschroer>
 //                 Kensuke Hoshikawa <https://github.com/starhoshi>
 //                 Thomas Bruun <https://github.com/bruun>
+//                 Gal Talmor <https://github.com/galtalmor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -737,12 +738,17 @@ declare namespace Stripe {
              * charge if a partial refund was issued), positive integer or zero.
              */
             amount_refunded: number;
+            
+            /**
+             * ID of the Connect application that created the charge. [Expandable]
+             */
+            application?: string | null;
 
             /**
              * The application fee (if any) for the charge. See the Connect documentation
              * for details. [Expandable]
              */
-            application_fee?: string | applicationFees.IApplicationFee;
+            application_fee?: string | applicationFees.IApplicationFee | null;
 
             /**
              * ID of the balance transaction that describes the impact of this charge on
@@ -767,25 +773,33 @@ declare namespace Stripe {
             /**
              * ID of the customer this charge is for if one exists. [Expandable]
              */
-            customer: string | customers.ICustomer;
+            customer: string | customers.ICustomer | null;
 
             description?: string;
 
+            /**
+             * The account (if any) the charge was made on behalf of, with an automatic
+             * transfer. See the [Connect documentation]
+             * <https://stripe.com/docs/connect/destination-charges> for details.
+             * [Expandable]
+             */
+            destination?: string | null;
+
             /**
              * Details about the dispute if the charge has been disputed.
              */
-            dispute?: disputes.IDispute;
+            dispute?: disputes.IDispute | null;
 
             /**
              * Error code explaining reason for charge failure if available (see the errors section for a list of
              * codes: https://stripe.com/docs/api#errors).
              */
-            failure_code: string;
+            failure_code: string | null;
 
             /**
              * Message to user further explaining reason for charge failure if available.
              */
-            failure_message: string;
+            failure_message: string | null;
 
             /**
              * Hash with information on fraud assessments for the charge.
@@ -805,16 +819,30 @@ declare namespace Stripe {
             /**
              * ID of the invoice this charge is for if one exists. [Expandable]
              */
-            invoice: string | invoices.IInvoice;
+            invoice: string | invoices.IInvoice | null;
 
             livemode: boolean;
 
             metadata: IMetadata;
 
+            /**
+             * The Stripe account ID for which these funds are intended. Automatically
+             * set if you use the destination parameter. For details, see [Creating
+             * Separate Charges and Transfers]
+             * <https://stripe.com/docs/connect/charges-transfers#on-behalf-of>.
+             */
+            on_behalf_of?: string | null;
+
             /**
              * ID of the order this charge is for if one exists. [Expandable]
              */
-            order: string | orders.IOrder;
+            order: string | orders.IOrder | null;
+
+            /**
+             * Details about whether the payment was accepted, and why. See
+             * understanding declines for details. [Expandable]
+             */
+            outcome?: any;
 
             /**
              * true if the charge succeeded, or was successfully authorized for later capture.
@@ -824,12 +852,12 @@ declare namespace Stripe {
             /**
              * This is the email address that the receipt for this charge was sent to.
              */
-            receipt_email: string;
+            receipt_email: string | null;
 
             /**
              * This is the transaction number that appears on email receipts sent for this charge.
              */
-            receipt_number: string;
+            receipt_number: string | null;
 
             /**
              * Whether or not the charge has been fully refunded. If the charge is only partially refunded,
@@ -842,10 +870,15 @@ declare namespace Stripe {
              */
             refunds: IChargeRefunds;
 
+            /**
+             * ID of the review associated with this charge if one exists. [Expandable]
+             */
+            review?: string | null;
+
             /**
              * Shipping information for the charge.
              */
-            shipping?: IShippingInformation;
+            shipping?: IShippingInformation | null;
 
             /**
              * For most Stripe users, the source of every charge is a credit or debit card.
@@ -858,13 +891,13 @@ declare namespace Stripe {
              * from another Stripe account. See the Connect documentation for details.
              * [Expandable]
              */
-            source_transfer: string | transfers.ITransfer;
+            source_transfer: string | transfers.ITransfer | null;
 
             /**
              * Extra information about a charge. This will appear on your customer’s
              * credit card statement.
              */
-            statement_descriptor: string;
+            statement_descriptor: string | null;
 
             /**
              * The status of the payment is either "succeeded", "pending", or "failed".
@@ -875,7 +908,15 @@ declare namespace Stripe {
              * ID of the transfer to the destination account (only applicable if the
              * charge was created using the destination parameter). [Expandable]
              */
-            transfer: string | transfers.ITransfer;
+            transfer?: string | transfers.ITransfer;
+
+            /**
+             * A string that identifies this transaction as part of a group.
+             * See the [Connect documentation]
+             * <https://stripe.com/docs/connect/charges-transfers#grouping-transactions>
+             * for details.
+             */
+            transfer_group?: string | null;
         }
 
         interface IChargeCreationOptions extends IDataOptionsWithMetadata {
@@ -1056,7 +1097,7 @@ declare namespace Stripe {
             }
         }
 
-        interface IChargeRefunds extends IList<refunds.IRefund>, resources.ChargeRefunds { }
+        interface IChargeRefunds extends IList<refunds.IRefund> { }
     }
 
     namespace coupons {
@@ -4086,7 +4127,7 @@ declare namespace Stripe {
              * in the card object if the card belongs to an account or recipient
              * instead.
              */
-            customer?: string | customers.ICustomer;
+            customer?: string | customers.ICustomer | null;
 
             /**
              * Only applicable on accounts (not customers or recipients). This
@@ -4120,7 +4161,7 @@ declare namespace Stripe {
             /**
              * The card number
              */
-            number: string;
+            number?: string;
 
             /**
              * Card brand. Can be Visa, American Express, MasterCard, Discover, JCB, Diners Club, or Unknown.
@@ -4134,20 +4175,20 @@ declare namespace Stripe {
              */
             funding: "credit" | "debit" | "prepaid" | "unknown";
             last4: string;
-            address_city: string;
+            address_city: string | null;
 
             /**
              * Billing address country, if provided when creating card
              */
-            address_country: string;
-            address_line1: string;
+            address_country: string | null;
+            address_line1: string | null;
 
             /**
              * If address_line1 was provided, results of the check: pass, fail, unavailable, or unchecked.
              */
-            address_line1_check: string;
-            address_line2: string;
-            address_state: string;
+            address_line1_check: string | null;
+            address_line2: string | null;
+            address_state: string | null;
             address_zip: string;
 
             /**
@@ -4169,7 +4210,7 @@ declare namespace Stripe {
             /**
              * (For Apple Pay integrations only.) The last four digits of the device account number.
              */
-            dynamic_last4: string;
+            dynamic_last4: string | null;
 
             /**
              * Cardholder name
@@ -4188,7 +4229,7 @@ declare namespace Stripe {
              * If the card number is tokenized, this is the method that was
              * used. Can be "apple_pay" or "android_pay".
              */
-            tokenization_method: "apple_pay" | "android_pay";
+            tokenization_method: "apple_pay" | "android_pay" | null;
         }
 
         interface ICardUpdateOptions extends IDataOptionsWithMetadata {

From 98395d3d9a6b6d2de27571f16041870878adb670 Mon Sep 17 00:00:00 2001
From: Daryl LaBar <d3labar@hotmail.com>
Date: Mon, 14 May 2018 19:54:48 -0400
Subject: [PATCH 0320/1124] Made Optional Parameters Optional.  Utilized
 AttributeType. (#25722)

* Made Optional Parameters Optional.  Utilized AttributeType

* Fixed Lint Error
---
 types/xrm/index.d.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index fe5d44214e..18d8cae218 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -1121,13 +1121,13 @@ declare namespace Xrm {
          * @deprecated Use {@link Xrm.WebApi.retrieveRecord} instead.
          * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
-        retrieveRecord(entityType: string, id: string, options: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
+        retrieveRecord(entityType: string, id: string, options?: string): Async.PromiseLike<Async.OfflineOperationSuccessCallbackObject>;
 
         /**
          * Retrieves a collection of entity records in mobile clients while working in the offline mode.
          *
          * @param entityType The logical name of the entity.
-         * @param options (Optional) The logical name of the enti
+         * @param options (Optional) The logical name of the entity
          * @param maxPageSize (Optional) A positive number to indicates the number of entity records to be returned per page.
          * * If you do not specify this parameter, the default value is passed as 5000.
          * * If the number of records being retrieved is more than maxPageSize, an @odata.nextLink property
@@ -1144,7 +1144,7 @@ declare namespace Xrm {
          * @deprecated Use {@link Xrm.WebApi.retrieveMultipleRecords} instead.
          * @see {@link https://docs.microsoft.com/en-us/dynamics365/get-started/whats-new/customer-engagement/important-changes-coming#some-client-apis-are-deprecated External Link: Deprecated Client APIs}
          */
-        retrieveMultipleRecords(entityType: string, options: string, maxPageSize: number): Async.PromiseLike<Array<{ [key: string]: any }>>;
+        retrieveMultipleRecords(entityType: string, options?: string, maxPageSize?: number): Async.PromiseLike<Array<{ [key: string]: any }>>;
 
         /**
          * Updates an entity record in mobile clients while working in the offline mode.
@@ -2100,7 +2100,7 @@ declare namespace Xrm {
              * * optionset
              * * string
              */
-            getAttributeType(): string;
+            getAttributeType(): AttributeType;
 
             /**
              * Gets the attribute format.
@@ -3541,9 +3541,9 @@ declare namespace Xrm {
 
         /**
          * Saves the record with the given save mode.
-         * @param saveMode (Optional) the save mode to save, as either "saveandclose" or "saveandnew".
+         * @param saveMode (Optional) the save mode to save, as either "saveandclose" or "saveandnew".  If no parameter is included in the method, the record will simply be saved.
          */
-        save(saveMode: EntitySaveMode): void;
+        save(saveMode?: EntitySaveMode): void;
 
         /**
          * The collection of attributes for the record.
@@ -3692,14 +3692,14 @@ declare namespace Xrm {
              * Returns all process instances for the entity record that the calling user has access to.
              * @param callbackFunction (Optional) a function to call when the operation is complete.
              */
-            getProcessInstances(callbackFunction: GetProcessInstancesDelegate): void;
+            getProcessInstances(callbackFunction?: GetProcessInstancesDelegate): void;
 
             /**
              * Sets a process instance as the active instance
              * @param processInstanceId The Id of the process instance to make the active instance.
              * @param callbackFunction (Optional) a function to call when the operation is complete.
              */
-            setActiveProcessInstance(processInstanceId: string, callbackFunction: SetProcessInstanceDelegate): void;
+            setActiveProcessInstance(processInstanceId: string, callbackFunction?: SetProcessInstanceDelegate): void;
 
             /**
              * Returns a Stage object representing the active stage.
@@ -3837,7 +3837,7 @@ declare namespace Xrm {
              * @param status The new status for the process
              * @param callbackFunction (Optional) a function to call when the operation is complete.
              */
-            setStatus(status: ProcessStatus, callbackFunction: ProcessSetStatusDelegate): void;
+            setStatus(status: ProcessStatus, callbackFunction?: ProcessSetStatusDelegate): void;
         }
 
         /**
@@ -4786,7 +4786,7 @@ declare namespace Xrm {
          * @returns On success, returns a promise containing a JSON object with the retrieved attributes and their values.
          * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrieverecord External Link: retrieveRecord (Client API reference)}
          */
-        retrieveRecord(entityLogicalName: string, id: string, options: string): Async.PromiseLike<any>;
+        retrieveRecord(entityLogicalName: string, id: string, options?: string): Async.PromiseLike<any>;
 
         /**
          * Retrieves a collection of entity records.

From 06caab2123387d471212f59a470754da1b8e3a46 Mon Sep 17 00:00:00 2001
From: Gal Talmor <galtalmor@gmail.com>
Date: Mon, 14 May 2018 17:11:48 -0700
Subject: [PATCH 0321/1124] Fix stripe ICharge interface with missing fields
 and optional null values

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

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 884cbacc06..496ae404f0 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -1097,7 +1097,7 @@ declare namespace Stripe {
             }
         }
 
-        interface IChargeRefunds extends IList<refunds.IRefund> { }
+        interface IChargeRefunds extends IList<refunds.IRefund>, resources.ChargeRefunds { }
     }
 
     namespace coupons {
@@ -5423,18 +5423,18 @@ declare namespace Stripe {
              * Once entirely refunded, a charge can't be refunded again.
              * This method will throw an error when called on an already-refunded charge, or when trying to refund more money than is left on a charge.
              */
-            create(data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            create(data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            create(options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            create(response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create?(data: refunds.IRefundCreationOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create?(data: refunds.IRefundCreationOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create?(options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            create?(response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
 
             /**
              * Retrieves the details of an existing refund.
              */
-            retrieve(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            retrieve(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve?(id: string, data: IDataOptions, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve?(id: string, data: IDataOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve?(id: string, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            retrieve?(id: string, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
 
 
             /**
@@ -5443,18 +5443,18 @@ declare namespace Stripe {
              *
              * This request only accepts metadata as an argument.
              */
-            update(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
-            update(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            update?(id: string, data: IDataOptionsWithMetadata, options: HeaderOptions, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
+            update?(id: string, data: IDataOptionsWithMetadata, response?: IResponseFn<refunds.IRefund>): Promise<refunds.IRefund>;
 
             /**
              * Returns a list of all refunds you’ve previously created. The refunds are returned in sorted order,
              * with the most recent refunds appearing first.
              * For convenience, the 10 most recent refunds are always available by default on the charge object.
              */
-            list(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
-            list(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list?(data: refunds.IRefundListOptions, options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list?(data: refunds.IRefundListOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list?(options: HeaderOptions, response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
+            list?(response?: IResponseFn<IList<refunds.IRefund>>): Promise<IList<refunds.IRefund>>;
         }
 
         class Coupons extends StripeResource {

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 0322/1124] 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 0323/1124] 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 0324/1124] 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 0325/1124] 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 0326/1124] 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 0327/1124] 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 0328/1124] 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 0329/1124] 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 0330/1124] 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 0331/1124] 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 0332/1124] 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 0333/1124] 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 0334/1124] 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 0335/1124] 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 0336/1124] [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 0337/1124] [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 0338/1124] 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 0339/1124] 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 0340/1124] 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 0341/1124] 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 0342/1124] 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 0343/1124] 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 0344/1124] [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 0345/1124] 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 0346/1124] 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 0347/1124] 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 0348/1124] 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 0349/1124] 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 0350/1124] 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 0351/1124] 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 0352/1124] 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 0353/1124] 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 0354/1124] 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 0355/1124] 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 0356/1124] 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 0357/1124] 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 0358/1124] [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 0359/1124] 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 0360/1124] 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 0361/1124] 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 0362/1124] 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 20d62b5477c55888a6e22e7a6e56cfe0d4101aa7 Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Wed, 16 May 2018 11:12:01 +1000
Subject: [PATCH 0363/1124] Fixed indentation

---
 types/react-calendar-timeline/index.d.ts | 118 +++++++++++------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 86c79ca7ae..26a3df52cd 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for react-calendar-timeline v0.15.12
 // Project: https://github.com/namespace-ee/react-calendar-timeline
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
-//				   Alex Maclean <https://github.com/acemac>
+//				         Alex Maclean <https://github.com/acemac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -9,7 +9,7 @@
 
 declare module "react-calendar-timeline" {
  
-   export interface TimelineGroup {
+  export interface TimelineGroup {
     id: number;
     title: React.ReactNode;
   }
@@ -33,63 +33,63 @@ declare module "react-calendar-timeline" {
   }
 
   export interface ReactCalendarTimelineProps {
-      groups: TimelineGroup[];
-      items: TimelineItem[];
-      keys?:{
-          groupIdKey: string;
-          groupTitleKey: string;
-          itemIdKey: string;
-          itemTitleKey: string;
-          itemGroupKey: string;
-          itemTimeStartKey: string;
-          itemTimeEndKey: string;
-      };
-      selected?: number[];
-      sidebarWidth?: number;
-      sidebarContent?: any;
-      rightSidebarWidth?: number;
-      rightSidebarContent?: any;
-      dragSnap?: number;
-      minResizeWidth?: number;
-      stickyOffset?: number;
-      stickyHeader?: boolean;
-      headerRef?: any;
-      lineHeight?: number;
-      headerLabelGroupHeight?: number;
-      headerLabelHeight?: number;
-      itemHeightRatio?: number;
-      minZoom?: number;
-      maxZoom?: number;
-      clickTolerance?: number;
-      canMove?: boolean;
-      canChangeGroup?: boolean;
-      canResize?: boolean;
-      useResizeHandle?: boolean;
-      showCursorLine?: boolean;
-      stackItems?: boolean;
-      traditionalZoom?: boolean;
-      itemTouchSendsClick?: boolean;
-      onItemMove?(itemId:number, dragTime:number, newGroupOrder:number): any;
-      onItemResize?(itemId:number, newResizeEnd: number, edge: "left" | "right"): any;
-      onItemSelect?(itemId:number, e: any, time: number): any;
-      onItemClick?(itemId:number, e: any, time: number): any;
-      onItemDoubleClick?(itemId:number, e: any, time: number): any;
-      onCanvasClick?(groupId:number, time:number, e:any): any;
-      onCanvasDoubleClick?(groupId:number, time:number, e:any): any;
-      moveResizeValidator?(action:"move" | "resize", itemId:number, time:number, resizeEdge: "left" | "right"): any;
-      defaultTimeStart?: any;
-      defaultTimeEnd?: any;
-      visibleTimeStart?: number;
-      visibleTimeEnd?: number;
-      onTimeChange?(visibleTimeStart: number, visibleTimeEnd: number, updateScrollCanvas: (start: number, end: number) => void): any;
-      onTimeInit?(visibleTimeStart: number, visibleTimeEnd: number): any;
-      onBoundsChange?(canvasTimeStart: number, canvasTimeEnd: number): any;
-      onZoom?(timelineContext: TimelineContext): any;
-      children?: any;
-      fullUpdate?: boolean;
-      itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactNode;
-      groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactNode;
-      minimumWidthForItemContentVisibility?: number;
+    groups: TimelineGroup[];
+    items: TimelineItem[];
+    keys?:{
+        groupIdKey: string;
+        groupTitleKey: string;
+        itemIdKey: string;
+        itemTitleKey: string;
+        itemGroupKey: string;
+        itemTimeStartKey: string;
+        itemTimeEndKey: string;
+    };
+    selected?: number[];
+    sidebarWidth?: number;
+    sidebarContent?: any;
+    rightSidebarWidth?: number;
+    rightSidebarContent?: any;
+    dragSnap?: number;
+    minResizeWidth?: number;
+    stickyOffset?: number;
+    stickyHeader?: boolean;
+    headerRef?: any;
+    lineHeight?: number;
+    headerLabelGroupHeight?: number;
+    headerLabelHeight?: number;
+    itemHeightRatio?: number;
+    minZoom?: number;
+    maxZoom?: number;
+    clickTolerance?: number;
+    canMove?: boolean;
+    canChangeGroup?: boolean;
+    canResize?: boolean;
+    useResizeHandle?: boolean;
+    showCursorLine?: boolean;
+    stackItems?: boolean;
+    traditionalZoom?: boolean;
+    itemTouchSendsClick?: boolean;
+    onItemMove?(itemId:number, dragTime:number, newGroupOrder:number): any;
+    onItemResize?(itemId:number, newResizeEnd: number, edge: "left" | "right"): any;
+    onItemSelect?(itemId:number, e: any, time: number): any;
+    onItemClick?(itemId:number, e: any, time: number): any;
+    onItemDoubleClick?(itemId:number, e: any, time: number): any;
+    onCanvasClick?(groupId:number, time:number, e:any): any;
+    onCanvasDoubleClick?(groupId:number, time:number, e:any): any;
+    moveResizeValidator?(action:"move" | "resize", itemId:number, time:number, resizeEdge: "left" | "right"): any;
+    defaultTimeStart?: any;
+    defaultTimeEnd?: any;
+    visibleTimeStart?: number;
+    visibleTimeEnd?: number;
+    onTimeChange?(visibleTimeStart: number, visibleTimeEnd: number, updateScrollCanvas: (start: number, end: number) => void): any;
+    onTimeInit?(visibleTimeStart: number, visibleTimeEnd: number): any;
+    onBoundsChange?(canvasTimeStart: number, canvasTimeEnd: number): any;
+    onZoom?(timelineContext: TimelineContext): any;
+    children?: any;
+    fullUpdate?: boolean;
+    itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactNode;
+    groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactNode;
+    minimumWidthForItemContentVisibility?: number;
   }
   let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimelineProps>;
   export default ReactCalendarTimeline;

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 0364/1124] 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 0365/1124] 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 0366/1124] [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 6b80387511b4e4ab007305dd1f8bc3eafb397796 Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Wed, 16 May 2018 16:03:37 +1000
Subject: [PATCH 0367/1124] Fixed typing.

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

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 26a3df52cd..d5643d0e2a 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -87,8 +87,8 @@ declare module "react-calendar-timeline" {
     onZoom?(timelineContext: TimelineContext): any;
     children?: any;
     fullUpdate?: boolean;
-    itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactNode;
-    groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactNode;
+    itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactElement<{}>;;
+    groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactElement<{}>;;
     minimumWidthForItemContentVisibility?: number;
   }
   let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimelineProps>;

From 6d9d52c150e170c5a5f2ed01d04c2d93022bf73f Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Wed, 16 May 2018 16:29:00 +1000
Subject: [PATCH 0368/1124] Fat fingers.

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

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index d5643d0e2a..8c523e68c6 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -87,8 +87,8 @@ declare module "react-calendar-timeline" {
     onZoom?(timelineContext: TimelineContext): any;
     children?: any;
     fullUpdate?: boolean;
-    itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactElement<{}>;;
-    groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactElement<{}>;;
+    itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactElement<{}>;
+    groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactElement<{}>;
     minimumWidthForItemContentVisibility?: number;
   }
   let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimelineProps>;

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 0369/1124] 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 0370/1124] 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 0371/1124] [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 0372/1124] [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 a1747548e69ab37d2a09e0f9bfeeee3c42e2dcd2 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 16 May 2018 09:47:49 +0200
Subject: [PATCH 0373/1124] Name updates

---
 types/chrome/chrome-webview.d.ts    | 4 ++--
 types/chrome/test/chrome-webview.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/chrome/chrome-webview.d.ts b/types/chrome/chrome-webview.d.ts
index e2e0b7c429..b358b5a07d 100644
--- a/types/chrome/chrome-webview.d.ts
+++ b/types/chrome/chrome-webview.d.ts
@@ -15,13 +15,13 @@
 /**
  * Use the <code>webview</code> tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
  */
-declare namespace chrome.webviewTag {
+declare namespace chrome.webview {
     /** Options that determine what data should be cleared by `clearData`. */
     export interface ClearDataOptions {
         /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
         since: number;
     }
-    export interface WindowEvent extends chrome.events.Event<() => void> {}
+    export interface WindowEvent extends chrome.events.Event<() => void> { }
 
     export interface ConsoleEvent extends Event {
         /**
diff --git a/types/chrome/test/chrome-webview.ts b/types/chrome/test/chrome-webview.ts
index 87ac8d606c..ff69f71d9b 100644
--- a/types/chrome/test/chrome-webview.ts
+++ b/types/chrome/test/chrome-webview.ts
@@ -1,4 +1,4 @@
-import webview = chrome.webviewTag;
+import webview = chrome.webview;
 
 let element: webview.HTMLWebViewElement;
 

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 0374/1124] 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 c7325ae6d19e077b19ed390d88719a9a57a17e86 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 16 May 2018 11:01:25 +0200
Subject: [PATCH 0375/1124] Separate typings for chrome-apps

---
 .../chrome-webview.d.ts                       |   7 +-
 .../index.d.ts}                               |  29 +-
 .../test/chrome-webview.ts                    |   2 -
 .../test/index.ts}                            |  10 +-
 types/chrome-apps/tsconfig.json               |  26 ++
 types/chrome-apps/tslint.json                 |  79 +++++
 types/chrome/index.d.ts                       | 274 +++++++++---------
 types/chrome/tsconfig.json                    |   8 +-
 8 files changed, 255 insertions(+), 180 deletions(-)
 rename types/{chrome => chrome-apps}/chrome-webview.d.ts (98%)
 rename types/{chrome/chrome-app.d.ts => chrome-apps/index.d.ts} (98%)
 rename types/{chrome => chrome-apps}/test/chrome-webview.ts (97%)
 rename types/{chrome/test/chrome-app.ts => chrome-apps/test/index.ts} (98%)
 create mode 100644 types/chrome-apps/tsconfig.json
 create mode 100644 types/chrome-apps/tslint.json

diff --git a/types/chrome/chrome-webview.d.ts b/types/chrome-apps/chrome-webview.d.ts
similarity index 98%
rename from types/chrome/chrome-webview.d.ts
rename to types/chrome-apps/chrome-webview.d.ts
index b358b5a07d..b3ab9ced0c 100644
--- a/types/chrome/chrome-webview.d.ts
+++ b/types/chrome-apps/chrome-webview.d.ts
@@ -1,13 +1,8 @@
-/// <reference path="chrome-app.d.ts" />
-
 // Project: http://developer.chrome.com/apps/
 // Definitions by: Nikolai Ommundsen <https://github.com/niikoo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-//
 // WebView ref: https://chromium.googlesource.com/chromium/src/+/64.0.3274.2/chrome/common/extensions/api/webview_tag.json
-//
-
+// TypeScript Version: 2.3
 
 ///////////////////
 // <webview> Tag
diff --git a/types/chrome/chrome-app.d.ts b/types/chrome-apps/index.d.ts
similarity index 98%
rename from types/chrome/chrome-app.d.ts
rename to types/chrome-apps/index.d.ts
index 65d80f3290..e5511245d2 100644
--- a/types/chrome/chrome-app.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -1,7 +1,9 @@
+/// <reference path="./chrome-webview.d.ts" />
 // Type definitions for Chrome packaged application development
 // Project: http://developer.chrome.com/apps/
 // Definitions by: Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>, Nikolai Ommundsen <https://github.com/niikoo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 /// <reference types="chrome"/>
 /// <reference types="filesystem"/>
@@ -21,29 +23,10 @@ declare namespace chrome.app {
 // App Runtime
 ////////////////////
 declare namespace chrome.app.runtime {
-    enum LaunchSource {
-        "untracked" = "untracked",
-        "app_launcher" = "app_launcher",
-        "new_tab_page" = "new_tab_page",
-        "reload" = "reload",
-        "restart" = "restart",
-        "load_and_launch" = "load_and_launch",
-        "command_line" = "command_line",
-        "file_handler" = "file_handler",
-        "url_handler" = "url_handler",
-        "system_tray" = "system_tray",
-        "about_page" = "about_page",
-        "keyboard" = "keyboard",
-        "extensions_page" = "extensions_page",
-        "management_api" = "management_api",
-        "ephemeral_app" = "ephemeral_app",
-        "background" = "background",
-        "kiosk" = "kiosk",
-        "chrome_internal" = "chrome_internal",
-        "test" = "test",
-        "installed_notification" = "installed_notification",
-        "context_menu" = "context_menu",
-    }
+    type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
+        'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
+        'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
+        'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
 
     interface LaunchData {
         id?: string;
diff --git a/types/chrome/test/chrome-webview.ts b/types/chrome-apps/test/chrome-webview.ts
similarity index 97%
rename from types/chrome/test/chrome-webview.ts
rename to types/chrome-apps/test/chrome-webview.ts
index ff69f71d9b..f606486eb7 100644
--- a/types/chrome/test/chrome-webview.ts
+++ b/types/chrome-apps/test/chrome-webview.ts
@@ -1,4 +1,2 @@
 import webview = chrome.webview;
-
 let element: webview.HTMLWebViewElement;
-
diff --git a/types/chrome/test/chrome-app.ts b/types/chrome-apps/test/index.ts
similarity index 98%
rename from types/chrome/test/chrome-app.ts
rename to types/chrome-apps/test/index.ts
index 6dbd06d9e2..8dff00c11f 100644
--- a/types/chrome/test/chrome-app.ts
+++ b/types/chrome-apps/test/index.ts
@@ -1,5 +1,3 @@
-
-
 import runtime = chrome.app.runtime;
 import cwindow = chrome.app.window;
 
@@ -44,7 +42,7 @@ var visibleEverywhere: boolean = chrome.app.window.canSetVisibleOnAllWorkspaces(
 
 function test_fileSystem(): void {
     var accepts: chrome.fileSystem.AcceptOptions[] = [
-        {mimeTypes: ["text/*"], extensions: ['js', 'css', 'txt', 'html', 'xml', 'tsv', 'csv', 'rtf']}
+        { mimeTypes: ["text/*"], extensions: ['js', 'css', 'txt', 'html', 'xml', 'tsv', 'csv', 'rtf'] }
     ];
     var chooseOption: chrome.fileSystem.ChooseEntryOptions = {
         type: "openFile",
@@ -58,13 +56,13 @@ function test_fileSystem(): void {
 
         var retainedId = chrome.fileSystem.retainEntry(entry);
         chrome.fileSystem.isRestorable(retainedId, (isRestorable: boolean) => {
-            if(isRestorable){
+            if (isRestorable) {
                 chrome.fileSystem.restoreEntry(retainedId, (restoredEntry: Entry) => { });
             }
         });
 
-        chrome.fileSystem.getWritableEntry(entry, (writableEntry: Entry) => {});
-        chrome.fileSystem.isWritableEntry(entry, (isWritable: boolean) => {});
+        chrome.fileSystem.getWritableEntry(entry, (writableEntry: Entry) => { });
+        chrome.fileSystem.isWritableEntry(entry, (isWritable: boolean) => { });
     });
 }
 
diff --git a/types/chrome-apps/tsconfig.json b/types/chrome-apps/tsconfig.json
new file mode 100644
index 0000000000..5d8da04531
--- /dev/null
+++ b/types/chrome-apps/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": false,
+        "noImplicitThis": false,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "chrome-webview.d.ts",
+        "test/index.ts",
+        "test/chrome-webview.ts"
+    ]
+}
diff --git a/types/chrome-apps/tslint.json b/types/chrome-apps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/chrome-apps/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/chrome/index.d.ts b/types/chrome/index.d.ts
index d2b92e4b22..231812c946 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -135,7 +135,7 @@ declare namespace chrome.alarms {
         name: string;
     }
 
-    export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> {}
+    export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
 
     /**
      * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
@@ -282,19 +282,19 @@ declare namespace chrome.bookmarks {
         childIds: string[];
     }
 
-    export interface BookmarkRemovedEvent extends chrome.events.Event<(id: string, removeInfo: BookmarkRemoveInfo) => void> {}
+    export interface BookmarkRemovedEvent extends chrome.events.Event<(id: string, removeInfo: BookmarkRemoveInfo) => void> { }
 
-    export interface BookmarkImportEndedEvent extends chrome.events.Event<() => void> {}
+    export interface BookmarkImportEndedEvent extends chrome.events.Event<() => void> { }
 
-    export interface BookmarkMovedEvent extends chrome.events.Event<(id: string, moveInfo: BookmarkMoveInfo) => void> {}
+    export interface BookmarkMovedEvent extends chrome.events.Event<(id: string, moveInfo: BookmarkMoveInfo) => void> { }
 
-    export interface BookmarkImportBeganEvent extends chrome.events.Event<() => void> {}
+    export interface BookmarkImportBeganEvent extends chrome.events.Event<() => void> { }
 
-    export interface BookmarkChangedEvent extends chrome.events.Event<(id: string, changeInfo: BookmarkChangeInfo) => void> {}
+    export interface BookmarkChangedEvent extends chrome.events.Event<(id: string, changeInfo: BookmarkChangeInfo) => void> { }
 
-    export interface BookmarkCreatedEvent extends chrome.events.Event<(id: string, bookmark: BookmarkTreeNode) => void> {}
+    export interface BookmarkCreatedEvent extends chrome.events.Event<(id: string, bookmark: BookmarkTreeNode) => void> { }
 
-    export interface BookmarkChildrenReordered extends chrome.events.Event<(id: string, reorderInfo: BookmarkReorderInfo) => void> {}
+    export interface BookmarkChildrenReordered extends chrome.events.Event<(id: string, reorderInfo: BookmarkReorderInfo) => void> { }
 
     export interface BookmarkSearchQuery {
         query?: string;
@@ -480,7 +480,7 @@ declare namespace chrome.browserAction {
         popup: string;
     }
 
-    export interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+    export interface BrowserClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> { }
 
     /**
      * Since Chrome 22.
@@ -737,7 +737,7 @@ declare namespace chrome.commands {
         shortcut?: string;
     }
 
-    export interface CommandEvent extends chrome.events.Event<(command: string) => void> {}
+    export interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
 
     /**
      * Returns all the registered extension commands for this extension and their shortcut (if active).
@@ -1062,7 +1062,7 @@ declare namespace chrome.contextMenus {
         type?: string;
     }
 
-    export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> {}
+    export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData, tab?: chrome.tabs.Tab) => void> { }
 
     /**
      * Since Chrome 38.
@@ -1223,7 +1223,7 @@ declare namespace chrome.cookies {
         cause: string;
     }
 
-    export interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> {}
+    export interface CookieChangedEvent extends chrome.events.Event<(changeInfo: CookieChangeInfo) => void> { }
 
     /**
      * Lists all existing cookie stores.
@@ -1327,9 +1327,9 @@ declare module chrome {
             faviconUrl?: string;
         }
 
-        export interface DebuggerDetachedEvent extends chrome.events.Event<(source: Debuggee, reason: string) => void> {}
+        export interface DebuggerDetachedEvent extends chrome.events.Event<(source: Debuggee, reason: string) => void> { }
 
-        export interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> {}
+        export interface DebuggerEventEvent extends chrome.events.Event<(source: Debuggee, method: string, params?: Object) => void> { }
 
         /**
          * Attaches debugger to the given target.
@@ -1374,7 +1374,7 @@ declare module chrome {
         export var onEvent: DebuggerEventEvent;
     }
 
-    export {_debugger as debugger}
+    export { _debugger as debugger }
 }
 ////////////////////
 // Declarative Content
@@ -1443,14 +1443,14 @@ declare namespace chrome.declarativeContent {
 
     /** Matches the state of a web page by various criteria. */
     export class PageStateMatcher {
-        constructor(options: PageStateMatcherProperties);
+        constructor (options: PageStateMatcherProperties);
     }
 
     /** Declarative event action that shows the extension's page action while the corresponding conditions are met. */
-    export class ShowPageAction {}
+    export class ShowPageAction { }
 
     /** Provides the Declarative Event API consisting of addRules, removeRules, and getRules. */
-    export interface PageChangedEvent extends chrome.events.Event<() => void> {}
+    export interface PageChangedEvent extends chrome.events.Event<() => void> { }
 
     export var onPageChanged: PageChangedEvent;
 }
@@ -1559,7 +1559,7 @@ declare namespace chrome.declarativeWebRequest {
         filter: RequestCookie;
     }
 
-    export interface RequestedEvent extends chrome.events.Event<Function> {}
+    export interface RequestedEvent extends chrome.events.Event<Function> { }
 
     export var onRequest: RequestedEvent;
 }
@@ -1660,9 +1660,9 @@ declare namespace chrome.devtools.inspectedWindow {
         value: string;
     }
 
-    export interface ResourceAddedEvent extends chrome.events.Event<(resource: Resource) => void> {}
+    export interface ResourceAddedEvent extends chrome.events.Event<(resource: Resource) => void> { }
 
-    export interface ResourceContentCommittedEvent extends chrome.events.Event<(resource: Resource, content: string) => void> {}
+    export interface ResourceContentCommittedEvent extends chrome.events.Event<(resource: Resource, content: string) => void> { }
 
     /** The ID of the tab being inspected. This ID may be used with chrome.tabs.* API. */
     export var tabId: number;
@@ -1734,9 +1734,9 @@ declare namespace chrome.devtools.network {
         getContent(callback: (content: string, encoding: string) => void): void;
     }
 
-    export interface RequestFinishedEvent extends chrome.events.Event<(request: Request) => void> {}
+    export interface RequestFinishedEvent extends chrome.events.Event<(request: Request) => void> { }
 
-    export interface NavigatedEvent extends chrome.events.Event<(url: string) => void> {}
+    export interface NavigatedEvent extends chrome.events.Event<(url: string) => void> { }
 
     /**
      * Returns HAR log that contains all known network requests.
@@ -1761,11 +1761,11 @@ declare namespace chrome.devtools.network {
  * Availability: Since Chrome 18.
  */
 declare namespace chrome.devtools.panels {
-    export interface PanelShownEvent extends chrome.events.Event<(window: Window) => void> {}
+    export interface PanelShownEvent extends chrome.events.Event<(window: Window) => void> { }
 
-    export interface PanelHiddenEvent extends chrome.events.Event<() => void> {}
+    export interface PanelHiddenEvent extends chrome.events.Event<() => void> { }
 
-    export interface PanelSearchEvent extends chrome.events.Event<(action: string, queryString?: string) => void> {}
+    export interface PanelSearchEvent extends chrome.events.Event<(action: string, queryString?: string) => void> { }
 
     /** Represents a panel created by extension. */
     export interface ExtensionPanel {
@@ -1784,7 +1784,7 @@ declare namespace chrome.devtools.panels {
         onSearch: PanelSearchEvent;
     }
 
-    export interface ButtonClickedEvent extends chrome.events.Event<() => void> {}
+    export interface ButtonClickedEvent extends chrome.events.Event<() => void> { }
 
     /** A button created by the extension. */
     export interface Button {
@@ -1799,7 +1799,7 @@ declare namespace chrome.devtools.panels {
         onClicked: ButtonClickedEvent;
     }
 
-    export interface SelectionChangedEvent extends chrome.events.Event<() => void> {}
+    export interface SelectionChangedEvent extends chrome.events.Event<() => void> { }
 
     /** Represents the Elements panel. */
     export interface ElementsPanel {
@@ -1834,9 +1834,9 @@ declare namespace chrome.devtools.panels {
         onSelectionChanged: SelectionChangedEvent;
     }
 
-    export interface ExtensionSidebarPaneShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> {}
+    export interface ExtensionSidebarPaneShownEvent extends chrome.events.Event<(window: chrome.windows.Window) => void> { }
 
-    export interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event<() => void> {}
+    export interface ExtensionSidebarPaneHiddenEvent extends chrome.events.Event<() => void> { }
 
     /** A sidebar created by the extension. */
     export interface ExtensionSidebarPane {
@@ -2152,13 +2152,13 @@ declare namespace chrome.downloads {
         conflictAction?: string;
     }
 
-    export interface DownloadChangedEvent extends chrome.events.Event<(downloadDelta: DownloadDelta) => void> {}
+    export interface DownloadChangedEvent extends chrome.events.Event<(downloadDelta: DownloadDelta) => void> { }
 
-    export interface DownloadCreatedEvent extends chrome.events.Event<(downloadItem: DownloadItem) => void> {}
+    export interface DownloadCreatedEvent extends chrome.events.Event<(downloadItem: DownloadItem) => void> { }
 
-    export interface DownloadErasedEvent extends chrome.events.Event<(downloadId: number) => void> {}
+    export interface DownloadErasedEvent extends chrome.events.Event<(downloadId: number) => void> { }
 
-    export interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> {}
+    export interface DownloadDeterminingFilenameEvent extends chrome.events.Event<(downloadItem: DownloadItem, suggest: (suggestion?: DownloadFilenameSuggestion) => void) => void> { }
 
     /**
      * Find DownloadItem. Set query to the empty object to get all DownloadItem. To get a specific DownloadItem, set only the id field. To page through a large number of items, set orderBy: ['-startTime'], set limit to the number of items per page, and set startedAfter to the startTime of the last item from the last page.
@@ -2507,7 +2507,7 @@ declare namespace chrome.extension {
         message: string;
     }
 
-    export interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> {}
+    export interface OnRequestEvent extends chrome.events.Event<((request: any, sender: runtime.MessageSender, sendResponse: (response: any) => void) => void) | ((sender: runtime.MessageSender, sendResponse: (response: any) => void) => void)> { }
 
     /**
      * Since Chrome 7.
@@ -2618,7 +2618,7 @@ declare namespace chrome.fileBrowserHandler {
         entries: any[];
     }
 
-    export interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> {}
+    export interface FileBrowserHandlerExecuteEvent extends chrome.events.Event<(id: string, details: FileHandlerExecuteEventDetails) => void> { }
 
     /**
      * Prompts user to select file path under which file should be saved. When the file is selected, file access permission required to use the file (read, write and create) are granted to the caller. The file will not actually get created during the function call, so function caller must ensure its existence before using it. The function has to be invoked with a user gesture.
@@ -2864,33 +2864,33 @@ declare namespace chrome.fileSystemProvider {
         operationRequestId: number;
     }
 
-    export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> {}
+    export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
 
-    export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
+    export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> {}
+    export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
 
-    export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> {}
+    export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
     /**
      * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
@@ -3051,13 +3051,13 @@ declare namespace chrome.fontSettings {
         fontId: string;
     }
 
-    export interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+    export interface DefaultFixedFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> { }
 
-    export interface DefaultFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+    export interface DefaultFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> { }
 
-    export interface MinimumFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> {}
+    export interface MinimumFontSizeChangedEvent extends chrome.events.Event<(details: FontSizeDetails) => void> { }
 
-    export interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> {}
+    export interface FontChangedEvent extends chrome.events.Event<(details: FullFontDetails) => void> { }
 
     /**
      * Sets the default font size.
@@ -3199,11 +3199,11 @@ declare namespace chrome.gcm {
         detail: Object;
     }
 
-    export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> {}
+    export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
 
-    export interface MessageDeletionEvent extends chrome.events.Event<() => void> {}
+    export interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
 
-    export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> {}
+    export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
 
     /** The maximum size (in bytes) of all key/value pairs in a message. */
     export var MAX_MESSAGE_SIZE: number;
@@ -3311,9 +3311,9 @@ declare namespace chrome.history {
         urls?: string[];
     }
 
-    export interface HistoryVisitedEvent extends chrome.events.Event<(result: HistoryItem) => void> {}
+    export interface HistoryVisitedEvent extends chrome.events.Event<(result: HistoryItem) => void> { }
 
-    export interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> {}
+    export interface HistoryVisitRemovedEvent extends chrome.events.Event<(removed: RemovedResult) => void> { }
 
     /**
      * Searches the history for the last visit time of each page matching the query.
@@ -3473,7 +3473,7 @@ declare namespace chrome.identity {
         interactive?: boolean;
     }
 
-    export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> {}
+    export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
 
     /**
      * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
@@ -3540,7 +3540,7 @@ declare namespace chrome.identity {
  * @since Chrome 6.
  */
 declare namespace chrome.idle {
-    export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> {}
+    export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
 
     /**
      * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
@@ -3829,25 +3829,25 @@ declare namespace chrome.input.ime {
         anchor: number;
     }
 
-    export interface BlurEvent extends chrome.events.Event<(contextID: number) => void> {}
+    export interface BlurEvent extends chrome.events.Event<(contextID: number) => void> { }
 
-    export interface CandidateClickedEvent extends chrome.events.Event<(engineID: string, candidateID: number, button: string) => void> {}
+    export interface CandidateClickedEvent extends chrome.events.Event<(engineID: string, candidateID: number, button: string) => void> { }
 
-    export interface KeyEventEvent extends chrome.events.Event<(engineID: string, keyData: KeyboardEvent) => void> {}
+    export interface KeyEventEvent extends chrome.events.Event<(engineID: string, keyData: KeyboardEvent) => void> { }
 
-    export interface DeactivatedEvent extends chrome.events.Event<(engineID: string) => void> {}
+    export interface DeactivatedEvent extends chrome.events.Event<(engineID: string) => void> { }
 
-    export interface InputContextUpdateEvent extends chrome.events.Event<(context: InputContext) => void> {}
+    export interface InputContextUpdateEvent extends chrome.events.Event<(context: InputContext) => void> { }
 
-    export interface ActivateEvent extends chrome.events.Event<(engineID: string, screen: string) => void> {}
+    export interface ActivateEvent extends chrome.events.Event<(engineID: string, screen: string) => void> { }
 
-    export interface FocusEvent extends chrome.events.Event<(context: InputContext) => void> {}
+    export interface FocusEvent extends chrome.events.Event<(context: InputContext) => void> { }
 
-    export interface MenuItemActivatedEvent extends chrome.events.Event<(engineID: string, name: string) => void> {}
+    export interface MenuItemActivatedEvent extends chrome.events.Event<(engineID: string, name: string) => void> { }
 
-    export interface SurroundingTextChangedEvent extends chrome.events.Event<(engineID: string, surroundingInfo: SurroundingTextInfo) => void> {}
+    export interface SurroundingTextChangedEvent extends chrome.events.Event<(engineID: string, surroundingInfo: SurroundingTextInfo) => void> { }
 
-    export interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> {}
+    export interface InputResetEvent extends chrome.events.Event<(engineID: string) => void> { }
 
     /**
      * Adds the provided menu items to the language menu when this IME is active.
@@ -4079,13 +4079,13 @@ declare namespace chrome.management {
         showConfirmDialog?: boolean;
     }
 
-    export interface ManagementDisabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+    export interface ManagementDisabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> { }
 
-    export interface ManagementUninstalledEvent extends chrome.events.Event<(id: string) => void> {}
+    export interface ManagementUninstalledEvent extends chrome.events.Event<(id: string) => void> { }
 
-    export interface ManagementInstalledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+    export interface ManagementInstalledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> { }
 
-    export interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> {}
+    export interface ManagementEnabledEvent extends chrome.events.Event<(info: ExtensionInfo) => void> { }
 
     /**
      * Enables or disables an app or extension.
@@ -4232,7 +4232,7 @@ declare namespace chrome.networking.config {
         Security?: string;
     }
 
-    export interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> {}
+    export interface CaptivePorttalDetectedEvent extends chrome.events.Event<(networkInfo: NetworkInfo) => void> { }
 
     /**
      * Allows an extension to define network filters for the networks it can handle. A call to this function will remove all filters previously installed by the extension before setting the new list.
@@ -4337,15 +4337,15 @@ declare namespace chrome.notifications {
         requireInteraction?: boolean;
     }
 
-    export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> {}
+    export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
 
-    export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> {}
+    export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
 
-    export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> {}
+    export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
 
-    export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> {}
+    export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
 
-    export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> {}
+    export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
 
     /** The notification closed, either by the system or by user action. */
     export var onClosed: NotificationClosedEvent;
@@ -4445,13 +4445,13 @@ declare namespace chrome.omnibox {
         description: string;
     }
 
-    export interface OmniboxInputEnteredEvent extends chrome.events.Event<(text: string) => void> {}
+    export interface OmniboxInputEnteredEvent extends chrome.events.Event<(text: string) => void> { }
 
-    export interface OmniboxInputChangedEvent extends chrome.events.Event<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void> {}
+    export interface OmniboxInputChangedEvent extends chrome.events.Event<(text: string, suggest: (suggestResults: SuggestResult[]) => void) => void> { }
 
-    export interface OmniboxInputStartedEvent extends chrome.events.Event<() => void> {}
+    export interface OmniboxInputStartedEvent extends chrome.events.Event<() => void> { }
 
-    export interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> {}
+    export interface OmniboxInputCancelledEvent extends chrome.events.Event<() => void> { }
 
     /**
      * Sets the description and styling for the default suggestion. The default suggestion is the text that is displayed in the first suggestion row underneath the URL bar.
@@ -4478,7 +4478,7 @@ declare namespace chrome.omnibox {
  * @since Chrome 5.
  */
 declare namespace chrome.pageAction {
-    export interface PageActionClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+    export interface PageActionClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> { }
 
     export interface TitleDetails {
         /** The id of the tab for which you want to modify the page action. */
@@ -4787,13 +4787,13 @@ declare namespace chrome.printerProvider {
         document: Blob;
     }
 
-    export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> {}
+    export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
 
-    export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> {}
+    export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
 
-    export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> {}
+    export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
 
-    export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> {}
+    export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
 
     /** Event fired when print manager requests printers provided by extensions. */
     export var onGetPrintersRequested: PrinterRequestedEvent;
@@ -4930,7 +4930,7 @@ declare namespace chrome.proxy {
         fatal: boolean;
     }
 
-    export interface ProxyErrorEvent extends chrome.events.Event<(details: ErrorDetails) => void> {}
+    export interface ProxyErrorEvent extends chrome.events.Event<(details: ErrorDetails) => void> { }
 
     export var settings: chrome.types.ChromeSetting;
     /** Notifies about proxy errors. */
@@ -5060,21 +5060,21 @@ declare namespace chrome.runtime {
         version: string;
     }
 
-    export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> {}
+    export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
 
-    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> {}
+    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
 
-    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
+    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
 
-    export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> {}
+    export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
 
-    export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> {}
+    export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
 
-    export interface RuntimeEvent extends chrome.events.Event<() => void> {}
+    export interface RuntimeEvent extends chrome.events.Event<() => void> { }
 
-    export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> {}
+    export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
 
-    export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> {}
+    export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
 
     export interface ManifestIcons {
         [size: number]: string;
@@ -5462,7 +5462,7 @@ declare namespace chrome.scriptBadge {
         popup: string;
     }
 
-    export interface ScriptBadgeClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> {}
+    export interface ScriptBadgeClickedEvent extends chrome.events.Event<(tab: chrome.tabs.Tab) => void> { }
 
     export function getPopup(details: GetPopupDetails, callback: Function): void;
     export function getAttention(details: AttentionDetails): void;
@@ -5510,7 +5510,7 @@ declare namespace chrome.sessions {
         sessions: Session[];
     }
 
-    export interface SessionChangedEvent extends chrome.events.Event<() => void> {}
+    export interface SessionChangedEvent extends chrome.events.Event<() => void> { }
 
     /** The maximum number of sessions.Session that will be included in a requested list. */
     export var MAX_SESSION_RESULTS: number;
@@ -5646,7 +5646,7 @@ declare namespace chrome.storage {
         MAX_WRITE_OPERATIONS_PER_MINUTE: number;
     }
 
-    export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> {}
+    export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
 
     /** Items in the local storage area are local to each machine. */
     export var local: LocalStorageArea;
@@ -5820,9 +5820,9 @@ declare namespace chrome.system.storage {
         availableCapacity: number;
     }
 
-    export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> {}
+    export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
 
-    export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> {}
+    export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
 
     /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
     export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
@@ -5876,7 +5876,7 @@ declare namespace chrome.tabCapture {
         videoConstraints?: MediaStreamConstraints;
     }
 
-    export interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> {}
+    export interface CaptureStatusChangedEvent extends chrome.events.Event<(info: CaptureInfo) => void> { }
 
     /**
      * Captures the visible area of the currently active tab. Capture can only be started on the currently active tab after the extension has been invoked. Capture is maintained across page navigations within the tab, and stops when the tab is closed, or the media stream is closed by the extension.
@@ -6327,27 +6327,27 @@ declare namespace chrome.tabs {
         zoomSettings: ZoomSettings;
     }
 
-    export interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> {}
+    export interface TabHighlightedEvent extends chrome.events.Event<(highlightInfo: HighlightInfo) => void> { }
 
-    export interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> {}
+    export interface TabRemovedEvent extends chrome.events.Event<(tabId: number, removeInfo: TabRemoveInfo) => void> { }
 
-    export interface TabUpdatedEvent extends chrome.events.Event<(tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void> {}
+    export interface TabUpdatedEvent extends chrome.events.Event<(tabId: number, changeInfo: TabChangeInfo, tab: Tab) => void> { }
 
-    export interface TabAttachedEvent extends chrome.events.Event<(tabId: number, attachInfo: TabAttachInfo) => void> {}
+    export interface TabAttachedEvent extends chrome.events.Event<(tabId: number, attachInfo: TabAttachInfo) => void> { }
 
-    export interface TabMovedEvent extends chrome.events.Event<(tabId: number, moveInfo: TabMoveInfo) => void> {}
+    export interface TabMovedEvent extends chrome.events.Event<(tabId: number, moveInfo: TabMoveInfo) => void> { }
 
-    export interface TabDetachedEvent extends chrome.events.Event<(tabId: number, detachInfo: TabDetachInfo) => void> {}
+    export interface TabDetachedEvent extends chrome.events.Event<(tabId: number, detachInfo: TabDetachInfo) => void> { }
 
-    export interface TabCreatedEvent extends chrome.events.Event<(tab: Tab) => void> {}
+    export interface TabCreatedEvent extends chrome.events.Event<(tab: Tab) => void> { }
 
-    export interface TabActivatedEvent extends chrome.events.Event<(activeInfo: TabActiveInfo) => void> {}
+    export interface TabActivatedEvent extends chrome.events.Event<(activeInfo: TabActiveInfo) => void> { }
 
-    export interface TabReplacedEvent extends chrome.events.Event<(addedTabId: number, removedTabId: number) => void> {}
+    export interface TabReplacedEvent extends chrome.events.Event<(addedTabId: number, removedTabId: number) => void> { }
 
-    export interface TabSelectedEvent extends chrome.events.Event<(tabId: number, selectInfo: TabWindowInfo) => void> {}
+    export interface TabSelectedEvent extends chrome.events.Event<(tabId: number, selectInfo: TabWindowInfo) => void> { }
 
-    export interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> {}
+    export interface TabZoomChangeEvent extends chrome.events.Event<(ZoomChangeInfo: ZoomChangeInfo) => void> { }
 
     /**
      * Injects JavaScript code into a page. For details, see the programmatic injection section of the content scripts doc.
@@ -6828,7 +6828,7 @@ declare namespace chrome.ttsEngine {
         pitch?: number;
     }
 
-    export interface TtsEngineSpeakEvent extends chrome.events.Event<(utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void> {}
+    export interface TtsEngineSpeakEvent extends chrome.events.Event<(utterance: string, options: SpeakOptions, sendTtsEvent: (event: chrome.tts.TtsEvent) => void) => void> { }
 
     /** Called when the user makes a call to tts.speak() and one of the voices from this extension's manifest is the first to match the options object. */
     export var onSpeak: TtsEngineSpeakEvent;
@@ -6912,7 +6912,7 @@ declare namespace chrome.types {
         incognitoSpecific?: boolean;
     }
 
-    export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> {}
+    export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
 
     /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
     export interface ChromeSetting {
@@ -6969,15 +6969,15 @@ declare namespace chrome.vpnProvider {
         dnsServer: string[];
     }
 
-    export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> {}
+    export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
 
-    export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> {}
+    export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
 
-    export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> {}
+    export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
 
-    export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> {}
+    export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
 
-    export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> {}
+    export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
 
     /**
      * Creates a new VPN configuration that persists across multiple login sessions of the user.
@@ -7175,17 +7175,17 @@ declare namespace chrome.webNavigation {
         addListener(callback: (details: T) => void, filters?: WebNavigationEventFilter): void;
     }
 
-    export interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> {}
+    export interface WebNavigationFramedEvent extends WebNavigationEvent<WebNavigationFramedCallbackDetails> { }
 
-    export interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> {}
+    export interface WebNavigationFramedErrorEvent extends WebNavigationEvent<WebNavigationFramedErrorCallbackDetails> { }
 
-    export interface WebNavigationSourceEvent extends WebNavigationEvent<WebNavigationSourceCallbackDetails> {}
+    export interface WebNavigationSourceEvent extends WebNavigationEvent<WebNavigationSourceCallbackDetails> { }
 
-    export interface WebNavigationParentedEvent extends WebNavigationEvent<WebNavigationParentedCallbackDetails> {}
+    export interface WebNavigationParentedEvent extends WebNavigationEvent<WebNavigationParentedCallbackDetails> { }
 
-    export interface WebNavigationTransitionalEvent extends WebNavigationEvent<WebNavigationTransitionCallbackDetails> {}
+    export interface WebNavigationTransitionalEvent extends WebNavigationEvent<WebNavigationTransitionCallbackDetails> { }
 
-    export interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> {}
+    export interface WebNavigationReplacementEvent extends WebNavigationEvent<WebNavigationReplacementCallbackDetails> { }
 
     /**
      * Retrieves information about the given frame. A frame refers to an <iframe> or a <frame> of a web page and is identified by a tab ID and a frame ID.
@@ -7419,17 +7419,17 @@ declare namespace chrome.webRequest {
         addListener(callback: (details: T) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-    export interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> {}
+    export interface WebResponseHeadersEvent extends _WebResponseHeadersEvent<WebResponseHeadersDetails> { }
 
-    export interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> {}
+    export interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> { }
 
-    export interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> {}
+    export interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> { }
 
     export interface WebAuthenticationChallengeEvent extends chrome.events.Event<(details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void> {
         addListener(callback: (details: WebAuthenticationChallengeDetails, callback?: (response: BlockingResponse) => void) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
     }
 
-    export interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> {}
+    export interface WebResponseErrorEvent extends _WebResponseHeadersEvent<WebResponseErrorDetails> { }
 
     /**
      * The maximum number of times that handlerBehaviorChanged can be called per 10 minute sustained interval. handlerBehaviorChanged is an expensive function call that shouldn't be called often.
@@ -7544,9 +7544,9 @@ declare namespace chrome.webstore {
      */
     export function install(failureCallback?: (error: string, errorCode?: string) => void): void;
 
-    export interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> {}
+    export interface InstallationStageEvent extends chrome.events.Event<(stage: string) => void> { }
 
-    export interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> {}
+    export interface DownloadProgressEvent extends chrome.events.Event<(percentDownloaded: number) => void> { }
 
     /**
      * Fired when an inline installation enters a new InstallStage. In order to receive notifications about this event, listeners must be registered before the inline installation begins.
@@ -7709,9 +7709,9 @@ declare namespace chrome.windows {
         windowTypes: string[];
     }
 
-    export interface WindowIdEvent extends chrome.events.Event<(windowId: number, filters?: WindowEventFilter) => void> {}
+    export interface WindowIdEvent extends chrome.events.Event<(windowId: number, filters?: WindowEventFilter) => void> { }
 
-    export interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> {}
+    export interface WindowReferenceEvent extends chrome.events.Event<(window: Window, filters?: WindowEventFilter) => void> { }
 
     /**
      * The windowId value that represents the current window.
diff --git a/types/chrome/tsconfig.json b/types/chrome/tsconfig.json
index 1463d006eb..4502d8a056 100644
--- a/types/chrome/tsconfig.json
+++ b/types/chrome/tsconfig.json
@@ -19,11 +19,7 @@
     },
     "files": [
         "index.d.ts",
-        "chrome-app.d.ts",
         "chrome-cast.d.ts",
-        "chrome-webview.d.ts",
-        "test/index.ts",
-        "test/chrome-app.ts",
-        "test/chrome-webview.ts"
+        "test/index.ts"
     ]
-}
\ No newline at end of file
+}

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 0376/1124] 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 0377/1124] 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 4e412e57ededaa6382b402208ebcddf9a0b8a771 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Wed, 16 May 2018 11:09:29 +0200
Subject: [PATCH 0378/1124] Typings for intl-locales-supported

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

diff --git a/types/intl-locales-supported/index.d.ts b/types/intl-locales-supported/index.d.ts
new file mode 100644
index 0000000000..1ad51f1f6c
--- /dev/null
+++ b/types/intl-locales-supported/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for intl-locales-supported 1.0
+// Project: https://github.com/yahoo/intl-locales-supported
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default function areIntlLocalesSupported(locales: string | string[]): void;
diff --git a/types/intl-locales-supported/intl-locales-supported-tests.ts b/types/intl-locales-supported/intl-locales-supported-tests.ts
new file mode 100644
index 0000000000..dcddcd545d
--- /dev/null
+++ b/types/intl-locales-supported/intl-locales-supported-tests.ts
@@ -0,0 +1,4 @@
+import areIntlLocalesSupported from "intl-locales-supported";
+
+areIntlLocalesSupported("en-GB");
+areIntlLocalesSupported([ "en-GB", "en-US" ]);
diff --git a/types/intl-locales-supported/tsconfig.json b/types/intl-locales-supported/tsconfig.json
new file mode 100644
index 0000000000..f528331ae4
--- /dev/null
+++ b/types/intl-locales-supported/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",
+        "intl-locales-supported-tests.ts"
+    ]
+}
diff --git a/types/intl-locales-supported/tslint.json b/types/intl-locales-supported/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/intl-locales-supported/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0379/1124] 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 0d02c685c52f6042f9189d9c498f7f551a0a6711 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Wed, 16 May 2018 11:15:57 +0200
Subject: [PATCH 0380/1124] Update index.d.ts

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

diff --git a/types/intl-locales-supported/index.d.ts b/types/intl-locales-supported/index.d.ts
index 1ad51f1f6c..b156905fdf 100644
--- a/types/intl-locales-supported/index.d.ts
+++ b/types/intl-locales-supported/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for intl-locales-supported 1.0
 // Project: https://github.com/yahoo/intl-locales-supported
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export default function areIntlLocalesSupported(locales: string | string[]): void;

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 0381/1124] 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 0382/1124] 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 0383/1124] 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 0384/1124] 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 0385/1124] 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 0386/1124] 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 0387/1124] [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 0388/1124] [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 0389/1124] 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 0390/1124] 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 0391/1124] 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 0392/1124] 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 0393/1124] 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 0394/1124] 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 0395/1124] 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 0396/1124] 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 0397/1124] 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 0398/1124] 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 0399/1124] 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 0400/1124] 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 0401/1124] 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 0402/1124] 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 0403/1124] 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 0404/1124] 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 0405/1124] 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 d2a9d45da2402d3ab6fd57173ba6747ab3fba4cb Mon Sep 17 00:00:00 2001
From: Gal Talmor <galtalmor@gmail.com>
Date: Wed, 16 May 2018 21:48:18 -0700
Subject: [PATCH 0406/1124] Fix stripe ICharge interface with missing fields
 and optional null values

---
 types/stripe/index.d.ts | 105 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 100 insertions(+), 5 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 496ae404f0..959cfe76ef 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -482,7 +482,7 @@ declare namespace Stripe {
             /**
              * ID of the Connect Application that earned the fee. [Expandable]
              */
-            application: string; //TODO: Implement IApplication interface and reference type here for expansion:- "string | IApplication"
+            application: string | applications.IApplication;
 
             /**
              * Balance transaction that describes the impact of this collected application
@@ -742,7 +742,7 @@ declare namespace Stripe {
             /**
              * ID of the Connect application that created the charge. [Expandable]
              */
-            application?: string | null;
+            application?: string | applications.IApplication | null;
 
             /**
              * The application fee (if any) for the charge. See the Connect documentation
@@ -783,7 +783,7 @@ declare namespace Stripe {
              * <https://stripe.com/docs/connect/destination-charges> for details.
              * [Expandable]
              */
-            destination?: string | null;
+            destination?: string | accounts.IAccount | null;
 
             /**
              * Details about the dispute if the charge has been disputed.
@@ -842,7 +842,7 @@ declare namespace Stripe {
              * Details about whether the payment was accepted, and why. See
              * understanding declines for details. [Expandable]
              */
-            outcome?: any;
+            outcome?: charges.IOutcome;
 
             /**
              * true if the charge succeeded, or was successfully authorized for later capture.
@@ -873,7 +873,7 @@ declare namespace Stripe {
             /**
              * ID of the review associated with this charge if one exists. [Expandable]
              */
-            review?: string | null;
+            review?: string | reviews.IReview | null;
 
             /**
              * Shipping information for the charge.
@@ -1097,6 +1097,48 @@ declare namespace Stripe {
             }
         }
 
+        interface IOutcome {
+            /**
+             * The value reversed_after_approval indicates the payment was blocked by Stripe after
+             * bank authorization, and may temporarily appear as “pending” on a cardholder’s statement.
+             */
+            network_status: "approved_by_network" | "declined_by_network" | "not_sent_to_network" | "reversed_after_approval";
+
+            /**
+             * An enumerated value providing a more detailed explanation of the outcome’s type. Charges
+             * blocked by Radar’s default block rule have the value highest_risk_level. Charges placed
+             * in review by Radar’s default review rule have the value elevated_risk_level. Charges
+             * authorized, blocked, or placed in review by custom rules have the value rule. See
+             * understanding declines for more details.
+             */
+            reason: string | null;
+
+            /**
+             * Stripe’s evaluation of the riskiness of the payment. Possible values for evaluated
+             * payments are normal, elevated, highest. For non-card payments, and card-based payments
+             * predating the public assignment of risk levels, this field will have the value not_assessed.
+             * In the event of an error in the evaluation, this field will have the value unknown.
+             */
+            risk_level?: string | null;
+
+            /**
+             * The ID of the Radar rule that matched the payment, if applicable. [Expandable]
+             */
+            rule?: string | string[] | null;
+
+            /**
+             * See [understanding declines]<https://stripe.com/docs/declines> and
+             * [Radar reviews]<https://stripe.com/docs/radar/review> for details.
+             */
+            type: "authorized" | "manual_review" | "issuer_declined" | "blocked" | "invalid";
+
+            /**
+             * A human-readable description of the outcome type and reason, designed for you (the
+             * recipient of the payment), not your customer.
+             */
+            seller_message: string;
+        }
+
         interface IChargeRefunds extends IList<refunds.IRefund>, resources.ChargeRefunds { }
     }
 
@@ -4979,6 +5021,59 @@ declare namespace Stripe {
         }
     }
 
+    namespace reviews {
+        interface IReview extends IResourceObject {
+            /**
+             * Unique identifier for the object.
+             */
+            "id": string;
+
+            /**
+             * String representing the object’s type. Objects of the same type share the same value.
+             */
+            "object": "review";
+            
+            /**
+             * The charge associated with this review. [Expandable]
+             */
+            "charge": string | charges.ICharge;
+
+            /**
+             * Time at which the object was created. Measured in seconds since the Unix epoch.
+             */
+            "created": number;
+
+            /**
+             * Has the value true if the object exists in live mode or the value false if the object exists in test mode.
+             */
+            "livemode": false;
+
+            /**
+             * If true, the review needs action.
+             */
+            "open": true;
+
+            /**
+             * The reason the review is currently open or closed.
+             */
+            "reason": "rule" | "manual" | "approved" | "refunded" | "refunded_as_fraud" | "disputed";
+        }
+    }
+
+    namespace applications {
+        interface IApplication extends IResourceObject {
+            /**
+             * String representing the object’s type. Objects of the same type share the same value.
+             */
+            "object": "application";
+
+            /**
+             * String representing the application’s name.
+             */
+            "name": string;
+        }
+    } 
+
     class StripeResource {
         constructor(stripe: Stripe, urlData: any);
     }

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 0407/1124] [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 0408/1124] 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 0409/1124] 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 0410/1124] [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 0411/1124] 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 834abc73d8be76f0b7dbcbb2f04d7cfc02887315 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Thu, 17 May 2018 08:57:07 +0200
Subject: [PATCH 0412/1124] Add typings for uuid-parse

---
 types/uuid-parse/index.d.ts          | 25 +++++++++++++++++++++++++
 types/uuid-parse/tsconfig.json       | 23 +++++++++++++++++++++++
 types/uuid-parse/tslint.json         |  1 +
 types/uuid-parse/uuid-parse-tests.ts |  9 +++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 types/uuid-parse/index.d.ts
 create mode 100644 types/uuid-parse/tsconfig.json
 create mode 100644 types/uuid-parse/tslint.json
 create mode 100644 types/uuid-parse/uuid-parse-tests.ts

diff --git a/types/uuid-parse/index.d.ts b/types/uuid-parse/index.d.ts
new file mode 100644
index 0000000000..b69d3dfa1f
--- /dev/null
+++ b/types/uuid-parse/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for uuid-parse 1.0
+// Project: https://github.com/zefferus/uuid-parse
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+import 'node';
+
+/**
+ * Parse a UUID into it's component bytes
+ * @param id UUID (-like) string
+ * @param buffer Array or buffer where UUID bytes are to be written. Default: A new Buffer is used
+ * @param offset Starting index in buffer at which to begin writing. Default: 0
+ */
+export function parse(
+    id: string,
+    buffer?: Buffer | any[],
+    offset?: number,
+): Buffer;
+
+/**
+ * Convert UUID byte array (ala parse()) into a string
+ * @param buffer Array or buffer where UUID bytes are read.
+ * @param offset Starting index in buffer at which to begin reading. Default: 0
+ */
+export function unparse(buffer: Buffer, offset?: number): string;
diff --git a/types/uuid-parse/tsconfig.json b/types/uuid-parse/tsconfig.json
new file mode 100644
index 0000000000..910fc5da90
--- /dev/null
+++ b/types/uuid-parse/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",
+        "uuid-parse-tests.ts"
+    ]
+}
diff --git a/types/uuid-parse/tslint.json b/types/uuid-parse/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/uuid-parse/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/uuid-parse/uuid-parse-tests.ts b/types/uuid-parse/uuid-parse-tests.ts
new file mode 100644
index 0000000000..b78e114b54
--- /dev/null
+++ b/types/uuid-parse/uuid-parse-tests.ts
@@ -0,0 +1,9 @@
+import * as uuidParse from 'uuid-parse';
+
+uuidParse.parse('797ff043-11eb-11e1-80d6-510998755d10');
+uuidParse.parse('797ff043-11eb-11e1-80d6-510998755d10', []);
+uuidParse.parse('797ff043-11eb-11e1-80d6-510998755d10', new Buffer(''));
+uuidParse.parse('797ff043-11eb-11e1-80d6-510998755d10', new Buffer(''), 123);
+
+uuidParse.unparse(new Buffer(''));
+uuidParse.unparse(new Buffer(''), 123);

From 8a498aace206e32578d0a32318060d2506575cb0 Mon Sep 17 00:00:00 2001
From: "skubarenko.andrey" <andrey.skubarenko@devexpress.com>
Date: Thu, 17 May 2018 10:53:21 +0300
Subject: [PATCH 0413/1124] Add a github id

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

diff --git a/types/devexpress-aspnetcore-bootstrap/index.d.ts b/types/devexpress-aspnetcore-bootstrap/index.d.ts
index 9422ccd2f7..51d1c2ebb4 100644
--- a/types/devexpress-aspnetcore-bootstrap/index.d.ts
+++ b/types/devexpress-aspnetcore-bootstrap/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for DevExpress ASP.NET 181.3
 // Project: http://devexpress.com/
 // Definitions by: DevExpress Inc. <https://github.com/devexpress>
+//                 Andrey Skubarenko <https://github.com/skubarenko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 

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 0414/1124] 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 0415/1124] 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 52ef0f1056eca09391b89699bb6bc9a442bab605 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Thu, 17 May 2018 15:58:55 +0700
Subject: [PATCH 0416/1124] Ignore shrinkwrap.yaml

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index c8e25cec8d..ac63b6f6b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ npm-debug.log
 
 # yarn
 yarn.lock
+
+# pnpm
+shrinkwrap.yaml

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 0417/1124] 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 0418/1124] "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 0419/1124] "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 0420/1124] "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 0421/1124] 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 0422/1124] 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 0423/1124] "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 0424/1124] 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 0425/1124] 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 27d4663769c6920ba46cc6d2a1088114325ca4cb Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Wed, 16 May 2018 15:17:55 -0400
Subject: [PATCH 0426/1124] Add typings for cesium

---
 types/cesium/index.d.ts    | 5114 ++++++++++++++++++++++++++++++++++++
 types/cesium/tsconfig.json |   23 +
 types/cesium/tslint.json   |    1 +
 3 files changed, 5138 insertions(+)
 create mode 100644 types/cesium/index.d.ts
 create mode 100644 types/cesium/tsconfig.json
 create mode 100644 types/cesium/tslint.json

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
new file mode 100644
index 0000000000..08bc2706d7
--- /dev/null
+++ b/types/cesium/index.d.ts
@@ -0,0 +1,5114 @@
+// Type definitions for cesium 1.44
+// Project: http://cesiumjs.org
+// Definitions by: Aigars Zeiza <https://github.com/Zuzon>
+//                 Harry Nicholls <https://github.com/hnipps>
+//                 Jared Szechy <https://github.com/szechyjs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare namespace Cesium {
+    type RenderState = any;
+
+    interface Proxy {
+        getURL(resource: string): string;
+    }
+
+    class ArcGisImageServerTerrainProvider extends TerrainProvider {
+        constructor(options: { url: string; token?: string; proxy?: any; tilingScheme?: TilingScheme; ellipsoid?: Ellipsoid; credit?: Credit | string });
+    }
+
+    class AssociativeArray {
+        length: number;
+        values: any[];
+        contains(key: string | number): boolean;
+        set(key: string | number, value: any): void;
+        get(key: string | number): any;
+        remove(key: string | number): boolean;
+        removeAll(): void;
+    }
+
+    class AxisAlignedBoundingBox {
+        minimum: Cartesian3;
+        maximum: Cartesian3;
+        center: Cartesian3;
+        constructor(minimum?: Cartesian3, maximum?: Cartesian3, center?: Cartesian3);
+        clone(result?: AxisAlignedBoundingBox): AxisAlignedBoundingBox;
+        intersect(plane: Cartesian4): Intersect;
+        equals(right?: AxisAlignedBoundingBox): boolean;
+        static fromPoints(positions: Cartesian3[], result?: AxisAlignedBoundingBox): AxisAlignedBoundingBox;
+        static clone(box: AxisAlignedBoundingBox, result?: AxisAlignedBoundingBox): AxisAlignedBoundingBox;
+        static equals(left?: AxisAlignedBoundingBox, right?: AxisAlignedBoundingBox): boolean;
+        static intersect(box: AxisAlignedBoundingBox, plane: Cartesian4): Intersect;
+    }
+
+    class BoundingRectangle {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        constructor(x?: number, y?: number, width?: number, height?: number);
+        clone(result?: BoundingRectangle): BoundingRectangle;
+        intersect(right: BoundingRectangle): Intersect;
+        equals(right?: BoundingRectangle): boolean;
+        static fromPoints(positions: Cartesian2[], result?: BoundingRectangle): BoundingRectangle;
+        static fromRectangle(rectangle: Rectangle, projection?: any, result?: BoundingRectangle): BoundingRectangle;
+        static clone(rectangle: BoundingRectangle, result?: BoundingRectangle): BoundingRectangle;
+        static union(left: BoundingRectangle, right: BoundingRectangle, result?: BoundingRectangle): BoundingRectangle;
+        static expand(rectangle: BoundingRectangle, point: Cartesian2, result?: BoundingRectangle): BoundingRectangle;
+        static intersect(left: BoundingRectangle, right: BoundingRectangle): Intersect;
+        static equals(left?: BoundingRectangle, right?: BoundingRectangle): boolean;
+    }
+
+    class BoundingSphere extends Packable {
+        center: Cartesian3;
+        radius: number;
+        constructor(center?: Cartesian3, radius?: number);
+        intersect(plane: Cartesian4): Intersect;
+        equals(right?: BoundingSphere): boolean;
+        clone(result?: BoundingSphere): BoundingSphere;
+        static fromPoints(positions: Cartesian3[], result?: BoundingSphere): BoundingSphere;
+        static fromRectangle2D(rectangle: Rectangle, projection?: any, result?: BoundingSphere): BoundingSphere;
+        static fromRectangleWithHeights2D(rectangle: Rectangle, projection?: any, minimumHeight?: number, maximumHeight?: number, result?: BoundingSphere): BoundingSphere;
+        static fromRectangle3D(rectangle: Rectangle, ellipsoid?: Ellipsoid, surfaceHeight?: number, result?: BoundingSphere): BoundingSphere;
+        static fromVertices(positions: Cartesian3[], center?: Cartesian3, stride?: number, result?: BoundingSphere): BoundingSphere;
+        static fromCornerPoints(corner?: number, oppositeCorner?: number, result?: BoundingSphere): BoundingSphere;
+        static fromEllipsoid(ellipsoid: Ellipsoid, result?: BoundingSphere): BoundingSphere;
+        static fromBoundingSpheres(boundingSpheres: BoundingSphere[], result?: BoundingSphere): BoundingSphere;
+        static clone(sphere: BoundingSphere, result?: BoundingSphere): BoundingSphere;
+        static pack(value: BoundingSphere, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: BoundingSphere): BoundingSphere;
+        static union(left: BoundingSphere, right: BoundingSphere, result?: BoundingSphere): BoundingSphere;
+        static expand(sphere: BoundingSphere, point: Cartesian3, result?: BoundingSphere): BoundingSphere;
+        static intersect(sphere: BoundingSphere, plane: Cartesian4): Intersect;
+        static transform(sphere: BoundingSphere, transform: Matrix4, result?: BoundingSphere): BoundingSphere;
+        static distanceSquaredTo(sphere: BoundingSphere, cartesian: Cartesian3): number;
+        static transformWithoutScale(sphere: BoundingSphere, transform: Matrix4, result?: BoundingSphere): BoundingSphere;
+        static computePlaneDistances(sphere: BoundingSphere, position: Cartesian3, direction: Cartesian3, result?: Cartesian2): Interval;
+        static projectTo2D(sphere: BoundingSphere, projection?: any, result?: BoundingSphere): BoundingSphere;
+        static equals(left?: BoundingSphere, right?: BoundingSphere): boolean;
+    }
+
+    class BoxGeometry extends Packable {
+        constructor(options: { minimumCorner: Cartesian3; maximumCorner: Cartesian3; vertexFormat?: VertexFormat });
+        static fromDimensions(): void;
+        static unpack(array: number[], startingIndex?: number, result?: BoxGeometry): BoxGeometry;
+        static createGeometry(boxGeometry: BoxGeometry): Geometry;
+    }
+
+    class BoxOutlineGeometry extends Packable {
+        constructor();
+        static fromDimensions(): void;
+        static unpack(array: number[], startingIndex?: number, result?: BoxOutlineGeometry): BoxOutlineGeometry;
+        static createGeometry(boxGeometry: BoxOutlineGeometry): Geometry;
+    }
+
+    class Cartesian2 extends Packable {
+        x: number;
+        y: number;
+        static ZERO: Cartesian2;
+        static UNIT_X: Cartesian2;
+        static UNIT_Y: Cartesian2;
+        constructor(x?: number, y?: number);
+        clone(result?: Cartesian2): Cartesian2;
+        equals(right?: Cartesian2): boolean;
+        equalsEpsilon(right: Cartesian2, relativeEpsilon: number, absoluteEpsilon?: number): boolean;
+        toString(): string;
+        static fromElements(x: number, y: number, result?: Cartesian2): Cartesian2;
+        static clone(cartesian: Cartesian2, result?: Cartesian2): Cartesian2;
+        static fromCartesian3(cartesian: Cartesian3, result?: Cartesian2): Cartesian2;
+        static fromCartesian4(cartesian: Cartesian4, result?: Cartesian2): Cartesian2;
+        static pack(value: Cartesian2, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Cartesian2): Cartesian2;
+        static fromArray(array: number[], startingIndex?: number, result?: Cartesian2): Cartesian2;
+        static maximumComponent(cartesian: Cartesian2): number;
+        static minimumComponent(cartesian: Cartesian2): number;
+        static minimumByComponent(first: Cartesian2, second: Cartesian2, result: Cartesian2): Cartesian2;
+        static maximumByComponent(first: Cartesian2, second: Cartesian2, result: Cartesian2): Cartesian2;
+        static magnitudeSquared(cartesian: Cartesian2): number;
+        static magnitude(cartesian: Cartesian2): number;
+        static distance(left: Cartesian2, right: Cartesian2): number;
+        static distanceSquared(left: Cartesian2, right: Cartesian2): number;
+        static normalize(cartesian: Cartesian2, result: Cartesian2): Cartesian2;
+        static dot(left: Cartesian2, right: Cartesian2): number;
+        static multiplyComponents(left: Cartesian2, right: Cartesian2, result: Cartesian2): Cartesian2;
+        static add(left: Cartesian2, right: Cartesian2, result: Cartesian2): Cartesian2;
+        static subtract(left: Cartesian2, right: Cartesian2, result: Cartesian2): Cartesian2;
+        static multiplyByScalar(cartesian: Cartesian2, scalar: number, result: Cartesian2): Cartesian2;
+        static divideByScalar(cartesian: Cartesian2, scalar: number, result: Cartesian2): Cartesian2;
+        static negate(cartesian: Cartesian2, result: Cartesian2): Cartesian2;
+        static abs(cartesian: Cartesian2, result: Cartesian2): Cartesian2;
+        static lerp(start: Cartesian2, end: Cartesian2, t: number, result: Cartesian2): Cartesian2;
+        static angleBetween(left: Cartesian2, right: Cartesian2): number;
+        static mostOrthogonalAxis(cartesian: Cartesian2, result: Cartesian2): Cartesian2;
+        static equals(left?: Cartesian2, right?: Cartesian2): boolean;
+        static equalsEpsilon(left: Cartesian2, right: Cartesian2, relativeEpsilon: number, absoluteEpsilon?: number): boolean;
+    }
+
+    class Cartesian3 extends Packable implements PositionProperty {
+        x: number;
+        y: number;
+        z: number;
+        static ZERO: Cartesian3;
+        static UNIT_X: Cartesian3;
+        static UNIT_Y: Cartesian3;
+        static UNIT_Z: Cartesian3;
+        constructor(x?: number, y?: number, z?: number);
+        clone(result?: Cartesian3): Cartesian3;
+        equals(right?: Cartesian3): boolean;
+        equalsEpsilon(right: Cartesian3, relativeEpsilon: number, absoluteEpsilon?: number): boolean;
+        toString(): string;
+        static fromSpherical(spherical: Spherical, result?: Cartesian3): Cartesian3;
+        static fromElements(x: number, y: number, z: number, result?: Cartesian3): Cartesian3;
+        static clone(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        static fromCartesian4(cartesian: Cartesian4, result?: Cartesian3): Cartesian3;
+        static pack(value: Cartesian3, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Cartesian3): Cartesian3;
+        static fromArray(array: number[], startingIndex?: number, result?: Cartesian3): Cartesian3;
+        static maximumComponent(cartesian: Cartesian3): number;
+        static minimumComponent(cartesian: Cartesian3): number;
+        static minimumByComponent(first: Cartesian3, second: Cartesian3, result: Cartesian3): Cartesian3;
+        static maximumByComponent(first: Cartesian3, second: Cartesian3, result: Cartesian3): Cartesian3;
+        static magnitudeSquared(cartesian: Cartesian3): number;
+        static magnitude(cartesian: Cartesian3): number;
+        static distance(left: Cartesian3, right: Cartesian3): number;
+        static distanceSquared(left: Cartesian3, right: Cartesian3): number;
+        static normalize(cartesian: Cartesian3, result: Cartesian3): Cartesian3;
+        static dot(left: Cartesian3, right: Cartesian3): number;
+        static multiplyComponents(left: Cartesian3, right: Cartesian3, result: Cartesian3): Cartesian3;
+        static add(left: Cartesian3, right: Cartesian3, result: Cartesian3): Cartesian3;
+        static subtract(left: Cartesian3, right: Cartesian3, result: Cartesian3): Cartesian3;
+        static multiplyByScalar(cartesian: Cartesian3, scalar: number, result: Cartesian3): Cartesian3;
+        static divideByScalar(cartesian: Cartesian3, scalar: number, result: Cartesian3): Cartesian3;
+        static negate(cartesian: Cartesian3, result: Cartesian3): Cartesian3;
+        static abs(cartesian: Cartesian3, result: Cartesian3): Cartesian3;
+        static lerp(start: Cartesian3, end: Cartesian3, t: number, result: Cartesian3): Cartesian3;
+        static angleBetween(left: Cartesian3, right: Cartesian3): number;
+        static mostOrthogonalAxis(cartesian: Cartesian3, result: Cartesian3): Cartesian3;
+        static equals(left?: Cartesian3, right?: Cartesian3): boolean;
+        static equalsEpsilon(left: Cartesian3, right: Cartesian3, relativeEpsilon: number, absoluteEpsilon?: number): boolean;
+        static cross(left: Cartesian3, right: Cartesian3, result: Cartesian3): Cartesian3;
+        static fromDegrees(longitude: number, latitude: number, height?: number, ellipsoid?: Ellipsoid, result?: Cartesian3): Cartesian3;
+        static fromRadians(longitude: number, latitude: number, height?: number, ellipsoid?: Ellipsoid, result?: Cartesian3): Cartesian3;
+        static fromDegreesArray(coordinates: number[], ellipsoid?: Ellipsoid, result?: Cartesian3[]): Cartesian3[];
+        static fromRadiansArray(coordinates: number[], ellipsoid?: Ellipsoid, result?: Cartesian3[]): Cartesian3[];
+        static fromDegreesArrayHeights(coordinates: number[], ellipsoid?: Ellipsoid, result?: Cartesian3[]): Cartesian3[];
+        static fromRadiansArrayHeights(coordinates: number[], ellipsoid?: Ellipsoid, result?: Cartesian3[]): Cartesian3[];
+        isConstant: boolean;
+        definitionChanged: Event;
+        referenceFrame: ReferenceFrame;
+        getValue(time: JulianDate, result?: Cartesian3): Cartesian3;
+        getValueInReferenceFrame(time: JulianDate, referenceFrame: ReferenceFrame, result?: Cartesian3): Cartesian3;
+    }
+
+    class Cartesian4 extends Packable {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+        static ZERO: Cartesian4;
+        static UNIT_X: Cartesian4;
+        static UNIT_Y: Cartesian4;
+        static UNIT_Z: Cartesian4;
+        static UNIT_W: Cartesian4;
+        constructor(x?: number, y?: number, z?: number, w?: number);
+        clone(result?: Cartesian4): Cartesian4;
+        equals(right?: Cartesian4): boolean;
+        equalsEpsilon(right: Cartesian4, relativeEpsilon: number, absoluteEpsilon?: number): boolean;
+        toString(): string;
+        static fromElements(x: number, y: number, z: number, w: number, result?: Cartesian4): Cartesian4;
+        static fromColor(color: Color, result?: Cartesian4): Cartesian4;
+        static clone(cartesian: Cartesian4, result?: Cartesian4): Cartesian4;
+        static pack(value: Cartesian4, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Cartesian4): Cartesian4;
+        static fromArray(array: number[], startingIndex?: number, result?: Cartesian4): Cartesian4;
+        static maximumComponent(cartesian: Cartesian4): number;
+        static minimumComponent(cartesian: Cartesian4): number;
+        static minimumByComponent(first: Cartesian4, second: Cartesian4, result: Cartesian4): Cartesian4;
+        static maximumByComponent(first: Cartesian4, second: Cartesian4, result: Cartesian4): Cartesian4;
+        static magnitudeSquared(cartesian: Cartesian4): number;
+        static magnitude(cartesian: Cartesian4): number;
+        static distance(left: Cartesian4, right: Cartesian4): number;
+        static distanceSquared(left: Cartesian4, right: Cartesian4): number;
+        static normalize(cartesian: Cartesian4, result: Cartesian4): Cartesian4;
+        static dot(left: Cartesian4, right: Cartesian4): number;
+        static multiplyComponents(left: Cartesian4, right: Cartesian4, result: Cartesian4): Cartesian4;
+        static add(left: Cartesian4, right: Cartesian4, result: Cartesian4): Cartesian4;
+        static subtract(left: Cartesian4, right: Cartesian4, result: Cartesian4): Cartesian4;
+        static multiplyByScalar(cartesian: Cartesian4, scalar: number, result: Cartesian4): Cartesian4;
+        static divideByScalar(cartesian: Cartesian4, scalar: number, result: Cartesian4): Cartesian4;
+        static negate(cartesian: Cartesian4, result: Cartesian4): Cartesian4;
+        static abs(cartesian: Cartesian4, result: Cartesian4): Cartesian4;
+        static lerp(start: Cartesian4, end: Cartesian4, t: number, result: Cartesian4): Cartesian4;
+        static mostOrthogonalAxis(cartesian: Cartesian4, result: Cartesian4): Cartesian4;
+        static equals(left?: Cartesian4, right?: Cartesian4): boolean;
+        static equalsEpsilon(left: Cartesian4, right: Cartesian4, relativeEpsilon: number, absoluteEpsilon?: number): boolean;
+    }
+
+    class Cartographic {
+        longitude: number;
+        latitude: number;
+        height: number;
+        static ZERO: Cartographic;
+        constructor(longitude?: number, latitude?: number, height?: number);
+        clone(result?: Cartographic): Cartographic;
+        equals(right?: Cartographic): boolean;
+        equalsEpsilon(right: Cartographic, epsilon: number): boolean;
+        toString(): string;
+        static fromRadians(longitude: number, latitude: number, height?: number, result?: Cartographic): Cartographic;
+        static fromDegrees(longitude: number, latitude: number, height?: number, result?: Cartographic): Cartographic;
+        static clone(cartographic: Cartographic, result?: Cartographic): Cartographic;
+        static equals(left?: Cartographic, right?: Cartographic): boolean;
+        static equalsEpsilon(left: Cartographic, right: Cartographic, epsilon: number): boolean;
+    }
+
+    class CatmullRomSpline {
+        times: number[];
+        points: Cartesian3[];
+        firstTangent: Cartesian3;
+        lastTangent: Cartesian3;
+        constructor(options: { times: number[]; points: Cartesian3[]; firstTangent?: Cartesian3; lastTangent?: Cartesian3 });
+        findTimeInterval(time: number): number;
+        evaluate(time: number, result?: Cartesian3): Cartesian3;
+    }
+
+    class CesiumTerrainProvider extends TerrainProvider {
+        requestVertexNormals: boolean;
+        requestWaterMask: boolean;
+        constructor(options: { url: string; proxy?: Proxy; requestVertexNormals?: boolean; requestWaterMask?: boolean; ellipsoid?: Ellipsoid; credit?: Credit | string });
+    }
+
+    class CircleGeometry extends Packable {
+        constructor(options: {
+            center: Cartesian3;
+            radius: number;
+            ellipsoid?: Ellipsoid;
+            height?: number;
+            granularity?: number;
+            vertexFormat?: VertexFormat;
+            extrudedHeight?: number;
+            stRotation?: number
+        });
+        static unpack(array: number[], startingIndex?: number, result?: CircleGeometry): number[];
+        static createGeometry(circleGeometry: CircleGeometry): Geometry;
+    }
+
+    class CircleOutlineGeometry extends Packable {
+        constructor(options: { center: Cartesian3; radius: number; ellipsoid?: Ellipsoid; height?: number; granularity?: number; extrudedHeight?: number; numberOfVerticalLines?: number });
+        static unpack(array: number[], startingIndex?: number, result?: CircleOutlineGeometry): number[];
+        static createGeometry(circleGeometry: CircleOutlineGeometry): Geometry;
+    }
+
+    class Clock {
+        startTime: JulianDate;
+        stopTime: JulianDate;
+        currentTime: JulianDate;
+        multiplier: number;
+        clockStep: ClockStep;
+        clockRange: ClockRange;
+        canAnimate: boolean;
+        shouldAnimate: boolean;
+        onTick: Event;
+        constructor(options: {
+            startTime?: JulianDate;
+            stopTime?: JulianDate;
+            currentTime?: JulianDate;
+            multiplier?: number;
+            clockStep?: ClockStep;
+            clockRange?: ClockRange;
+            canAnimate?: boolean;
+            shouldAnimate?:
+            boolean
+        });
+        tick(): JulianDate;
+    }
+
+    class Color extends Packable {
+        red: number;
+        green: number;
+        blue: number;
+        alpha: number;
+        static ALICEBLUE: Color;
+        static ANTIQUEWHITE: Color;
+        static AQUA: Color;
+        static AQUAMARINE: Color;
+        static AZURE: Color;
+        static BEIGE: Color;
+        static BISQUE: Color;
+        static BLACK: Color;
+        static BLANCHEDALMOND: Color;
+        static BLUE: Color;
+        static BLUEVIOLET: Color;
+        static BROWN: Color;
+        static BURLYWOOD: Color;
+        static CADETBLUE: Color;
+        static CHARTREUSE: Color;
+        static CHOCOLATE: Color;
+        static CORAL: Color;
+        static CORNFLOWERBLUE: Color;
+        static CORNSILK: Color;
+        static CRIMSON: Color;
+        static CYAN: Color;
+        static DARKBLUE: Color;
+        static DARKCYAN: Color;
+        static DARKGOLDENROD: Color;
+        static DARKGRAY: Color;
+        static DARKGREEN: Color;
+        static DARKGREY: Color;
+        static DARKKHAKI: Color;
+        static DARKMAGENTA: Color;
+        static DARKOLIVEGREEN: Color;
+        static DARKORANGE: Color;
+        static DARKORCHID: Color;
+        static DARKRED: Color;
+        static DARKSALMON: Color;
+        static DARKSEAGREEN: Color;
+        static DARKSLATEBLUE: Color;
+        static DARKSLATEGRAY: Color;
+        static DARKSLATEGREY: Color;
+        static DARKTURQUOISE: Color;
+        static DARKVIOLET: Color;
+        static DEEPPINK: Color;
+        static DEEPSKYBLUE: Color;
+        static DIMGRAY: Color;
+        static DIMGREY: Color;
+        static DODGERBLUE: Color;
+        static FIREBRICK: Color;
+        static FLORALWHITE: Color;
+        static FORESTGREEN: Color;
+        static FUSCHIA: Color;
+        static GAINSBORO: Color;
+        static GHOSTWHITE: Color;
+        static GOLD: Color;
+        static GOLDENROD: Color;
+        static GRAY: Color;
+        static GREEN: Color;
+        static GREENYELLOW: Color;
+        static GREY: Color;
+        static HONEYDEW: Color;
+        static HOTPINK: Color;
+        static INDIANRED: Color;
+        static INDIGO: Color;
+        static IVORY: Color;
+        static KHAKI: Color;
+        static LAVENDER: Color;
+        static LAVENDAR_BLUSH: Color;
+        static LAWNGREEN: Color;
+        static LEMONCHIFFON: Color;
+        static LIGHTBLUE: Color;
+        static LIGHTCORAL: Color;
+        static LIGHTCYAN: Color;
+        static LIGHTGOLDENRODYELLOW: Color;
+        static LIGHTGRAY: Color;
+        static LIGHTGREEN: Color;
+        static LIGHTGREY: Color;
+        static LIGHTPINK: Color;
+        static LIGHTSEAGREEN: Color;
+        static LIGHTSKYBLUE: Color;
+        static LIGHTSLATEGRAY: Color;
+        static LIGHTSLATEGREY: Color;
+        static LIGHTSTEELBLUE: Color;
+        static LIGHTYELLOW: Color;
+        static LIME: Color;
+        static LIMEGREEN: Color;
+        static LINEN: Color;
+        static MAGENTA: Color;
+        static MAROON: Color;
+        static MEDIUMAQUAMARINE: Color;
+        static MEDIUMBLUE: Color;
+        static MEDIUMORCHID: Color;
+        static MEDIUMPURPLE: Color;
+        static MEDIUMSEAGREEN: Color;
+        static MEDIUMSLATEBLUE: Color;
+        static MEDIUMSPRINGGREEN: Color;
+        static MEDIUMTURQUOISE: Color;
+        static MEDIUMVIOLETRED: Color;
+        static MIDNIGHTBLUE: Color;
+        static MINTCREAM: Color;
+        static MISTYROSE: Color;
+        static MOCCASIN: Color;
+        static NAVAJOWHITE: Color;
+        static NAVY: Color;
+        static OLDLACE: Color;
+        static OLIVE: Color;
+        static OLIVEDRAB: Color;
+        static ORANGE: Color;
+        static ORANGERED: Color;
+        static ORCHID: Color;
+        static PALEGOLDENROD: Color;
+        static PALEGREEN: Color;
+        static PALETURQUOISE: Color;
+        static PALEVIOLETRED: Color;
+        static PAPAYAWHIP: Color;
+        static PEACHPUFF: Color;
+        static PERU: Color;
+        static PINK: Color;
+        static PLUM: Color;
+        static POWDERBLUE: Color;
+        static PURPLE: Color;
+        static RED: Color;
+        static ROSYBROWN: Color;
+        static ROYALBLUE: Color;
+        static SADDLEBROWN: Color;
+        static SALMON: Color;
+        static SANDYBROWN: Color;
+        static SEAGREEN: Color;
+        static SEASHELL: Color;
+        static SIENNA: Color;
+        static SILVER: Color;
+        static SKYBLUE: Color;
+        static SLATEBLUE: Color;
+        static SLATEGRAY: Color;
+        static SLATEGREY: Color;
+        static SNOW: Color;
+        static SPRINGGREEN: Color;
+        static STEELBLUE: Color;
+        static TAN: Color;
+        static TEAL: Color;
+        static THISTLE: Color;
+        static TOMATO: Color;
+        static TURQUOISE: Color;
+        static VIOLET: Color;
+        static WHEAT: Color;
+        static WHITE: Color;
+        static WHITESMOKE: Color;
+        static YELLOW: Color;
+        static YELLOWGREEN: Color;
+        static TRANSPARENT: Color;
+        static add(left: Color, right: Color, result?: Color): Color;
+        static byteToFloat(number: number): number;
+        static clone(color: Color, result?: Color): Color;
+        static divide(left: Color, right: Color, result?: Color): Color;
+        static divideByScalar(color: Color, scalar: number, result?: Color): Color;
+        static equals(left: Color, right: Color): boolean;
+        static floatToByte(number: number): number;
+        static fromAlpha(color: Color, alpha: number, result?: Color): Color;
+        static fromBytes(red?: number, green?: number, blue?: number, alpha?: number, result?: Color): Color;
+        static fromCartesian4(cartesian: Cartesian4, result?: Color): Color;
+        static fromCssColorString(color: string): Color;
+        static fromHsl(hue?: number, saturation?: number, lightness?: number, alpha?: number): Color;
+        static fromRandom(options?: {
+                red?: number;
+                minimumRed?: number;
+                maximumRed?: number;
+                green?: number;
+                minimumGreen?: number;
+                maximumGreen?: number;
+                blue?: number;
+                minimumBlue?: number;
+                maximumBlue?: number;
+                alpha?: number;
+                minimumAlpha?: number;
+                maximumAlpha?: number
+            }, result?: Color): Color;
+        static fromRgba(rgba: number): Color;
+        static mod(left: Color, right: Color, result?: Color): Color;
+        static multiply(left: Color, right: Color, result?: Color): Color;
+        static multiplyByScalar(color: Color, scalar: number, result?: Color): Color;
+        static pack(value: Color, array: number[], startingIndex?: number): number[];
+        static subtract(left: Color, right: Color, result?: Color): Color;
+        static unpack(array: number[], startingIndex?: number, result?: Color): Color;
+        constructor(red?: number, green?: number, blue?: number, alpha?: number);
+        brighten(magnitude: number, result: Color): Color;
+        clone(result?: Color): Color;
+        darken(magnitude: number, result: Color): Color;
+        equals(other: Color): boolean;
+        equalsEpsilon(other: Color, epsilon?: number): boolean;
+        toBytes(result?: number[]): number[];
+        toCssColorString(): string;
+        toRgba(): number;
+        toString(): string;
+        withAlpha(alpha: number, result?: Color): Color;
+    }
+
+    class ColorGeometryInstanceAttribute {
+        value: Uint8Array;
+        componentDatatype: ComponentDatatype;
+        componentsPerAttribute: number;
+        normalize: boolean;
+        constructor(red?: number, green?: number, blue?: number, alpha?: number);
+        static fromColor(color: Color): ColorGeometryInstanceAttribute;
+        static toValue(color: Color, result?: Uint8Array): Uint8Array;
+    }
+
+    class CorridorGeometry extends Packable {
+        constructor(options: {
+            positions: Cartesian3[];
+            width: number;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            height?: number;
+            extrudedHeight?: number;
+            vertexFormat?: VertexFormat;
+            cornerType?: CornerType
+        });
+        static unpack(array: number[], startingIndex?: number, result?: CorridorGeometry): CorridorGeometry;
+        static createGeometry(corridorGeometry: CorridorGeometry): Geometry;
+    }
+
+    class CorridorOutlineGeometry extends Packable {
+        constructor(options: {
+            positions: Cartesian3[];
+            width: number;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            height?: number;
+            extrudedHeight?: number;
+            cornerType?: CornerType
+        });
+        static unpack(array: number[], startingIndex?: number, result?: CorridorOutlineGeometry): CorridorOutlineGeometry;
+        static createGeometry(corridorOutlineGeometry: CorridorOutlineGeometry): Geometry;
+    }
+
+    class Credit {
+        readonly element: HTMLElement;
+        readonly html: string;
+        readonly imageUrl: string;
+        readonly link: string;
+        readonly showOnScreen: boolean;
+        readonly text: string;
+        constructor(html: string, showOnScreen?: boolean);
+        static equals(left: Credit, right: Credit): boolean;
+        equals(credits: Credit): boolean;
+        hasImage(): boolean;
+        hasLink(): boolean;
+    }
+
+    class CylinderGeometry extends Packable {
+        constructor(options: { length: number; topRadius: number; bottomRadius: number; slices?: number; vertexFormat?: VertexFormat });
+        static unpack(array: number[], startingIndex?: number, result?: CylinderGeometry): CylinderGeometry;
+        static createGeometry(cylinderGeometry: CylinderGeometry): Geometry;
+    }
+
+    class CylinderOutlineGeometry extends Packable {
+        constructor(options: { length: number; topRadius: number; bottomRadius: number; slices?: number; numberOfVerticalLines?: number });
+        static unpack(array: number[], startingIndex?: number, result?: CylinderOutlineGeometry): CylinderOutlineGeometry;
+        static createGeometry(cylinderGeometry: CylinderOutlineGeometry): Geometry;
+    }
+
+    class DefaultProxy {
+        constructor(proxy: string);
+        getURL(resource: string): string;
+    }
+
+    class DeveloperError {
+        name: string;
+        message: string;
+        stack: string;
+        constructor(message?: string);
+    }
+
+    class EllipseGeometry extends Packable {
+        constructor(options: {
+            center: Cartesian3;
+            semiMajorAxis: number;
+            semiMinorAxis: number;
+            ellipsoid?: Ellipsoid;
+            height?: number;
+            extrudedHeight?: number;
+            rotation?: number;
+            stRotation?: number;
+            granularity?: number;
+            vertexFormat?: VertexFormat
+        });
+        static unpack(array: number[], startingIndex?: number, result?: EllipseGeometry): EllipseGeometry;
+        static createGeometry(ellipseGeometry: EllipseGeometry): Geometry;
+    }
+
+    class EllipseOutlineGeometry extends Packable {
+        constructor(options: {
+            center: Cartesian3;
+            semiMajorAxis: number;
+            semiMinorAxis: number;
+            ellipsoid?: Ellipsoid;
+            height?: number;
+            extrudedHeight?: number;
+            rotation?: number;
+            granularity?: number;
+            numberOfVerticalLines?: number
+        });
+        static unpack(array: number[], startingIndex?: number, result?: EllipseOutlineGeometry): EllipseOutlineGeometry;
+        static createGeometry(ellipseGeometry: EllipseOutlineGeometry): Geometry;
+    }
+
+    class Ellipsoid extends Packable {
+        radii: Cartesian3;
+        radiiSquared: Cartesian3;
+        radiiToTheFourth: Cartesian3;
+        oneOverRadii: Cartesian3;
+        oneOverRadiiSquared: Cartesian3;
+        minimumRadius: number;
+        maximumRadius: number;
+        static WGS84: Ellipsoid;
+        static UNIT_SPHERE: Ellipsoid;
+        static MOON: Ellipsoid;
+        constructor(x?: number, y?: number, z?: number);
+        clone(result?: Ellipsoid): Ellipsoid;
+        geocentricSurfaceNormal(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        geodeticSurfaceNormalCartographic(cartographic: Cartographic, result?: Cartesian3): Cartesian3;
+        geodeticSurfaceNormal(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        cartographicToCartesian(cartographic: Cartographic, result?: Cartesian3): Cartesian3;
+        cartographicArrayToCartesianArray(cartographics: Cartographic[], result?: Cartesian3[]): Cartesian3[];
+        cartesianToCartographic(cartesian: Cartesian3, result?: Cartographic): Cartographic;
+        cartesianArrayToCartographicArray(cartesians: Cartesian3[], result?: Cartographic[]): Cartographic[];
+        scaleToGeodeticSurface(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        scaleToGeocentricSurface(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        transformPositionToScaledSpace(position: Cartesian3, result?: Cartesian3): Cartesian3;
+        transformPositionFromScaledSpace(position: Cartesian3, result?: Cartesian3): Cartesian3;
+        equals(right?: Ellipsoid): boolean;
+        toString(): string;
+        static clone(ellipsoid: Ellipsoid, result?: Ellipsoid): Ellipsoid;
+        static fromCartesian3(radii?: Cartesian3): Ellipsoid;
+        static unpack(array: number[], startingIndex?: number, result?: Ellipsoid): Ellipsoid;
+    }
+
+    class EllipsoidGeodesic {
+        surfaceDistance: number;
+        start: Cartographic;
+        end: Cartographic;
+        startHeading: number;
+        endHeading: number;
+        constructor(start?: Cartographic, end?: Cartographic, ellipsoid?: Ellipsoid);
+        setEndPoints(start: Cartographic, end: Cartographic): void;
+        interpolateUsingFraction(fraction: number): Cartographic;
+        interpolateUsingSurfaceDistance(distance: number): Cartographic;
+    }
+
+    class EllipsoidGeometry extends Packable {
+        constructor(options?: { radii?: Cartesian3; stackPartitions?: number; slicePartitions?: number; vertexFormat?: VertexFormat });
+        static unpack(array: number[], startingIndex?: number, result?: EllipsoidGeometry): EllipsoidGeometry;
+        static createGeometry(ellipsoidGeometry: EllipsoidGeometry): Geometry;
+    }
+
+    class EllipsoidOutlineGeometry extends Packable {
+        constructor(options?: { radii?: Cartesian3; stackPartitions?: number; slicePartitions?: number; subdivisions?: number });
+        static unpack(array: number[], startingIndex?: number, result?: EllipsoidOutlineGeometry): EllipsoidOutlineGeometry;
+        static createGeometry(ellipsoidGeometry: EllipsoidOutlineGeometry): Geometry;
+    }
+
+    class EllipsoidTangentPlane {
+        ellipsoid: Ellipsoid;
+        origin: Cartesian3;
+        constructor(ellipsoid: Ellipsoid, origin: Cartesian3);
+        projectPointOntoPlane(cartesian: Cartesian3, result?: Cartesian2): Cartesian2;
+        projectPointsOntoPlane(cartesians: Cartesian3[], result?: Cartesian2[]): Cartesian2[];
+        projectPointsOntoEllipsoid(cartesians: Cartesian2[], result?: Cartesian3[]): Cartesian3[];
+        static fromPoints(ellipsoid: Ellipsoid, cartesians: Cartesian3): EllipsoidTangentPlane;
+    }
+
+    class EllipsoidTerrainProvider extends TerrainProvider {
+        constructor(options?: { tilingScheme?: TilingScheme; ellipsoid?: Ellipsoid });
+    }
+
+    class Event {
+        numberOfListeners: number;
+        addEventListener(listener: () => void, scope?: any): Event.RemoveCallback;
+        removeEventListener(listener: () => void, scope?: any): boolean;
+        raiseEvent(...args: any[]): void;
+    }
+
+    namespace Event {
+        type RemoveCallback = () => void;
+    }
+
+    class EventHelper {
+        add(event: Event, listener: () => void, scope?: any): EventHelper.RemoveCallback;
+        removeAll(): void;
+    }
+
+    namespace EventHelper {
+        type RemoveCallback = () => void;
+    }
+
+    class GeographicProjection {
+        ellipsoid: Ellipsoid;
+        constructor(ellipsoid?: Ellipsoid);
+        project(cartographic: Cartographic, result?: Cartesian3): Cartesian3;
+        unproject(cartesian: Cartesian3, result?: Cartographic): Cartographic;
+    }
+
+    class GeographicTilingScheme {
+        ellipsoid: Ellipsoid;
+        rectangle: Rectangle;
+        projection: MapProjection;
+        constructor(options?: { ellipsoid?: Ellipsoid; rectangle?: Rectangle; numberOfLevelZeroTilesX?: number; numberOfLevelZeroTilesY?: number });
+        getNumberOfXTilesAtLevel(level: number): number;
+        getNumberOfYTilesAtLevel(level: number): number;
+        rectangleToNativeRectangle(rectangle: Rectangle, result?: Rectangle): Rectangle;
+        tileXYToNativeRectangle(x: number, y: number, level: number, result?: any): Rectangle;
+        tileXYToRectangle(x: number, y: number, level: number, result?: any): Rectangle;
+        positionToTileXY(position: Cartographic, level: number, result?: Cartesian2): Cartesian2;
+    }
+
+    class Geometry {
+        attributes: GeometryAttributes;
+        indices: any[];
+        primitiveType: PrimitiveType;
+        boundingSphere: BoundingSphere;
+        constructor(options: { attributes: GeometryAttributes; primitiveType?: PrimitiveType; indices?: Uint16Array | Uint32Array; boundingSphere?: BoundingSphere });
+        static computeNumberOfVertices(geometry: Cartesian3): number;
+    }
+
+    class GeometryAttribute {
+        componentDatatype: ComponentDatatype;
+        componentsPerAttribute: number;
+        normalize: boolean;
+        values: any[];
+        constructor(options?: { componentDatatype?: ComponentDatatype; componentsPerAttribute?: number; normalize?: boolean; values?: number[] });
+    }
+
+    class GeometryAttributes {
+        position: GeometryAttribute;
+        normal: GeometryAttribute;
+        st: GeometryAttribute;
+        binormal: GeometryAttribute;
+        tangent: GeometryAttribute;
+        color: GeometryAttribute;
+    }
+
+    class GeometryInstance {
+        geometry: Geometry;
+        modelMatrix: Matrix4;
+        id: any;
+        attributes: any;
+        constructor(options: { geometry: Geometry; modelMatrix?: Matrix4; id?: any; attributes?: any });
+    }
+
+    class GeometryInstanceAttribute {
+        componentDatatype: ComponentDatatype;
+        componentsPerAttribute: number;
+        normalize: boolean;
+        value: number[];
+        constructor(options: { componentDatatype?: ComponentDatatype; componentsPerAttribute?: number; normalize?: boolean; value?: number[] });
+    }
+
+    class GregorianDate {
+        year: number;
+        month: number;
+        day: number;
+        hour: number;
+        minute: number;
+        second: number;
+        millisecond: number;
+        isLeapSecond: boolean;
+    }
+
+    class HeightmapTerrainData {
+        waterMask: Uint8Array | HTMLImageElement | HTMLCanvasElement;
+        constructor(options: {
+            buffer: Int8Array | Uint8Array | Int16Array | Uint16Array | Float32Array | Float64Array;
+            width: number;
+            height: number;
+            childTileMask?: number;
+            structure?: any;
+            structureheightScale?: number;
+            structureheightOffset?: number;
+            structureelementsPerHeight?: number;
+            structurestride?: number;
+            structureelementMultiplier?: number;
+            structureisBigEndian?: boolean;
+            createdByUpsampling?: boolean
+        });
+        createMesh(tilingScheme: TilingScheme, x: number, y: number, level: number): Promise<TerrainMesh>;
+        interpolateHeight(rectangle: Rectangle, longitude: number, latitude: number): number;
+        upsample(tilingScheme: TilingScheme, thisX: number, thisY: number, thisLevel: number, descendantX: number, descendantY: number, descendantLevel: number): Promise<HeightmapTerrainData>;
+        isChildAvailable(thisX: number, thisY: number, childX: number, childY: number): boolean;
+        wasCreatedByUpsampling(): boolean;
+    }
+
+    class HermiteSpline {
+        times: number[];
+        points: Cartesian3[];
+        inTangents: Cartesian3[];
+        outTangents: Cartesian3[];
+        constructor(options: { times: number[]; points: Cartesian3[]; inTangents: Cartesian3[]; outTangents: Cartesian3[] });
+        findTimeInterval(time: number): number;
+        evaluate(time: number, result?: Cartesian3): Cartesian3;
+        static createC1(): HermiteSpline;
+        static createNaturalCubic(): HermiteSpline | LinearSpline;
+        static createClampedCubic(): HermiteSpline | LinearSpline;
+    }
+
+    class IonImageryProvider extends ImageryProvider {
+      constructor(options: {assetId: number, accessToken?: string, server?: string})
+    }
+
+    class Interval {
+        start: number;
+        stop: number;
+        constructor(start?: number, stop?: number);
+    }
+
+    class JulianDate {
+        dayNumber: number;
+        secondsOfDay: number;
+        static leapSeconds: LeapSecond[];
+        constructor(julianDayNumber?: number, secondsOfDay?: number, timeStandard?: TimeStandard);
+        clone(result?: JulianDate): JulianDate;
+        equals(right?: JulianDate): boolean;
+        equalsEpsilon(right: JulianDate, epsilon: number): boolean;
+        toString(): string;
+        static fromDate(date: Date, result?: JulianDate): JulianDate;
+        static fromIso8601(iso8601String: string, result?: JulianDate): JulianDate;
+        static now(result?: JulianDate): JulianDate;
+        static toGregorianDate(julianDate: JulianDate, result?: GregorianDate): GregorianDate;
+        static toDate(julianDate: JulianDate): Date;
+        static toIso8601(julianDate: JulianDate, precision?: number): string;
+        static clone(julianDate: JulianDate, result?: JulianDate): JulianDate;
+        static compare(left: JulianDate, right: JulianDate): number;
+        static equals(left?: JulianDate, right?: JulianDate): boolean;
+        static equalsEpsilon(left: JulianDate, right: JulianDate, epsilon: number): boolean;
+        static totalDays(julianDate: JulianDate): number;
+        static secondsDifference(left: JulianDate, right: JulianDate): number;
+        static daysDifference(left: JulianDate, right: JulianDate): number;
+        static computeTaiMinusUtc(julianDate: JulianDate): number;
+        static addSeconds(julianDate: JulianDate, seconds: number, result: JulianDate): JulianDate;
+        static addMinutes(julianDate: JulianDate, minutes: number, result: JulianDate): JulianDate;
+        static addHours(julianDate: JulianDate, hours: number, result: JulianDate): JulianDate;
+        static addDays(julianDate: JulianDate, days: number, result: JulianDate): JulianDate;
+        static lessThan(left: JulianDate, right: JulianDate): boolean;
+        static lessThanOrEquals(left: JulianDate, right: JulianDate): boolean;
+        static greaterThan(left: JulianDate, right: JulianDate): boolean;
+        static greaterThanOrEquals(left: JulianDate, right: JulianDate): boolean;
+    }
+
+    class LeapSecond {
+        julianDate: JulianDate;
+        offset: number;
+        constructor(date?: JulianDate, offset?: number);
+    }
+
+    class LinearSpline {
+        times: number[];
+        points: Cartesian3[];
+        constructor();
+        findTimeInterval(time: number): number;
+        evaluate(time: number, result?: Cartesian3): Cartesian3;
+    }
+
+    class MapProjection {
+        ellipsoid: Ellipsoid;
+        project(cartographic: Cartographic, result?: Cartesian3): Cartesian3;
+        unproject(cartesian: Cartesian3, result?: Cartographic): Cartographic;
+    }
+
+    class Matrix2 extends Packable {
+        static IDENTITY: Matrix2;
+        static COLUMN0ROW0: number;
+        static COLUMN0ROW1: number;
+        static COLUMN1ROW0: number;
+        static COLUMN1ROW1: number;
+        constructor(column0Row0?: number, column1Row0?: number, column0Row1?: number, column1Row1?: number);
+        clone(result?: Matrix2): Matrix2;
+        equals(right?: Matrix2): boolean;
+        equalsEpsilon(right: Matrix2, epsilon: number): boolean;
+        toString(): string;
+        static pack(value: Matrix2, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Matrix2): Matrix2;
+        static clone(matrix: Matrix2, result?: Matrix2): Matrix2;
+        static fromArray(array: number[], startingIndex?: number, result?: Matrix2): Matrix2;
+        static fromColumnMajorArray(values: number[], result?: Matrix2): Matrix2;
+        static fromRowMajorArray(values: number[], result?: Matrix2): Matrix2;
+        static fromScale(scale: Cartesian2, result?: Matrix2): Matrix2;
+        static fromUniformScale(scale: number, result?: Matrix2): Matrix2;
+        static fromRotation(angle: number, result?: Matrix2): Matrix2;
+        static toArray(matrix: Matrix2, result?: number[]): number[];
+        static getElementIndex(row: number, column: number): number;
+        static getColumn(matrix: Matrix2, index: number, result: Cartesian2): Cartesian2;
+        static setColumn(matrix: Matrix2, index: number, cartesian: Cartesian2, result: Cartesian2): Matrix2;
+        static getRow(matrix: Matrix2, index: number, result: Cartesian2): Cartesian2;
+        static setRow(matrix: Matrix2, index: number, cartesian: Cartesian2, result: Matrix2): Matrix2;
+        static getScale(matrix: Matrix2, result: Cartesian2): Cartesian2;
+        static getMaximumScale(matrix: Matrix2): number;
+        static multiply(left: Matrix2, right: Matrix2, result: Matrix2): Matrix2;
+        static add(left: Matrix2, right: Matrix2, result: Matrix2): Matrix2;
+        static subtract(left: Matrix2, right: Matrix2, result: Matrix2): Matrix2;
+        static multiplyByVector(matrix: Matrix2, cartesian: Cartesian2, result: Cartesian2): Cartesian2;
+        static multiplyByScalar(matrix: Matrix2, scalar: number, result: Matrix2): Matrix2;
+        static negate(matrix: Matrix2, result: Matrix2): Matrix2;
+        static transpose(matrix: Matrix2, result: Matrix2): Matrix2;
+        static abs(matrix: Matrix2, result: Matrix2): Matrix2;
+        static equals(left?: Matrix2, right?: Matrix2): boolean;
+        static equalsEpsilon(left: Matrix2, right: Matrix2, epsilon: number): boolean;
+    }
+
+    class Matrix3 extends Packable {
+        static IDENTITY: Matrix3;
+        static COLUMN0ROW0: number;
+        static COLUMN0ROW1: number;
+        static COLUMN0ROW2: number;
+        static COLUMN1ROW0: number;
+        static COLUMN1ROW1: number;
+        static COLUMN1ROW2: number;
+        static COLUMN2ROW0: number;
+        static COLUMN2ROW1: number;
+        static COLUMN2ROW2: number;
+        constructor(column0Row0?: number, column1Row0?: number, column2Row0?: number, column0Row1?: number, column1Row1?: number,
+                    column2Row1?: number, column0Row2?: number, column1Row2?: number, column2Row2?: number);
+        clone(result?: Matrix3): Matrix3;
+        equals(right?: Matrix3): boolean;
+        equalsEpsilon(right: Matrix3, epsilon: number): boolean;
+        toString(): string;
+        static pack(value: Matrix3, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Matrix3): Matrix3;
+        static clone(matrix: Matrix3, result?: Matrix3): Matrix3;
+        static fromArray(array: number[], startingIndex?: number, result?: Matrix3): Matrix3;
+        static fromColumnMajorArray(values: number[], result?: Matrix3): Matrix3;
+        static fromRowMajorArray(values: number[], result?: Matrix3): Matrix3;
+        static fromQuaternion(quaternion: Quaternion): Matrix3;
+        static fromScale(scale: Cartesian3, result?: Matrix3): Matrix3;
+        static fromUniformScale(scale: number, result?: Matrix3): Matrix3;
+        static fromCrossProduct(the: Cartesian3, result?: Matrix3): Matrix3;
+        static fromRotationX(angle: number, result?: Matrix3): Matrix3;
+        static fromRotationY(angle: number, result?: Matrix3): Matrix3;
+        static fromRotationZ(angle: number, result?: Matrix3): Matrix3;
+        static toArray(matrix: Matrix3, result?: number[]): number[];
+        static getElementIndex(row: number, column: number): number;
+        static getColumn(matrix: Matrix3, index: number, result: Cartesian3): Cartesian3;
+        static setColumn(matrix: Matrix3, index: number, cartesian: Cartesian3, result: Cartesian3): Matrix3;
+        static getRow(matrix: Matrix3, index: number, result: Cartesian3): Cartesian3;
+        static setRow(matrix: Matrix3, index: number, cartesian: Cartesian3, result: Cartesian3): Matrix3;
+        static getScale(matrix: Matrix3, result: Cartesian3): Cartesian3;
+        static getMaximumScale(matrix: Matrix3): number;
+        static multiply(left: Matrix3, right: Matrix3, result: Matrix3): Matrix3;
+        static add(left: Matrix3, right: Matrix3, result: Matrix3): Matrix3;
+        static subtract(left: Matrix3, right: Matrix3, result: Matrix3): Matrix3;
+        static multiplyByVector(matrix: Matrix3, cartesian: Cartesian3, result: Cartesian3): Cartesian3;
+        static multiplyByScalar(matrix: Matrix3, scalar: number, result: Matrix3): Matrix3;
+        static negate(matrix: Matrix3, result: Matrix3): Matrix3;
+        static transpose(matrix: Matrix3, result: Matrix3): Matrix3;
+        static computeEigenDecomposition(matrix: Matrix3, result?: any): any;
+        static abs(matrix: Matrix3, result: Matrix3): Matrix3;
+        static determinant(matrix: Matrix3): number;
+        static inverse(matrix: Matrix3, result: Matrix3): Matrix3;
+        static equals(left?: Matrix3, right?: Matrix3): boolean;
+        static equalsEpsilon(left: Matrix3, right: Matrix3, epsilon: number): boolean;
+    }
+
+    class Matrix4 extends Packable {
+        static IDENTITY: Matrix4;
+        static COLUMN0ROW0: number;
+        static COLUMN0ROW1: number;
+        static COLUMN0ROW2: number;
+        static COLUMN0ROW3: number;
+        static COLUMN1ROW0: number;
+        static COLUMN1ROW1: number;
+        static COLUMN1ROW2: number;
+        static COLUMN1ROW3: number;
+        static COLUMN2ROW0: number;
+        static COLUMN2ROW1: number;
+        static COLUMN2ROW2: number;
+        static COLUMN2ROW3: number;
+        static COLUMN3ROW0: number;
+        static COLUMN3ROW1: number;
+        static COLUMN3ROW2: number;
+        static COLUMN3ROW3: number;
+        constructor(column0Row0?: number, column1Row0?: number, column2Row0?: number, column3Row0?: number, column0Row1?: number,
+                    column1Row1?: number, column2Row1?: number, column3Row1?: number, column0Row2?: number, column1Row2?: number,
+                    column2Row2?: number, column3Row2?: number, column0Row3?: number, column1Row3?: number, column2Row3?: number,
+                    column3Row3?: number);
+        clone(result?: Matrix4): Matrix4;
+        equals(right?: Matrix4): boolean;
+        equalsEpsilon(right: Matrix4, epsilon: number): boolean;
+        toString(): string;
+        static pack(value: Matrix4, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Matrix4): Matrix4;
+        static clone(matrix: Matrix4, result?: Matrix4): Matrix4;
+        static fromArray(array: number[], startingIndex?: number, result?: Matrix4): Matrix4;
+        static fromColumnMajorArray(values: number[], result?: Matrix4): Matrix4;
+        static fromRowMajorArray(values: number[], result?: Matrix4): Matrix4;
+        static fromRotationTranslation(rotation: Matrix3, translation?: Cartesian3, result?: Matrix4): Matrix4;
+        static fromTranslationQuaternionRotationScale(translation: Cartesian3, rotation: Quaternion, scale: Cartesian3, result?: Matrix4): Matrix4;
+        static fromTranslation(translation: Cartesian3, result?: Matrix4): Matrix4;
+        static fromScale(scale: Cartesian3, result?: Matrix4): Matrix4;
+        static fromUniformScale(scale: number, result?: Matrix4): Matrix4;
+        static fromCamera(camera: Camera, result?: Matrix4): Matrix4;
+        static computePerspectiveFieldOfView(fovY: number, aspectRatio: number, near: number, far: number, result: Matrix4): Matrix4;
+        static computeOrthographicOffCenter(left: number, right: number, bottom: number, top: number, near: number, far: number, result: Matrix4): Matrix4;
+        static computePerspectiveOffCenter(left: number, right: number, bottom: number, top: number, near: number, far: number, result: Matrix4): Matrix4;
+        static computeInfinitePerspectiveOffCenter(left: number, right: number, bottom: number, top: number, near: number, far: number, result: Matrix4): Matrix4;
+        static computeViewportTransformation(viewport: any, nearDepthRange: number, farDepthRange: number, result: Matrix4): Matrix4;
+        static toArray(matrix: Matrix4, result?: number[]): number[];
+        static getElementIndex(row: number, column: number): number;
+        static getColumn(matrix: Matrix4, index: number, result: Cartesian4): Cartesian4;
+        static setColumn(matrix: Matrix4, index: number, cartesian: Cartesian4, result: Cartesian4): Matrix4;
+        static getRow(matrix: Matrix4, index: number, result: Cartesian4): Cartesian4;
+        static setRow(matrix: Matrix4, index: number, cartesian: Cartesian4, result: Cartesian4): Matrix4;
+        static getScale(matrix: Matrix4, result: Cartesian3): Cartesian3;
+        static getMaximumScale(matrix: Matrix4): number;
+        static multiply(left: Matrix4, right: Matrix4, result: Matrix4): Matrix4;
+        static add(left: Matrix4, right: Matrix4, result: Matrix4): Matrix4;
+        static subtract(left: Matrix4, right: Matrix4, result: Matrix4): Matrix4;
+        static multiplyTransformation(left: Matrix4, right: Matrix4, result: Matrix4): Matrix4;
+        static multiplyByMatrix3(matrix: Matrix4, rotation: Matrix3, result: Matrix4): Matrix4;
+        static multiplyByTranslation(matrix: Matrix4, translation: Cartesian3, result: Matrix4): Matrix4;
+        static multiplyByUniformScale(matrix: Matrix4, scale: number, result: Matrix4): Matrix4;
+        static multiplyByScale(matrix: Matrix4, scale: Cartesian3, result: Matrix4): Matrix4;
+        static multiplyByVector(matrix: Matrix4, cartesian: Cartesian4, result: Cartesian4): Cartesian4;
+        static multiplyByPointAsVector(matrix: Matrix4, cartesian: Cartesian3, result: Cartesian3): Cartesian3;
+        static multiplyByPoint(matrix: Matrix4, cartesian: Cartesian3, result: Cartesian3): Cartesian3;
+        static multiplyByScalar(matrix: Matrix4, scalar: number, result: Matrix4): Matrix4;
+        static negate(matrix: Matrix4, result: Matrix4): Matrix4;
+        static transpose(matrix: Matrix4, result: Matrix4): Matrix4;
+        static abs(matrix: Matrix4, result: Matrix4): Matrix4;
+        static equals(left?: Matrix4, right?: Matrix4): boolean;
+        static equalsEpsilon(left: Matrix4, right: Matrix4, epsilon: number): boolean;
+        static getTranslation(matrix: Matrix4, result: Cartesian3): Cartesian3;
+        static getRotation(matrix: Matrix4, result: Matrix3): Matrix3;
+        static inverse(matrix: Matrix4, result: Matrix4): Matrix4;
+        static inverseTransformation(matrix: Matrix4, result: Matrix4): Matrix4;
+    }
+
+    class NearFarScalar extends Packable {
+        near: number;
+        nearValue: number;
+        far: number;
+        farValue: number;
+        constructor(near?: number, nearValue?: number, far?: number, farValue?: number);
+        clone(result?: NearFarScalar): NearFarScalar;
+        equals(right?: NearFarScalar): boolean;
+        static clone(nearFarScalar: NearFarScalar, result?: NearFarScalar): NearFarScalar;
+        static pack(value: NearFarScalar, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: NearFarScalar): NearFarScalar;
+        static equals(left?: NearFarScalar, right?: NearFarScalar): boolean;
+    }
+
+    class ObjectOrientedBoundingBox {
+        rotation: Matrix3;
+        translation: Cartesian3;
+        scale: Cartesian3;
+        constructor(rotation?: Matrix3, translation?: Cartesian3, scale?: Cartesian3);
+        clone(result?: ObjectOrientedBoundingBox): ObjectOrientedBoundingBox;
+        equals(right?: ObjectOrientedBoundingBox): boolean;
+        static fromPoints(positions: Cartesian3[], result?: ObjectOrientedBoundingBox): ObjectOrientedBoundingBox;
+        static fromBoundingRectangle(boundingRectangle: BoundingRectangle, rotation?: number): ObjectOrientedBoundingBox;
+        static clone(box: ObjectOrientedBoundingBox, result?: ObjectOrientedBoundingBox): ObjectOrientedBoundingBox;
+        static intersect(left: ObjectOrientedBoundingBox, right: ObjectOrientedBoundingBox): boolean;
+        static equals(left: ObjectOrientedBoundingBox, right: ObjectOrientedBoundingBox): boolean;
+    }
+
+    class Occluder {
+        position: Cartesian3;
+        radius: number;
+        cameraPosition: Cartesian3;
+        constructor(occluderBoundingSphere: BoundingSphere, cameraPosition: Cartesian3);
+        isPointVisible(occludee: Cartesian3): boolean;
+        isBoundingSphereVisible(occludee: BoundingSphere): boolean;
+        computeVisibility(occludeeBS: BoundingSphere): number;
+        static fromBoundingSphere(occluderBoundingSphere: BoundingSphere, cameraPosition: Cartesian3, result?: Occluder): Occluder;
+        static computeOccludeePoint(occluderBoundingSphere: BoundingSphere, occludeePosition: Cartesian3, positions: Cartesian3[]): any;
+        static computeOccludeePointFromRectangle(rectangle: Rectangle, ellipsoid?: Ellipsoid): any;
+    }
+
+    class PinBuilder {
+        fromColor(color: Color, size: number): HTMLCanvasElement;
+        fromUrl(url: string, color: Color, size: number): HTMLCanvasElement | Promise<HTMLCanvasElement>;
+        fromMakiIconId(id: string, color: Color, size: number): HTMLCanvasElement | Promise<HTMLCanvasElement>;
+        fromText(text: string, color: Color, size: number): HTMLCanvasElement;
+    }
+
+    class Plane {
+        normal: Cartesian3;
+        distance: number;
+        constructor(normal: Cartesian3, distance: number);
+        static fromPointNormal(point: Cartesian3, normal: Cartesian3, result?: Plane): Plane;
+        static getPointDistance(plane: Plane, point: Cartesian3): number;
+    }
+
+    class PolygonGeometry extends Packable {
+        constructor(options: {
+            polygonHierarchy: PolygonHierarchy;
+            height?: number;
+            extrudedHeight?: number;
+            vertexFormat?: VertexFormat;
+            stRotation?: number;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            perPositionHeight?: boolean
+        });
+        static fromPositions(options?: {
+            positions: Cartesian3[];
+            height?: number;
+            extrudedHeight?: number;
+            vertexFormat?: VertexFormat;
+            stRotation?: number;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            perPositionHeight?: boolean;
+            closeTop?: boolean;
+            closeBottom?: boolean;
+        }): PolygonGeometry;
+        static unpack(array: number[], startingIndex?: number, result?: PolygonGeometry): PolygonGeometry;
+        static createGeometry(polygonGeometry: PolygonGeometry): Geometry;
+    }
+
+    class PolygonHierarchy extends Property {
+        positions: Cartesian3[];
+        holes: PolygonHierarchy[];
+        constructor(positions?: Cartesian3[], holes?: PolygonHierarchy[]);
+    }
+
+    class PolygonOutlineGeometry extends Packable {
+        constructor(options: {
+            polygonHierarchy: any;
+            height?: number;
+            extrudedHeight?: number;
+            vertexFormat?: VertexFormat;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            perPositionHeight?: boolean
+        });
+        static unpack(array: number[], startingIndex?: number, result?: PolygonOutlineGeometry): PolygonOutlineGeometry;
+        static fromPositions(options?: {
+            positions: Cartesian3[];
+            height?: number;
+            extrudedHeight?: number;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            perPositionHeight?: boolean;
+        }): PolygonOutlineGeometry;
+        static createGeometry(polygonGeometry: PolygonOutlineGeometry): Geometry;
+    }
+
+    class PolylineGeometry extends Packable {
+        constructor(options: { positions: Cartesian3[]; width?: number; colors?: Color[]; colorsPerVertex?: boolean; followSurface?: boolean; granularity?: number; ellipsoid?: Ellipsoid });
+        static unpack(array: number[], startingIndex?: number, result?: PolylineGeometry): PolylineGeometry;
+        static createGeometry(polylineGeometry: PolylineGeometry): Geometry;
+    }
+
+    class PolylineVolumeGeometry extends Packable {
+        constructor(options: { polylinePositions: Cartesian3[]; shapePositions: Cartesian2[]; ellipsoid?: Ellipsoid; granularity?: number; vertexFormat?: VertexFormat; cornerType?: CornerType });
+        static unpack(array: number[], startingIndex?: number, result?: PolylineVolumeGeometry): PolylineVolumeGeometry;
+        static createGeometry(polylineVolumeGeometry: PolylineVolumeGeometry): Geometry;
+    }
+
+    class PolylineVolumeOutlineGeometry extends Packable {
+        constructor(options: { polylinePositions: Cartesian3[]; shapePositions: number; ellipsoid?: Ellipsoid; granularity?: number; cornerType?: CornerType });
+        static unpack(array: number[], startingIndex?: number, result?: PolylineVolumeOutlineGeometry): PolylineVolumeOutlineGeometry;
+        static createGeometry(polylineVolumeOutlineGeometry: PolylineVolumeOutlineGeometry): Geometry;
+    }
+
+    class QuantizedMeshTerrainData {
+        waterMask: Uint8Array | HTMLImageElement | HTMLCanvasElement;
+        constructor(options: {
+            quantizedVertices: Uint16Array;
+            indices: Uint16Array | Uint32Array;
+            minimumHeight: number;
+            maximumHeight: number;
+            boundingSphere: BoundingSphere;
+            horizonOcclusionPoint: Cartesian3;
+            westIndices: number[];
+            southIndices: number[];
+            eastIndices: number[];
+            northIndices: number[];
+            westSkirtHeight: number;
+            southSkirtHeight: number;
+            eastSkirtHeight: number;
+            northSkirtHeight: number;
+            childTileMask?: number;
+            createdByUpsampling?: boolean;
+            encodedNormals?: Uint8Array;
+            waterMask?: Uint8Array
+        });
+        createMesh(tilingScheme: TilingScheme, x: number, y: number, level: number): Promise<TerrainMesh>;
+        upsample(tilingScheme: TilingScheme, thisX: number, thisY: number, thisLevel: number, descendantX: number, descendantY: number, descendantLevel: number): Promise<QuantizedMeshTerrainData>;
+        interpolateHeight(rectangle: Rectangle, longitude: number, latitude: number): number;
+        isChildAvailable(thisX: number, thisY: number, childX: number, childY: number): boolean;
+        wasCreatedByUpsampling(): boolean;
+    }
+
+    class Quaternion extends Packable {
+        x: number;
+        y: number;
+        z: number;
+        w: number;
+        static packedInterpolationLength: number;
+        static ZERO: Quaternion;
+        static IDENTITY: Quaternion;
+        constructor(x?: number, y?: number, z?: number, w?: number);
+        clone(result?: Quaternion): Quaternion;
+        equals(right?: Quaternion): boolean;
+        equalsEpsilon(right: Quaternion, epsilon: number): boolean;
+        toString(): string;
+        static fromAxisAngle(axis: Cartesian3, angle: number, result?: Quaternion): Quaternion;
+        static fromRotationMatrix(matrix: Matrix3, result?: Quaternion): Quaternion;
+        static fromHeadingPitchRoll(heading: number, pitch: number, roll: number, result: Quaternion): Quaternion;
+        static pack(value: Quaternion, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Quaternion): Quaternion;
+        static convertPackedArrayForInterpolation(packedArray: number[], startingIndex?: number, lastIndex?: number, result?: number[]): void;
+        static unpackInterpolationResult(array: number[], sourceArray: number[], startingIndex?: number, lastIndex?: number, result?: Quaternion): Quaternion;
+        static clone(quaternion: Quaternion, result?: Quaternion): Quaternion;
+        static conjugate(quaternion: Quaternion, result: Quaternion): Quaternion;
+        static magnitudeSquared(quaternion: Quaternion): number;
+        static magnitude(quaternion: Quaternion): number;
+        static normalize(quaternion: Quaternion, result: Quaternion): Quaternion;
+        static inverse(quaternion: Quaternion, result: Quaternion): Quaternion;
+        static add(left: Quaternion, right: Quaternion, result: Quaternion): Quaternion;
+        static subtract(left: Quaternion, right: Quaternion, result: Quaternion): Quaternion;
+        static negate(quaternion: Quaternion, result: Quaternion): Quaternion;
+        static dot(left: Quaternion, right: Quaternion): number;
+        static multiply(left: Quaternion, right: Quaternion, result: Quaternion): Quaternion;
+        static multiplyByScalar(quaternion: Quaternion, scalar: number, result: Quaternion): Quaternion;
+        static divideByScalar(quaternion: Quaternion, scalar: number, result: Quaternion): Quaternion;
+        static computeAxis(quaternion: Quaternion, result: Cartesian3): Cartesian3;
+        static computeAngle(quaternion: Quaternion): number;
+        static lerp(start: Quaternion, end: Quaternion, t: number, result: Quaternion): Quaternion;
+        static slerp(start: Quaternion, end: Quaternion, t: number, result: Quaternion): Quaternion;
+        static log(quaternion: Quaternion, result: Cartesian3): Cartesian3;
+        static exp(cartesian: Cartesian3, result: Quaternion): Quaternion;
+        static computeInnerQuadrangle(q0: Quaternion, q1: Quaternion, q2: Quaternion, result: Quaternion): Quaternion;
+        static squad(q0: Quaternion, q1: Quaternion, s0: Quaternion, s1: Quaternion, t: number, result: Quaternion): Quaternion;
+        static fastSlerp(start: Quaternion, end: Quaternion, t: number, result: Quaternion): Quaternion;
+        static fastSquad(q0: Quaternion, q1: Quaternion, s0: Quaternion, s1: Quaternion, t: number, result?: Quaternion): Quaternion;
+        static equals(left?: Quaternion, right?: Quaternion): boolean;
+        static equalsEpsilon(left: Quaternion, right: Quaternion, epsilon: number): boolean;
+    }
+
+    class QuaternionSpline {
+        times: number[];
+        points: Quaternion[];
+        innerQuadrangles: Quaternion[];
+        constructor(options: { times: number[]; points: Quaternion[]; firstInnerQuadrangle?: Quaternion; lastInnerQuadrangle?: Quaternion });
+        findTimeInterval(time: number): number;
+        evaluate(time: number, result?: Quaternion): Quaternion;
+    }
+
+    class Queue {
+        readonly length: number;
+        enqueue(item: any): void;
+        dequeue(): any;
+        contains(item: any): boolean;
+        clear(): void;
+        peek(): any;
+        sort(compareFunction: Queue.Comparator): void;
+    }
+
+    namespace Queue {
+        type Comparator = (a: any, b: any) => number;
+    }
+
+    class Ray {
+        origin: Cartesian3;
+        direction: Cartesian3;
+        constructor(origin?: Cartesian3, direction?: Cartesian3);
+        static getPoint(t: number, result?: Cartesian3): Cartesian3;
+    }
+
+    class Rectangle extends Packable {
+        west: number;
+        south: number;
+        east: number;
+        north: number;
+        width: number;
+        height: number;
+        static MAX_VALUE: Rectangle;
+        constructor(west?: number, south?: number, east?: number, north?: number);
+        clone(result?: Rectangle): Rectangle;
+        equals(other?: Rectangle): boolean;
+        equalsEpsilon(other: Rectangle, epsilon: number): boolean;
+        static pack(value: Rectangle, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: Rectangle): Rectangle;
+        static computeWidth(rectangle: Rectangle): number;
+        static computeHeight(rectangle: Rectangle): number;
+        static fromDegrees(west?: number, south?: number, east?: number, north?: number, result?: Rectangle): Rectangle;
+        static fromCartographicArray(cartographics: Cartographic[], result?: Rectangle): Rectangle;
+        static clone(rectangle: Rectangle, result?: Rectangle): Rectangle;
+        static equals(left?: Rectangle, right?: Rectangle): boolean;
+        static validate(rectangle: Rectangle): void;
+        static southwest(rectangle: Rectangle, result?: Cartographic): Cartographic;
+        static northwest(rectangle: Rectangle, result?: Cartographic): Cartographic;
+        static northeast(rectangle: Rectangle, result?: Cartographic): Cartographic;
+        static southeast(rectangle: Rectangle, result?: Cartographic): Cartographic;
+        static center(rectangle: Rectangle, result?: Cartographic): Cartographic;
+        static intersection(rectangle: Rectangle, otherRectangle: Rectangle, result?: Rectangle): Rectangle;
+        static contains(rectangle: Rectangle, cartographic: Cartographic): boolean;
+        static subsample(rectangle: Rectangle, ellipsoid?: Ellipsoid, surfaceHeight?: number, result?: Cartesian3[]): Cartesian3[];
+    }
+
+    class RectangleGeometry extends Packable {
+        constructor(options: {
+            rectangle: Rectangle;
+            vertexFormat?: VertexFormat;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            height?: number;
+            rotation?: number;
+            stRotation?: number;
+            extrudedHeight?: number
+        });
+        static pack(value: BoundingSphere, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: RectangleGeometry): RectangleGeometry;
+        static createGeometry(rectangleGeometry: RectangleGeometry): Geometry;
+    }
+
+    class RectangleOutlineGeometry extends Packable {
+        constructor(options: {
+            rectangle: Rectangle;
+            ellipsoid?: Ellipsoid;
+            granularity?: number;
+            height?: number;
+            rotation?: number;
+            extrudedHeight?: number
+        });
+        static pack(value: BoundingSphere, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: RectangleGeometry): RectangleOutlineGeometry;
+        static createGeometry(rectangleGeometry: RectangleOutlineGeometry): Geometry;
+    }
+
+    class RequestErrorEvent {
+        statusCode: number;
+        response: any;
+        responseHeaders: any;
+        constructor(statusCode?: number, response?: any, responseHeaders?: string | object);
+        toString(): string;
+    }
+
+    class RuntimeError {
+        name: string;
+        message: string;
+        stack: string;
+        constructor(message?: string);
+    }
+
+    class ScreenSpaceEventHandler {
+        constructor(element?: HTMLCanvasElement);
+        setInputAction(action: () => void, type: number, modifier?: number): void;
+        getInputAction(type: number, modifier?: number): () => void;
+        removeInputAction(type: number, modifier?: number): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class ShowGeometryInstanceAttribute {
+        value: Uint8Array;
+        componentDatatype: ComponentDatatype;
+        componentsPerAttribute: number;
+        normalize: boolean;
+        constructor(show?: boolean);
+        static toValue(show: boolean, result?: Uint8Array): Uint8Array;
+    }
+
+    class SimplePolylineGeometry extends Packable {
+        constructor(options: { positions: Cartesian3[]; colors?: Color[]; colorsPerVertex?: boolean; followSurface?: boolean; granularity?: number; ellipsoid?: Ellipsoid });
+        static unpack(array: number[], startingIndex?: number, result?: SimplePolylineGeometry): SimplePolylineGeometry;
+        static createGeometry(simplePolylineGeometry: SimplePolylineGeometry): Geometry;
+    }
+
+    class SphereGeometry extends Packable {
+        constructor(options?: { radius?: number; stackPartitions?: number; slicePartitions?: number; vertexFormat?: VertexFormat });
+        static unpack(array: number[], startingIndex?: number, result?: SphereGeometry): SphereGeometry;
+        static createGeometry(sphereGeometry: SphereGeometry): Geometry;
+    }
+
+    class SphereOutlineGeometry extends Packable {
+        constructor(options?: { radius?: number; stackPartitions?: number; slicePartitions?: number; subdivisions?: number });
+        static unpack(array: number[], startingIndex?: number, result?: SphereOutlineGeometry): SphereOutlineGeometry;
+        static createGeometry(sphereGeometry: SphereOutlineGeometry): Geometry;
+    }
+
+    class Spherical {
+        constructor(clock?: number, cone?: number, magnitude?: number);
+        equals(other: Spherical): boolean;
+        clone(result?: Spherical): Spherical;
+        equalsEpsilon(other: Spherical, epsilon: number): boolean;
+        toString(): string;
+        static fromCartesian3(cartesian3: Cartesian3, spherical?: Spherical): Spherical;
+        static clone(spherical: Spherical, result?: Spherical): Spherical;
+        static normalize(spherical: Spherical, result?: Spherical): Spherical;
+        static equals(left: Spherical, right: Spherical): boolean;
+        static equalsEpsilon(left: Spherical, right: Spherical, epsilon?: number): boolean;
+    }
+
+    class Spline {
+        times: number[];
+        points: Cartesian3[] | Quaternion[];
+        evaluate(time: number, result?: Cartesian3 | Quaternion): Cartesian3 | Quaternion;
+        findTimeInterval(time: number, startIndex: number): number;
+    }
+
+    class TaskProcessor {
+        constructor(workerName: string, maximumActiveTasks?: number);
+        scheduleTask(parameters: any, transferableObjects?: any[]): Promise<any>;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class TerrainData {
+        waterMask: Uint8Array | HTMLImageElement | HTMLCanvasElement;
+        interpolateHeight(rectangle: Rectangle, longitude: number, latitude: number): number;
+        isChildAvailable(thisX: number, thisY: number, childX: number, childY: number): boolean;
+        createMesh(tilingScheme: TilingScheme, x: number, y: number, level: number): Promise<TerrainMesh>;
+        upsample(tilingScheme: TilingScheme, thisX: number, thisY: number, thisLevel: number, descendantX: number, descendantY: number, descendantLevel: number): Promise<TerrainData>;
+        wasCreatedByUpsampling(): boolean;
+    }
+
+    class TerrainMesh {
+        center: Cartesian3;
+        vertices: Float32Array;
+        stride: number;
+        indices: Uint16Array | Uint32Array;
+        minimumHeight: number;
+        maximumHeight: number;
+        boundingSphere3D: BoundingSphere;
+        occludeePointInScaledSpace: Cartesian3;
+        constructor(center: Cartesian3, vertices: Float32Array, indices: Uint16Array | Uint32Array, minimumHeight: number,
+                    maximumHeight: number, boundingSphere3D: BoundingSphere, occludeePointInScaledSpace: Cartesian3, vertexStride?: number);
+    }
+
+    abstract class TerrainProvider {
+        availability: any; // TileAvailability
+        credit: Credit;
+        errorEvent: Event;
+        hasVertexNormals: boolean;
+        hasWaterMask: boolean;
+        ready: boolean;
+        readonly readyPromise: Promise<boolean>;
+        tilingScheme: TilingScheme;
+        static heightmapTerrainQuality: number;
+        static getEstimatedLevelZeroGeometricErrorForAHeightmap(ellipsoid: Ellipsoid, tileImageWidth: number, numberOfTilesAtLevelZero: number): number;
+        static getRegularGridIndices(width: number, height: number): Uint16Array;
+        getLevelMaximumGeometricError(level: number): number;
+        getTileDataAvailable(x: number, y: number, level: number): boolean;
+        requestTileGeometry(x: number, y: number, level: number, throttleRequests?: boolean): Promise<TerrainData>;
+    }
+
+    class TileProviderError {
+        provider: ImageryProvider | TerrainProvider;
+        message: string;
+        x: number;
+        y: number;
+        level: number;
+        timesRetried: number;
+        retry: boolean;
+        error: Error;
+        constructor(provider: ImageryProvider | TerrainProvider, message: string, x?: number, y?: number, level?: number, timesRetried?: number, error?: Error);
+        static handleError(previousError: TileProviderError, provider: ImageryProvider | TerrainProvider, event: Event,
+                            message: string, x: number, y: number, level: number, retryFunction: TileProviderError.RetryFunction,
+                            errorDetails?: Error): TileProviderError;
+        static handleSuccess(previousError: TileProviderError): void;
+    }
+
+    namespace TileProviderError {
+        type RetryFunction = () => void;
+    }
+
+    class TilingScheme {
+        ellipsoid: Ellipsoid;
+        rectangle: Rectangle;
+        projection: MapProjection;
+        getNumberOfXTilesAtLevel(level: number): number;
+        getNumberOfYTilesAtLevel(level: number): number;
+        rectangleToNativeRectangle(rectangle: Rectangle, result?: Rectangle): Rectangle;
+        tileXYToNativeRectangle(x: number, y: number, level: number, result?: any): Rectangle;
+        tileXYToRectangle(x: number, y: number, level: number, result?: any): Rectangle;
+        positionToTileXY(position: Cartographic, level: number, result?: Cartesian2): Cartesian2;
+    }
+
+    class TimeInterval {
+        start: JulianDate;
+        stop: JulianDate;
+        data: any;
+        isStartIncluded: boolean;
+        isStopIncluded: boolean;
+        isEmpty: boolean;
+        static EMPTY: TimeInterval;
+        constructor(options?: { start?: JulianDate; stop?: JulianDate; isStartIncluded?: boolean; isStopIncluded?: boolean; data?: any });
+        clone(result?: TimeInterval): TimeInterval;
+        equals(right?: TimeInterval, dataComparer?: TimeInterval.DataComparer): boolean;
+        equalsEpsilon(right: TimeInterval, epsilon: number, dataComparer?: TimeInterval.DataComparer): boolean;
+        toString(): string;
+        static fromIso8601(options: { iso8601: string; isStartIncluded?: boolean; isStopIncluded?: boolean; data?: any }, result?: TimeInterval): TimeInterval;
+        static toIso8601(timeInterval: TimeInterval, precision?: number): string;
+        static clone(timeInterval?: TimeInterval, result?: TimeInterval): TimeInterval;
+        static equals(left?: TimeInterval, right?: TimeInterval, dataComparer?: TimeInterval.DataComparer): boolean;
+        static equalsEpsilon(left: TimeInterval, right: TimeInterval, epsilon: number, dataComparer?: TimeInterval.DataComparer): boolean;
+        static intersect(left: TimeInterval, right: TimeInterval, result: TimeInterval, mergeCallback?: TimeInterval.MergeCallback): TimeInterval;
+        static contains(timeInterval: TimeInterval, julianDate: JulianDate): boolean;
+    }
+
+    namespace TimeInterval {
+        type MergeCallback = (leftData: any, rightData: any) => any;
+        type DataComparer = (leftData: any, rightData: any) => boolean;
+    }
+
+    class TimeIntervalCollection {
+        readonly changedEvent: Event;
+        readonly start: JulianDate;
+        readonly isStartIncluded: boolean;
+        readonly stop: JulianDate;
+        readonly isStopIncluded: boolean;
+        readonly length: number;
+        readonly isEmpty: boolean;
+        constructor(intervals?: TimeInterval[]);
+        equals(right?: TimeIntervalCollection, dataComparer?: TimeInterval.DataComparer): boolean;
+        get(index: number): TimeInterval;
+        removeAll(): void;
+        findIntervalContainingDate(date: JulianDate): TimeInterval | undefined;
+        findDataForIntervalContainingDate(date: JulianDate): any;
+        contains(julianDate: JulianDate): boolean;
+        indexOf(date: JulianDate): number;
+        findInterval(options?: { start?: JulianDate; stop?: JulianDate; isStartIncluded?: boolean; isStopIncluded?: boolean }): TimeInterval;
+        addInterval(interval: TimeInterval, dataComparer?: TimeInterval.DataComparer): void;
+        removeInterval(interval: TimeInterval): void;
+        intersect(other: TimeIntervalCollection, dataComparer?: TimeInterval.DataComparer, mergeCallback?: TimeInterval.MergeCallback): TimeIntervalCollection;
+    }
+
+    class VRTheWorldTerrainProvider extends TerrainProvider {
+        constructor(options: { url: string; proxy?: any; ellipsoid?: Ellipsoid; credit?: Credit | string });
+    }
+
+    class VertexFormat extends Packable {
+        position: boolean;
+        normal: boolean;
+        st: boolean;
+        binormal: boolean;
+        tangent: boolean;
+        color: boolean;
+        static POSITION_ONLY: VertexFormat;
+        static POSITION_AND_NORMAL: VertexFormat;
+        static POSITION_NORMAL_AND_ST: VertexFormat;
+        static POSITION_AND_ST: VertexFormat;
+        static POSITION_AND_COLOR: VertexFormat;
+        static ALL: VertexFormat;
+        static DEFAULT: VertexFormat;
+        constructor(options?: any);
+        static unpack(array: number[], startingIndex?: number, result?: VertexFormat): VertexFormat;
+        static clone(cartesian: VertexFormat, result?: VertexFormat): VertexFormat;
+    }
+
+    class WallGeometry extends Packable {
+        constructor(options: { positions: Cartesian3[]; granularity?: number; maximumHeights?: number[]; minimumHeights?: number[]; ellipsoid?: Ellipsoid; vertexFormat?: VertexFormat });
+        static unpack(array: number[], startingIndex?: number, result?: WallGeometry): WallGeometry;
+        static fromConstantHeights(positions: Cartesian3[], maximumHeight?: number, minimumHeight?: number, ellipsoid?: Ellipsoid): WallGeometry;
+        static createGeometry(wallGeometry: WallGeometry): Geometry;
+    }
+
+    class WallOutlineGeometry extends Packable {
+        constructor(options: { positions: Cartesian3[]; granularity?: number; maximumHeights?: number[]; minimumHeights?: number[]; ellipsoid?: Ellipsoid });
+        static unpack(array: number[], startingIndex?: number, result?: WallOutlineGeometry): WallOutlineGeometry;
+        static fromConstantHeights(positions: Cartesian3[], maximumHeight?: number, minimumHeight?: number, ellipsoid?: Ellipsoid): WallOutlineGeometry;
+        static createGeometry(wallGeometry: WallOutlineGeometry): Geometry;
+    }
+
+    class WebMercatorProjection {
+        ellipsoid: Ellipsoid;
+        static MaximumLatitude: number;
+        constructor(ellipsoid?: Ellipsoid);
+        project(cartographic: Cartographic, result?: Cartesian3): Cartesian3;
+        unproject(cartesian: Cartesian3, result?: Cartographic): Cartographic;
+        static mercatorAngleToGeodeticLatitude(mercatorAngle: number): number;
+        static geodeticLatitudeToMercatorAngle(latitude: number): number;
+    }
+
+    class WebMercatorTilingScheme {
+        ellipsoid: Ellipsoid;
+        rectangle: Rectangle;
+        projection: MapProjection;
+        constructor(options?: { ellipsoid?: Ellipsoid;
+            numberOfLevelZeroTilesX?: number;
+            numberOfLevelZeroTilesY?: number;
+            rectangleSouthwestInMeters?: Cartesian2;
+            rectangleNortheastInMeters?: Cartesian2
+        });
+        getNumberOfXTilesAtLevel(level: number): number;
+        getNumberOfYTilesAtLevel(level: number): number;
+        rectangleToNativeRectangle(rectangle: Rectangle, result?: Rectangle): Rectangle;
+        tileXYToNativeRectangle(x: number, y: number, level: number, result?: any): Rectangle;
+        tileXYToRectangle(x: number, y: number, level: number, result?: any): Rectangle;
+        positionToTileXY(position: Cartographic, level: number, result?: Cartesian2): Cartesian2;
+    }
+
+    class BillboardGraphics {
+        definitionChanged: Event;
+        image: Property;
+        imageSubRegion: Property;
+        scale: Property;
+        rotation: Property;
+        alignedAxis: Property;
+        horizontalOrigin: Property;
+        verticalOrigin: Property;
+        color: Property;
+        eyeOffset: Property;
+        pixelOffset: Property;
+        show: Property;
+        width: Property;
+        height: Property;
+        scaleByDistance: Property;
+        translucencyByDistance: Property;
+        pixelOffsetScaleByDistance: Property;
+        constructor(options?: { image?: Property;
+            show?: Property;
+            scale?: Property;
+            horizontalOrigin?: Property;
+            verticalOrigin?: Property;
+            eyeOffset?: Property;
+            pixelOffset?: Property;
+            rotation?: Property;
+            alignedAxis?: Property;
+            width?: Property;
+            height?: Property;
+            color?: Property;
+            scaleByDistance?: Property;
+            translucencyByDistance?: Property;
+            pixelOffsetScaleByDistance?: Property;
+            imageSubRegion?: Property
+        });
+        clone(result?: BillboardGraphics): BillboardGraphics;
+        merge(source: BillboardGraphics): BillboardGraphics;
+    }
+
+    class BillboardVisualizer extends Visualizer {
+        constructor(entityCluster: EntityCluster, entityCollection: EntityCollection);
+    }
+
+    class BoxGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class BoxGraphics {
+        definitionChanged: Event;
+        show: Property;
+        dimensions: Property;
+        material: MaterialProperty;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        constructor(options?: {
+            dimensions?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property
+        });
+        clone(result?: BoxGraphics): BoxGraphics;
+        merge(source: BoxGraphics): BoxGraphics;
+    }
+
+    class CallbackProperty extends Property {
+        constructor(callback: CallbackProperty.Callback, isConstant: boolean);
+        setCallback(callback: CallbackProperty.Callback, isConstant: boolean): void;
+    }
+
+    namespace CallbackProperty {
+        type Callback = (time?: JulianDate, result?: any) => any;
+    }
+
+    class CheckerboardMaterialProperty extends MaterialProperty {
+        evenColor: Color;
+        oddColor: Color;
+        repeat: Property;
+        constructor(options?: { evenColor?: Color; oddColor?: Color; repeat?: Property });
+    }
+
+    class ColorMaterialProperty extends MaterialProperty {
+        color: Color;
+        constructor(color?: Color);
+    }
+
+    class CompositeEntityCollection {
+        collectionChanged: Event;
+        id: string;
+        values: Entity[];
+        constructor(collections?: EntityCollection[]);
+        addCollection(collection: EntityCollection, index?: number): void;
+        removeCollection(collection: EntityCollection): boolean;
+        removeAllCollections(): void;
+        containsCollection(collection: EntityCollection): boolean;
+        contains(entity: Entity): boolean;
+        indexOfCollection(collection: EntityCollection): number;
+        getCollection(index: number): EntityCollection;
+        getCollectionsLength(): number;
+        raiseCollection(collection: EntityCollection): void;
+        lowerCollection(collection: EntityCollection): void;
+        raiseCollectionToTop(collection: EntityCollection): void;
+        lowerCollectionToBottom(collection: EntityCollection): void;
+        suspendEvents(): void;
+        resumeEvents(): void;
+        computeAvailability(): TimeInterval;
+        getById(id: any): Entity;
+    }
+
+    class CompositeMaterialProperty extends MaterialProperty {
+        intervals: TimeIntervalCollection;
+    }
+
+    class CompositePositionProperty {
+        isConstant: boolean;
+        definitionChanged: Event;
+        intervals: TimeIntervalCollection;
+        referenceFrame: ReferenceFrame;
+        getValue(time: JulianDate, result?: any): any;
+        getValueInReferenceFrame(time: JulianDate, referenceFrame: ReferenceFrame, result?: Cartesian3): Cartesian3;
+        equals(other?: Property): boolean;
+    }
+
+    class CompositeProperty extends Property {
+        intervals: TimeIntervalCollection;
+    }
+
+    class ConstantPositionProperty {
+        isConstant: boolean;
+        definitionChanged: Event;
+        referenceFrame: ReferenceFrame;
+        constructor(value?: Cartesian3, referenceFrame?: ReferenceFrame);
+        getValue(time: JulianDate, result?: any): any;
+        setValue(value: Cartesian3, referenceFrame?: ReferenceFrame): void;
+        getValueInReferenceFrame(time: JulianDate, referenceFrame: ReferenceFrame, result?: Cartesian3): Cartesian3;
+        equals(other?: Property): boolean;
+    }
+
+    class ConstantProperty extends Property {
+        constructor(value?: any);
+        setValue(value: any): void;
+    }
+
+    class CorridorGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class CorridorGraphics {
+        definitionChanged: Event;
+        show: Property;
+        material: MaterialProperty;
+        positions: Property;
+        height: Property;
+        extrudedHeight: Property;
+        granularity: Property;
+        width: Property;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        cornerType: Property;
+        constructor(options?: {
+            positions?: Property;
+            width?: Property;
+            cornerType?: Property;
+            height?: Property;
+            extrudedHeight?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            granularity?: Property
+        });
+        clone(result?: CorridorGraphics): CorridorGraphics;
+        merge(source: CorridorGraphics): CorridorGraphics;
+    }
+
+    class CustomDataSource extends DataSource {
+        constructor(name?: string);
+    }
+
+    class CylinderGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class CylinderGraphics {
+        definitionChanged: Event;
+        length: Property;
+        topRadius: Property;
+        bottomRadius: Property;
+        numberOfVerticalLines: Property;
+        slices: Property;
+        show: Property;
+        material: MaterialProperty;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        constructor(options?: { length?: Property;
+            topRadius?: Property;
+            bottomRadius?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            numberOfVerticalLines?: Property;
+            slices?: Property
+        });
+        clone(result?: CylinderGraphics): CylinderGraphics;
+        merge(source: CylinderGraphics): CylinderGraphics;
+    }
+
+    class CzmlDataSource extends DataSource {
+        static updaters: any[];
+        static load(czml: Resource | string | object, options?: { sourceUri?: string }): Promise<CzmlDataSource>;
+        static processMaterialPacketData(object: object, propertyName: string, packetData: object, interval: TimeInterval, sourceUri: string, entityCollection: EntityCollection): void;
+        static processPacketData(type: () => any, object: object, propertyName: string, packetData: object, interval: TimeInterval, sourceUri: string, entityCollection: EntityCollection): void;
+        static processPositionPacketData(object: object, propertyName: string, packetData: object, interval: TimeInterval, sourceUri: string, entityCollection: EntityCollection): void;
+        constructor(name?: string);
+        load(czml: Resource | string | object, options?: { sourceUri?: string }): Promise<CzmlDataSource>;
+        process(czml: Resource | string | object, options?: { sourceUri?: string }): Promise<CzmlDataSource>;
+    }
+
+    abstract class DataSource {
+        changedEvent: Event;
+        clock: DataSourceClock;
+        clustering: EntityCluster;
+        entities: EntityCollection;
+        errorEvent: Event;
+        isLoading: boolean;
+        loadingEvent: Event;
+        name: string;
+        show: boolean;
+        update(time: JulianDate): boolean;
+    }
+
+    class DataSourceClock {
+        definitionChanged: Event;
+        startTime: JulianDate;
+        stopTime: JulianDate;
+        currentTime: JulianDate;
+        clockRange: ClockRange;
+        clockStep: ClockStep;
+        multiplier: number;
+        clone(result?: DataSourceClock): DataSourceClock;
+        equals(other: DataSourceClock): boolean;
+        merge(source: DataSourceClock): DataSourceClock;
+        getValue(): Clock;
+    }
+
+    class DataSourceCollection {
+        length: number;
+        dataSourceAdded: Event;
+        dataSourceRemoved: Event;
+        add(dataSource: DataSource | Promise<DataSource>): Promise<DataSource>;
+        remove(dataSource: DataSource, destroy?: boolean): boolean;
+        removeAll(destroy?: boolean): void;
+        contains(dataSource: DataSource): boolean;
+        indexOf(dataSource: DataSource): number;
+        get(index: number): DataSource;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class DataSourceDisplay {
+        scene: Scene;
+        dataSources: DataSourceCollection;
+        defaultDataSource: CustomDataSource;
+        static defaultVisualizersCallback: DataSourceDisplay.VisualizersCallback;
+        constructor(options: { scene: Scene; dataSourceCollection: DataSourceCollection; visualizersCallback?: DataSourceDisplay.VisualizersCallback });
+        isDestroyed(): boolean;
+        destroy(): void;
+        update(time: JulianDate): boolean;
+    }
+
+    namespace DataSourceDisplay {
+        type VisualizersCallback = (scene: Scene, dataSource: DataSource) => Visualizer[];
+    }
+
+    class DynamicGeometryUpdater {
+        update(time: JulianDate): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class EllipseGeometryUpdater extends GeometryUpdater {
+        readonly onTerrain: boolean;
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class EllipseGraphics {
+        definitionChanged: Event;
+        semiMajorAxis: Property;
+        semiMinorAxis: Property;
+        rotation: Property;
+        show: Property;
+        material: MaterialProperty;
+        height: Property;
+        extrudedHeight: Property;
+        granularity: Property;
+        stRotation: Property;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        numberOfVerticalLines: Property;
+        constructor(options?: {
+            semiMajorAxis?: number;
+            semiMinorAxis?: number;
+            height?: Property;
+            extrudedHeight?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            numberOfVerticalLines?: Property;
+            rotation?: Property;
+            stRotation?: Property;
+            granularity?: Property
+        });
+        clone(result?: EllipseGraphics): EllipseGraphics;
+        merge(source: EllipseGraphics): EllipseGraphics;
+    }
+
+    class EllipsoidGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+        createFillGeometryInstance(time: JulianDate, skipModelMatrix?: boolean, modelMatrixResult?: Matrix4): GeometryInstance;
+        createOutlineGeometryInstance(time: JulianDate, skipModelMatrix?: boolean, modelMatrixResult?: Matrix4): GeometryInstance;
+    }
+
+    class EllipsoidGraphics {
+        definitionChanged: Event;
+        show: Property;
+        radii: Property;
+        material: MaterialProperty;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        stackPartitions: Property;
+        slicePartitions: Property;
+        subdivisions: Property;
+        constructor(options?: {
+            radii?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            subdivisions?: Property;
+            stackPartitions?: Property;
+            slicePartitions?: Property
+        });
+        clone(result?: EllipsoidGraphics): EllipsoidGraphics;
+        merge(source: EllipsoidGraphics): EllipsoidGraphics;
+    }
+
+    class Entity {
+        availability: TimeIntervalCollection;
+        billboard: BillboardGraphics;
+        box: BoxGraphics;
+        corridor: CorridorGraphics;
+        cylinder: CylinderGraphics;
+        readonly definitionChanged: Event;
+        description: Property;
+        ellipse: EllipseGraphics;
+        ellipsoid: EllipsoidGraphics;
+        entityCollection: EntityCollection;
+        id: string;
+        isShowing: boolean;
+        label: LabelGraphics;
+        model: ModelGraphics;
+        name: string;
+        orientation: Property;
+        parent: Entity;
+        path: PathGraphics;
+        plane: any;
+        point: PointGraphics;
+        polygon: PolygonGraphics;
+        polyline: PolylineGraphics;
+        polylineVolume: PolylineVolumeGraphics;
+        position: PositionProperty;
+        properties: any;
+        propertyNames: any[];
+        rectangle: RectangleGraphics;
+        show: boolean;
+        viewFrom: Property;
+        wall: WallGraphics;
+        constructor(options?: {
+          id?: string;
+          name?: string;
+          availability?: TimeIntervalCollection;
+          show?: boolean;
+          description?: Property;
+          position?: PositionProperty;
+          orientation?: Property;
+          viewFrom?: Property;
+          parent?: Entity;
+          billboard?: BillboardGraphics;
+          box?: BoxGraphics;
+          corridor?: CorridorGraphics;
+          cylinder?: CylinderGraphics;
+          ellipse?: EllipseGraphics;
+          ellipsoid?: EllipsoidGraphics;
+          label?: LabelGraphics;
+          model?: ModelGraphics;
+          path?: PathGraphics;
+          plane?: any;
+          point?: PointGraphics;
+          polygon?: PolygonGraphics;
+          polyline?: PolylineGraphics;
+          polylineVolume?: PolylineVolumeGraphics;
+          rectangle?: RectangleGraphics;
+          wall?: WallGraphics
+        });
+        addProperty(propertyName: string): void;
+        computeModelMatrix(time: JulianDate, result?: Matrix4): Matrix4;
+        isAvailable(time: JulianDate): boolean;
+        merge(source: Entity): Entity;
+        removeProperty(propertyName: string): void;
+    }
+
+    class EntityCluster {
+      clusterBillboards: boolean;
+      clusterEvent: Event;
+      clusterLabels: boolean;
+      clusterPoints: boolean;
+      enabled: boolean;
+      minimumClusterSize: number;
+      pixelRange: number;
+      constructor(options?: { enabled?: boolean; pixelRange?: number; minimumClusterSize?: number; clusterBillboards?: boolean; clusterLabels?: boolean; clusterPoints?: boolean });
+      destroy(): void;
+      // newClusterCallback(clusteredEntities, cluster)
+    }
+
+    class EntityCollection {
+        readonly collectionChanged: Event;
+        readonly id: string;
+        readonly owner: DataSource | CompositeEntityCollection;
+        show: boolean;
+        readonly values: Entity[];
+        static collectionChangedEventCallback(collection: EntityCollection, added: Entity[], removed: Entity[], changed: Entity[]): void;
+        constructor(owner: DataSource | CompositeEntityCollection);
+        add(entity: Entity): Entity;
+        computeAvailability(): TimeInterval;
+        contains(entity: Entity): boolean;
+        getById(id: string): Entity;
+        getOrCreateEntity(id: string): Entity;
+        remove(entity: Entity): boolean;
+        removeAll(): void;
+        removeById(id: string): boolean;
+        resumeEvents(): void;
+        suspendEvents(): void;
+    }
+
+    class EntityView {
+        entity: Entity;
+        scene: Scene;
+        ellipsoid: Ellipsoid;
+        boundingSphere: Entity;
+        static defaultOffset3D: Cartesian3;
+        constructor(entity: Entity, scene: Scene, ellipsoid?: Ellipsoid, boundingSphere?: BoundingSphere);
+        update(time: JulianDate): void;
+    }
+
+    class GeoJsonDataSource extends DataSource {
+        static clampToGround: boolean;
+        static crsLinkHrefs: any;
+        static crsLinkTypes: any;
+        static crsNames: any;
+        static fill: Color;
+        static markerColor: Color;
+        static markerSize: number;
+        static markerSymbol: string;
+        static stroke: Color;
+        static strokeWidth: number;
+        static load(data: Resource | string | object, options?: {
+            sourceUri?: string;
+            markerSize?: number;
+            markerSymbol?: string;
+            markerColor?: Color;
+            stroke?: Color;
+            strokeWidth?: number;
+            fill?: Color;
+            clampToGround?: boolean
+        }): Promise<GeoJsonDataSource>;
+        constructor(name?: string);
+        load(data: Resource | string | object, options?: {
+            sourceUri?: string;
+            markerSize?: number;
+            markerSymbol?: string;
+            markerColor?: Color;
+            stroke?: Color;
+            strokeWidth?: number;
+            fill?: Color;
+            clampToGround?: boolean
+        }): Promise<GeoJsonDataSource>;
+    }
+
+    class GeometryUpdater {
+      readonly classificationTypeProperty: Property;
+      readonly readonlydistanceDisplayConditionProperty: Property;
+      readonly entity: Entity;
+      readonly fillEnabled: boolean;
+      readonly fillMaterialProperty: MaterialProperty;
+      readonly geometryChanged: boolean;
+      readonly hasConstantFill: boolean;
+      readonly hasConstantOutline: boolean;
+      readonly id: string;
+      readonly isClosed: boolean;
+      readonly isDynamic: boolean;
+      readonly outlineColorProperty: Property;
+      readonly outlineEnabled: boolean;
+      readonly outlineWidth: number;
+      readonly shadowsProperty: Property;
+      constructor(options: { entity: Entity; scene: Scene; geometryOptions: any; geometryPropertyName: string; observedPropertyNames: string[] });
+      createDynamicUpdater(primitives: PrimitiveCollection, groundPrimitives: PrimitiveCollection): DynamicGeometryUpdater;
+      destroy(): void;
+      isDestroyed(): boolean;
+      isFilled(time: JulianDate): boolean;
+      isOutlineVisible(time: JulianDate): boolean;
+      createFillGeometryInstance(time: JulianDate): GeometryInstance;
+      createOutlineGeometryInstance(time: JulianDate): GeometryInstance;
+    }
+
+    class GeometryVisualizer extends Visualizer {
+        constructor(scene: Scene, entityCollection: EntityCollection, primitives?: PrimitiveCollection, groundPrimitives?: PrimitiveCollection);
+    }
+
+    class GridMaterialProperty extends MaterialProperty {
+        color: Color;
+        cellAlpha: Property;
+        lineCount: Property;
+        lineThickness: Property;
+        lineOffset: Property;
+        constructor(options?: { color?: Property; cellAlpha?: Property; lineCount?: Property; lineThickness?: Property; lineOffset?: Property });
+    }
+
+    class ImageMaterialProperty extends MaterialProperty {
+        image: Property;
+        repeat: Property;
+        constructor(options?: { image?: Property; repeat?: Property });
+    }
+
+    class KmlDataSource extends DataSource {
+        refreshEvent: Event;
+        unsupportedNodeEvent: Event;
+        constructor(options?: {camera?: Camera, canvas?: HTMLCanvasElement; ellipsoid?: Ellipsoid});
+        static load(data: Resource | string | Document | Blob,
+            options?: { camera: Camera, canvas: HTMLCanvasElement; sourceUri?: string, clampToGround?: boolean; ellipsoid?: Ellipsoid }): Promise<KmlDataSource>;
+        load(data: Resource | string | Document | Blob, options?: { sourceUri?: string, clampToGround?: boolean, ellipsoid?: Ellipsoid }): Promise<KmlDataSource>;
+    }
+
+    class KmlFeatureData {
+        author: { name: string; uri: string; email: string };
+        link: { href: string; hreflang: string; rel: string; type: string; title: string; length: string };
+        address: string;
+        phoneNumber: string;
+        snippet: string;
+        extendedData: string;
+    }
+
+    class LabelGraphics {
+        definitionChanged: Event;
+        text: Property;
+        font: Property;
+        style: Property;
+        fillColor: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        horizontalOrigin: Property;
+        verticalOrigin: Property;
+        eyeOffset: Property;
+        pixelOffset: Property;
+        scale: Property;
+        show: Property;
+        translucencyByDistance: Property;
+        pixelOffsetScaleByDistance: Property;
+        constructor(options?: {
+            text?: Property;
+            font?: Property;
+            style?: Property;
+            fillColor?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            show?: Property;
+            scale?: Property;
+            horizontalOrigin?: Property;
+            verticalOrigin?: Property;
+            eyeOffset?: Property;
+            pixelOffset?: Property;
+            translucencyByDistance?: Property;
+            pixelOffsetScaleByDistance?: Property
+        });
+        clone(result?: LabelGraphics): LabelGraphics;
+        merge(source: LabelGraphics): LabelGraphics;
+    }
+
+    class LabelVisualizer extends Visualizer {
+        constructor(entityCluster: EntityCluster, entityCollection: EntityCollection);
+    }
+
+    class MaterialProperty extends Property {
+        getType(time: JulianDate): string;
+    }
+
+    class ModelGraphics {
+        clampAnimations: Property | boolean;
+        clippingPlanes: Property;
+        color: Property;
+        colorBlendAmount: Property | number;
+        colorBlendMode: Property;
+        readonly definitionChanged: Event;
+        distanceDisplayCondition: Property;
+        heightReference: Property;
+        incrementallyLoadTextures: Property | boolean;
+        maximumScale: Property | number;
+        minimumScale: Property | number;
+        minimumPixelSize: Property | number;
+        nodeTransformations: any; // PropertyBag
+        runAnimations: Property | boolean;
+        scale: Property | number;
+        shadows: Property;
+        show: Property | boolean;
+        silhouetteColor: Property;
+        silhouetteSize: Property | number;
+        uri: Property | string;
+        constructor(options?: {
+          uri?: Property | string;
+          show?: Property | boolean;
+          scale?: Property | number;
+          minimumPixelSize?: Property | number;
+          maximumScale?: Property | number;
+          incrementallyLoadTextures?: Property | boolean;
+          runAnimations?: Property | boolean;
+          clampAnimations?: Property | boolean;
+          nodeTransformations?: Property;
+          shadows?: Property;
+          heightReference?: Property;
+          distanceDisplayCondition?: Property;
+          silhouetteColor?: Property;
+          silhouetteSize?: Property | number;
+          color?: Property;
+          colorBlendMode?: Property;
+          colorBlendAmount?: Property | number;
+          clippingPlanes?: Property;
+        });
+        clone(result?: ModelGraphics): ModelGraphics;
+        merge(source: ModelGraphics): ModelGraphics;
+    }
+
+    class ModelVisualizer extends Visualizer {
+        constructor(scene: Scene, entityCollection: EntityCollection);
+    }
+
+    class PathGraphics {
+        readonly definitionChanged: Event;
+        distanceDisplayCondition: Property;
+        leadTime: Property | number;
+        material: MaterialProperty;
+        resolution: Property | number;
+        trailTime: Property | number;
+        show: Property | boolean;
+        width: Property | number;
+        constructor(options?: {
+          leadTime?: Property | number;
+          trailTime?: Property | number;
+          show?: Property | boolean;
+          width?: Property | number;
+          material?: MaterialProperty;
+          resolution?: Property | number;
+          distanceDisplayCondition?: Property;
+        });
+        clone(result?: PathGraphics): PathGraphics;
+        merge(source: PathGraphics): PathGraphics;
+    }
+
+    class PathVisualizer extends Visualizer {
+        constructor(scene: Scene, entityCollection: EntityCollection);
+    }
+
+    class PointGraphics {
+        color: Property;
+        readonly definitionChanged: Event;
+        disableDepthTestDistance: Property;
+        distanceDisplayCondition: Property;
+        heightReference: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        pixelSize: Property;
+        scaleByDistance: Property;
+        show: Property;
+        translucencyByDistance: Property;
+        constructor(options?: {
+          color?: Color;
+          pixelSize?: number;
+          outlineColor?: Color;
+          outlineWidth?: number;
+          show?: boolean;
+          scaleByDistance?: Property;
+          translucencyByDistance?: Property;
+          heightReference?: HeightReference;
+          distanceDisplayCondition?: Property;
+          disableDepthTestDistance?: Property
+        });
+        clone(result?: PointGraphics): PointGraphics;
+        merge(source: PointGraphics): PointGraphics;
+    }
+
+    class PointVisualizer extends Visualizer {
+        constructor(entityCluster: EntityCluster, entityCollection: EntityCollection);
+    }
+
+    class PolygonGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class PolygonGraphics {
+        definitionChanged: Event;
+        show: Property;
+        material: MaterialProperty;
+        positions: Property;
+        hierarchy: Property;
+        height: Property;
+        extrudedHeight: Property;
+        granularity: Property;
+        stRotation: Property;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        perPositionHeight: Property;
+        constructor(options?: {
+            hierarchy?: Property;
+            height?: number;
+            extrudedHeight?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: boolean;
+            outlineColor?: Property;
+            outlineWidth?: number;
+            stRotation?: Property;
+            granularity?: Property;
+            perPositionHeight?: Property
+        });
+        clone(result?: PolygonGraphics): PolygonGraphics;
+        merge(source: PolygonGraphics): PolygonGraphics;
+    }
+
+    class PolylineArrowMaterialProperty extends MaterialProperty {
+        color: Property;
+        constructor(color?: Property);
+    }
+
+    class PolylineGeometryUpdater extends GeometryUpdater {
+        readonly depthFailMaterialProperty: MaterialProperty;
+        readonly distanceDisplayConditionProperty: Property;
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class PolylineGlowMaterialProperty extends MaterialProperty {
+        color: Color;
+        glowPower: Property;
+        constructor(options?: { color?: Property; glowPower?: Property });
+    }
+
+    class PolylineGraphics {
+        definitionChanged: Event;
+        show: Property;
+        material: MaterialProperty;
+        positions: Property;
+        width: number;
+        followSurface: Property;
+        granularity: Property;
+        constructor(options?: { positions?: Cartesian3[]; followSurface?: Property; width?: number; show?: Property; material?: MaterialProperty; granularity?: Property });
+        clone(result?: PolylineGraphics): PolylineGraphics;
+        merge(source: PolylineGraphics): PolylineGraphics;
+    }
+
+    class PolylineOutlineMaterialProperty extends MaterialProperty {
+        color: Color;
+        outlineColor: Color;
+        outlineWidth: Property;
+        constructor(options?: { color?: Property; outlineColor?: Property; outlineWidth?: Property });
+    }
+
+    class PolylineVolumeGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class PolylineVolumeGraphics {
+        definitionChanged: Event;
+        show: Property;
+        material: MaterialProperty;
+        positions: Property;
+        shape: Property;
+        granularity: Property;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        cornerType: Property;
+        constructor(options?: {
+            positions?: Property;
+            shape?: Property;
+            cornerType?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            granularity?: Property
+        });
+        clone(result?: PolylineVolumeGraphics): PolylineVolumeGraphics;
+        merge(source: PolylineVolumeGraphics): PolylineVolumeGraphics;
+    }
+
+    abstract class PositionProperty extends Property {
+        referenceFrame: ReferenceFrame;
+        getValueInReferenceFrame(time: JulianDate, referenceFrame: ReferenceFrame, result?: Cartesian3): Cartesian3;
+    }
+
+    class PositionPropertyArray extends PositionProperty {
+        constructor(value?: Property[]);
+        getValue(time?: JulianDate, result?: Cartesian3[]): Cartesian3[];
+        setValue(value: Property[]): void;
+    }
+
+    abstract class Property {
+        readonly isConstant: boolean;
+        readonly definitionChanged: Event;
+        getValue(time: JulianDate, result?: any): any;
+        equals(other?: Property): boolean;
+    }
+
+    class PropertyArray extends Property {
+        constructor(value?: Property[]);
+        getValue(time?: JulianDate, result?: any[]): any[];
+        setValue(value: Property[]): void;
+    }
+
+    class RectangleGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class RectangleGraphics {
+        definitionChanged: Event;
+        show: Property;
+        coordinates: Property;
+        material: MaterialProperty;
+        height: Property;
+        extrudedHeight: Property;
+        granularity: Property;
+        stRotation: Property;
+        rotation: Property;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        closeTop: Property;
+        closeBottom: Property;
+        constructor(options?: {
+            coordinates?: Property;
+            height?: Property;
+            extrudedHeight?: Property;
+            closeTop?: Property;
+            closeBottom?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            rotation?: Property;
+            stRotation?: Property;
+            granularity?: Property
+        });
+        clone(result?: RectangleGraphics): RectangleGraphics;
+        merge(source: RectangleGraphics): RectangleGraphics;
+    }
+
+    class ReferenceProperty extends Property {
+        readonly referenceFrame: ReferenceFrame;
+        readonly targetId: string;
+        readonly targetCollection: EntityCollection;
+        readonly targetPropertyNames: string[];
+        readonly resolvedProperty: Property;
+        constructor(targetCollection: EntityCollection, targetId: string, targetPropertyNames: string);
+        getValueInReferenceFrame(time: JulianDate, referenceFrame: ReferenceFrame, result?: Cartesian3): Cartesian3;
+        getType(time: JulianDate): string;
+        static fromString(targetCollection: Entity, referenceString: string): ReferenceProperty;
+    }
+
+    class SampledPositionProperty extends SampledProperty {
+        numberOfDerivatives: boolean;
+        constructor(referenceFrame?: ReferenceFrame, numberOfDerivatives?: number);
+        addSample(time: JulianDate, position: Cartesian3, derivatives?: Cartesian3[]): void;
+        addSamples(times: JulianDate[], positions: Cartesian3[], derivatives?: any[][]): void;
+        addSamplesPackedArray(packedSamples: number[], epoch?: JulianDate): void;
+    }
+
+    class SampledProperty extends PositionProperty {
+        type: any;
+        derivativeTypes: Packable[];
+        interpolationDegree: number;
+        interpolationAlgorithm: InterpolationAlgorithm;
+        forwardExtrapolationType: ExtrapolationType;
+        forwardExtrapolationDuration: number;
+        backwardExtrapolationType: ExtrapolationType;
+        backwardExtrapolationDuration: number;
+        constructor(type: number | Packable, derivativeTypes?: Packable[]);
+        setInterpolationOptions(options?: { interpolationAlgorithm?: InterpolationAlgorithm; interpolationDegree?: number }): void;
+        addSample(time: JulianDate, value: Packable, derivatives?: Packable[]): void;
+        addSamples(times: JulianDate[], values: Packable[], derivativeValues?: any[][]): void;
+        addSamplesPackedArray(packedSamples: number[], epoch?: JulianDate): void;
+    }
+
+    class StripeMaterialProperty extends MaterialProperty {
+        orientation: Property;
+        evenColor: Color;
+        oddColor: Color;
+        offset: Property;
+        repeat: number;
+        constructor(options?: { evenColor?: Property; oddColor?: Property; repeat?: Property; offset?: Property; orientation?: Property });
+    }
+
+    class TimeIntervalCollectionPositionProperty extends PositionProperty {
+        intervals: TimeIntervalCollection;
+        constructor(referenceFrame?: ReferenceFrame);
+    }
+
+    class TimeIntervalCollectionProperty extends Property {
+        intervals: TimeIntervalCollection;
+    }
+
+    class VelocityOrientationProperty extends Property {
+        position: Property;
+        ellipsoid: Property;
+        constructor(position?: Property, ellipsoid?: Ellipsoid);
+        getValue(time?: JulianDate, result?: Quaternion): Quaternion;
+    }
+
+    abstract class Visualizer {
+        update(time: JulianDate): boolean;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class WallGeometryUpdater extends GeometryUpdater {
+        constructor(entity: Entity, scene: Scene);
+    }
+
+    class WallGraphics {
+        readonly definitionChanged: Event;
+        show: Property;
+        material: MaterialProperty;
+        positions: Property;
+        minimumHeights: Property;
+        maximumHeights: Property;
+        granularity: Property;
+        fill: Property;
+        outline: Property;
+        outlineColor: Property;
+        outlineWidth: Property;
+        constructor(options?: {
+            positions?: Property;
+            maximumHeights?: Property;
+            minimumHeights?: Property;
+            show?: Property;
+            fill?: Property;
+            material?: MaterialProperty;
+            outline?: Property;
+            outlineColor?: Property;
+            outlineWidth?: Property;
+            granularity?: Property
+        });
+        clone(result?: WallGraphics): WallGraphics;
+        merge(source: WallGraphics): WallGraphics;
+    }
+
+    class Appearance {
+        readonly closed: boolean;
+        readonly fragmentShaderSource: string;
+        material: Material;
+        readonly renderState: any;
+        translucent: boolean;
+        readonly vertexShaderSource: string;
+        constructor(options?: { translucent?: boolean; closed?: boolean; material?: Material; vertexShaderSource?: string; fragmentShaderSource?: string; renderState?: RenderState });
+        getFragmentShaderSource(): string;
+        isTranslucent(): boolean;
+        getRenderState(): any;
+    }
+
+    class ArcGisMapServerImageryProvider extends ImageryProvider {
+        url: string;
+        usingPrecachedTiles: boolean;
+        constructor(options: {
+            url: string;
+            tileDiscardPolicy?: TileDiscardPolicy;
+            proxy?: Proxy;
+            usePreCachedTilesIfAvailable?: boolean;
+            enablePickFeatures?: boolean;
+            rectangle?: Rectangle;
+            tilingScheme?: TilingScheme;
+            ellipsoid?: Ellipsoid;
+            tileWidth?: number;
+            tileHeight?: number;
+            maximumLevel?: number
+        }, layers?: string);
+    }
+
+    class DistanceDisplayCondition extends Packable {
+        far: number;
+        near: number;
+        constructor(near: number, far: number);
+        static clone(value?: DistanceDisplayCondition, result?: DistanceDisplayCondition): DistanceDisplayCondition;
+        static equals(left: DistanceDisplayCondition, right: DistanceDisplayCondition): boolean;
+        static pack(value: DistanceDisplayCondition, array: number[], startingIndex: number): number[];
+        static unpack(array: number[], startingIndex: number, result: DistanceDisplayCondition): DistanceDisplayCondition;
+        clone(result: DistanceDisplayCondition): DistanceDisplayCondition;
+        equals(other: DistanceDisplayCondition): boolean;
+    }
+
+    class Billboard {
+      alignedAxis: Cartesian3;
+      color: Color;
+      disableDepthTestDistance: number;
+      distanceDisplayCondition: DistanceDisplayCondition;
+      eyeOffset: Cartesian3;
+      height: number;
+      heightReference: HeightReference;
+      horizontalOrigin: HorizontalOrigin;
+      id: any;
+      image: string;
+      pixelOffset: Cartesian2;
+      pixelOffsetScaleByDistance: NearFarScalar;
+      position: Cartesian3;
+      readonly ready: boolean;
+      rotation: number;
+      scale: number;
+      scaleByDistance: NearFarScalar;
+      show: boolean;
+      sizeInMeters: boolean;
+      translucencyByDistance: NearFarScalar;
+      verticalOrigin: VerticalOrigin;
+      width: number;
+      computeScreenSpacePosition(scene: Scene, result?: Cartesian2): Cartesian2;
+      equals(other: Billboard): boolean;
+      setImage(id: string, image: HTMLImageElement | HTMLCanvasElement | string | Billboard.CreateImageCallback): void;
+      setImageSubRegion(id: string, subRegion: BoundingRectangle): void;
+    }
+
+    namespace Billboard {
+        type CreateImageCallback = (id: string) => HTMLImageElement | HTMLCanvasElement | Promise<HTMLImageElement | HTMLCanvasElement>;
+    }
+
+    class BillboardCollection {
+        blendOption: BlendOption;
+        debugShowBoundingVolume: boolean;
+        length: number;
+        modelMatrix: Matrix4;
+        constructor(options?: { modelMatrix?: Matrix4; debugShowBoundingVolume?: boolean; scene?: Scene; blendOption?: BlendOption });
+        add(billboard?: any): Billboard;
+        contains(billboard?: Billboard): boolean;
+        destroy(): void;
+        get(index: number): Billboard;
+        isDestroyed(): boolean;
+        remove(billboard: Billboard): boolean;
+        removeAll(): void;
+        update(): void;
+    }
+
+    class BingMapsImageryProvider extends ImageryProvider {
+        readonly url: string;
+        readonly key: string;
+        readonly mapStyle: BingMapsStyle;
+        readonly culture: string;
+        constructor(options: { url: string; key?: string; tileProtocol?: string; mapStyle?: string; culture?: string; ellipsoid?: Ellipsoid; tileDiscardPolicy?: TileDiscardPolicy; proxy?: Proxy });
+        static tileXYToQuadKey(x: number, y: number, level: number): string;
+        static quadKeyToTileXY(quadkey: string): {x: number, y: number, level: number};
+    }
+
+    // tslint:disable-next-line no-unnecessary-class
+    class EasingFunction {
+        static BACK_IN: EasingFunction.Callback;
+        static BACK_IN_OUT: EasingFunction.Callback;
+        static BACK_OUT: EasingFunction.Callback;
+        static BOUNCE_IN: EasingFunction.Callback;
+        static BOUNCE_IN_OUT: EasingFunction.Callback;
+        static BOUNCE_OUT: EasingFunction.Callback;
+        static CIRCULAR_IN: EasingFunction.Callback;
+        static CIRCULAR_IN_OUT: EasingFunction.Callback;
+        static CIRCULAR_OUT: EasingFunction.Callback;
+        static CUBIC_IN: EasingFunction.Callback;
+        static CUBIC_IN_OUT: EasingFunction.Callback;
+        static CUBIR_OUT: EasingFunction.Callback;
+        static ELASTIC_IN: EasingFunction.Callback;
+        static ELASTIC_IN_OUT: EasingFunction.Callback;
+        static ELASTIC_OUT: EasingFunction.Callback;
+        static EXPONENTIAL_IN: EasingFunction.Callback;
+        static EXPONENTIAL_IN_OUT: EasingFunction.Callback;
+        static EXPONENTIAL_OUT: EasingFunction.Callback;
+        static LINEAR_NONE: EasingFunction.Callback;
+        static QUADRATIC_IN: EasingFunction.Callback;
+        static QUADRATIC_IN_OUT: EasingFunction.Callback;
+        static QUADRATIC_OUT: EasingFunction.Callback;
+        static QUARTIC_IN: EasingFunction.Callback;
+        static QUARTIC_IN_OUT: EasingFunction.Callback;
+        static QUARTIC_OUT: EasingFunction.Callback;
+        static QUINTIC_IN: EasingFunction.Callback;
+        static QUINTIC_IN_OUT: EasingFunction.Callback;
+        static QUINTIC_OUT: EasingFunction.Callback;
+        static SINUSOIDAL_IN: EasingFunction.Callback;
+        static SINUSOIDAL_IN_OUT: EasingFunction.Callback;
+        static SINUSOIDAL_OUT: EasingFunction.Callback;
+    }
+
+    namespace EasingFunction {
+        type Callback = (time: number) => number;
+    }
+
+    class Camera {
+        position: Cartesian3;
+        direction: Cartesian3;
+        up: Cartesian3;
+        right: Cartesian3;
+        frustum: Frustum;
+        defaultMoveAmount: number;
+        defaultLookAmount: number;
+        defaultRotateAmount: number;
+        defaultZoomAmount: number;
+        constrainedAxis: Cartesian3;
+        maximumTranslateFactor: number;
+        maximumZoomFactor: number;
+        readonly transform: Matrix4;
+        readonly inverseTransform: Matrix4;
+        readonly viewMatrix: Matrix4;
+        readonly inverseViewMatrix: Matrix4;
+        readonly positionCartographic: Cartographic;
+        readonly positionWC: Cartesian3;
+        percentageChanged: number;
+        readonly directionWC: Cartesian3;
+        readonly upWC: Cartesian3;
+        readonly rightWC: Cartesian3;
+        readonly heading: number;
+        readonly pitch: number;
+        readonly roll: number;
+        readonly moveStart: Event;
+        readonly moveEnd: Event;
+        static DEFAULT_OFFSET: HeadingPitchRange;
+        static DEFAULT_VIEW_RECTANGLE: Rectangle;
+        static DEFAULT_VIEW_FACTOR: number;
+        readonly changed: Event;
+        constructor(scene: Scene);
+        cameraToWorldCoordinates(cartesian: Cartesian4, result?: Cartesian4): Cartesian4;
+        cameraToWorldCoordinatesPoint(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        cameraToWorldCoordinatesVector(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        cancelFlight(): void;
+        computeViewRectangle(ellipsoid?: Ellipsoid, result?: Rectangle): Rectangle | undefined;
+        distanceToBoundingSphere(boundingSphere: BoundingSphere): number;
+        flyHome(duration: number): void;
+        flyTo(options: {
+            destination: Cartesian3 | Rectangle;
+            orientation?: any;
+            duration?: number;
+            complete?: Camera.FlightCompleteCallback;
+            cancel?: Camera.FlightCancelledCallback;
+            endTransform?: Matrix4;
+            maximumHeight?: number;
+            pitchAdjustHeight?: number;
+            flyOverLongitude?: number;
+            flyOverLongitudeWeight?: number;
+            easingFunction?: EasingFunction
+        }): void;
+        flyToBoundingSphere(boundingSphere: BoundingSphere, options?: {
+            duration?: number;
+            offset?: HeadingPitchRange;
+            complete?: Camera.FlightCompleteCallback;
+            cancel?: Camera.FlightCancelledCallback;
+            endTransform?: Matrix4;
+            maximumHeight?: number;
+            pitchAdjustHeight?: number;
+            flyOverLongitude?: number;
+            flyOverLongitudeWeight?: number;
+            easingFunction?: EasingFunction
+        }): void;
+        getMagnitude(): number;
+        getPickRay(windowPosition: Cartesian2, result?: Ray): Ray;
+        getPixelSize(boundingSphere: BoundingSphere, drawingBufferWidth: number, drawingBufferHeight: number): number;
+        getRectangleCameraCoordinates(rectangle: Rectangle, result?: Cartesian3): Cartesian3;
+        look(axis: Cartesian3, angle?: number): void;
+        lookAt(target: Cartesian3, offset: Cartesian3 | HeadingPitchRange): void;
+        lookAtTransform(transform: Matrix4, offset: Cartesian3 | HeadingPitchRange): void;
+        lookDown(amount?: number): void;
+        lookLeft(amount?: number): void;
+        lookRight(amount?: number): void;
+        lookUp(amount?: number): void;
+        move(direction: Cartesian3, amount?: number): void;
+        moveBackward(amount?: number): void;
+        moveDown(amount?: number): void;
+        moveForward(amount?: number): void;
+        moveLeft(amount?: number): void;
+        moveRight(amount?: number): void;
+        moveUp(amount?: number): void;
+        pickEllipsoid(windowPosition: Cartesian2, ellipsoid?: Ellipsoid, result?: Cartesian3): Cartesian3;
+        rotate(axis: Cartesian3, angle?: number): void;
+        rotateDown(angle?: number): void;
+        rotateLeft(angle?: number): void;
+        rotateRight(angle?: number): void;
+        rotateUp(angle?: number): void;
+        setView(options: {destination?: Cartesian3 | Rectangle; orientation?: any; endTransform?: Matrix4}): void;
+        switchToOrthographicFrustum(): void;
+        switchToPerspectiveFrustum(): void;
+        twistLeft(amount?: number): void;
+        twistRight(amount?: number): void;
+        viewBoundingSphere(boundingSphere: BoundingSphere, offset?: HeadingPitchRange): void;
+        worldToCameraCoordinates(cartesian: Cartesian4, result?: Cartesian4): Cartesian4;
+        worldToCameraCoordinatesPoint(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        worldToCameraCoordinatesVector(cartesian: Cartesian3, result?: Cartesian3): Cartesian3;
+        zoomIn(amount?: number): void;
+        zoomOut(amount?: number): void;
+    }
+
+    namespace Camera {
+        type FlightCancelledCallback = () => void;
+        type FlightCompleteCallback = () => void;
+    }
+
+    class CameraEventAggregator {
+        currentMousePosition: Cartesian2;
+        anyButtonDown: boolean;
+        constructor(element?: HTMLCanvasElement);
+        isMoving(type: CameraEventType, modifier?: KeyboardEventModifier): boolean;
+        getMovement(type: CameraEventType, modifier?: KeyboardEventModifier): any;
+        getLastMovement(type: CameraEventType, modifier?: KeyboardEventModifier): any;
+        isButtonDown(type: CameraEventType, modifier?: KeyboardEventModifier): boolean;
+        getStartMousePosition(type: CameraEventType, modifier?: KeyboardEventModifier): Cartesian2;
+        getButtonPressTime(type: CameraEventType, modifier?: KeyboardEventModifier): Date;
+        getButtonReleaseTime(type: CameraEventType, modifier?: KeyboardEventModifier): Date;
+        reset(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class CreditDisplay {
+        static cesiumCredit: Credit;
+        container: HTMLElement;
+        constructor(container: HTMLElement, delimiter?: string, viewport?: HTMLElement);
+        addCredit(credit: Credit): void;
+        addDefaultCredit(credit: Credit): void;
+        beginFrame(credit: Credit): void;
+        destroy(): void;
+        endFrame(credit: Credit): void;
+        isDestroyed(): boolean;
+        removeDefaultCredit(credit: Credit): void;
+        update(): void;
+    }
+
+    class CullingVolume {
+        planes: Cartesian4[];
+        constructor(planes: Cartesian4[]);
+        computeVisibility(boundingVolume: any): Intersect;
+    }
+
+    class DebugAppearance extends Appearance {
+        readonly attributeName: string;
+        readonly glslDatatype: string;
+        constructor(options: { attributeName: string; glslDatatype?: string; vertexShaderSource?: string; fragmentShaderSource?: string; renderState?: RenderState });
+    }
+
+    class DebugModelMatrixPrimitive {
+        length: number;
+        width: number;
+        show: boolean;
+        modelMatrix: Matrix4;
+        id: any;
+        constructor(options?: { length?: number; width?: number; modelMatrix?: Matrix4; show?: boolean; id?: any });
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class DiscardMissingTileImagePolicy {
+        constructor(options: { missingImageUrl: Resource | string; pixelsToCheck: Cartesian2[]; disableCheckIfAllPixelsAreTransparent?: boolean });
+        isReady(): boolean;
+        shouldDiscardImage(image: HTMLImageElement): boolean;
+    }
+
+    class EllipsoidPrimitive {
+        center: Cartesian3;
+        radii: Cartesian3;
+        modelMatrix: Matrix4;
+        show: boolean;
+        material: Material;
+        id: any;
+        debugShowBoundingVolume: boolean;
+        constructor(options?: { center?: Cartesian3; radii?: Cartesian3; modelMatrix?: Matrix4; show?: boolean; material?: Material; id?: any; debugShowBoundingVolume?: boolean });
+        update(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class EllipsoidSurfaceAppearance extends Appearance {
+        readonly vertexFormat: VertexFormat;
+        readonly flat: boolean;
+        readonly faceForward: boolean;
+        readonly aboveGround: boolean;
+        static VERTEX_FORMAT: VertexFormat;
+        constructor(options?: {
+            flat?: boolean;
+            faceForward?: boolean;
+            translucent?: boolean;
+            aboveGround?: boolean;
+            material?: Material;
+            vertexShaderSource?: string;
+            fragmentShaderSource?: string;
+            renderState?: RenderState
+        });
+    }
+
+    class FrameRateMonitor {
+        samplingWindow: number;
+        quietPeriod: number;
+        warmupPeriod: number;
+        minimumFrameRateDuringWarmup: number;
+        minimumFrameRateAfterWarmup: number;
+        scene: Scene;
+        lowFrameRate: Event;
+        nominalFrameRate: Event;
+        lastFramesPerSecond: number;
+        static defaultSettings: any;
+        constructor(options?: {
+            scene: Scene;
+            samplingWindow?: number;
+            quietPeriod?: number;
+            warmupPeriod?: number;
+            minimumFrameRateDuringWarmup?: number;
+            minimumFrameRateAfterWarmup?: number
+        });
+        pause(): void;
+        unpause(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+        static fromScene(scene: Scene): FrameRateMonitor;
+    }
+
+    // tslint:disable-next-line no-unnecessary-class
+    class GetFeatureInfoFormat {
+        constructor(type: string, format?: string, callback?: (res: any) => any);
+    }
+
+    class Globe {
+        terrainProvider: TerrainProvider;
+        northPoleColor: Cartesian3;
+        southPoleColor: Cartesian3;
+        show: boolean;
+        oceanNormalMapUrl: string;
+        depthTestAgainstTerrain: boolean;
+        maximumScreenSpaceError: number;
+        tileCacheSize: number;
+        enableLighting: boolean;
+        lightingFadeOutDistance: number;
+        lightingFadeInDistance: number;
+        showWaterEffect: boolean;
+        ellipsoid: Ellipsoid;
+        imageryLayers: ImageryLayerCollection;
+        baseColor: Color;
+        constructor(ellipsoid?: Ellipsoid);
+        pick(ray: Ray, scene: Scene, result?: Cartesian3): Cartesian3;
+        getHeight(cartographic: Cartographic): number;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class GoogleEarthEnterpriseImageryProvider extends ImageryProvider {
+        url: string;
+        path: string;
+        channel: number;
+        version: number;
+        requestType: string;
+        constructor(options: {
+            url: string;
+            channel: number;
+            path?: string;
+            maximumLevel?: number;
+            tileDiscardPolicy?: TileDiscardPolicy;
+            ellipsoid?: Ellipsoid;
+            proxy?: Proxy
+        });
+    }
+
+    class GridImageryProvider extends ImageryProvider {
+        constructor(options?: {
+            tilingScheme?: TilingScheme;
+            ellipsoid?: Ellipsoid;
+            cells?: number;
+            color?: Color;
+            glowColor?: Color;
+            glowWidth?: number;
+            tileWidth?: number;
+            tileHeight?: number;
+            canvasSize?: number
+        }, backgroundColor?: Color);
+    }
+
+    class HeadingPitchRange {
+        heading: number;
+        pitch: number;
+        range: number;
+        constructor(heading?: number, pitch?: number, range?: number);
+        static clone(hpr: HeadingPitchRange, result?: HeadingPitchRange): HeadingPitchRange;
+    }
+
+    class ImageryLayer {
+        alpha: number;
+        brightness: number;
+        contrast: number;
+        hue: number;
+        saturation: number;
+        gamma: number;
+        show: boolean;
+        imageryProvider: ImageryProvider;
+        rectangle: Rectangle;
+        static DEFAULT_BRIGHTNESS: number;
+        static DEFAULT_CONTRAST: number;
+        static DEFAULT_HUE: number;
+        static DEFAULT_SATURATION: number;
+        static DEFAULT_GAMMA: number;
+        constructor(imageryProvider: ImageryProvider, options?: {
+            rectangle?: Rectangle;
+            alpha?: number | ImageryLayer.ValueFunc;
+            brightness?: number | ImageryLayer.ValueFunc;
+            contrast?: number | ImageryLayer.ValueFunc;
+            hue?: number | ImageryLayer.ValueFunc;
+            saturation?: number | ImageryLayer.ValueFunc;
+            gamma?: number | ImageryLayer.ValueFunc;
+            show?: boolean;
+            maximumAnisotropy?: number;
+            minimumTerrainLevel?: number;
+            maximumTerrainLevel?: number
+        });
+        isBaseLayer(): boolean;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    namespace ImageryLayer {
+        type ValueFunc = (frameState: any, layer: ImageryLayer, x: number, y: number, level: number) => number;
+    }
+
+    class ImageryLayerCollection {
+        layerAdded: Event;
+        layerRemoved: Event;
+        layerMoved: Event;
+        layerShownOrHidden: Event;
+        length: number;
+        add(layer: ImageryLayer, index?: number): void;
+        addImageryProvider(imageryProvider: ImageryProvider, index?: number): ImageryLayer;
+        remove(layer: ImageryLayer, destroy?: boolean): boolean;
+        removeAll(destroy?: boolean): void;
+        contains(layer: ImageryLayer): boolean;
+        indexOf(layer: ImageryLayer): number;
+        get(index: number): ImageryLayer;
+        raise(layer: ImageryLayer): void;
+        lower(layer: ImageryLayer): void;
+        raiseToTop(layer: ImageryLayer): void;
+        lowerToBottom(layer: ImageryLayer): void;
+        pickImageryLayerFeatures(ray: Ray, scene: Scene): Promise<ImageryLayerFeatureInfo[]> | undefined;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class ImageryLayerFeatureInfo {
+        name: string;
+        description: string;
+        position: Cartographic;
+        data: any;
+        configureNameFromProperties(properties: any): void;
+        configureDescriptionFromProperties(properties: any): void;
+    }
+
+    abstract class ImageryProvider {
+        credit: Credit;
+        defaultAlpha: number;
+        defaultBrightness: number;
+        defaultContrast: number;
+        defaultGamma: number;
+        defaultHue: number;
+        defaultSaturation: number;
+        defaultMagnificationFilter: any;
+        defaultMinificationFilter: any;
+        readonly errorEvent: Event;
+        readonly hasAlphaChannel: boolean;
+        readonly maximumLevel: number;
+        readonly minimumLevel: number;
+        readonly proxy: Proxy;
+        readonly ready: boolean;
+        readonly readyPromise: Promise<boolean>;
+        readonly rectangle: Rectangle;
+        readonly tileDiscardPolicy: TileDiscardPolicy;
+        readonly tileWidth: number;
+        readonly tileHeight: number;
+        readonly tilingScheme: TilingScheme;
+        getTileCredits(x: number, y: number, level: number): Credit[];
+        requestImage(x: number, y: number, level: number): Promise<HTMLImageElement | HTMLCanvasElement>;
+        pickFeatures(x: number, y: number, level: number, longitude: number, latitude: number): Promise<ImageryLayerFeatureInfo[]>;
+        static loadImage(url: string): Promise<HTMLImageElement | HTMLCanvasElement>;
+    }
+
+    class Label {
+        show: boolean;
+        position: Cartesian3;
+        text: string;
+        font: string;
+        fillColor: Color;
+        outlineColor: Color;
+        outlineWidth: number;
+        style: LabelStyle;
+        pixelOffset: Cartesian2;
+        translucencyByDistance: NearFarScalar;
+        pixelOffsetScaleByDistance: NearFarScalar;
+        eyeOffset: Cartesian3;
+        horizontalOrigin: HorizontalOrigin;
+        verticalOrigin: VerticalOrigin;
+        scale: number;
+        id: any;
+        computeScreenSpacePosition(scene: Scene, result?: Cartesian2): Cartesian2;
+        equals(other: Label): boolean;
+        isDestroyed(): boolean;
+    }
+
+    class LabelCollection {
+        modelMatrix: Matrix4;
+        debugShowBoundingVolume: boolean;
+        length: number;
+        constructor(options?: { modelMatrix?: Matrix4; debugShowBoundingVolume?: boolean });
+        add(options?: any): Label;
+        remove(label: Label): boolean;
+        removeAll(): void;
+        contains(label: Label): boolean;
+        get(index: number): Label;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class Material {
+        type: string;
+        shaderSource: string;
+        materials: any;
+        uniforms: any;
+        translucent: boolean;
+        static DefaultImageId: string;
+        static DefaultCubeMapId: string;
+        static ColorType: string;
+        static ImageType: string;
+        static DiffuseMapType: string;
+        static AlphaMapType: string;
+        static SpecularMapType: string;
+        static EmissionMapType: string;
+        static BumpMapType: string;
+        static NormalMapType: string;
+        static GridType: string;
+        static StripeType: string;
+        static CheckerboardType: string;
+        static DotType: string;
+        static WaterType: string;
+        static RimLightingType: string;
+        static FadeType: string;
+        static PolylineArrowType: string;
+        static PolylineGlowType: string;
+        static PolylineOutlineType: string;
+        constructor(options?: { strict?: boolean; translucent?: boolean; fabric: any });
+        isTranslucent(): boolean;
+        isDestroyed(): boolean;
+        destroy(): void;
+        static fromType(type: string, uniforms?: any): Material;
+    }
+
+    class MaterialAppearance extends Appearance {
+        readonly materialSupport: MaterialAppearance.MaterialSupport;
+        readonly vertexFormat: VertexFormat;
+        readonly flat: boolean;
+        readonly faceForward: boolean;
+        constructor(options?: {
+            flat?: boolean;
+            faceForward?: boolean;
+            translucent?: boolean;
+            closed?: boolean;
+            materialSupport?: MaterialAppearance.MaterialSupport;
+            material?: Material;
+            vertexShaderSource?: string;
+            fragmentShaderSource?: string;
+            renderState?: RenderState
+        });
+    }
+
+    namespace MaterialAppearance {
+        enum MaterialSupport {
+            BASIC,
+            TEXTURED,
+            ALL
+        }
+    }
+
+    class Model {
+        show: boolean;
+        modelMatrix: Matrix4;
+        scale: number;
+        minimumPixelSize: number;
+        id: any;
+        activeAnimations: ModelAnimationCollection;
+        debugShowBoundingVolume: boolean;
+        debugWireframe: boolean;
+        gltf: any;
+        basePath: string;
+        boundingSphere: BoundingSphere;
+        ready: boolean;
+        readyPromise: Promise<Model>;
+        asynchronous: boolean;
+        allowPicking: boolean;
+        constructor(options?: {
+            gltf?: any;
+            basePath?: string;
+            show?: boolean;
+            modelMatrix?: Matrix4;
+            scale?: number;
+            minimumPixelSize?: number;
+            id?: any;
+            allowPicking?: boolean;
+            asynchronous?: boolean;
+            debugShowBoundingVolume?: boolean;
+            debugWireframe?: boolean
+        });
+        getNode(name: string): ModelNode;
+        getMesh(name: string): ModelMesh;
+        getMaterial(name: string): ModelMaterial;
+        update(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+        static fromGltf(options: {
+            url: string;
+            headers?: any;
+            show?: boolean;
+            modelMatrix?: Matrix4;
+            scale?: number;
+            minimumPixelSize?: number;
+            allowPicking?: boolean;
+            asynchronous?: boolean;
+            debugShowBoundingVolume?: boolean;
+            debugWireframe?: boolean
+        }): Model;
+    }
+
+    class ModelAnimation {
+        removeOnStop: boolean;
+        start: Event;
+        update: Event;
+        stop: Event;
+        name: string;
+        startTime: JulianDate;
+        delay: number;
+        stopTime: JulianDate;
+        speedup: number;
+        reverse: boolean;
+        loop: ModelAnimationLoop;
+    }
+
+    class ModelAnimationCollection {
+        animationAdded: Event;
+        animationRemoved: Event;
+        length: number;
+        add(options: {
+            name: string;
+            startTime?: JulianDate;
+            delay?: number;
+            stopTime?: JulianDate;
+            removeOnStop?: boolean;
+            speedup?: number;
+            reverse?: boolean;
+            loop?: ModelAnimationLoop
+        }): ModelAnimation;
+        addAll(options?: {
+            startTime?: JulianDate;
+            delay?: number;
+            stopTime?: JulianDate;
+            removeOnStop?: boolean;
+            speedup?: number;
+            reverse?: boolean;
+            loop?: ModelAnimationLoop
+        }): ModelAnimation[];
+        remove(animation: ModelAnimation): boolean;
+        removeAll(): void;
+        contains(animation: ModelAnimation): boolean;
+        get(index: number): ModelAnimation;
+    }
+
+    class ModelMaterial {
+        readonly name: string;
+        readonly id: string;
+        setValue(name: string, value?: any): void;
+        getValue(name: string): any;
+    }
+
+    class ModelMesh {
+        name: string;
+        id: string;
+        materials: ModelMaterial[];
+    }
+
+    class ModelNode {
+        name: string;
+        id: string;
+        show: boolean;
+        matrix: Matrix4;
+    }
+
+    class Moon {
+        show: boolean;
+        textureUrl: string;
+        onlySunLighting: boolean;
+        ellipsoid: Ellipsoid;
+        constructor(options?: { show?: boolean; textureUrl?: string; ellipsoid?: Ellipsoid; onlySunLighting?: boolean });
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class NeverTileDiscardPolicy {
+        isReady(): boolean;
+        shouldDiscardImage(image: HTMLImageElement | Promise<HTMLImageElement>): Promise<boolean>;
+    }
+
+    class PerInstanceColorAppearance extends Appearance {
+        readonly vertexFormat: VertexFormat;
+        readonly flat: boolean;
+        readonly faceForward: boolean;
+        static VERTEX_FORMAT: VertexFormat;
+        static FLAT_VERTEX_FORMAT: VertexFormat;
+        constructor(options?: { flat?: boolean;
+            faceForward?: boolean;
+            translucent?: boolean;
+            closed?: boolean;
+            vertexShaderSource?: string;
+            fragmentShaderSource?: string;
+            renderState?: RenderState
+        });
+    }
+
+    abstract class Frustum {
+        near: number;
+        far: number;
+        readonly projectionMatrix: Matrix4;
+        computeCullingVolume(position: Cartesian3, direction: Cartesian3, up: Cartesian3): CullingVolume;
+        getPixelDimensions(drawingBufferWidth: number, drawingBufferHeight: number, distance: number, result: Cartesian2): Cartesian2;
+    }
+
+    class OrthographicFrustum extends Frustum {
+        aspectRatio: number;
+        width: number;
+        static packedLength: number;
+        constructor(options?: {width: number; aspectRatio: number; near: number; far: number});
+        pack(value: OrthographicFrustum, array: number[], startingIndex: number): number[];
+        unpack(array: number[], startingIndex: number, result: OrthographicFrustum): OrthographicFrustum;
+        clone(result?: OrthographicFrustum): OrthographicFrustum;
+        equals(other?: OrthographicFrustum): boolean;
+    }
+
+    class PerspectiveFrustum extends Frustum {
+        fov: number;
+        aspectRatio: number;
+        xOffset: number;
+        yOffset: number;
+        readonly infiniteProjectionMatrix: Matrix4;
+        readonly fovy: number;
+        static packedLength: number;
+        constructor(options?: {fov: number; aspectRatio: number; near: number; far: number; xOffset: number; yOffset: number});
+        pack(value: PerspectiveFrustum, array: number[], startingIndex: number): number[];
+        unpack(array: number[], startingIndex: number, result: PerspectiveFrustum): PerspectiveFrustum;
+        clone(result?: PerspectiveFrustum): PerspectiveFrustum;
+        equals(other?: PerspectiveFrustum): boolean;
+    }
+
+    class PerspectiveOffCenterFrustum extends Frustum {
+        left: number;
+        right: number;
+        top: number;
+        bottom: number;
+        readonly infiniteProjectionMatrix: Matrix4;
+        constructor(options?: {left: number; right: number; top: number; bottom: number; near: number; far: number});
+        clone(result?: PerspectiveOffCenterFrustum): PerspectiveOffCenterFrustum;
+        equals(other?: PerspectiveOffCenterFrustum): boolean;
+    }
+
+    class PointPrimitive {
+        color: Color;
+        disableDepthTestDistance: number;
+        distanceDisplayCondition: DistanceDisplayCondition;
+        id: any;
+        outlineColor: Color;
+        outlineWidth: number;
+        pixelSize: number;
+        position: Cartesian3;
+        scaleByDistance: NearFarScalar;
+        show: boolean;
+        translucencyByDistance: NearFarScalar;
+        computeScreenSpacePosition(scene: Scene, result?: Cartesian2): Cartesian2;
+        equals(other: PointPrimitive): boolean;
+    }
+
+    class PointPrimitiveCollection {
+        blendOption: BlendOption;
+        debugShowBoundingVolume: boolean;
+        length: number;
+        modelMatrix: Matrix4;
+        constructor(options?: { modelMatrix?: Matrix4; debugShowBoundingVolume?: boolean, blendOption?: BlendOption });
+        add(pointPrimitive?: any): PointPrimitive;
+        contains(pointPrimitive?: PointPrimitive): boolean;
+        destroy(): void;
+        get(index: number): PointPrimitive;
+        isDestroyed(): boolean;
+        remove(pointPrimitive: PointPrimitive): boolean;
+        removeAll(): void;
+    }
+
+    class Polyline {
+        show: boolean;
+        positions: Cartesian3[];
+        material: Material;
+        width: number;
+        loop: boolean;
+        id: any;
+        constructor(options?: { show?: boolean; width?: number; loop?: boolean; material?: Material; positions?: Cartesian3[]; id?: any });
+    }
+
+    class PolylineCollection {
+        modelMatrix: Matrix4;
+        debugShowBoundingVolume: boolean;
+        length: number;
+        constructor(options?: { modelMatrix?: Matrix4; debugShowBoundingVolume?: boolean });
+        add(polyline?: any): Polyline;
+        remove(polyline: Polyline): boolean;
+        removeAll(): void;
+        contains(polyline: Polyline): boolean;
+        get(index: number): Polyline;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class PolylineColorAppearance extends Appearance {
+        readonly vertexFormat: VertexFormat;
+        static VERTEX_FORMAT: VertexFormat;
+        constructor(options?: { translucent?: boolean; vertexShaderSource?: string; fragmentShaderSource?: string; renderState?: RenderState });
+    }
+
+    class PolylineMaterialAppearance extends Appearance {
+        readonly vertexFormat: VertexFormat;
+        static VERTEX_FORMAT: VertexFormat;
+        constructor(options?: { translucent?: boolean; material?: Material; vertexShaderSource?: string; fragmentShaderSource?: string; renderState?: RenderState });
+    }
+
+    class Primitive {
+        readonly allowPicking: boolean;
+        appearance: Appearance;
+        readonly asynchronous: boolean;
+        readonly compressVertices: boolean;
+        cull: boolean;
+        debugShowBoundingVolume: boolean;
+        depthFailAppearance: Appearance;
+        readonly geometryInstances: GeometryInstance[] | GeometryInstance;
+        readonly interleave: boolean;
+        modelMatrix: Matrix4;
+        readonly ready: boolean;
+        readonly readyPromise: Promise<Primitive>;
+        readonly releaseGeometryInstances: boolean;
+        shadows: ShadowMode;
+        show: boolean;
+        readonly vertexCacheOptimize: boolean;
+        constructor(options?: {
+            geometryInstances?: any[] | GeometryInstance;
+            appearance?: Appearance;
+            show?: boolean;
+            modelMatrix?: Matrix4;
+            vertexCacheOptimize?: boolean;
+            interleave?: boolean;
+            compressVertices?: boolean;
+            releaseGeometryInstances?: boolean;
+            allowPicking?: boolean;
+            cull?: boolean;
+            asynchronous?: boolean;
+            debugShowBoundingVolume?: boolean;
+            shadows: ShadowMode
+        });
+        destroy(): void;
+        getGeometryInstanceAttributes(id: any): any;
+        isDestroyed(): boolean;
+        update(): void;
+    }
+
+    class PrimitiveCollection {
+        show: boolean;
+        destroyPrimitives: boolean;
+        readonly length: number;
+        constructor(options?: { show?: boolean; destroyPrimitives?: boolean });
+        add(primitive: any): any;
+        remove(primitive?: any): boolean;
+        removeAll(): void;
+        contains(primitive?: any): boolean;
+        raise(primitive?: any): void;
+        raiseToTop(primitive?: any): void;
+        lower(primitive?: any): void;
+        lowerToBottom(primitive?: any): void;
+        get(index: number): any;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class RectanglePrimitive {
+        ellipsoid: Ellipsoid;
+        rectangle: Rectangle;
+        granularity: number;
+        height: number;
+        rotation: number;
+        textureRotationAngle: number;
+        show: boolean;
+        material: Material;
+        id: any;
+        asynchronous: boolean;
+        debugShowBoundingVolume: boolean;
+        constructor(options?: {
+            ellipsoid?: Ellipsoid;
+            rectangle?: Rectangle;
+            granularity?: number;
+            height?: number;
+            rotation?: number;
+            textureRotationAngle?: number;
+            show?: boolean;
+            material?: Material;
+            id?: any;
+            asynchronous?: boolean;
+            debugShowBoundingVolume?: boolean
+        });
+        update(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class Scene {
+        backgroundColor: Color;
+        readonly camera: Camera;
+        readonly canvas: Element;
+        completeMorphOnUserInput: boolean;
+        debugCommandFilter: (command: any) => boolean;
+        readonly debugFrustumStatistics: any;
+        debugShowCommands: boolean;
+        debugShowDepthFrustum: number;
+        debugShowFramesPerSecond: boolean;
+        debugShowFrustumPlanes: boolean;
+        debugShowFrustums: boolean;
+        readonly drawingBufferHeight: number;
+        readonly drawingBufferWidth: number;
+        eyeSeparation: number;
+        farToNearRatio: number;
+        focalLength: number;
+        fog: Fog;
+        fxaa: boolean;
+        globe: Globe;
+        readonly groundPrimitives: PrimitiveCollection;
+        readonly id: string;
+        readonly imageryLayers: ImageryLayerCollection;
+        imagerySplitPosition: number;
+        invertClassification: boolean;
+        invertClassificationColor: Color;
+        readonly lastRenderTime: JulianDate;
+        logarithmicDepthFarToNearRatio: number;
+        mapMode2D: boolean;
+        readonly mapProjection: MapProjection;
+        readonly maximumAliasedLineWidth: number;
+        readonly maximumCubeMapSize: number;
+        maximumRenderTimeChange: number;
+        minimumDisableDepthTestDistance: number;
+        mode: SceneMode;
+        moon: Moon;
+        morphComplete: Event;
+        morphStart: Event;
+        morphTime: number;
+        nearToFarDistance2D: number;
+        readonly orderIndependentTranslucency: boolean;
+        readonly pickPositionSupported: boolean;
+        pickTranslucentDepth: boolean;
+        readonly postRender: Event;
+        readonly preRender: Event;
+        readonly preUpdate: Event;
+        readonly primitives: PrimitiveCollection;
+        readonly renderError: Event;
+        requestRenderMode: boolean;
+        rethrowRenderErrors: boolean;
+        readonly scene3DOnly: boolean;
+        readonly screenSpaceCameraController: ScreenSpaceCameraController;
+        shadowMap: ShadowMap;
+        skyAtmosphere: SkyAtmosphere;
+        skyBox: SkyBox;
+        sun: Sun;
+        sunBloom: boolean;
+        terrainExaggeration: number;
+        terrainProvider: TerrainProvider;
+        readonly terrainProviderChanged: Event;
+        useDepthPicking: boolean;
+        useWebVR: boolean;
+        constructor(options?: {
+            canvas: HTMLCanvasElement;
+            contextOptions?: any;
+            creditContainer?: Element;
+            creditViewport?: Element;
+            mapProjection?: MapProjection;
+            orderIndependentTranslucency?: boolean;
+            scene3DOnly?: boolean;
+            terrainExaggeration?: number;
+            shadows?: boolean;
+            mapMode2D?: MapMode2D;
+            requestRenderMode?: boolean;
+            maximumRenderTimeChange?: number
+        });
+        cartesianToCanvasCoordinates(position: Cartesian3, result?: Cartesian2): Cartesian2;
+        completeMorph(): void;
+        destroy(): void;
+        drillPick(windowPosition: Cartesian2, limit?: number): any[];
+        getCompressedTextureFormatSupported(format: string): boolean;
+        isDestroyed(): boolean;
+        morphTo2D(duration?: number): void;
+        morphTo3D(duration?: number): void;
+        morphToColumbusView(duration?: number): void;
+        pick(windowPosition: Cartesian2, width?: number, height?: number): any;
+        pickPosition(windowPosition: Cartesian2, result?: Cartesian3): Cartesian3;
+        requestRender(): void;
+    }
+
+    class ScreenSpaceCameraController {
+        enableInputs: boolean;
+        enableTranslate: boolean;
+        enableZoom: boolean;
+        enableRotate: boolean;
+        enableTilt: boolean;
+        enableLook: boolean;
+        inertiaSpin: number;
+        inertiaTranslate: number;
+        inertiaZoom: number;
+        maximumMovementRatio: number;
+        bounceAnimationTime: number;
+        minimumZoomDistance: number;
+        maximumZoomDistance: number;
+        translateEventTypes: CameraEventType | any[];
+        zoomEventTypes: CameraEventType | any[];
+        rotateEventTypes: CameraEventType | any[];
+        tiltEventTypes: CameraEventType | any[];
+        lookEventTypes: CameraEventType | any[];
+        minimumPickingTerrainHeight: number;
+        minimumCollisionTerrainHeight: number;
+        minimumTrackBallHeight: number;
+        enableCollisionDetection: boolean;
+        constructor(scene: Scene);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class SingleTileImageryProvider extends ImageryProvider {
+        url: string;
+        constructor(options: { url: string; rectangle?: Rectangle; credit?: Credit | string; ellipsoid?: Ellipsoid; proxy?: any });
+    }
+
+    class SkyAtmosphere {
+        show: boolean;
+        ellipsoid: Ellipsoid;
+        constructor(ellipsoid?: Ellipsoid);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class SkyBox {
+        sources: any;
+        show: boolean;
+        constructor(options: { sources?: any; show?: boolean });
+        update(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class Sun {
+        show: boolean;
+        glowFactor: number;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class Fog {
+        density: number;
+        enabled: boolean;
+        minimumBrightness: number;
+        screenSpaceErrorFactor: number;
+    }
+
+    class TileCoordinatesImageryProvider extends ImageryProvider {
+        constructor(options?: { tilingScheme?: TilingScheme; ellipsoid?: Ellipsoid; color?: Color; tileWidth?: number; tileHeight?: number });
+    }
+
+    class TileDiscardPolicy {
+        isReady(): boolean;
+        shouldDiscardImage(image: HTMLImageElement | Promise<HTMLImageElement>): Promise<boolean>;
+    }
+
+    class TileMapServiceImageryProvider extends ImageryProvider {
+        url: string;
+        constructor(options?: {
+            url?: string;
+            fileExtension?: string;
+            proxy?: any;
+            credit?: Credit | string;
+            minimumLevel?: number;
+            maximumLevel?: number;
+            rectangle?: Rectangle;
+            tilingScheme?: TilingScheme;
+            ellipsoid?: Ellipsoid;
+            tileWidth?: number;
+            tileHeight?: number
+        });
+    }
+
+    class ViewportQuad {
+        show: boolean;
+        rectangle: BoundingRectangle;
+        material: Material;
+        constructor(rectangle?: BoundingRectangle, material?: Material);
+        update(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class WebMapServiceImageryProvider extends ImageryProvider {
+        readonly url: string;
+        static DefaultParameters: {service: string, version: string, request: string, styles: string, format: string};
+        static GetFeatureInfoDefaultParameters: {service: string, version: string, request: string};
+        constructor(options: {
+            url: string;
+            layers: string;
+            parameters?: any;
+            getFeatureInfoParameters?: any;
+            enablePickFeatures?: boolean;
+            getFeatureInfoFormats?: GetFeatureInfoFormat[];
+            rectangle?: Rectangle;
+            tilingScheme?: TilingScheme;
+            ellipsoid?: Ellipsoid;
+            tileWidth?: number;
+            tileHeight?: number;
+            minimumLevel?: number;
+            maximumLevel?: number;
+            crs?: string;
+            srs?: string;
+            credit?: Credit | string;
+            subdomains?: string | string[]
+        });
+    }
+
+    class WebMapTileServiceImageryProvider extends ImageryProvider {
+        clock: Clock;
+        dimensions: any;
+        readonly format: string;
+        times: TimeIntervalCollection;
+        readonly url: string;
+        constructor(options: {
+            url: string;
+            format?: string;
+            layer: string;
+            style: string;
+            tileMatrixSetID: string;
+            tileMatrixLabels?: any[];
+            clock?: Clock;
+            times?: TimeIntervalCollection;
+            dimensions?: any;
+            tileWidth?: number;
+            tileHeight?: number;
+            tilingScheme?: TilingScheme;
+            rectangle?: Rectangle;
+            minimumLevel?: number;
+            maximumLevel?: number;
+            ellipsoid?: Ellipsoid;
+            credit?: Credit | string;
+            subdomains?: string | string[]
+        });
+    }
+
+    class Animation {
+        readonly container: Element;
+        readonly viewModel: AnimationViewModel;
+        constructor(container: Element | string, viewModel: AnimationViewModel);
+        isDestroyed(): boolean;
+        destroy(): void;
+        resize(): void;
+        applyThemeChanges(): void;
+    }
+
+    class AnimationViewModel {
+        shuttleRingDragging: boolean;
+        snapToTicks: boolean;
+        timeLabel: string;
+        dateLabel: string;
+        multiplierLabel: string;
+        shuttleRingAngle: number;
+        slower: Command;
+        faster: Command;
+        clockViewModel: ClockViewModel;
+        pauseViewModel: ToggleButtonViewModel;
+        playReverseViewModel: ToggleButtonViewModel;
+        playForwardViewModel: ToggleButtonViewModel;
+        playRealtimeViewModel: ToggleButtonViewModel;
+        dateFormatter: AnimationViewModel.DateFormatter;
+        timeFormatter: AnimationViewModel.TimeFormatter;
+        static defaultDateFormatter: AnimationViewModel.DateFormatter;
+        static defaultTicks: number[];
+        static defaultTimeFormatter: AnimationViewModel.TimeFormatter;
+        constructor(clockViewModel: ClockViewModel);
+        getShuttleRingTicks(): number[];
+        setShuttleRingTicks(positiveTicks: number[]): void;
+    }
+
+    namespace AnimationViewModel {
+        type DateFormatter = (date: JulianDate, viewModel: AnimationViewModel) => string;
+        type TimeFormatter = (date: JulianDate, viewModel: AnimationViewModel) => string;
+    }
+
+    class BaseLayerPicker {
+        container: Element;
+        viewModel: BaseLayerPickerViewModel;
+        constructor(container: Element, options: {
+            globe: Globe;
+            imageryProviderViewModels?: ProviderViewModel[];
+            selectedImageryProviderViewModel?: ProviderViewModel;
+            terrainProviderViewModels?: ProviderViewModel[];
+            selectedTerrainProviderViewModel?: ProviderViewModel
+        });
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class BaseLayerPickerViewModel {
+        imageryProviderViewModels: ProviderViewModel[];
+        terrainProviderViewModels: ProviderViewModel[];
+        dropDownVisible: boolean;
+        buttonTooltip: string;
+        buttonImageUrl: string;
+        selectedImagery: ProviderViewModel;
+        selectedTerrain: ProviderViewModel;
+        toggleDropDown: Command;
+        globe: Globe;
+        constructor(options: {
+            globe: Globe;
+            imageryProviderViewModels?: ProviderViewModel[];
+            selectedImageryProviderViewModel?: ProviderViewModel;
+            terrainProviderViewModels?: ProviderViewModel[];
+            selectedTerrainProviderViewModel?: ProviderViewModel
+        });
+    }
+
+    class ProviderViewModel {
+        name: string;
+        tooltip: string;
+        iconUrl: string;
+        creationCommand: Command;
+        constructor(options: { name: string; tooltip: string; iconUrl: string; creationFunction: ProviderViewModel.CreationFunction | Command });
+    }
+
+    namespace ProviderViewModel {
+        type CreationFunction = () => ImageryProvider | TerrainProvider | ImageryProvider[] | TerrainProvider[];
+    }
+
+    class CesiumInspector {
+        container: Element;
+        viewModel: CesiumInspectorViewModel;
+        constructor(container: Element | string, scene: Scene);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class CesiumInspectorViewModel {
+        frustums: boolean;
+        performance: boolean;
+        shaderCacheText: string;
+        primitiveBoundingSphere: boolean;
+        primitiveReferenceFrame: boolean;
+        filterPrimitive: boolean;
+        tileBoundingSphere: boolean;
+        filterTile: boolean;
+        wireframe: boolean;
+        suspendUpdates: boolean;
+        tileCoordinates: boolean;
+        frustumStatisticText: string;
+        tileText: string;
+        hasPickedPrimitive: boolean;
+        hasPickedTile: boolean;
+        pickPimitiveActive: boolean;
+        pickTileActive: boolean;
+        dropDownVisible: boolean;
+        generalVisible: boolean;
+        primitivesVisible: boolean;
+        terrainVisible: boolean;
+        generalSwitchText: string;
+        primitivesSwitchText: string;
+        terrainSwitchText: string;
+        scene: Scene;
+        performanceContainer: Element;
+        toggleDropDown: Command;
+        showFrustums: Command;
+        showPerformance: Command;
+        showPrimitiveBoundingSphere: Command;
+        showPrimitiveReferenceFrame: Command;
+        doFilterPrimitive: Command;
+        showWireframe: Command;
+        doSuspendUpdates: Command;
+        showTileCoordinates: Command;
+        showTileBoundingSphere: Command;
+        doFilterTile: Command;
+        toggleGeneral: Command;
+        togglePrimitives: Command;
+        toggleTerrain: Command;
+        pickPrimitive: Command;
+        pickTile: Command;
+        selectParent: Command;
+        selectNW: Command;
+        selectNE: Command;
+        selectSW: Command;
+        selectSE: Command;
+        primitive: Command;
+        tile: Command;
+        constructor(scene: Scene);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class CesiumWidget {
+        container: Element;
+        canvas: HTMLCanvasElement;
+        creditContainer: Element;
+        creditViewport: Element;
+        scene: Scene;
+        readonly imageryLayers: ImageryLayerCollection;
+        terrainProvider: TerrainProvider;
+        readonly camera: Camera;
+        clock: Clock;
+        screenSpaceEventHandler: ScreenSpaceEventHandler;
+        targetFrameRate: number;
+        useDefaultRenderLoop: boolean;
+        resolutionScale: number;
+        constructor(container: Element | string, options?: {
+            clock?: Clock;
+            imageryProvider?: ImageryProvider;
+            terrainProvider?: TerrainProvider;
+            skyBox?: SkyBox;
+            skyAtmosphere?: SkyAtmosphere;
+            sceneMode?: SceneMode;
+            scene3DOnly?: boolean;
+            orderIndependentTranslucency?: boolean;
+            mapProjection?: MapProjection;
+            globe?: Globe;
+            useDefaultRenderLoop?: boolean;
+            targetFrameRate?: number;
+            showRenderLoopErrors?: boolean;
+            contextOptions?: any;
+            creditContainer?: Element | string;
+            creditViewport?: Element | string;
+            terrainExaggeration?: number;
+            shadows?: boolean;
+            terrainShadows?: ShadowMode;
+            mapMode2D?: MapMode2D;
+            requestRenderMode?: boolean;
+            maximumRenderTimeChange?: number
+        });
+        showErrorPanel(title: string, message: string, error?: string): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+        resize(): void;
+        render(): void;
+    }
+
+    class ClockViewModel {
+        systemTime: JulianDate;
+        startTime: JulianDate;
+        stopTime: JulianDate;
+        currentTime: JulianDate;
+        multiplier: number;
+        clockStep: ClockStep;
+        clockRange: ClockRange;
+        canAnimate: boolean;
+        shouldAnimate: boolean;
+        clock: Clock;
+        constructor(clock?: Clock);
+        synchronize(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class Command {
+        canExecute: boolean;
+        beforeExecute: Event;
+        afterExecute: Event;
+    }
+
+    class FullscreenButton {
+        container: Element;
+        viewModel: FullscreenButtonViewModel;
+        constructor(container: Element | string, fullscreenElement?: Element | string);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class FullscreenButtonViewModel {
+        isFullscreen: boolean;
+        isFullscreenEnabled: boolean;
+        tooltip: string;
+        fullscreenElement: Element;
+        command: Command;
+        constructor(fullscreenElement?: Element | string);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class Geocoder {
+        container: Element;
+        viewModel: GeocoderViewModel;
+        constructor(options: { container: Element | string; scene: Scene; url?: string; key?: string; flightDuration?: number });
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class GeocoderViewModel {
+        isSearchInProgress: boolean;
+        searchText: string;
+        flightDuration: number;
+        url: string;
+        key: string;
+        complete: Event;
+        scene: Scene;
+        search: Command;
+        constructor(options: { scene: Scene; url?: string; key?: string; flightDuration?: number });
+    }
+
+    class HomeButton {
+        container: Element;
+        viewModel: HomeButtonViewModel;
+        constructor(container: Element | string, scene: Scene, duration?: number);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class HomeButtonViewModel {
+        tooltip: string;
+        scene: Scene;
+        command: Command;
+        duration: number;
+        constructor(scene: Scene, duration?: number);
+    }
+
+    class VRButton {
+        container: Element;
+        viewModel: VRButtonViewModel;
+        constructor(container: Element | string, scene: Scene, vrElement: Element | string);
+        destroy(): void;
+        isDestroyed(): boolean;
+    }
+
+    class VRButtonViewModel {
+        command: Command;
+        isVREnabled: boolean;
+        isVRMode: boolean;
+        tooltip: string;
+        vrElement: Element;
+        constructor(scene: Scene, vrElement: Element | string);
+        destroy(): void;
+        isDestroyed(): boolean;
+    }
+
+    class InfoBox {
+        container: Element;
+        viewModel: InfoBoxViewModel;
+        frame: HTMLIFrameElement;
+        constructor(container: Element | string);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class InfoBoxViewModel {
+        maxHeight: number;
+        enableCamera: boolean;
+        isCameraTracking: boolean;
+        showInfo: boolean;
+        titleText: string;
+        description: string;
+        cameraIconPath: string;
+        cameraClicked: Event;
+        closeClicked: Event;
+        maxHeightOffset(offset: number): string;
+    }
+
+    class NavigationHelpButton {
+        container: Element;
+        viewModel: NavigationHelpButtonViewModel;
+        constructor(options: { container: Element | string; instructionsInitiallyVisible?: boolean });
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class NavigationHelpButtonViewModel {
+        showInstructions: boolean;
+        tooltip: string;
+        command: Command;
+        showClick: Command;
+        showTouch: Command;
+    }
+
+    class PerformanceWatchdog {
+        container: Element;
+        viewModel: PerformanceWatchdogViewModel;
+        constructor(options?: { container: Element | string; scene: Scene; lowFrameRateMessage?: string });
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class PerformanceWatchdogViewModel {
+        lowFrameRateMessage: string;
+        lowFrameRateMessageDismissed: boolean;
+        showingLowFrameRateMessage: boolean;
+        scene: Scene;
+        dismissMessage: Command;
+        constructor(options?: { scene: Scene; lowFrameRateMessage?: string });
+    }
+
+    class ProjectionPicker {
+        container: Element;
+        viewModel: ProjectionPickerViewModel;
+        constructor(container: Element | string, scene: Scene);
+        destroy(): void;
+        isDestroyed(): boolean;
+    }
+
+    class ProjectionPickerViewModel {
+        dropDownVisible: boolean;
+        isOrthographicProjection: Command;
+        scene: Scene;
+        sceneMode: SceneMode;
+        selectedTooltip: string;
+        switchToOrthographic: Command;
+        switchToPerspective: Command;
+        toggleDropdown: Command;
+        tooltipOrthographic: string;
+        tooltipPerspective: string;
+        constructor(scene: Scene);
+        destroy(): void;
+        isDestroyed(): boolean;
+    }
+
+    class SceneModePicker {
+        container: Element;
+        viewModel: SceneModePickerViewModel;
+        constructor(container: Element | string, scene: Scene, duration?: number);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class SceneModePickerViewModel {
+        sceneMode: SceneMode;
+        dropDownVisible: boolean;
+        tooltip2D: string;
+        tooltip3D: string;
+        tooltipColumbusView: string;
+        selectedTooltip: string;
+        scene: Scene;
+        duration: number;
+        toggleDropDown: Command;
+        morphTo2D: Command;
+        morphTo3D: Command;
+        morphToColumbusView: Command;
+        constructor(scene: Scene, duration?: number);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class SelectionIndicator {
+        container: Element;
+        viewModel: SelectionIndicatorViewModel;
+        constructor(container: Element | string, scene: Scene);
+        isDestroyed(): boolean;
+        destroy(): void;
+    }
+
+    class SelectionIndicatorViewModel {
+        position: Cartesian3;
+        showSelection: boolean;
+        isVisible: boolean;
+        computeScreenSpacePosition: SelectionIndicatorViewModel.ComputeScreenSpacePosition;
+        container: Element;
+        selectionIndicatorElement: Element;
+        scene: Scene;
+        constructor(scene: Scene, selectionIndicatorElement: Element, container: Element);
+        update(): void;
+        animateAppear(): void;
+        animateDepart(): void;
+    }
+
+    namespace SelectionIndicatorViewModel {
+        type ComputeScreenSpacePosition = (position: Cartesian3, result: Cartesian2) => Cartesian2;
+    }
+
+    class Timeline {
+        container: Element;
+        constructor(container: Element, clock: Clock);
+        isDestroyed(): boolean;
+        destroy(): void;
+        zoomTo(startTime: JulianDate, stopTime: JulianDate): void;
+        resize(): void;
+    }
+
+    class ToggleButtonViewModel {
+        toggled: boolean;
+        tooltip: string;
+        command: Command;
+        constructor(command: Command, options?: { toggled?: boolean; tooltip?: string });
+    }
+
+    class Viewer {
+        readonly container: Element;
+        readonly bottomContainer: Element;
+        readonly cesiumWidget: CesiumWidget;
+        readonly selectionIndicator: SelectionIndicator;
+        readonly infoBox: InfoBox;
+        readonly geocoder: Geocoder;
+        readonly homeButton: HomeButton;
+        readonly sceneModePicker: SceneModePicker;
+        readonly projectionPicker: ProjectionPicker;
+        readonly navigationHelpButton: NavigationHelpButton;
+        readonly baseLayerPicker: BaseLayerPicker;
+        readonly animation: Animation;
+        readonly timeline: Timeline;
+        readonly fullscreenButton: FullscreenButton;
+        readonly dataSourceDisplay: DataSourceDisplay;
+        readonly entities: EntityCollection;
+        readonly dataSources: DataSourceCollection;
+        readonly canvas: HTMLCanvasElement;
+        readonly scene: Scene;
+        readonly imageryLayers: ImageryLayerCollection;
+        terrainProvider: TerrainProvider;
+        terrainShadows: ShadowMode;
+        readonly camera: Camera;
+        clockTrackedDataSource: DataSource;
+        readonly clockViewModel: ClockViewModel;
+        readonly clock: Clock;
+        readonly screenSpaceEventHandler: ScreenSpaceEventHandler;
+        targetFrameRate: number;
+        useDefaultRenderLoop: boolean;
+        resolutionScale: number;
+        allowDataSourcesToSuspendAnimation: boolean;
+        trackedEntity: Entity;
+        selectedEntity: Entity;
+        readonly trackedEntityChanged: Event;
+        readonly selectedEntityChanged: Event;
+        readonly shadowMap: ShadowMap;
+        readonly vrButton: VRButton;
+        shadows: boolean;
+        constructor(container: Element | string, options?: {
+            animation?: boolean;
+            baseLayerPicker?: boolean;
+            fullscreenButton?: boolean;
+            vrButton?: boolean;
+            geocoder?: boolean;
+            homeButton?: boolean;
+            infoBox?: boolean;
+            sceneModePicker?: boolean;
+            selectionIndicator?: boolean;
+            timeline?: boolean;
+            navigationHelpButton?: boolean;
+            navigationInstructionsInitiallyVisible?: boolean;
+            scene3DOnly?: boolean;
+            shouldAnimate?: boolean;
+            clockViewModel?: ClockViewModel;
+            selectedImageryProviderViewModel?: ProviderViewModel;
+            imageryProviderViewModels?: ProviderViewModel[];
+            selectedTerrainProviderViewModel?: ProviderViewModel;
+            terrainProviderViewModels?: ProviderViewModel[];
+            imageryProvider?: ImageryProvider;
+            terrainProvider?: TerrainProvider;
+            skyBox?: SkyBox;
+            skyAtmosphere?: SkyAtmosphere;
+            fullscreenElement?: Element | string;
+            useDefaultRenderLoop?: boolean;
+            targetFrameRate?: number;
+            showRenderLoopErrors?: boolean;
+            automaticallyTrackDataSourceClocks?: boolean;
+            contextOptions?: any;
+            sceneMode?: SceneMode;
+            mapProjection?: MapProjection;
+            globe?: Globe;
+            orderIndependentTranslucency?: boolean;
+            creditContainer?: Element | string;
+            creditViewport?: Element | string;
+            dataSources?: DataSourceCollection;
+            terrainExaggeration?: number;
+            shadows?: boolean;
+            terrainShadows?: ShadowMode;
+            mapMode2D?: MapMode2D;
+            projectionPicker?: boolean;
+            requestRenderMode?: boolean;
+            maximumRenderTimeChange?: number
+        });
+        extend(mixin: Viewer.ViewerMixin, options: any): void;
+        resize(): void;
+        forceResize(): void;
+        render(): void;
+        isDestroyed(): boolean;
+        destroy(): void;
+        zoomTo(target: Entity | Entity[] | EntityCollection | DataSource | Promise<Entity | Entity[] | EntityCollection | DataSource>, offset?: HeadingPitchRange): Promise<boolean>;
+        flyTo(target: Entity | Entity[] | EntityCollection | DataSource | Promise<Entity | Entity[] | EntityCollection | DataSource>,
+                options?: { duration?: number; maximumHeight?: number; offset?: HeadingPitchRange }): Promise<boolean>;
+    }
+
+    namespace Viewer {
+        type ViewerMixin = (viewer: Viewer, options: any) => void;
+    }
+
+    function barycentricCoordinates(point: Cartesian2 | Cartesian3, p0: Cartesian2 | Cartesian3, p1: Cartesian2 | Cartesian3, p2: Cartesian2 | Cartesian3, result?: Cartesian3): Cartesian3;
+
+    function binarySearch(array: any[], itemToFind: any, comparator: binarySearch.Comparator): number;
+
+    namespace binarySearch {
+        type Comparator = (a: any, b: any) => number;
+    }
+
+    function cancelAnimationFrame(requestID: number): undefined;
+
+    function clone(object: any, deep?: boolean): any;
+
+    function combine(object1?: any, object2?: any, deep?: boolean): any;
+
+    function destroyObject(object: any, message?: string): undefined;
+
+    function formatError(object: any): string;
+
+    function getFilenameFromUri(uri: string): string;
+
+    function getImagePixels(image: HTMLImageElement): number[];
+
+    function isArray(value: any): boolean;
+
+    function isLeapYear(year: number): boolean;
+
+    function jsonp(url: string, options?: { parameters?: any; callbackParameterName?: string; proxy?: any }): Promise<any>;
+
+    function loadArrayBuffer(url: string | Promise<string>, headers?: any): Promise<ArrayBuffer>;
+
+    function loadBlob(url: string | Promise<string>, headers?: any): Promise<Blob>;
+
+    function loadImage(url: string | Promise<string>, allowCrossOrigin?: boolean): Promise<HTMLImageElement>;
+
+    function loadImageViaBlob(url: string | Promise<string>): Promise<HTMLImageElement>;
+
+    function loadJson(url: string | Promise<string>, headers?: any): Promise<any>;
+
+    function loadText(url: string | Promise<string>, headers?: any): Promise<string>;
+
+    function loadWithXhr(options: { url: string | Promise<string>; responseType?: string; method?: string; data?: string; headers?: any; overrideMimeType?: string }): Promise<any>;
+
+    function loadXML(url: string | Promise<string>, headers?: any): Promise<XMLDocument>;
+
+    function mergeSort(array: any[], comparator: mergeSort.Comparator, userDefinedObject?: any): undefined;
+
+    namespace mergeSort {
+        type Comparator = (a: any, b: any, userDefinedObject?: any) => number;
+    }
+
+    function objectToQuery(obj: any): string;
+
+    function pointInsideTriangle(point: Cartesian2 | Cartesian3, p0: Cartesian2 | Cartesian3, p1: Cartesian2 | Cartesian3, p2: Cartesian2 | Cartesian3): boolean;
+
+    function queryToObject(queryString: string): any;
+
+    function requestAnimationFrame(callback: requestAnimationFrame.Callback): number;
+
+    namespace requestAnimationFrame {
+        type Callback = (timestamp: number) => void;
+    }
+
+    function sampleTerrain(terrainProvider: TerrainProvider, level: number, positions: Cartographic[]): Promise<Cartographic[]>;
+
+    function subdivideArray(array: any[], numberOfArrays: number): undefined;
+
+    function throttleRequestByServer(url: string, requestFunction: throttleRequestByServer.RequestFunction): Promise<any>;
+
+    namespace throttleRequestByServer {
+        type RequestFunction = (url: string) => Promise<any>;
+    }
+
+    function createTangentSpaceDebugPrimitive(options: { geometry: Geometry; length?: number; modelMatrix?: Matrix4 }): Primitive;
+
+    function viewerCesiumInspectorMixin(viewer: Viewer): undefined;
+
+    function viewerDragDropMixin(viewer: Viewer, options?: { dropTarget?: Element | string; clearOnDrop?: boolean; flyToOnDrop?: boolean; clampToGround?: boolean; proxy?: DefaultProxy }): undefined;
+
+    function viewerPerformanceWatchdogMixin(viewer: Viewer): undefined;
+
+    function createCommand(func: () => any, canExecute?: boolean): Command;
+
+    function createTaskProcessorWorker(workerFunction: createTaskProcessorWorker.WorkerFunction): createTaskProcessorWorker.TaskProcessorWorkerFunction;
+
+    namespace createTaskProcessorWorker {
+        type WorkerFunction = (parameters: any, transferableObjects: any[]) => any;
+        type TaskProcessorWorkerFunction = (event: any) => void;
+    }
+
+    enum ClockRange {
+        UNBOUNDED,
+        CLAMPED,
+        LOOP_STOP,
+    }
+
+    enum ClockStep {
+        TICK_DEPENDENT,
+        SYSTEM_CLOCK_MULTIPLIER,
+        SYSTEM_CLOCK,
+    }
+
+    enum ComponentDatatype {
+        BYTE,
+        UNSIGNED_BYTE,
+        SHORT,
+        UNSIGNED_SHORT,
+        FLOAT,
+        DOUBLE,
+    }
+
+    namespace ComponentDatatype {
+        function getSizeInBytes(componentDatatype: ComponentDatatype): number;
+        function fromTypedArray(array: Int8Array | Uint8Array | Int16Array | Uint16Array | Float32Array | Float64Array): ComponentDatatype;
+        function validate(componentDatatype: ComponentDatatype): boolean;
+        function createTypedArray(componentDatatype: ComponentDatatype, valuesOrLength: number | any[]): Int8Array | Uint8Array | Int16Array | Uint16Array | Float32Array | Float64Array;
+        function createArrayBufferView(componentDatatype: ComponentDatatype, buffer: ArrayBuffer, byteOffset?: number, length?: number):
+            Int8Array | Uint8Array | Int16Array | Uint16Array | Float32Array | Float64Array;
+    }
+
+    enum CornerType {
+        ROUNDED,
+        MITERED,
+        BEVELED,
+    }
+
+    namespace CubicRealPolynomial {
+        function computeDiscriminant(a: number, b: number, c: number, d: number): number;
+        function computeRealRoots(a: number, b: number, c: number, d: number): number[];
+    }
+
+    enum ExtrapolationType {
+        NONE,
+        HOLD,
+        EXTRAPOLATE,
+    }
+
+    namespace FeatureDetection {
+        function supportsFullscreen(): boolean;
+        function supportsTypedArrays(): boolean;
+        function supportsWebAssembly(): boolean;
+        function supportsWebWorkers(): boolean;
+    }
+
+    enum Fullscreen {
+        element,
+        changeEventName,
+        errorEventName,
+        enabled,
+        fullscreen,
+    }
+
+    namespace Fullscreen {
+        function supportsFullscreen(): boolean;
+        function requestFullscreen(element: any): undefined;
+        function exitFullscreen(): undefined;
+    }
+
+    namespace GeometryPipeline {
+        function toWireframe(geometry: Geometry): Geometry;
+        function createLineSegmentsForVectors(geometry: Geometry, attributeName?: string, length?: number): Geometry;
+        function createAttributeLocations(geometry: Geometry): any;
+        function reorderForPreVertexCache(geometry: Geometry): Geometry;
+        function reorderForPostVertexCache(geometry: Geometry, cacheCapacity?: number): Geometry;
+        function fitToUnsignedShortIndices(geometry: Geometry): Geometry[];
+        function projectTo2D(geometry: Geometry, attributeName: string, attributeName3D: string, attributeName2D: string, projection?: any): Geometry;
+        function encodeAttribute(geometry: Geometry, attributeName: string, attributeHighName: string, attributeLowName: string): Geometry;
+        function transformToWorldCoordinates(instance: GeometryInstance): GeometryInstance;
+        function computeNormal(geometry: Geometry): Geometry;
+        function computeBinormalAndTangent(geometry: Geometry): Geometry;
+        function compressVertices(geometry: Geometry): Geometry;
+    }
+
+    enum HeightmapTessellator {
+        DEFAULT_STRUCTURE,
+    }
+
+    namespace HeightmapTessellator {
+        function computeVertices(options: {
+            vertices: any[] | Float32Array;
+            heightmap: Int8Array | Uint8Array | Int16Array | Uint16Array | Float32Array | Float64Array;
+            width: number;
+            height: number;
+            skirtHeight: number;
+            nativeRectangle: Rectangle;
+            rectangle?: Rectangle;
+            isGeographic?: boolean;
+            relativetoCenter?: Cartesian3;
+            ellipsoid?: Ellipsoid;
+            structure?: any;
+            structureheightScale?: number;
+            structureheightOffset?: number;
+            structureelementsPerHeight?: number;
+            structurestride?: number;
+            structureelementMultiplier?: number;
+            structureisBigEndian?: boolean
+        }): undefined;
+    }
+
+    enum HeightReference {
+        CLAMP_TO_GROUND,
+        NONE,
+        RELATIVE_TO_GROUND
+    }
+
+    class HermitePolynomialApproximation extends InterpolationAlgorithm {
+        static getRequiredDataPoints(degree: number, inputOrder?: number): number;
+    }
+
+    enum IndexDatatype {
+        UNSIGNED_BYTE,
+        UNSIGNED_SHORT,
+        UNSIGNED_INT,
+    }
+
+    namespace IndexDatatype {
+        function getSizeInBytes(indexDatatype: IndexDatatype): number;
+        function validate(indexDatatype: IndexDatatype): boolean;
+        function createTypedArray(numberOfVertices: number, indicesLengthOrArray: any): Uint16Array | Uint32Array;
+        function createTypedArrayFromArrayBuffer(numberOfVertices: number, sourceArray: ArrayBuffer, byteOffset: number, length: number): Uint16Array | Uint32Array;
+    }
+
+    // tslint:disable-next-line no-unnecessary-class
+    class InterpolationAlgorithm {
+        static type: string;
+        static getRequiredDataPoints(degree: number): number;
+        static interpolateOrderZero(x: number, xTable: number[], yTable: number[], yStride: number, result?: number[]): number[];
+        static interpolate(x: number, xTable: number[], yTable: number[], yStride: number, inputOrder: number, outputOrder: number, result?: number[]): number[];
+    }
+
+    enum Intersect {
+        OUTSIDE,
+        INTERSECTING,
+        INSIDE,
+    }
+
+    namespace IntersectionTests {
+        function rayPlane(ray: Ray, plane: Plane, result?: Cartesian3): Cartesian3;
+        function rayTriangle(ray: Ray, p0: Cartesian3, p1: Cartesian3, p2: Cartesian3, cullBackFaces?: boolean, result?: Cartesian3): Cartesian3;
+        function lineSegmentTriangle(v0: Cartesian3, v1: Cartesian3, p0: Cartesian3, p1: Cartesian3, p2: Cartesian3, cullBackFaces?: boolean, result?: Cartesian3): Cartesian3;
+        function raySphere(ray: Ray, sphere: BoundingSphere, result?: any): any;
+        function lineSegmentSphere(p0: Cartesian3, p1: Cartesian3, sphere: BoundingSphere, result?: any): any;
+        function rayEllipsoid(ray: Ray, ellipsoid: Ellipsoid): any;
+        function grazingAltitudeLocation(ray: Ray, ellipsoid: Ellipsoid): Cartesian3;
+        function lineSegmentPlane(endPoint0: Cartesian3, endPoint1: Cartesian3, plane: Plane, result?: Cartesian3): Cartesian3;
+        function trianglePlaneIntersection(p0: Cartesian3, p1: Cartesian3, p2: Cartesian3, plane: Plane): any;
+    }
+
+    namespace Intersections2D {
+        function clipTriangleAtAxisAlignedThreshold(threshold: number, keepAbove: boolean, u0: number, u1: number, u2: number, result?: number[]): number[];
+        function computeBarycentricCoordinates(x: number, y: number, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number, result?: Cartesian3): Cartesian3;
+    }
+
+    enum Iso8601 {
+        MINIMUM_VALUE,
+        MAXIMUM_VALUE,
+        MAXIMUM_INTERVAL,
+    }
+
+    enum KeyboardEventModifier {
+        SHIFT,
+        CTRL,
+        ALT,
+    }
+
+    class LagrangePolynomialApproximation extends InterpolationAlgorithm {}
+
+    class LinearApproximation extends InterpolationAlgorithm {}
+
+    enum MapMode2D {
+        INFINITE_SCROLL,
+        ROTATE
+    }
+
+    enum Math {
+        EPSILON1,
+        EPSILON2,
+        EPSILON3,
+        EPSILON4,
+        EPSILON5,
+        EPSILON6,
+        EPSILON7,
+        EPSILON8,
+        EPSILON9,
+        EPSILON10,
+        EPSILON11,
+        EPSILON12,
+        EPSILON13,
+        EPSILON14,
+        EPSILON15,
+        EPSILON16,
+        EPSILON17,
+        EPSILON18,
+        EPSILON19,
+        EPSILON20,
+        GRAVITATIONALPARAMETER,
+        SOLAR_RADIUS,
+        LUNAR_RADIUS,
+        SIXTY_FOUR_KILOBYTES,
+        PI,
+        ONE_OVER_PI,
+        PI_OVER_TWO,
+        PI_OVER_THREE,
+        PI_OVER_FOUR,
+        PI_OVER_SIX,
+        THREE_PI_OVER_TWO,
+        TWO_PI,
+        ONE_OVER_TWO_PI,
+        RADIANS_PER_DEGREE,
+        DEGREES_PER_RADIAN,
+        RADIANS_PER_ARCSECOND,
+    }
+
+    namespace Math {
+        function sign(value: number): number;
+        function signNotZero(value: number): number;
+        function toSNorm(value: number): number;
+        function fromSNorm(value: number): number;
+        function sinh(value: number): number;
+        function cosh(value: number): number;
+        function lerp(p: number, q: number, time: number): number;
+        function toRadians(degrees: number): number;
+        function toDegrees(radians: number): number;
+        function convertLongitudeRange(angle: number): number;
+        function negativePiToPi(angle: number): number;
+        function zeroToTwoPi(angle: number): number;
+        function mod(m: number, n: number): number;
+        function equalsEpsilon(left: number, right: number, relativeEpsilon: number, absoluteEpsilon?: number): boolean;
+        function factorial(n: number): number;
+        function incrementWrap(n?: number, maximumValue?: number, minimumValue?: number): number;
+        function isPowerOfTwo(n: number): boolean;
+        function nextPowerOfTwo(n: number): number;
+        function clamp(value: number, min: number, max: number): number;
+        function setRandomNumberSeed(seed: number): undefined;
+        function nextRandomNumber(): number;
+        function acosClamped(value: number): number;
+        function asinClamped(value: number): number;
+        function chordLength(angle: number, radius: number): number;
+    }
+
+    // tslint:disable-next-line no-unnecessary-class
+    abstract class Packable {
+        static packedLength: number;
+        static pack(value: any, array: number[], startingIndex?: number): number[];
+        static unpack(array: number[], startingIndex?: number, result?: any): Packable;
+    }
+
+    enum PackableForInterpolation {
+        packedInterpolationLength,
+    }
+
+    namespace PackableForInterpolation {
+        function convertPackedArrayForInterpolation(packedArray: number[], startingIndex?: number, lastIndex?: number, result?: number[]): number[];
+        function unpackInterpolationResult(array: number[], sourceArray: number[], startingIndex?: number, lastIndex?: number, result?: any): any;
+    }
+
+    enum PixelFormat {
+        DEPTH_COMPONENT,
+        DEPTH_STENCIL,
+        ALPHA,
+        RGB,
+        RGBA,
+        LUMINANCE,
+        LUMINANCE_ALPHA,
+    }
+
+    enum PrimitiveType {
+        POINTS,
+        LINES,
+        LINE_LOOP,
+        LINE_STRIP,
+        TRIANGLES,
+        TRIANGLE_STRIP,
+        TRIANGLE_FAN,
+    }
+
+    namespace QuadraticRealPolynomial {
+        function computeDiscriminant(a: number, b: number, c: number): number;
+        function computeRealRoots(a: number, b: number, c: number): number[];
+    }
+
+    namespace QuarticRealPolynomial {
+        function computeDiscriminant(a: number, b: number, c: number, d: number, e: number): number;
+        function computeRealRoots(a: number, b: number, c: number, d: number, e: number): number[];
+    }
+
+    enum ReferenceFrame {
+        FIXED,
+        INERTIAL,
+    }
+
+    enum ScreenSpaceEventType {
+        LEFT_DOWN,
+        LEFT_UP,
+        LEFT_CLICK,
+        LEFT_DOUBLE_CLICK,
+        RIGHT_DOWN,
+        RIGHT_UP,
+        RIGHT_CLICK,
+        RIGHT_DOUBLE_CLICK,
+        MIDDLE_DOWN,
+        MIDDLE_UP,
+        MIDDLE_CLICK,
+        MIDDLE_DOUBLE_CLICK,
+        MOUSE_MOVE,
+        WHEEL,
+        PINCH_START,
+        PINCH_END,
+        PINCH_MOVE,
+    }
+
+    namespace Simon1994PlanetaryPositions {
+        function computeSunPositionInEarthInertialFrame(julianDate?: JulianDate, result?: Cartesian3): Cartesian3;
+        function computeMoonPositionInEarthInertialFrame(julianDate?: JulianDate, result?: Cartesian3): Cartesian3;
+    }
+
+    class ShadowMap {
+        darkness: number;
+        enabled: boolean;
+        maximumDistance: number;
+        normalOffset: boolean;
+        size: number;
+        softShadows: boolean;
+        constructor(obtions: {
+            lightCamera: Camera;
+            enabled?: boolean;
+            isPointLight?: boolean;
+            pointLightRadius?: number;
+            cascadesEnabled?: boolean;
+            numberOfCascades?: number;
+            maximumDistance?: number;
+            size?: number;
+            softShadows?: boolean;
+            darkness?: number;
+            normalOffset?: boolean
+        });
+    }
+
+    enum ShadowMode {
+        CAST_ONLY,
+        DISABLED,
+        ENABLED,
+        RECEIVE_ONLY
+    }
+
+    enum TimeStandard {
+        UTC,
+        TAI,
+    }
+
+    namespace Transforms {
+        function eastNorthUpToFixedFrame(origin: Cartesian3, ellipsoid?: Ellipsoid, result?: Matrix4): Matrix4;
+        function northEastDownToFixedFrame(origin: Cartesian3, ellipsoid?: Ellipsoid, result?: Matrix4): Matrix4;
+        function northUpEastToFixedFrame(origin: Cartesian3, ellipsoid?: Ellipsoid, result?: Matrix4): Matrix4;
+        function headingPitchRollToFixedFrame(origin: Cartesian3, heading: number, pitch: number, roll: number, ellipsoid?: Ellipsoid, result?: Matrix4): Matrix4;
+        function headingPitchRollQuaternion(origin: Cartesian3, heading: number, pitch: number, roll: number, ellipsoid?: Ellipsoid, result?: Quaternion): Quaternion;
+        function computeTemeToPseudoFixedMatrix(date: JulianDate, result?: Matrix3): Matrix3;
+        function preloadIcrfFixed(timeInterval: TimeInterval): Promise<void>;
+        function computeIcrfToFixedMatrix(date: JulianDate, result?: Matrix3): Matrix3;
+        function computeFixedToIcrfMatrix(date: JulianDate, result?: Matrix3): Matrix3;
+        function pointToWindowCoordinates(modelViewProjectionMatrix: Matrix4, viewportTransformation: Matrix4, point: Cartesian3, result?: Cartesian2): Cartesian2;
+    }
+
+    namespace TridiagonalSystemSolver {
+        function solve(diagonal: number[], lower: number[], upper: number[], right: Cartesian3[]): Cartesian3[];
+    }
+
+    enum Visibility {
+        NONE,
+        PARTIAL,
+        FULL,
+    }
+
+    enum WindingOrder {
+        CLOCKWISE,
+        COUNTER_CLOCKWISE,
+    }
+
+    enum StripeOrientation {
+        HORIZONTAL,
+        VERTICAL,
+    }
+
+    enum BingMapsStyle {
+        AERIAL,
+        AERIAL_WITH_LABELS,
+        ROAD,
+        ORDNANCE_SURVEY,
+        COLLINS_BART,
+    }
+
+    enum BlendEquation {
+        ADD,
+        SUBTRACT,
+        REVERSE_SUBTRACT,
+    }
+
+    enum BlendFunction {
+        ZERO,
+        ONE,
+        SOURCE_COLOR,
+        ONE_MINUS_SOURCE_COLOR,
+        DESTINATION_COLOR,
+        ONE_MINUS_DESTINATION_COLOR,
+        SOURCE_ALPHA,
+        ONE_MINUS_SOURCE_ALPHA,
+        DESTINATION_ALPHA,
+        ONE_MINUS_DESTINATION_ALPHA,
+        CONSTANT_COLOR,
+        ONE_MINUS_CONSTANT_COLOR,
+        CONSTANT_ALPHA,
+        ONE_MINUS_CONSTANT_ALPHA,
+        SOURCE_ALPHA_SATURATE,
+    }
+
+    enum BlendingState {
+        DISABLED,
+        ALPHA_BLEND,
+        PRE_MULTIPLIED_ALPHA_BLEND,
+        ADDITIVE_BLEND,
+    }
+
+    enum BlendOption {
+        OPAQUE,
+        OPAQUE_AND_TRANSLUCENT,
+        TRANSLUCENT
+    }
+
+    enum CameraEventType {
+        LEFT_DRAG,
+        RIGHT_DRAG,
+        MIDDLE_DRAG,
+        WHEEL,
+        PINCH,
+    }
+
+    enum CullFace {
+        FRONT,
+        BACK,
+        FRONT_AND_BACK,
+    }
+
+    enum DepthFunction {
+        NEVER,
+        LESS,
+        EQUAL,
+        LESS_OR_EQUAL,
+        GREATER,
+        NOT_EQUAL,
+        GREATER_OR_EQUAL,
+        ALWAYS,
+    }
+
+    enum HorizontalOrigin {
+        CENTER,
+        LEFT,
+        RIGHT,
+    }
+
+    enum LabelStyle {
+        FILL,
+        OUTLINE,
+        FILL_AND_OUTLINE,
+    }
+
+    enum ModelAnimationLoop {
+        NONE,
+        REPEAT,
+        MIRRORED_REPEAT,
+    }
+
+    enum SceneMode {
+        MORPHING,
+        COLUMBUS_VIEW,
+        SCENE2D,
+        SCENE3D,
+    }
+
+    namespace SceneMode {
+        function getMorphTime(value: SceneMode): number;
+    }
+
+    namespace SceneTransforms {
+        function wgs84ToWindowCoordinates(scene: Scene, position: Cartesian3, result?: Cartesian2): Cartesian2;
+        function wgs84ToDrawingBufferCoordinates(scene: Scene, position: Cartesian3, result?: Cartesian2): Cartesian2;
+    }
+
+    enum StencilFunction {
+        NEVER,
+        LESS,
+        EQUAL,
+        LESS_OR_EQUAL,
+        GREATER,
+        NOT_EQUAL,
+        GREATER_OR_EQUAL,
+        ALWAYS,
+    }
+
+    enum StencilOperation {
+        ZERO,
+        KEEP,
+        REPLACE,
+        INCREMENT,
+        DECREMENT,
+        INVERT,
+        INCREMENT_WRAP,
+        DECREMENT_WRAP,
+    }
+
+    enum VerticalOrigin {
+        CENTER,
+        BOTTOM,
+        TOP,
+    }
+
+    function createOpenStreetMapImageryProvider(options: {
+        url?: string,
+        fileExtension?: string,
+        rectangle?: Rectangle,
+        minimumLevel?: number,
+        maximumLevel?: number,
+        ellipsoid?: Ellipsoid,
+        credit?: Credit | string
+    }): UrlTemplateImageryProvider;
+
+    function createTileMapServiceImageryProvider(options: {
+        url?: string,
+        fileExtension?: string,
+        credit?: Credit | string,
+        minimumLevel?: number,
+        maximumLevel?: number,
+        rectangle?: Rectangle,
+        tilingScheme?: TilingScheme,
+        ellipsoid?: Ellipsoid,
+        tileWidth?: number,
+        tileHeight?: number,
+        flipXY?: boolean
+    }): UrlTemplateImageryProvider;
+
+    function createWorldImagery(options: {
+        style?: any // IonWorldImageryStyle
+    }): IonImageryProvider;
+
+    function createWorldTerrain(options: {
+        requestVertexNormals?: boolean,
+        requestWaterMask?: boolean
+    }): CesiumTerrainProvider;
+
+    class UrlTemplateImageryProvider extends ImageryProvider {
+        url: string;
+        pickFeaturesUrl: string;
+        urlSchemeZeroPadding: {};
+        subdomains: string | string[];
+        ellipsoid: Ellipsoid;
+        getFeatureInfoFormats: GetFeatureInfoFormat[];
+        enablePickFeatures: boolean;
+
+        constructor(options: {
+            url: string,
+            pickFeaturesUrl?: string,
+            urlSchemeZeroPadding?: {},
+            subdomains?: string | string[]
+            proxy?: {},
+            credit?: Credit | string,
+            minimumLevel?: number,
+            maximumLevel?: number,
+            rectangle?: Rectangle,
+            tilingScheme?: TilingScheme,
+            ellipsoid?: Ellipsoid,
+            tileWidth?: number,
+            tileHeight?: number,
+            hasAlphaChannel?: boolean,
+            getFeatureInfoFormats?: GetFeatureInfoFormat[],
+            enablePickFeatures?: boolean
+        });
+        reinitialize(options: Promise<object> | object): void;
+    }
+
+    class Resource {
+      static DEFAULT: Resource;
+      static readonly isBlobSupported: boolean;
+      readonly extension: string;
+      hasHeaders: boolean;
+      headers: any;
+      isBlobUri: boolean;
+      isCrossOriginUrl: boolean;
+      isDataUri: boolean;
+      proxy: DefaultProxy;
+      readonly queryParameters: any;
+      request: Request;
+      retryAttempts: number;
+      retryCallback: () => void;
+      readonly templateValues: any;
+      url: string;
+      static delete(options?: { url: string; data?: any; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; responseType?: string; overrideMimeType?: string }): Promise<any> | undefined;
+      static fetch(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; responseType?: string; overrideMimeType?: string }): Promise<any> | undefined;
+      static fetchArrayBuffer(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request }): Promise<ArrayBuffer> | undefined;
+      static fetchBlob(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request }): Promise<Blob> | undefined;
+      static fetchImage(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; preferBlob?: boolean }): Promise<any> | undefined;
+      static fetchJson(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request }): Promise<any> | undefined;
+      static fetchJsonp(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; callbackParameterName?: string }): Promise<any> | undefined;
+      static fetchText(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request }): Promise<string> | undefined;
+      static fetchXml(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request }): Promise<XMLDocument> | undefined;
+      static head(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; responseType?: string; overrideMimeType?: string }): Promise<any> | undefined;
+      static options(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; responseType?: string; overrideMimeType?: string }): Promise<any> | undefined;
+      static patch(options?: { url: string; data?: any; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; responseType?: string; overrideMimeType?: string }): Promise<any> | undefined;
+      static post(options?: { url: string; data?: any; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; responseType?: string; overrideMimeType?: string }): Promise<any> | undefined;
+      static put(options?: { url: string; data?: any; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request; responseType?: string; overrideMimeType?: string }): Promise<any> | undefined;
+      constructor(options?: { url: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                    retryAttempts?: number; request?: Request });
+      addQueryParameters(params: any, useAsDefault: boolean): void;
+      addTemplateValues(template: any, useAsDefault: boolean): void;
+      appendForwardSlash(): void;
+      appendQueryParameters(params: any): void;
+      clone(result: Resource): Resource;
+      delete(options?: { responseType?: string; headers?: any; overrideMimeType?: string }): Promise<any> | undefined;
+      fetch(options?: { responseType?: string; headers?: any; overrideMimeType?: string }): Promise<any> | undefined;
+      fetchArrayBuffer(): Promise<ArrayBuffer> | undefined;
+      fetchBlob(): Promise<Blob> | undefined;
+      fetchImage(preferBlob: boolean): Promise<any> | undefined;
+      fetchJson(): Promise<any> | undefined;
+      fetchJsonp(callbackParameterName: string): Promise<any> | undefined;
+      fetchText(): Promise<string> | undefined;
+      fetchXml(): Promise<XMLDocument> | undefined;
+      getBaseUri(includeQuery: boolean): string;
+      getDerivedResource(options: {url?: string; queryParameters?: any; templateValues?: any; headers?: any; proxy?: DefaultProxy; retryCallback?: Resource.RetryCallback;
+                            retryAttempts?: number; request?: Request; preserveQueryParameters?: boolean}): Resource;
+      getUrlComponent(query: boolean, proxy: boolean): string;
+      head(options?: {responseType?: string; headers?: any; overrideMimeType?: string}): Promise<any> | undefined;
+      options(options?: { responseType?: string; headers?: any; overrideMimeType?: string }): Promise<any> | undefined;
+      patch(data: any, options?: { responseType?: string; headers?: any; overrideMimeType?: string }): Promise<any> | undefined;
+      post(data: any, options?: { data?: any; responseType?: string; headers?: any; overrideMimeType?: string }): Promise<any> | undefined;
+      put(data: any, options?: { responseType?: string; headers?: any; overrideMimeType?: string }): Promise<any> | undefined;
+      setQueryParameters(params: any, useAsDefault: boolean): void;
+      setTemplateValues(template: any, useAsDefault: boolean): void;
+    }
+
+    namespace Resource {
+        type RetryCallback = (resource: Resource, error: Error) => void;
+    }
+
+    function defined(value: any): boolean;
+
+    namespace buildModuleUrl {
+      function setBaseUrl(value: string): undefined;
+    }
+}
diff --git a/types/cesium/tsconfig.json b/types/cesium/tsconfig.json
new file mode 100644
index 0000000000..71e6b79545
--- /dev/null
+++ b/types/cesium/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
diff --git a/types/cesium/tslint.json b/types/cesium/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cesium/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0427/1124] 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 0428/1124] 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 0429/1124] 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 0430/1124] 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 0431/1124] 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 0432/1124] 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 0433/1124] 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 0434/1124] @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 0435/1124] 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 0436/1124] 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 0437/1124] 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 0438/1124] 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 0439/1124] 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 0440/1124] 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 0441/1124] 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 6bb4375444a8f1a1f49a315ff4d4822fd1c1291c Mon Sep 17 00:00:00 2001
From: Andrew Scott <ascott18@gmail.com>
Date: Thu, 17 May 2018 09:46:35 -0700
Subject: [PATCH 0442/1124] [qrcode] QRCode.toString() supports render opts

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

diff --git a/types/qrcode/index.d.ts b/types/qrcode/index.d.ts
index c04a07c20f..aa0ef1ca92 100644
--- a/types/qrcode/index.d.ts
+++ b/types/qrcode/index.d.ts
@@ -40,7 +40,7 @@ export interface QRCodeToDataURLOptions extends QRCodeRenderersOptions {
     };
 }
 
-export interface QRCodeToStringOptions extends QRCodeOptions {
+export interface QRCodeToStringOptions extends QRCodeRenderersOptions {
     /**
      * Output format.
      * Default: utf8

From cd7c1bdbfe0b6710d10b4a9e4c8b96361737cece Mon Sep 17 00:00:00 2001
From: Andrew Scott <ascott18@gmail.com>
Date: Thu, 17 May 2018 09:53:19 -0700
Subject: [PATCH 0443/1124] [qrcode] Update version number

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

diff --git a/types/qrcode/index.d.ts b/types/qrcode/index.d.ts
index aa0ef1ca92..1bf0a13454 100644
--- a/types/qrcode/index.d.ts
+++ b/types/qrcode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for qrcode 0.8.2
+// Type definitions for qrcode 1.2.0
 // Project: https://github.com/soldair/node-qrcode
 // Definitions by: York Yao <https://github.com/plantain-00/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 5b1307fcc1e03e5bb10d61237197e88a9ad9e360 Mon Sep 17 00:00:00 2001
From: Gal Talmor <galtalmor@gmail.com>
Date: Thu, 17 May 2018 10:44:36 -0700
Subject: [PATCH 0444/1124] Fix stripe ICharge interface with missing fields
 and optional null values

---
 types/stripe/index.d.ts | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 959cfe76ef..357d855570 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -5023,40 +5023,35 @@ declare namespace Stripe {
 
     namespace reviews {
         interface IReview extends IResourceObject {
-            /**
-             * Unique identifier for the object.
-             */
-            "id": string;
-
             /**
              * String representing the object’s type. Objects of the same type share the same value.
              */
-            "object": "review";
+            object: "review";
             
             /**
              * The charge associated with this review. [Expandable]
              */
-            "charge": string | charges.ICharge;
+            charge: string | charges.ICharge;
 
             /**
              * Time at which the object was created. Measured in seconds since the Unix epoch.
              */
-            "created": number;
+            created: number;
 
             /**
              * Has the value true if the object exists in live mode or the value false if the object exists in test mode.
              */
-            "livemode": false;
+            livemode: boolean;
 
             /**
              * If true, the review needs action.
              */
-            "open": true;
+            open: boolean;
 
             /**
              * The reason the review is currently open or closed.
              */
-            "reason": "rule" | "manual" | "approved" | "refunded" | "refunded_as_fraud" | "disputed";
+            reason: "rule" | "manual" | "approved" | "refunded" | "refunded_as_fraud" | "disputed";
         }
     }
 
@@ -5065,12 +5060,12 @@ declare namespace Stripe {
             /**
              * String representing the object’s type. Objects of the same type share the same value.
              */
-            "object": "application";
+            object: "application";
 
             /**
              * String representing the application’s name.
              */
-            "name": string;
+            name: string;
         }
     } 
 

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 0445/1124] 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 0446/1124] 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 0447/1124] 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 0448/1124] 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 0449/1124] 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 0450/1124] 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 0451/1124] 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 e803cee3d3fe4a2e7de8cc9d0ecdc383f0ad668e Mon Sep 17 00:00:00 2001
From: Ali Afroozeh <ali.afroozeh@mendix.com>
Date: Thu, 17 May 2018 23:36:24 +0200
Subject: [PATCH 0452/1124] Update EventSource definitions to be compatible
 with lib.es6.d.ts

---
 types/eventsource/eventsource-tests.ts        | 26 +++++++++++++------
 types/eventsource/index.d.ts                  | 18 +++++++------
 .../lib/eventsource-polyfill/index.d.ts       | 15 ++++++-----
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/types/eventsource/eventsource-tests.ts b/types/eventsource/eventsource-tests.ts
index 62f867926f..3cef9cfc78 100644
--- a/types/eventsource/eventsource-tests.ts
+++ b/types/eventsource/eventsource-tests.ts
@@ -1,17 +1,27 @@
 import EventSource = require("eventsource");
 
 const eventSource = new EventSource("http://foobar");
-eventSource.onmessage = (x: any) => {};
-eventSource.onerror = (x: any) => {};
-eventSource.onopen = (x: any) => {};
-eventSource.addEventListener = (type: string, x: any) => {};
+let readyState: number = eventSource.readyState;
+let url: string = eventSource.url;
+let withCredentials: boolean = eventSource.withCredentials;
+eventSource.onmessage = (event: Event) => {};
+eventSource.onerror = (event: Event) => {};
+eventSource.onopen = (event: Event) => {};
+eventSource.addEventListener = (type: string, listener: (e: Event) => void) => {};
+eventSource.dispatchEvent = (event: Event) => true;
+eventSource.removeEventListener = (type: string, listener: (e: Event) => void) => {};
 eventSource.close();
 
 import EventSourcePolyfill = require("eventsource/lib/eventsource-polyfill");
 
 const eventSourcePolyfill = new EventSourcePolyfill("http://foobar");
-eventSourcePolyfill.onmessage = (x: any) => {};
-eventSourcePolyfill.onerror = (x: any) => {};
-eventSourcePolyfill.onopen = (x: any) => {};
-eventSourcePolyfill.addEventListener = (type: string, x: any) => {};
+readyState = eventSourcePolyfill.readyState;
+url = eventSourcePolyfill.url;
+withCredentials = eventSource.withCredentials;
+eventSourcePolyfill.onmessage = (event: Event) => {};
+eventSourcePolyfill.onerror = (event: Event) => {};
+eventSourcePolyfill.onopen = (event: Event) => {};
+eventSourcePolyfill.addEventListener = (type: string, listener: (e: Event) => void) => {};
+eventSourcePolyfill.dispatchEvent = (event: Event) => true;
+eventSourcePolyfill.removeEventListener = (type: string, listener: (e: Event) => void) => {};
 eventSourcePolyfill.close();
diff --git a/types/eventsource/index.d.ts b/types/eventsource/index.d.ts
index 62859d037b..613745e7a5 100644
--- a/types/eventsource/index.d.ts
+++ b/types/eventsource/index.d.ts
@@ -1,22 +1,24 @@
 // Type definitions for eventsource 1.0
 // Project: http://github.com/EventSource/eventsource
 // Definitions by: Scott Lee Davis <https://github.com/scottleedavis>
+//                 Ali Afroozeh <https://github.com/afroozeh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.8
 
 declare class EventSource {
   constructor(url: string, eventSourceInitDict?: EventSource.EventSourceInitDict);
-
-  static CLOSED: EventSource.ReadyState;
-  static CONNECTING: EventSource.ReadyState;
-  static OPEN: EventSource.ReadyState;
-
-  url: string;
-  readyState: EventSource.ReadyState;
+  readonly CLOSED: number;
+  readonly CONNECTING: number;
+  readonly OPEN: number;
+  readonly url: string;
+  readonly readyState: number;
+  readonly withCredentials: boolean;
   onopen: EventListener;
   onmessage: EventListener;
   onerror: EventListener;
   addEventListener(type: string, listener: EventListener): void;
+  dispatchEvent(evt: Event): boolean;
+  removeEventListener(type: string, listener?: EventListener): void;
   close(): void;
 }
 
diff --git a/types/eventsource/lib/eventsource-polyfill/index.d.ts b/types/eventsource/lib/eventsource-polyfill/index.d.ts
index 3e4ad378e4..1d4347d0aa 100644
--- a/types/eventsource/lib/eventsource-polyfill/index.d.ts
+++ b/types/eventsource/lib/eventsource-polyfill/index.d.ts
@@ -1,16 +1,17 @@
 declare class EventSource {
   constructor(url: string, eventSourceInitDict?: EventSource.EventSourceInitDict);
-
-  static CLOSED: EventSource.ReadyState;
-  static CONNECTING: EventSource.ReadyState;
-  static OPEN: EventSource.ReadyState;
-
-  url: string;
-  readyState: EventSource.ReadyState;
+  readonly CLOSED: number;
+  readonly CONNECTING: number;
+  readonly OPEN: number;
+  readonly url: string;
+  readonly readyState: number;
+  readonly withCredentials: boolean;
   onopen: EventListener;
   onmessage: EventListener;
   onerror: EventListener;
   addEventListener(type: string, listener: EventListener): void;
+  dispatchEvent(evt: Event): boolean;
+  removeEventListener(type: string, listener?: EventListener): void;
   close(): void;
 }
 

From 40432b21755010e3ffa0da4f7acd9092abab9810 Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Thu, 17 May 2018 16:08:03 -0600
Subject: [PATCH 0453/1124] Adjustments per rbuckton
 (https://github.com/DefinitelyTyped/DefinitelyTyped/pull/25849)

---
 .../axios-token-interceptor-tests.ts          |  6 +--
 types/axios-token-interceptor/index.d.ts      | 45 +++++++++----------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/types/axios-token-interceptor/axios-token-interceptor-tests.ts b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
index 63f40c611a..036223b699 100644
--- a/types/axios-token-interceptor/axios-token-interceptor-tests.ts
+++ b/types/axios-token-interceptor/axios-token-interceptor-tests.ts
@@ -1,9 +1,9 @@
-import tokenProvider from 'axios-token-interceptor';
+import tokenProvider = require('axios-token-interceptor');
 
 tokenProvider(); // $ExpectError
 
 const validOptions = {
-    getToken: () => Promise.resolve('qwerty'),
+	getToken: () => Promise.resolve('qwerty'),
 };
 tokenProvider(validOptions); // $ExpectType TokenProvider
 
@@ -11,7 +11,7 @@ tokenCache(); // $ExpectError
 
 const getToken = Promise.resolve('qwerty');
 const validCacheOptions = {
-    maxAge: 3600,
+	maxAge: 3600,
 };
 const cache = tokenProvider.tokenCache(getToken, validCacheOptions); // $Expect TokenCache
 
diff --git a/types/axios-token-interceptor/index.d.ts b/types/axios-token-interceptor/index.d.ts
index c2bcd259d2..85121f8165 100644
--- a/types/axios-token-interceptor/index.d.ts
+++ b/types/axios-token-interceptor/index.d.ts
@@ -6,28 +6,27 @@
 import { AxiosRequestConfig } from 'axios';
 
 // Module
-export function AxiosTokenProvider(Options: InterceptorOptions): TokenProvider;
-export namespace AxiosTokenProvider {
+declare function AxiosTokenProvider(Options: AxiosTokenProvider.InterceptorOptions): AxiosTokenProvider.TokenProvider;
+declare namespace AxiosTokenProvider {
 	function tokenCache(getToken: Promise<string>, options: TokenCacheOptions): TokenCache;
+
+	// Interfaces
+	interface InterceptorOptions {
+		token?: string;
+		getToken?: () => string | Promise<string>;
+		header?: string;
+		headerFormatter?: (token: string) => string;
+	}
+
+	type TokenProvider = (config: AxiosRequestConfig) => Promise<AxiosRequestConfig>;
+
+	interface TokenCacheOptions {
+		getMaxAge?: () => number;
+		maxAge?: number;
+	}
+
+	interface TokenCache {
+		reset(): void;
+	}
 }
-export default AxiosTokenProvider;
-
-// Interfaces
-
-export interface InterceptorOptions {
-    token?: string;
-    getToken?: () => string | Promise<string>;
-    header?: string;
-    headerFormatter?: (token: string) => string;
-}
-
-export type TokenProvider = (config: AxiosRequestConfig) => Promise<AxiosRequestConfig>;
-
-export interface TokenCacheOptions {
-    getMaxAge?: () => number;
-    maxAge?: number;
-}
-
-export interface TokenCache {
-    reset(): void;
-}
+export = AxiosTokenProvider;

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 0454/1124] 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 0455/1124] [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 0456/1124] 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 9c401045a8fbf603c6b4f4035009eb40378ad892 Mon Sep 17 00:00:00 2001
From: Jordan Janzen <v-jojanz@microsoft.com>
Date: Fri, 18 May 2018 01:15:32 +0100
Subject: [PATCH 0457/1124] Initial re-base@3.x type definitions

---
 types/re-base/index.d.ts       | 567 +++++++++++++++++++++++++++++++++
 types/re-base/re-base-tests.ts |   9 +
 types/re-base/tsconfig.json    |  22 ++
 types/re-base/tslint.json      |   1 +
 4 files changed, 599 insertions(+)
 create mode 100644 types/re-base/index.d.ts
 create mode 100644 types/re-base/re-base-tests.ts
 create mode 100644 types/re-base/tsconfig.json
 create mode 100644 types/re-base/tslint.json

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
new file mode 100644
index 0000000000..928bca7c47
--- /dev/null
+++ b/types/re-base/index.d.ts
@@ -0,0 +1,567 @@
+// Type definitions for re-base 3.2
+// Project: https://github.com/tylermcginnis/re-base#readme
+// Definitions by: jordandrako <https://github.com/jordandrako>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface QueryOptions {}
+
+interface RebaseBinding {}
+
+declare namespace firebase {
+
+}
+
+declare namespace firebase.app {
+    interface App {}
+}
+
+declare namespace firebase.database {
+    interface Database {}
+}
+
+declare namespace firebase.firestore {
+    class Firestore {}
+}
+
+declare namespace rebase {
+    interface SyncStateOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar`.
+         */
+        state: string;
+
+        /**
+         * A default value to set when the Firebase endpoint has no value (i.e., on init) (use this if you want a value other than an empty object or empty array)
+         */
+        defaultValue?: string | boolean | number | {};
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * Will keep any firebase generated keys intact when manipulating data using the asArray option.
+         */
+        keepKeys?: boolean;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+
+        /**
+         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with syncState) to change this.state.loading to false.
+         */
+        then?: () => void;
+
+        /**
+         * A callback function that will be invoked if the current user does not have read or write permissions at the location.
+         */
+        onFailure?: () => void;
+    }
+
+    interface BindToStateOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar` (no arrays).
+         */
+        state: string;
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+
+        /**
+         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with bindToState) to change this.state.loading to false.
+         */
+        then?: () => void;
+
+        /**
+         * A callback function that will be invoked if the current user does not have read permissions at the location.
+         */
+        onFailure?: () => void;
+    }
+
+    interface ListenToOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
+         */
+        then: (result: any) => void;
+
+        /**
+         * The callback function that will be invoked if the current user does not have read permissions at the location.
+         */
+        onFailure?: (error: any) => void;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+    }
+
+    interface FetchOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
+         */
+        then?: (result: any) => void;
+
+        /**
+         * The callback function that will be invoked with an error that occurs reading data from the specified endpoint.
+         */
+        onFailure?: () => void;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+    }
+
+    interface PostOptions {
+        /**
+         * The data you're wanting to persist to Firebase.
+         */
+        data: any;
+
+        /**
+         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
+         */
+        then?: (result: any) => void;
+    }
+
+    interface PushOptions {
+        /**
+         * The data you're wanting to persist to Firebase.
+         */
+        data: any;
+
+        /**
+         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
+         */
+        then?: (result: any) => void;
+    }
+
+    interface UpdateOptions {
+        /**
+         * The data you're wanting to persist to Firebase.
+         */
+        data: any;
+
+        /**
+         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
+         */
+        then?: (result: any) => void;
+    }
+
+    interface DocumentReference {}
+
+    interface CollectionReference {}
+
+    interface bindDocOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * A property name on your state to bind your document to, if omitted the document will be merged into your existing state.
+         */
+        state?: string;
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface listenToDocOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface bindCollectionOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * The state property to bind the collection to.
+         */
+        state?: string;
+
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+
+        /**
+         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
+         */
+        withIds?: boolean;
+
+        /**
+         * will embed the DocumentReference inside each document in your collection on the `ref` property.
+         */
+        withRefs?: boolean;
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface listenToCollectionOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * A callback that will be called with the data.
+         */
+        then: () => void;
+
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+
+        /**
+         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
+         */
+        withIds?: boolean;
+
+        /**
+         * will embed the DocumentReference inside each document in your collection on the `ref` property.
+         */
+        withRefs?: boolean;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface getOptions {
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+
+        /**
+         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
+         */
+        withIds?: boolean;
+
+        /**
+         * will embed the DocumentReference inside each document in your collection on the `ref` property.
+         */
+        withRefs?: boolean;
+    }
+
+    interface removeFromCollectionOptions {
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+    }
+
+    interface syncDocOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * The state property to sync.
+         */
+        state: string;
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface Rebase {
+        /**
+         * This property contains the initialized firebase app that was passed into re-base. You can access any of the firebase services that you are using off this object. For instance, if you want to use some firebase database methods that re-base doesn't have helpers for or if you are using the auth service and want to quickly access it off of re-base.
+         */
+        initializedApp: firebase.app.App;
+
+        /**
+         * This property contains an object that you can use when adding data that will be converted to a timestamp by Firebase. See [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue) for more info.
+         */
+        timestamp: {};
+
+        /**
+         * Allows you to set up two way data binding between your component's state and your Firebase. Whenever your Firebase changes, your component's state will change. Whenever your component's state changes, Firebase will change.
+         * @param endpoint The relative Firebase endpoint to which you'd like to bind your component's state.
+         * @param options syncState Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        syncState(endpoint: string, options: SyncStateOptions): RebaseBinding;
+
+        /**
+         * One way data binding from Firebase to your component's state. Allows you to bind a component's state property to a Firebase endpoint so whenever that Firebase endpoint changes, your component's state will be updated with that change.
+         * @param endpoint The relative Firebase endpoint that you'd like to bind to your component's state.
+         * @param options bindToState Options.
+         * @returns An object which you can pass to removeBinding if you want to remove the listener while the component is still mounted.
+         */
+        bindToState(
+            endpoint: string,
+            options: BindToStateOptions
+        ): RebaseBinding;
+
+        /**
+         * Allows you to listen to Firebase endpoints without binding those changes to a state property. Instead, a callback will be invoked with the newly updated data.
+         * @param endpoint The relative Firebase endpoint which contains the data with which you'd like to invoke your callback function.
+         * @param options listenTo Options.
+         * @returns An object which you can pass to removeBinding when your component unmounts to remove the Firebase listeners.
+         */
+        listenTo(endpoint: string, options: ListenToOptions): RebaseBinding;
+
+        /**
+         * Allows you to retrieve the data from a Firebase endpoint just once without subscribing or listening for data changes.
+         * @param endpoint The relative Firebase endpoint which contains the data you're wanting to fetch.
+         * @param options fetch Options.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        fetch(endpoint: string, options: FetchOptions): Promise<any>;
+
+        /**
+         * Allows you to update a Firebase endpoint with new data. *Replace all the data at this endpoint with the new data*.
+         * @param endpoint The relative Firebase endpoint that you'd like to update with the new data.
+         * @param options post Options.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        post(endpoint: string, options: PostOptions): Promise<any>;
+
+        /**
+         * Allows you to add data to a Firebase endpoint. *Adds data to a child of the endpoint with a new Firebase push key*.
+         * @param endpoint The relative Firebase endpoint that you'd like to push the new data to.
+         * @param options push Options.
+         * @returns A Firebase [ThenableReference](https://firebase.google.com/docs/reference/js/firebase.database.ThenableReference) which is defined by Firebase as a "Combined Promise and reference; resolves when write is complete, but can be used immediately as the reference to the child location."
+         */
+        push(endpoint: string, options: PushOptions): Promise<any>;
+
+        /**
+         * Allows you to update data at a Firebase endpoint changing only the properties you pass to it. **Warning: calling update with `options.data` being null will remove all the data at that endpoint**.
+         * @param endpoint The relative Firebase endpoint that you'd like to update.
+         * @param options update Options.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        update(endpoint: string, options: UpdateOptions): Promise<any>;
+
+        /**
+         * Allows you to delete all data at the endpoint location.
+         * @param endpoint The relative Firebase endpoint that you'd like to delete data from.
+         * @param callback A callback that will get invoked once the data is successfully removed Firebase. If there is an error, it will be the only argument to this function.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        remove(
+            endpoint: string,
+            callback?: (result: Promise<any>) => void
+        ): Promise<any>;
+
+        /**
+         * Bind a document to your component. When then document changes in firestore, your component will re-render with the latest data.
+         * @param refOrPath DocumentReference or path.
+         * @param options bindDoc Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        bindDoc(
+            refOrPath: DocumentReference | string,
+            options: bindDocOptions
+        ): RebaseBinding;
+
+        /**
+         * Listen to a document, when the data changes it will invoke a callback passing it the new data from Firestore.
+         * @param refOrPath DocumentReference or path.
+         * @param options listenToDoc Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        listenToDoc(
+            refOrPath: DocumentReference | string,
+            options: listenToDocOptions
+        ): RebaseBinding;
+
+        /**
+         * Bind a collection to a state property in your component. When then collection changes in firestore, your component will re-render with the latest data.
+         * @param refOrPath CollectionReference or path.
+         * @param options bindCollection Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        bindCollection(
+            refOrPath: CollectionReference | string,
+            options: bindCollectionOptions
+        ): RebaseBinding;
+
+        /**
+         * Listen to a collection, when the data changes it will invoke a callback passing it the new data from Firestore.
+         * @param refOrPath CollectionReference or path.
+         * @param options listenToCollection Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        listenToCollection(
+            refOrPath: CollectionReference | string,
+            options: listenToCollectionOptions
+        ): RebaseBinding;
+
+        /**
+         * Fetch either a Collection or Document.
+         * @param refOrPath CollectionReference, DocumentReference or path.
+         * @param options get Options.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        get(
+            refOrPath: CollectionReference | DocumentReference | string,
+            options: listenToCollectionOptions
+        ): Promise<any>;
+
+        /**
+         * Add a new Document to a Collection.
+         * @param refOrPath CollectionReference or path.
+         * @param data The document data.
+         * @param id The id for the document. If omitted, the Firestore will generate an id for you.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        addToCollection(
+            refOrPath: CollectionReference | string,
+            data: {},
+            id?: string
+        ): Promise<any>;
+
+        /**
+         * Update an existing document.
+         * @param refOrPath DocumentReference or path.
+         * @param data The document data.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        updateDoc(
+            refOrPath: DocumentReference | string,
+            data: {}
+        ): Promise<any>;
+
+        /**
+         * Deletes a document.
+         * @param refOrPath DocumentReference or path.
+         * @param data The document data.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        removeDoc(
+            refOrPath: DocumentReference | string,
+            data: {}
+        ): Promise<any>;
+
+        /**
+         * Removes documents from a collection. If no query is supplied, it will remove all the documents. If a query is supplied, it will only remove documents that match the query.
+         * @param refOrPath CollectionReference or path.
+         * @param options removeFromCollection Options.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        removeFromCollection(
+            refOrPath: CollectionReference | string,
+            options: removeFromCollectionOptions
+        ): Promise<any>;
+
+        /**
+         * Syncs a component's local state with a document in Firestore.
+         * @param refOrPath DocumentReference or path.
+         * @param options removeFromCollection Options.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        syncDoc(
+            refOrPath: DocumentReference | string,
+            options: syncDocOptions
+        ): RebaseBinding;
+
+        /**
+         * Clean up a listener. Listeners are automatically cleaned up when components unmount, however if you wish to remove a listener while the component is still mounted this will allow you to do that. An example would be if you want to start listening to a new document or change a query on all collection in response to a prop change.
+         * @param ref The return value of syncState`, `bindToState`, `listenTo`, `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or `syncDoc`.
+         */
+        removeBinding(ref: RebaseBinding): void;
+
+        /**
+         * Removes every Firebase/Firestore listener.
+         */
+        reset(): void;
+    }
+}
+
+declare module "re-base" {
+    /**
+     * Accepts an initialized firebase database or firestore database object.
+     * @param {object} firebaseDatabase Initialized firebase or firestore
+     * database.
+     * @return {Rebase} An instance of re-base.
+     */
+    export function createClass(
+        firebaseDatabase:
+            | firebase.database.Database
+            | firebase.firestore.Firestore
+    ): rebase.Rebase;
+}
diff --git a/types/re-base/re-base-tests.ts b/types/re-base/re-base-tests.ts
new file mode 100644
index 0000000000..702a6ab2dd
--- /dev/null
+++ b/types/re-base/re-base-tests.ts
@@ -0,0 +1,9 @@
+import * as rebase from "re-base";
+
+const database = {};
+const base = rebase.createClass(database);
+
+const _ref = base.syncState("foo", {
+    context: "bar",
+    state: "baz"
+});
diff --git a/types/re-base/tsconfig.json b/types/re-base/tsconfig.json
new file mode 100644
index 0000000000..eb916d27f6
--- /dev/null
+++ b/types/re-base/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",
+        "re-base-tests.ts"
+    ]
+}
diff --git a/types/re-base/tslint.json b/types/re-base/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/re-base/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c97480f5771b860388cfa599aca2c1ed434e2c83 Mon Sep 17 00:00:00 2001
From: Jordan Janzen <v-jojanz@microsoft.com>
Date: Thu, 17 May 2018 17:51:13 -0700
Subject: [PATCH 0458/1124] Fix linting errors.

---
 types/re-base/index.d.ts    | 96 ++++++++++---------------------------
 types/re-base/tsconfig.json | 14 ++----
 types/re-base/tslint.json   |  8 +++-
 3 files changed, 36 insertions(+), 82 deletions(-)

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
index 928bca7c47..5934b67295 100644
--- a/types/re-base/index.d.ts
+++ b/types/re-base/index.d.ts
@@ -3,27 +3,7 @@
 // Definitions by: jordandrako <https://github.com/jordandrako>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface QueryOptions {}
-
-interface RebaseBinding {}
-
-declare namespace firebase {
-
-}
-
-declare namespace firebase.app {
-    interface App {}
-}
-
-declare namespace firebase.database {
-    interface Database {}
-}
-
-declare namespace firebase.firestore {
-    class Firestore {}
-}
-
-declare namespace rebase {
+export namespace rebase {
     interface SyncStateOptions {
         /**
          * The context of your component.
@@ -53,7 +33,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
 
         /**
          * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with syncState) to change this.state.loading to false.
@@ -85,7 +65,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
 
         /**
          * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with bindToState) to change this.state.loading to false.
@@ -122,7 +102,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
     }
 
     interface FetchOptions {
@@ -149,7 +129,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
     }
 
     interface PostOptions {
@@ -188,10 +168,6 @@ declare namespace rebase {
         then?: (result: any) => void;
     }
 
-    interface DocumentReference {}
-
-    interface CollectionReference {}
-
     interface bindDocOptions {
         /**
          * Your react component.
@@ -350,7 +326,7 @@ declare namespace rebase {
         /**
          * This property contains the initialized firebase app that was passed into re-base. You can access any of the firebase services that you are using off this object. For instance, if you want to use some firebase database methods that re-base doesn't have helpers for or if you are using the auth service and want to quickly access it off of re-base.
          */
-        initializedApp: firebase.app.App;
+        initializedApp: {};
 
         /**
          * This property contains an object that you can use when adding data that will be converted to a timestamp by Firebase. See [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue) for more info.
@@ -363,7 +339,7 @@ declare namespace rebase {
          * @param options syncState Options.
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
-        syncState(endpoint: string, options: SyncStateOptions): RebaseBinding;
+        syncState(endpoint: string, options: SyncStateOptions): {};
 
         /**
          * One way data binding from Firebase to your component's state. Allows you to bind a component's state property to a Firebase endpoint so whenever that Firebase endpoint changes, your component's state will be updated with that change.
@@ -371,10 +347,7 @@ declare namespace rebase {
          * @param options bindToState Options.
          * @returns An object which you can pass to removeBinding if you want to remove the listener while the component is still mounted.
          */
-        bindToState(
-            endpoint: string,
-            options: BindToStateOptions
-        ): RebaseBinding;
+        bindToState(endpoint: string, options: BindToStateOptions): {};
 
         /**
          * Allows you to listen to Firebase endpoints without binding those changes to a state property. Instead, a callback will be invoked with the newly updated data.
@@ -382,7 +355,7 @@ declare namespace rebase {
          * @param options listenTo Options.
          * @returns An object which you can pass to removeBinding when your component unmounts to remove the Firebase listeners.
          */
-        listenTo(endpoint: string, options: ListenToOptions): RebaseBinding;
+        listenTo(endpoint: string, options: ListenToOptions): {};
 
         /**
          * Allows you to retrieve the data from a Firebase endpoint just once without subscribing or listening for data changes.
@@ -433,10 +406,7 @@ declare namespace rebase {
          * @param options bindDoc Options.
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
-        bindDoc(
-            refOrPath: DocumentReference | string,
-            options: bindDocOptions
-        ): RebaseBinding;
+        bindDoc(refOrPath: {} | string, options: bindDocOptions): {};
 
         /**
          * Listen to a document, when the data changes it will invoke a callback passing it the new data from Firestore.
@@ -444,10 +414,7 @@ declare namespace rebase {
          * @param options listenToDoc Options.
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
-        listenToDoc(
-            refOrPath: DocumentReference | string,
-            options: listenToDocOptions
-        ): RebaseBinding;
+        listenToDoc(refOrPath: {} | string, options: listenToDocOptions): {};
 
         /**
          * Bind a collection to a state property in your component. When then collection changes in firestore, your component will re-render with the latest data.
@@ -456,9 +423,9 @@ declare namespace rebase {
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
         bindCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             options: bindCollectionOptions
-        ): RebaseBinding;
+        ): {};
 
         /**
          * Listen to a collection, when the data changes it will invoke a callback passing it the new data from Firestore.
@@ -467,9 +434,9 @@ declare namespace rebase {
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
         listenToCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             options: listenToCollectionOptions
-        ): RebaseBinding;
+        ): {};
 
         /**
          * Fetch either a Collection or Document.
@@ -478,7 +445,7 @@ declare namespace rebase {
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
         get(
-            refOrPath: CollectionReference | DocumentReference | string,
+            refOrPath: {} | {} | string,
             options: listenToCollectionOptions
         ): Promise<any>;
 
@@ -490,7 +457,7 @@ declare namespace rebase {
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
         addToCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             data: {},
             id?: string
         ): Promise<any>;
@@ -501,10 +468,7 @@ declare namespace rebase {
          * @param data The document data.
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
-        updateDoc(
-            refOrPath: DocumentReference | string,
-            data: {}
-        ): Promise<any>;
+        updateDoc(refOrPath: {} | string, data: {}): Promise<any>;
 
         /**
          * Deletes a document.
@@ -512,10 +476,7 @@ declare namespace rebase {
          * @param data The document data.
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
-        removeDoc(
-            refOrPath: DocumentReference | string,
-            data: {}
-        ): Promise<any>;
+        removeDoc(refOrPath: {} | string, data: {}): Promise<any>;
 
         /**
          * Removes documents from a collection. If no query is supplied, it will remove all the documents. If a query is supplied, it will only remove documents that match the query.
@@ -524,7 +485,7 @@ declare namespace rebase {
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
         removeFromCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             options: removeFromCollectionOptions
         ): Promise<any>;
 
@@ -534,16 +495,13 @@ declare namespace rebase {
          * @param options removeFromCollection Options.
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
-        syncDoc(
-            refOrPath: DocumentReference | string,
-            options: syncDocOptions
-        ): RebaseBinding;
+        syncDoc(refOrPath: {} | string, options: syncDocOptions): {};
 
         /**
          * Clean up a listener. Listeners are automatically cleaned up when components unmount, however if you wish to remove a listener while the component is still mounted this will allow you to do that. An example would be if you want to start listening to a new document or change a query on all collection in response to a prop change.
          * @param ref The return value of syncState`, `bindToState`, `listenTo`, `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or `syncDoc`.
          */
-        removeBinding(ref: RebaseBinding): void;
+        removeBinding(ref: {}): void;
 
         /**
          * Removes every Firebase/Firestore listener.
@@ -555,13 +513,9 @@ declare namespace rebase {
 declare module "re-base" {
     /**
      * Accepts an initialized firebase database or firestore database object.
-     * @param {object} firebaseDatabase Initialized firebase or firestore
+     * @param firebaseDatabase Initialized firebase or firestore
      * database.
-     * @return {Rebase} An instance of re-base.
+     * @return An instance of re-base.
      */
-    export function createClass(
-        firebaseDatabase:
-            | firebase.database.Database
-            | firebase.firestore.Firestore
-    ): rebase.Rebase;
+    function createClass(firebaseDatabase: {}): rebase.Rebase;
 }
diff --git a/types/re-base/tsconfig.json b/types/re-base/tsconfig.json
index eb916d27f6..ff88a407d4 100644
--- a/types/re-base/tsconfig.json
+++ b/types/re-base/tsconfig.json
@@ -1,22 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "re-base-tests.ts"
-    ]
+    "files": ["index.d.ts", "re-base-tests.ts"]
 }
diff --git a/types/re-base/tslint.json b/types/re-base/tslint.json
index 3db14f85ea..c077883976 100644
--- a/types/re-base/tslint.json
+++ b/types/re-base/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false,
+        "no-declare-current-package": false
+    }
+}

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 0459/1124] [@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 0460/1124] [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 3388373368ef946a9864a4bb125a857b81e0cea0 Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Thu, 17 May 2018 19:38:18 -0700
Subject: [PATCH 0461/1124] Stricter linting rules

---
 types/re-base/tslint.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/types/re-base/tslint.json b/types/re-base/tslint.json
index c077883976..3db14f85ea 100644
--- a/types/re-base/tslint.json
+++ b/types/re-base/tslint.json
@@ -1,7 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "max-line-length": false,
-        "no-declare-current-package": false
-    }
-}
+{ "extends": "dtslint/dt.json" }

From cc4a1d7951a0edeeea649f03f613e0ad69f27626 Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Thu, 17 May 2018 19:40:03 -0700
Subject: [PATCH 0462/1124] - JSdoc line lengths - remove needless namespace -
 remove declare namesake module

---
 types/re-base/index.d.ts | 1155 +++++++++++++++++++++-----------------
 1 file changed, 642 insertions(+), 513 deletions(-)

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
index 5934b67295..ba838df0aa 100644
--- a/types/re-base/index.d.ts
+++ b/types/re-base/index.d.ts
@@ -3,519 +3,648 @@
 // Definitions by: jordandrako <https://github.com/jordandrako>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export namespace rebase {
-    interface SyncStateOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar`.
-         */
-        state: string;
-
-        /**
-         * A default value to set when the Firebase endpoint has no value (i.e., on init) (use this if you want a value other than an empty object or empty array)
-         */
-        defaultValue?: string | boolean | number | {};
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * Will keep any firebase generated keys intact when manipulating data using the asArray option.
-         */
-        keepKeys?: boolean;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-
-        /**
-         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with syncState) to change this.state.loading to false.
-         */
-        then?: () => void;
-
-        /**
-         * A callback function that will be invoked if the current user does not have read or write permissions at the location.
-         */
-        onFailure?: () => void;
-    }
-
-    interface BindToStateOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar` (no arrays).
-         */
-        state: string;
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-
-        /**
-         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with bindToState) to change this.state.loading to false.
-         */
-        then?: () => void;
-
-        /**
-         * A callback function that will be invoked if the current user does not have read permissions at the location.
-         */
-        onFailure?: () => void;
-    }
-
-    interface ListenToOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
-         */
-        then: (result: any) => void;
-
-        /**
-         * The callback function that will be invoked if the current user does not have read permissions at the location.
-         */
-        onFailure?: (error: any) => void;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-    }
-
-    interface FetchOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
-         */
-        then?: (result: any) => void;
-
-        /**
-         * The callback function that will be invoked with an error that occurs reading data from the specified endpoint.
-         */
-        onFailure?: () => void;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-    }
-
-    interface PostOptions {
-        /**
-         * The data you're wanting to persist to Firebase.
-         */
-        data: any;
-
-        /**
-         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
-         */
-        then?: (result: any) => void;
-    }
-
-    interface PushOptions {
-        /**
-         * The data you're wanting to persist to Firebase.
-         */
-        data: any;
-
-        /**
-         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
-         */
-        then?: (result: any) => void;
-    }
-
-    interface UpdateOptions {
-        /**
-         * The data you're wanting to persist to Firebase.
-         */
-        data: any;
-
-        /**
-         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
-         */
-        then?: (result: any) => void;
-    }
-
-    interface bindDocOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * A property name on your state to bind your document to, if omitted the document will be merged into your existing state.
-         */
-        state?: string;
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface listenToDocOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface bindCollectionOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * The state property to bind the collection to.
-         */
-        state?: string;
-
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-
-        /**
-         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
-         */
-        withIds?: boolean;
-
-        /**
-         * will embed the DocumentReference inside each document in your collection on the `ref` property.
-         */
-        withRefs?: boolean;
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface listenToCollectionOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * A callback that will be called with the data.
-         */
-        then: () => void;
-
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-
-        /**
-         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
-         */
-        withIds?: boolean;
-
-        /**
-         * will embed the DocumentReference inside each document in your collection on the `ref` property.
-         */
-        withRefs?: boolean;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface getOptions {
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-
-        /**
-         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
-         */
-        withIds?: boolean;
-
-        /**
-         * will embed the DocumentReference inside each document in your collection on the `ref` property.
-         */
-        withRefs?: boolean;
-    }
-
-    interface removeFromCollectionOptions {
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-    }
-
-    interface syncDocOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * The state property to sync.
-         */
-        state: string;
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface Rebase {
-        /**
-         * This property contains the initialized firebase app that was passed into re-base. You can access any of the firebase services that you are using off this object. For instance, if you want to use some firebase database methods that re-base doesn't have helpers for or if you are using the auth service and want to quickly access it off of re-base.
-         */
-        initializedApp: {};
-
-        /**
-         * This property contains an object that you can use when adding data that will be converted to a timestamp by Firebase. See [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue) for more info.
-         */
-        timestamp: {};
-
-        /**
-         * Allows you to set up two way data binding between your component's state and your Firebase. Whenever your Firebase changes, your component's state will change. Whenever your component's state changes, Firebase will change.
-         * @param endpoint The relative Firebase endpoint to which you'd like to bind your component's state.
-         * @param options syncState Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        syncState(endpoint: string, options: SyncStateOptions): {};
-
-        /**
-         * One way data binding from Firebase to your component's state. Allows you to bind a component's state property to a Firebase endpoint so whenever that Firebase endpoint changes, your component's state will be updated with that change.
-         * @param endpoint The relative Firebase endpoint that you'd like to bind to your component's state.
-         * @param options bindToState Options.
-         * @returns An object which you can pass to removeBinding if you want to remove the listener while the component is still mounted.
-         */
-        bindToState(endpoint: string, options: BindToStateOptions): {};
-
-        /**
-         * Allows you to listen to Firebase endpoints without binding those changes to a state property. Instead, a callback will be invoked with the newly updated data.
-         * @param endpoint The relative Firebase endpoint which contains the data with which you'd like to invoke your callback function.
-         * @param options listenTo Options.
-         * @returns An object which you can pass to removeBinding when your component unmounts to remove the Firebase listeners.
-         */
-        listenTo(endpoint: string, options: ListenToOptions): {};
-
-        /**
-         * Allows you to retrieve the data from a Firebase endpoint just once without subscribing or listening for data changes.
-         * @param endpoint The relative Firebase endpoint which contains the data you're wanting to fetch.
-         * @param options fetch Options.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        fetch(endpoint: string, options: FetchOptions): Promise<any>;
-
-        /**
-         * Allows you to update a Firebase endpoint with new data. *Replace all the data at this endpoint with the new data*.
-         * @param endpoint The relative Firebase endpoint that you'd like to update with the new data.
-         * @param options post Options.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        post(endpoint: string, options: PostOptions): Promise<any>;
-
-        /**
-         * Allows you to add data to a Firebase endpoint. *Adds data to a child of the endpoint with a new Firebase push key*.
-         * @param endpoint The relative Firebase endpoint that you'd like to push the new data to.
-         * @param options push Options.
-         * @returns A Firebase [ThenableReference](https://firebase.google.com/docs/reference/js/firebase.database.ThenableReference) which is defined by Firebase as a "Combined Promise and reference; resolves when write is complete, but can be used immediately as the reference to the child location."
-         */
-        push(endpoint: string, options: PushOptions): Promise<any>;
-
-        /**
-         * Allows you to update data at a Firebase endpoint changing only the properties you pass to it. **Warning: calling update with `options.data` being null will remove all the data at that endpoint**.
-         * @param endpoint The relative Firebase endpoint that you'd like to update.
-         * @param options update Options.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        update(endpoint: string, options: UpdateOptions): Promise<any>;
-
-        /**
-         * Allows you to delete all data at the endpoint location.
-         * @param endpoint The relative Firebase endpoint that you'd like to delete data from.
-         * @param callback A callback that will get invoked once the data is successfully removed Firebase. If there is an error, it will be the only argument to this function.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        remove(
-            endpoint: string,
-            callback?: (result: Promise<any>) => void
-        ): Promise<any>;
-
-        /**
-         * Bind a document to your component. When then document changes in firestore, your component will re-render with the latest data.
-         * @param refOrPath DocumentReference or path.
-         * @param options bindDoc Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        bindDoc(refOrPath: {} | string, options: bindDocOptions): {};
-
-        /**
-         * Listen to a document, when the data changes it will invoke a callback passing it the new data from Firestore.
-         * @param refOrPath DocumentReference or path.
-         * @param options listenToDoc Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        listenToDoc(refOrPath: {} | string, options: listenToDocOptions): {};
-
-        /**
-         * Bind a collection to a state property in your component. When then collection changes in firestore, your component will re-render with the latest data.
-         * @param refOrPath CollectionReference or path.
-         * @param options bindCollection Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        bindCollection(
-            refOrPath: {} | string,
-            options: bindCollectionOptions
-        ): {};
-
-        /**
-         * Listen to a collection, when the data changes it will invoke a callback passing it the new data from Firestore.
-         * @param refOrPath CollectionReference or path.
-         * @param options listenToCollection Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        listenToCollection(
-            refOrPath: {} | string,
-            options: listenToCollectionOptions
-        ): {};
-
-        /**
-         * Fetch either a Collection or Document.
-         * @param refOrPath CollectionReference, DocumentReference or path.
-         * @param options get Options.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        get(
-            refOrPath: {} | {} | string,
-            options: listenToCollectionOptions
-        ): Promise<any>;
-
-        /**
-         * Add a new Document to a Collection.
-         * @param refOrPath CollectionReference or path.
-         * @param data The document data.
-         * @param id The id for the document. If omitted, the Firestore will generate an id for you.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        addToCollection(
-            refOrPath: {} | string,
-            data: {},
-            id?: string
-        ): Promise<any>;
-
-        /**
-         * Update an existing document.
-         * @param refOrPath DocumentReference or path.
-         * @param data The document data.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        updateDoc(refOrPath: {} | string, data: {}): Promise<any>;
-
-        /**
-         * Deletes a document.
-         * @param refOrPath DocumentReference or path.
-         * @param data The document data.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        removeDoc(refOrPath: {} | string, data: {}): Promise<any>;
-
-        /**
-         * Removes documents from a collection. If no query is supplied, it will remove all the documents. If a query is supplied, it will only remove documents that match the query.
-         * @param refOrPath CollectionReference or path.
-         * @param options removeFromCollection Options.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        removeFromCollection(
-            refOrPath: {} | string,
-            options: removeFromCollectionOptions
-        ): Promise<any>;
-
-        /**
-         * Syncs a component's local state with a document in Firestore.
-         * @param refOrPath DocumentReference or path.
-         * @param options removeFromCollection Options.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        syncDoc(refOrPath: {} | string, options: syncDocOptions): {};
-
-        /**
-         * Clean up a listener. Listeners are automatically cleaned up when components unmount, however if you wish to remove a listener while the component is still mounted this will allow you to do that. An example would be if you want to start listening to a new document or change a query on all collection in response to a prop change.
-         * @param ref The return value of syncState`, `bindToState`, `listenTo`, `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or `syncDoc`.
-         */
-        removeBinding(ref: {}): void;
-
-        /**
-         * Removes every Firebase/Firestore listener.
-         */
-        reset(): void;
-    }
-}
-
-declare module "re-base" {
+export interface SyncStateOptions {
     /**
-     * Accepts an initialized firebase database or firestore database object.
-     * @param firebaseDatabase Initialized firebase or firestore
-     * database.
-     * @return An instance of re-base.
+     * The context of your component.
      */
-    function createClass(firebaseDatabase: {}): rebase.Rebase;
+    context: {};
+
+    /**
+     * The state property you want to sync with Firebase; can be an
+     * arbitrarily nested property a là `foo.bar`.
+     */
+    state: string;
+
+    /**
+     * A default value to set when the Firebase endpoint has no value (i.e.,
+     * on init) (use this if you want a value other than an empty object or
+     * empty array)
+     */
+    defaultValue?: string | boolean | number | {};
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * Will keep any firebase generated keys intact when manipulating data
+     * using the asArray option.
+     */
+    keepKeys?: boolean;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+
+    /**
+     * The callback function that will be invoked when the initial listener
+     * is established with Firebase. Typically used (with syncState) to
+     * change this.state.loading to false.
+     */
+    then?: () => void;
+
+    /**
+     * A callback function that will be invoked if the current user does
+     * not have read or write permissions at the location.
+     */
+    onFailure?: () => void;
 }
+
+export interface BindToStateOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * The state property you want to sync with Firebase; can be an
+     * arbitrarily nested property a là `foo.bar` (no arrays).
+     */
+    state: string;
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+
+    /**
+     * The callback function that will be invoked when the initial listener
+     * is established with Firebase. Typically used (with bindToState) to
+     * change this.state.loading to false.
+     */
+    then?: () => void;
+
+    /**
+     * A callback function that will be invoked if the current user does
+     * not have read permissions at the location.
+     */
+    onFailure?: () => void;
+}
+
+export interface ListenToOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * The callback function that will be invoked with the data from the
+     * specified endpoint when the endpoint changes.
+     */
+    then: (result: any) => void;
+
+    /**
+     * The callback function that will be invoked if the current user does
+     * not have read permissions at the location.
+     */
+    onFailure?: (error: any) => void;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+}
+
+export interface FetchOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * The callback function that will be invoked with the data from the
+     * specified endpoint when the endpoint changes.
+     */
+    then?: (result: any) => void;
+
+    /**
+     * The callback function that will be invoked with an error that occurs
+     * reading data from the specified endpoint.
+     */
+    onFailure?: () => void;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+}
+
+export interface PostOptions {
+    /**
+     * The data you're wanting to persist to Firebase.
+     */
+    data: any;
+
+    /**
+     * A callback that will get invoked once the new data has been saved to
+     * Firebase. If there is an error, it will be the only argument to this
+     * function.
+     */
+    then?: (result: any) => void;
+}
+
+export interface PushOptions {
+    /**
+     * The data you're wanting to persist to Firebase.
+     */
+    data: any;
+
+    /**
+     * A callback that will get invoked once the new data has been saved to
+     * Firebase. If there is an error, it will be the only argument to this
+     * function.
+     */
+    then?: (result: any) => void;
+}
+
+export interface UpdateOptions {
+    /**
+     * The data you're wanting to persist to Firebase.
+     */
+    data: any;
+
+    /**
+     * A callback that will get invoked once the new data has been saved to
+     * Firebase. If there is an error, it will be the only argument to this
+     * function.
+     */
+    then?: (result: any) => void;
+}
+
+export interface bindDocOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * A property name on your state to bind your document to, if omitted
+     * the document will be merged into your existing state.
+     */
+    state?: string;
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface listenToDocOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface bindCollectionOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * The state property to bind the collection to.
+     */
+    state?: string;
+
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+
+    /**
+     * Will embed firestore generated document ids inside each document in
+     * your collections on the `id` property.
+     */
+    withIds?: boolean;
+
+    /**
+     * will embed the DocumentReference inside each document in your
+     * collection on the `ref` property.
+     */
+    withRefs?: boolean;
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface listenToCollectionOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * A callback that will be called with the data.
+     */
+    then: () => void;
+
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+
+    /**
+     * Will embed firestore generated document ids inside each document in
+     * your collections on the `id` property.
+     */
+    withIds?: boolean;
+
+    /**
+     * will embed the DocumentReference inside each document in your
+     * collection on the `ref` property.
+     */
+    withRefs?: boolean;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface getOptions {
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+
+    /**
+     * Will embed firestore generated document ids inside each document in
+     * your collections on the `id` property.
+     */
+    withIds?: boolean;
+
+    /**
+     * will embed the DocumentReference inside each document in your
+     * collection on the `ref` property.
+     */
+    withRefs?: boolean;
+}
+
+export interface removeFromCollectionOptions {
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+}
+
+export interface syncDocOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * The state property to sync.
+     */
+    state: string;
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface Rebase {
+    /**
+     * This property contains the initialized firebase app that was passed
+     * into re-base. You can access any of the firebase services that you
+     * are using off this object. For instance, if you want to use some
+     * firebase database methods that re-base doesn't have helpers for or
+     * if you are using the auth service and want to quickly access it off
+     * of re-base.
+     */
+    initializedApp: {};
+
+    /**
+     * This property contains an object that you can use when adding data
+     * that will be converted to a timestamp by Firebase. See
+     * [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue)
+     * for more info.
+     */
+    timestamp: {};
+
+    /**
+     * Allows you to set up two way data binding between your component's
+     * state and your Firebase. Whenever your Firebase changes, your
+     * component's state will change. Whenever your component's state
+     * changes, Firebase will change.
+     * @param endpoint The relative Firebase endpoint to which you'd like
+     * to bind your component's state.
+     * @param options syncState Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    syncState(endpoint: string, options: SyncStateOptions): {};
+
+    /**
+     * One way data binding from Firebase to your component's state. Allows
+     * you to bind a component's state property to a Firebase endpoint so
+     * whenever that Firebase endpoint changes, your component's state will
+     * be updated with that change.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * bind to your component's state.
+     * @param options bindToState Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    bindToState(endpoint: string, options: BindToStateOptions): {};
+
+    /**
+     * Allows you to listen to Firebase endpoints without binding those
+     * changes to a state property. Instead, a callback will be invoked
+     * with the newly updated data.
+     * @param endpoint The relative Firebase endpoint which contains the
+     * data with which you'd like to invoke your callback function.
+     * @param options listenTo Options.
+     * @returns An object which you can pass to `removeBinding` when your
+     * component unmounts to remove the Firebase listeners.
+     */
+    listenTo(endpoint: string, options: ListenToOptions): {};
+
+    /**
+     * Allows you to retrieve the data from a Firebase endpoint just once
+     * without subscribing or listening for data changes.
+     * @param endpoint The relative Firebase endpoint which contains the
+     * data you're wanting to fetch.
+     * @param options fetch Options.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    fetch(endpoint: string, options: FetchOptions): Promise<any>;
+
+    /**
+     * Allows you to update a Firebase endpoint with new data. *Replace all
+     * the data at this endpoint with the new data*.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * update with the new data.
+     * @param options post Options.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    post(endpoint: string, options: PostOptions): Promise<any>;
+
+    /**
+     * Allows you to add data to a Firebase endpoint. *Adds data to a child
+     * of the endpoint with a new Firebase push key*.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * push the new data to.
+     * @param options push Options.
+     * @returns A Firebase [ThenableReference](https://firebase.google.com/docs/reference/js/firebase.database.ThenableReference)
+     * which is defined by Firebase as a "Combined Promise and reference;
+     * resolves when write is complete, but can be used immediately as the
+     * reference to the child location."
+     */
+    push(endpoint: string, options: PushOptions): Promise<any>;
+
+    /**
+     * Allows you to update data at a Firebase endpoint changing only the
+     * properties you pass to it. **Warning: calling update with
+     * `options.data` being null will remove all the data at that
+     * endpoint**.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * update.
+     * @param options update Options.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    update(endpoint: string, options: UpdateOptions): Promise<any>;
+
+    /**
+     * Allows you to delete all data at the endpoint location.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * delete data from.
+     * @param callback A callback that will get invoked once the data is
+     * successfully removed Firebase. If there is an error, it will be the
+     * only argument to this function.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    remove(
+        endpoint: string,
+        callback?: (result: Promise<any>) => void
+    ): Promise<any>;
+
+    /**
+     * Bind a document to your component. When then document changes in
+     * firestore, your component will re-render with the latest data.
+     * @param refOrPath DocumentReference or path.
+     * @param options bindDoc Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    bindDoc(refOrPath: {} | string, options: bindDocOptions): {};
+
+    /**
+     * Listen to a document, when the data changes it will invoke a
+     * callback passing it the new data from Firestore.
+     * @param refOrPath DocumentReference or path.
+     * @param options listenToDoc Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    listenToDoc(refOrPath: {} | string, options: listenToDocOptions): {};
+
+    /**
+     * Bind a collection to a state property in your component. When then
+     * collection changes in firestore, your component will re-render with
+     * the latest data.
+     * @param refOrPath CollectionReference or path.
+     * @param options bindCollection Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    bindCollection(
+        refOrPath: {} | string,
+        options: bindCollectionOptions
+    ): {};
+
+    /**
+     * Listen to a collection, when the data changes it will invoke a
+     * callback passing it the new data from Firestore.
+     * @param refOrPath CollectionReference or path.
+     * @param options listenToCollection Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    listenToCollection(
+        refOrPath: {} | string,
+        options: listenToCollectionOptions
+    ): {};
+
+    /**
+     * Fetch either a Collection or Document.
+     * @param refOrPath CollectionReference, DocumentReference or path.
+     * @param options get Options.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    get(
+        refOrPath: {} | {} | string,
+        options: listenToCollectionOptions
+    ): Promise<any>;
+
+    /**
+     * Add a new Document to a Collection.
+     * @param refOrPath CollectionReference or path.
+     * @param data The document data.
+     * @param id The id for the document. If omitted, the Firestore will
+     * generate an id for you.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    addToCollection(
+        refOrPath: {} | string,
+        data: {},
+        id?: string
+    ): Promise<any>;
+
+    /**
+     * Update an existing document.
+     * @param refOrPath DocumentReference or path.
+     * @param data The document data.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    updateDoc(refOrPath: {} | string, data: {}): Promise<any>;
+
+    /**
+     * Deletes a document.
+     * @param refOrPath DocumentReference or path.
+     * @param data The document data.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    removeDoc(refOrPath: {} | string, data: {}): Promise<any>;
+
+    /**
+     * Removes documents from a collection. If no query is supplied, it
+     * will remove all the documents. If a query is supplied, it will only
+     * remove documents that match the query.
+     * @param refOrPath CollectionReference or path.
+     * @param options removeFromCollection Options.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    removeFromCollection(
+        refOrPath: {} | string,
+        options: removeFromCollectionOptions
+    ): Promise<any>;
+
+    /**
+     * Syncs a component's local state with a document in Firestore.
+     * @param refOrPath DocumentReference or path.
+     * @param options removeFromCollection Options.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    syncDoc(refOrPath: {} | string, options: syncDocOptions): {};
+
+    /**
+     * Clean up a listener. Listeners are automatically cleaned up when
+     * components unmount, however if you wish to remove a listener while
+     * the component is still mounted this will allow you to do that. An
+     * example would be if you want to start listening to a new document or
+     * change a query on all collection in response to a prop change.
+     * @param ref The return value of syncState`, `bindToState`, `listenTo`,
+     * `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or
+     * `syncDoc`.
+     */
+    removeBinding(ref: {}): void;
+
+    /**
+     * Removes every Firebase/Firestore listener.
+     */
+    reset(): void;
+}
+
+/**
+ * Accepts an initialized firebase/firestore database object.
+ * @param database Initialized firebase/firestore
+ * database.
+ * @return An instance of re-base.
+ */
+export function createClass(database: {}): Rebase;

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 0463/1124] 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 0464/1124] 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 0465/1124] 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 2d614d3a2da03cbb2465db79f5622be6a8b50955 Mon Sep 17 00:00:00 2001
From: akizimov <a.kizimov@mute-lab.com>
Date: Fri, 18 May 2018 16:43:41 +0300
Subject: [PATCH 0466/1124] test fixes

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

diff --git a/types/redux-testkit/redux-testkit-tests.ts b/types/redux-testkit/redux-testkit-tests.ts
index 2fdbf14856..c0cff16e43 100644
--- a/types/redux-testkit/redux-testkit-tests.ts
+++ b/types/redux-testkit/redux-testkit-tests.ts
@@ -33,11 +33,11 @@ const getNumbers = (state: SimpleState = simpleState, type: string): number[] =>
 	return state.numbers.filter(element => {
 		const division = element % 2;
 
-		if (division === 0 && type === ODD_NUMBERS) {
+		if (division === 0 && type === EVEN_NUMBERS) {
 			return element;
 		}
 
-		if (division !== 0 && type === EVEN_NUMBERS) {
+		if (division !== 0 && type === ODD_NUMBERS) {
 			return element;
 		}
 	});

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 0467/1124] 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 0468/1124] 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 0469/1124] 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 0470/1124] [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 0471/1124] 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 0472/1124] 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 0473/1124] 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 0474/1124] 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 0475/1124] 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 0476/1124] 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 0477/1124] 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 0478/1124] 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 0479/1124] 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 ecec6c0af053c954bc8b13242a82b76366ae18cc Mon Sep 17 00:00:00 2001
From: Krzysztof Miemiec <krzysztof.miemiec@gmail.com>
Date: Fri, 18 May 2018 22:36:30 +0200
Subject: [PATCH 0480/1124] Initial version of typings for
 react-native-svg-charts

---
 types/react-native-svg-charts/index.d.ts      | 271 ++++++++++++++++++
 types/react-native-svg-charts/package.json    |   8 +
 .../react-native-svg-charts-tests.tsx         |  74 +++++
 types/react-native-svg-charts/tsconfig.json   |  25 ++
 types/react-native-svg-charts/tslint.json     |   1 +
 5 files changed, 379 insertions(+)
 create mode 100644 types/react-native-svg-charts/index.d.ts
 create mode 100644 types/react-native-svg-charts/package.json
 create mode 100644 types/react-native-svg-charts/react-native-svg-charts-tests.tsx
 create mode 100644 types/react-native-svg-charts/tsconfig.json
 create mode 100644 types/react-native-svg-charts/tslint.json

diff --git a/types/react-native-svg-charts/index.d.ts b/types/react-native-svg-charts/index.d.ts
new file mode 100644
index 0000000000..e35f30d410
--- /dev/null
+++ b/types/react-native-svg-charts/index.d.ts
@@ -0,0 +1,271 @@
+// Type definitions for react-native-svg-charts 5.0
+// Project: https://github.com/JesperLekland/react-native-svg-charts
+// Definitions by: Krzysztof Miemiec <https://github.com/krzysztof-miemiec>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { ScaleBand, ScaleLinear, ScaleLogarithmic, ScalePower, ScaleTime } from 'd3-scale';
+import { CurveFactory, Series } from 'd3-shape';
+import * as React from 'react';
+import { StyleProp, ViewStyle } from 'react-native';
+import {
+    CommonPathProps,
+    LinearGradientProps,
+    LineProps,
+    PathProps,
+    RadialGradientProps,
+    TextProps
+} from 'react-native-svg';
+
+export type ScaleType<Range, Output> =
+    | ScaleLinear<Range, Output>
+    | ScaleLogarithmic<Range, Output>
+    | ScalePower<Range, Output>
+    | ScaleTime<Range, Output>;
+
+export type ScaleFunction = () => ScaleType<any, any> | ScaleBand<any>;
+export type AccessorFunction<T, U> = (props: { item: T, index: number }) => U;
+export type SortFunction<T> = (a: T, b: T) => number;
+export type OffsetFunction = (series: Series<any, any>, order: number[]) => void;
+export type OrderFunction = (series: Series<any, any>) => number[];
+
+// Chart
+
+export interface ChartProps<T> {
+    data: T[];
+    style: StyleProp<ViewStyle>;
+    animate?: boolean;
+    animationDuration?: number;
+    svg?: PathProps;
+    width?: number;
+    height?: number;
+    curve?: CurveFactory;
+    contentInset?: {
+        top?: number,
+        left?: number,
+        right?: number,
+        bottom?: number,
+    };
+    gridMin?: number;
+    gridMax?: number;
+    gridProps?: GridProps<any>;
+    numberOfTicks?: number;
+    xScale?: ScaleFunction;
+    yScale?: ScaleFunction;
+    xAccessor?: AccessorFunction<T, number>;
+    yAccessor?: AccessorFunction<T, number>;
+}
+
+// Line Chart
+
+export class LineChart<T> extends React.PureComponent<ChartProps<T>> {
+}
+
+// Pie Chart
+
+export interface PieChartData {
+    svg?: PathProps;
+    key: string | number;
+    value?: number;
+    arc?: {
+        outerRadius?: number | string;
+        cornerRadius?: number | string;
+    };
+}
+
+export interface PieChartProps<T extends PieChartData> extends ChartProps<T> {
+    innerRadius?: number | string;
+    outerRadius?: number | string;
+    labelRadius?: number | string;
+    padAngle?: number;
+    sort?: SortFunction<T>;
+    valueAccessor?: AccessorFunction<T, number>;
+}
+
+export class PieChart<T extends PieChartData> extends React.PureComponent<PieChartProps<T>> {
+}
+
+// Area Chart
+
+export interface AreaChartProps<T> extends ChartProps<T> {
+    start?: number;
+}
+
+export class AreaChart<T> extends React.PureComponent<AreaChartProps<T>> {
+}
+
+// Stacked Area Chart
+
+export interface StackedAreaChartProps<T> extends ChartProps<T> {
+    keys: ReadonlyArray<keyof T>;
+    colors: string[];
+    offset?: OffsetFunction;
+    order?: OrderFunction;
+    renderGradient?: (props: {
+        id: string,
+        width: number,
+        height: number,
+        x: number,
+        y: number,
+        index: number,
+        key: keyof T,
+        color: string,
+    }) => React.Component<LinearGradientProps | RadialGradientProps>;
+    showGrid?: boolean;
+    extras?: any[];
+    renderDecorator?: () => {};
+}
+
+export class StackedAreaChart<T> extends React.PureComponent<StackedAreaChartProps<T>> {
+    static extractDataPoints<T>(data: T[], keys: ReadonlyArray<keyof T>, order?: OrderFunction, offset?: OffsetFunction): number[];
+}
+
+// Stacked Bar Chart
+
+export interface StackedBarChartProps<T> extends ChartProps<T> {
+    keys: ReadonlyArray<keyof T>;
+    colors: string[];
+    offset?: OffsetFunction;
+    order?: OrderFunction;
+    strokeColor?: string;
+    renderGradient: (props: { id: string }) => React.Component<LinearGradientProps | RadialGradientProps>;
+    spacingInner?: number;
+    spacingOuter?: number;
+    showGrid?: boolean;
+    extras?: any[];
+    extra?: () => {};
+}
+
+export class StackedBarChart<T> extends React.PureComponent<StackedBarChartProps<T>> {
+    static extractDataPoints<T>(data: T, keys: ReadonlyArray<keyof T>, order?: OrderFunction, offset?: OffsetFunction): number[];
+}
+
+// Bar Chart
+
+export interface BarChartProps<T> extends ChartProps<T> {
+    spacingInner?: number;
+    spacingOuter?: number;
+}
+
+export class BarChart<T> extends React.PureComponent<BarChartProps<T>> {
+}
+
+// XAxis
+
+export interface AxisProps<T> {
+    data: T[];
+    spacingInner?: number;
+    spacingOuter?: number;
+    formatLabel?: (value: any, index: number) => number | string;
+    scale?: ScaleFunction;
+    numberOfTicks?: number;
+    svg?: TextProps;
+}
+
+export interface XAxisProps<T> extends AxisProps<T> {
+    contentInset?: {
+        left?: number;
+        right?: number
+    };
+    xAccessor?: AccessorFunction<T, any>;
+}
+
+export class XAxis<T> extends React.PureComponent<XAxisProps<T>> {
+}
+
+// YAxis
+
+export interface YAxisProps<T> extends AxisProps<T> {
+    contentInset?: {
+        top?: number;
+        bottom?: number;
+    };
+    min?: number;
+    max?: number;
+    yAccessor?: AccessorFunction<T, any>;
+}
+
+export class YAxis<T> extends React.PureComponent<YAxisProps<T>> {
+}
+
+// Progress Circle
+
+export interface ProgressCircleProps {
+    progress: number;
+    style?: StyleProp<ViewStyle>;
+    progressColor?: string;
+    backgroundColor?: string;
+    strokeWidth?: number;
+    startAngle?: number;
+    endAngle?: number;
+    animate?: boolean;
+    animateDuration?: number;
+}
+
+export class ProgressCircle extends React.PureComponent<ProgressCircleProps> {
+}
+
+// Horizontal Line
+
+export interface HorizontalLineProps {
+    stroke: string;
+}
+
+// Point
+
+export interface PointProps {
+    x: (index: number) => number;
+    y: (value: number) => number;
+    value?: number;
+    radius?: number;
+    index?: number;
+    color: string;
+}
+
+// Tooltip
+
+export interface TooltipProps {
+    x: (index: number) => number;
+    y: (value: number) => number;
+    value?: number;
+    index?: number;
+    height?: number;
+    stroke?: string;
+    text: string;
+    pointStroke?: string;
+}
+
+export namespace Decorators {
+    class HorizontalLine extends React.Component<HorizontalLineProps> {}
+    class Point extends React.Component<PointProps> {}
+    class Tooltip extends React.Component<TooltipProps> {}
+}
+
+export type GridDirection = 'VERTICAL' | 'HORIZONTAL' | 'BOTH';
+
+export interface GridProps<T> {
+    direction?: GridDirection;
+    belowChart?: boolean;
+    svg?: LineProps;
+    ticks?: T[];
+    x?: (t: T) => number;
+    y?: (t: T) => number;
+}
+
+// Export as Component despite it's SFC.
+export class Grid<T> extends React.Component<GridProps<T>> {
+    static Direction: {
+        VERTICAL: 'VERTICAL',
+        HORIZONTAL: 'HORIZONTAL',
+        BOTH: 'BOTH',
+    };
+}
+
+export interface AnimatedPathProps extends CommonPathProps {
+    animated?: boolean;
+    animationDuration?: number;
+    renderPlaceholder?: () => any;
+}
+
+export class Path extends React.Component<AnimatedPathProps> {
+}
diff --git a/types/react-native-svg-charts/package.json b/types/react-native-svg-charts/package.json
new file mode 100644
index 0000000000..21ce5da517
--- /dev/null
+++ b/types/react-native-svg-charts/package.json
@@ -0,0 +1,8 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/d3-scale": "^2.0.0",
+        "@types/d3-shape": "^1.2.2",
+        "react-native-svg": "^6.2.1"
+    }
+}
diff --git a/types/react-native-svg-charts/react-native-svg-charts-tests.tsx b/types/react-native-svg-charts/react-native-svg-charts-tests.tsx
new file mode 100644
index 0000000000..5f12c801fc
--- /dev/null
+++ b/types/react-native-svg-charts/react-native-svg-charts-tests.tsx
@@ -0,0 +1,74 @@
+import * as React from 'react';
+import { Defs, LinearGradient, Stop } from 'react-native-svg';
+import { StackedAreaChart, XAxis, Grid } from 'react-native-svg-charts';
+import { curveNatural } from 'd3-shape';
+import { scaleTime } from 'd3-scale';
+
+interface Data {
+    time: number;
+    cpuUsage: number;
+    totalMemoryConsumption: number;
+    privateMemoryConsumption: number;
+}
+
+interface Props {
+    data: Data[];
+    width: number;
+}
+
+class Example extends React.Component<Props> {
+	render() {
+        const { data, width } = this.props;
+		return (
+            <StackedAreaChart
+                style={{ height: 200 }}
+                data={data}
+                keys={['totalMemoryConsumption', 'privateMemoryConsumption']}
+                colors={['url(#totalMemoryConsumption)', 'url(#privateMemoryConsumption)']}
+                contentInset={{ top: 20 }}
+                curve={curveNatural}
+                showGrid={true}
+                animate={true}
+                animationDuration={350}
+                numberOfTicks={10}
+
+            >
+                <Defs key="defs">
+                    <LinearGradient id="totalMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
+                        <Stop offset="0%" stopColor="#4ccfef" stopOpacity={0.9} />
+                        <Stop offset="100%" stopColor="#182b41" stopOpacity={0.9} />
+                    </LinearGradient>
+                    <LinearGradient id="privateMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
+                        <Stop offset="0%" stopColor="#a1d343" stopOpacity={0.8} />
+                        <Stop offset="100%" stopColor="#a1d343" stopOpacity={0.3} />
+                    </LinearGradient>
+                </Defs>
+                <XAxis
+                    data={data}
+                    formatLabel={(value) => new Date(value).toTimeString()}
+                    numberOfTicks={8}
+                    scale={scaleTime}
+                    contentInset={{ left: 10, right: 10 }}
+                    svg={{
+                        fillOpacity: .2,
+                        fill: '#fff',
+                        fontFamily: 'Regular',
+                        fontSize: 10,
+                    }}
+                    xAccessor={({ item }) => item.time}
+                />
+                <Grid
+                    direction="BOTH"
+                    ticks={[20, 40, 60, 80]}
+                    x={x => x * width}
+                    y={y => y * width}
+                    svg={{
+                        stroke: '#fff',
+                        strokeOpacity: .2,
+                    }}
+                    belowChart={true}
+                />
+            </StackedAreaChart>
+		);
+	}
+}
diff --git a/types/react-native-svg-charts/tsconfig.json b/types/react-native-svg-charts/tsconfig.json
new file mode 100644
index 0000000000..ea66ecf6b7
--- /dev/null
+++ b/types/react-native-svg-charts/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-svg-charts-tests.tsx"
+    ]
+}
diff --git a/types/react-native-svg-charts/tslint.json b/types/react-native-svg-charts/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-svg-charts/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0481/1124] 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 0482/1124] 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 0483/1124] 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 0484/1124] 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 0485/1124] 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 6e0571bc02496c49a2d82811a3ce926be716c61c Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Sat, 19 May 2018 07:34:54 +0200
Subject: [PATCH 0486/1124] Changed import to <reference />

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

diff --git a/types/uuid-parse/index.d.ts b/types/uuid-parse/index.d.ts
index b69d3dfa1f..f0e6b1a2d1 100644
--- a/types/uuid-parse/index.d.ts
+++ b/types/uuid-parse/index.d.ts
@@ -3,7 +3,8 @@
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
-import 'node';
+
+/// <reference types="node" />
 
 /**
  * Parse a UUID into it's component bytes

From f76d4aaa069587cf10fd2a5ff76e848abb18ec31 Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Sat, 19 May 2018 14:26:35 +0800
Subject: [PATCH 0487/1124] add v1

---
 types/jsreport-html-to-xlsx/v1/index.d.ts     | 24 +++++++++++++++++
 .../v1/jsreport-html-to-xlsx-tests.ts         | 19 ++++++++++++++
 types/jsreport-html-to-xlsx/v1/tsconfig.json  | 26 +++++++++++++++++++
 types/jsreport-html-to-xlsx/v1/tslint.json    |  1 +
 4 files changed, 70 insertions(+)
 create mode 100644 types/jsreport-html-to-xlsx/v1/index.d.ts
 create mode 100644 types/jsreport-html-to-xlsx/v1/jsreport-html-to-xlsx-tests.ts
 create mode 100644 types/jsreport-html-to-xlsx/v1/tsconfig.json
 create mode 100644 types/jsreport-html-to-xlsx/v1/tslint.json

diff --git a/types/jsreport-html-to-xlsx/v1/index.d.ts b/types/jsreport-html-to-xlsx/v1/index.d.ts
new file mode 100644
index 0000000000..84b37480aa
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/v1/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for jsreport-html-to-xlsx 1.4
+// Project: https://github.com/jsreport/jsreport-html-to-xlsx
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { ExtensionDefinition } from 'jsreport-core';
+import { Options as BaseOptions } from 'jsreport-xlsx';
+
+declare module 'jsreport-core' {
+	interface Template {
+		recipe: 'html-to-xlsx' | string;
+	}
+}
+
+declare namespace JsReportHtml2Xlsx {
+	interface Options extends BaseOptions {
+		strategy: string;
+	}
+}
+
+declare function JsReportHtml2Xlsx(options?: Partial<JsReportHtml2Xlsx.Options>): ExtensionDefinition;
+
+export = JsReportHtml2Xlsx;
diff --git a/types/jsreport-html-to-xlsx/v1/jsreport-html-to-xlsx-tests.ts b/types/jsreport-html-to-xlsx/v1/jsreport-html-to-xlsx-tests.ts
new file mode 100644
index 0000000000..9540cf7929
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/v1/jsreport-html-to-xlsx-tests.ts
@@ -0,0 +1,19 @@
+import JsReport = require('jsreport-core');
+import JsreportHtml2Xlsx = require('jsreport-html-to-xlsx');
+import JsreportXlsx = require('jsreport-xlsx');
+
+const jsreport = JsReport();
+jsreport.use(JsreportXlsx());
+jsreport.use(JsreportHtml2Xlsx());
+
+(async () => {
+	const content = `<table><tr><td>test</td></tr></table>`;
+	await jsreport.init();
+	const resp = await jsreport.render({
+		template: {
+			content,
+			engine: 'none',
+			recipe: 'xlsx'
+		}
+	});
+})();
diff --git a/types/jsreport-html-to-xlsx/v1/tsconfig.json b/types/jsreport-html-to-xlsx/v1/tsconfig.json
new file mode 100644
index 0000000000..6b073aa725
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/v1/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "esnext"
+        ],
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+       ],
+       "paths": {
+            "jsreport-html-to-xlsx": [ "jsreport-html-to-xlsx/v1" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsreport-html-to-xlsx-tests.ts"
+    ]
+}
diff --git a/types/jsreport-html-to-xlsx/v1/tslint.json b/types/jsreport-html-to-xlsx/v1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsreport-html-to-xlsx/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0488/1124] 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 0489/1124] 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 82d09842754d551d9a0715b41ab9f978deda9686 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Sat, 19 May 2018 12:55:37 +0200
Subject: [PATCH 0490/1124] Update index.d.ts

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

diff --git a/types/intl-locales-supported/index.d.ts b/types/intl-locales-supported/index.d.ts
index b156905fdf..76b5a4321e 100644
--- a/types/intl-locales-supported/index.d.ts
+++ b/types/intl-locales-supported/index.d.ts
@@ -3,4 +3,6 @@
 // Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default function areIntlLocalesSupported(locales: string | string[]): void;
+export = areIntlLocalesSupported;
+
+function areIntlLocalesSupported(locales: string | string[]): boolean;

From 6d5cd37bbadc2bd180ff8fde7d8c76d040b39b33 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Sat, 19 May 2018 12:55:58 +0200
Subject: [PATCH 0491/1124] Update intl-locales-supported-tests.ts

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

diff --git a/types/intl-locales-supported/intl-locales-supported-tests.ts b/types/intl-locales-supported/intl-locales-supported-tests.ts
index dcddcd545d..0ef43ea1e0 100644
--- a/types/intl-locales-supported/intl-locales-supported-tests.ts
+++ b/types/intl-locales-supported/intl-locales-supported-tests.ts
@@ -1,4 +1,4 @@
-import areIntlLocalesSupported from "intl-locales-supported";
+import areIntLocalesSupported = require("intl-locales-supported");
 
 areIntlLocalesSupported("en-GB");
 areIntlLocalesSupported([ "en-GB", "en-US" ]);

From 5bcb57689662abac60e127b799ef990d69342f88 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <esammutalessi@gmail.com>
Date: Sat, 19 May 2018 13:11:12 +0200
Subject: [PATCH 0492/1124] Fixes

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

diff --git a/types/intl-locales-supported/index.d.ts b/types/intl-locales-supported/index.d.ts
index 76b5a4321e..62d88c0e54 100644
--- a/types/intl-locales-supported/index.d.ts
+++ b/types/intl-locales-supported/index.d.ts
@@ -5,4 +5,4 @@
 
 export = areIntlLocalesSupported;
 
-function areIntlLocalesSupported(locales: string | string[]): boolean;
+declare function areIntlLocalesSupported(locales: string | string[]): boolean;
diff --git a/types/intl-locales-supported/intl-locales-supported-tests.ts b/types/intl-locales-supported/intl-locales-supported-tests.ts
index 0ef43ea1e0..9d63d0e9ec 100644
--- a/types/intl-locales-supported/intl-locales-supported-tests.ts
+++ b/types/intl-locales-supported/intl-locales-supported-tests.ts
@@ -1,4 +1,4 @@
-import areIntLocalesSupported = require("intl-locales-supported");
+import areIntlLocalesSupported = require("intl-locales-supported");
 
 areIntlLocalesSupported("en-GB");
 areIntlLocalesSupported([ "en-GB", "en-US" ]);

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 0493/1124] 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 0494/1124] 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 0495/1124] 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 0496/1124] 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 0497/1124] 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 0498/1124] 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 0499/1124] 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 0500/1124] 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 0501/1124] 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 0502/1124] [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 0503/1124] 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 0504/1124] [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 0505/1124] 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 0506/1124] [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 0507/1124] 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 0508/1124] 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 0509/1124] 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 0510/1124] 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 0511/1124] 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 0512/1124] 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 0513/1124] 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 0514/1124] 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 0515/1124] [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 0516/1124] 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 0517/1124] 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 0518/1124] [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 0519/1124] 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 0520/1124] 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 0521/1124] 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 0522/1124] 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 0523/1124] [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 0524/1124] 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 0525/1124] [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 0526/1124] 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 0527/1124] 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 0528/1124] 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 0529/1124] 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 0530/1124] 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 0531/1124] 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 0532/1124] [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 0533/1124] 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 0534/1124] 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 0535/1124] 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 0536/1124] 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 0537/1124] 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 0538/1124] 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 0539/1124] 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 0540/1124] 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 0541/1124] 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 0542/1124] 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 0543/1124] 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 cba41f0aca7c25c228af64d33a1850be413b8118 Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Mon, 21 May 2018 13:44:19 -0600
Subject: [PATCH 0544/1124] Update to include install function

---
 types/okta__okta-vue/index.d.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/types/okta__okta-vue/index.d.ts b/types/okta__okta-vue/index.d.ts
index 75a3332c68..5f67b78fc2 100644
--- a/types/okta__okta-vue/index.d.ts
+++ b/types/okta__okta-vue/index.d.ts
@@ -7,16 +7,18 @@
 import { VueConstructor, PluginFunction } from 'vue';
 import { NavigationGuard } from 'vue-router';
 
-export interface OktaVueOptions {
-    issuer: string;
-    client_id: string;
-    redirect_uri: string;
-    scope: string;
-}
-export function OktaVuePlugin(vm: VueConstructor, options: OktaVueOptions): void;
-export namespace OktaVuePlugin {
+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' {

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 0545/1124] 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 0546/1124] 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 0547/1124] [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 0548/1124] 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 0549/1124] 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 0550/1124] 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 0551/1124] 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 0552/1124] 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 0553/1124] 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 0554/1124] 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 0555/1124] 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 0556/1124] 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 0557/1124] 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 0558/1124] 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 0559/1124] 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 0560/1124] 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 0561/1124] 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 b27825f8a173cc29d503a30c669d5ce6efba0021 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 22 May 2018 09:00:39 +0200
Subject: [PATCH 0562/1124] Chrome apps: Separate typings

---
 types/chrome-apps/chrome-webview.d.ts    |  104 --
 types/chrome-apps/index.d.ts             | 1583 +++++++++++++++++++++-
 types/chrome-apps/test/chrome-webview.ts |    2 -
 types/chrome-apps/test/index.ts          |    5 +
 types/chrome-apps/tsconfig.json          |    4 +-
 5 files changed, 1584 insertions(+), 114 deletions(-)
 delete mode 100644 types/chrome-apps/chrome-webview.d.ts
 delete mode 100644 types/chrome-apps/test/chrome-webview.ts

diff --git a/types/chrome-apps/chrome-webview.d.ts b/types/chrome-apps/chrome-webview.d.ts
deleted file mode 100644
index b3ab9ced0c..0000000000
--- a/types/chrome-apps/chrome-webview.d.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// Project: http://developer.chrome.com/apps/
-// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// WebView ref: https://chromium.googlesource.com/chromium/src/+/64.0.3274.2/chrome/common/extensions/api/webview_tag.json
-// TypeScript Version: 2.3
-
-///////////////////
-// <webview> Tag
-///////////////////
-/**
- * Use the <code>webview</code> tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
- */
-declare namespace chrome.webview {
-    /** Options that determine what data should be cleared by `clearData`. */
-    export interface ClearDataOptions {
-        /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
-        since: number;
-    }
-    export interface WindowEvent extends chrome.events.Event<() => void> { }
-
-    export interface ConsoleEvent extends Event {
-        /**
-         * @description The severity level of the log message. Ranges from 0 to 4.
-         * @type {number}
-         * @memberof ConsoleEvent
-         */
-        level: number,
-        /**
-         * @description The logged message contents.
-         * @type {string}
-         * @memberof ConsoleEvent
-         */
-        message: string,
-        /**
-         * @description The line number of the message source.
-         * @type {number}
-         * @memberof ConsoleEvent
-         */
-        line: number,
-        /**
-         * @description A string identifying the resource which logged the message.
-         * @type {string}
-         * @memberof ConsoleEvent
-         */
-        sourceId: string
-    }
-
-    /** Description of a declarative rule for handling events. */
-    export interface Rule {
-        /** Optional priority of this rule. Defaults to 100.  */
-        priority?: number;
-        /** List of conditions that can trigger the actions. */
-        conditions: any[];
-        /** Optional. Optional identifier that allows referencing this rule.  */
-        id?: string;
-        /** List of actions that are triggered if one of the condtions is fulfilled. */
-        actions: any[];
-        /**
-         * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
-         * @since Chrome 28
-         * @type {string[]}
-         * @memberof Rule
-         */
-        tags?: string[];
-    }
-
-    /**
-     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-     * @export
-     * @interface InjectDetails
-     */
-    export interface InjectDetails {
-        /**
-         * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        code?: string,
-        /**
-         * @description JavaScript or CSS file to inject.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        file?: string
-    }
-
-    export interface WebViewElementEventMap extends ElementEventMap {
-        'message': ConsoleEvent
-    }
-
-    /**
-     * @description
-     * @export
-     * @interface HTMLWebViewElement
-     * @extends {Element}
-     */
-    export interface HTMLWebViewElement extends Element {
-        executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void,
-        src: string,
-        contentWindow: Window
-        addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
-        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    }
-}
diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index e5511245d2..606f34fc95 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -1,13 +1,20 @@
-/// <reference path="./chrome-webview.d.ts" />
 // Type definitions for Chrome packaged application development
 // Project: http://developer.chrome.com/apps/
-// Definitions by: Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>, Nikolai Ommundsen <https://github.com/niikoo>
+// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// WebView ref: https://chromium.googlesource.com/chromium/src/+/68.0.3432.1/chrome/common/extensions/api/webview_tag.json
 // TypeScript Version: 2.4
 
-/// <reference types="chrome"/>
 /// <reference types="filesystem"/>
 
+////////////////////
+// Global object
+////////////////////
+interface Window {
+    chrome: typeof chrome;
+}
+declare module chrome { }
+
 ////////////////////
 // App
 ////////////////////
@@ -19,6 +26,8 @@ declare namespace chrome.app {
     export function getDetails(): AppDetails;
 }
 
+export type GenericEvent = Event;
+
 ////////////////////
 // App Runtime
 ////////////////////
@@ -174,8 +183,288 @@ declare namespace chrome.app.window {
     export var onRestored: WindowEvent;
 }
 
+
 ////////////////////
-// fileSystem
+// Context Menus
+////////////////////
+
+declare namespace chrome.contextMenus {
+    /**
+    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
+    **/
+    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
+    /**
+    * The type of menu item.
+    **/
+    export type ItemType = "normal" | "checkbox" | "radio" | "separator";
+
+    /**
+    * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+    * @param {any} [object Object]
+     */
+    export function create(createProperties: object, callback?: () => void): void;
+
+    /**
+    * @description Updates a previously created context menu item.
+    * @param {any} id The ID of the item to update.
+    * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
+    * @param {any} [object Object]
+     */
+    export function update(id: number | string, updateProperties: object, callback?: () => void): void;
+
+    /**
+    * @description Removes a context menu item.
+    * @param {any} menuItemId The ID of the context menu item to remove.
+    * @param {any} [object Object]
+     */
+    export function remove(menuItemId: number | string, callback?: () => void): void;
+
+    /**
+    * @description Removes all context menu items added by this extension.
+    * @param {any} [object Object]
+     */
+    export function removeAll(callback?: () => void): void;
+
+}
+
+
+////////////////////
+// Events
+////////////////////
+/**
+ * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
+ * Availability: Since Chrome 21.
+ */
+declare namespace chrome.events {
+    /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
+    export interface UrlFilter {
+        /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
+        schemes?: string[];
+        /**
+         * Optional.
+          * Since Chrome 23.
+         * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+         */
+        urlMatches?: string;
+        /** Optional. Matches if the path segment of the URL contains a specified string.  */
+        pathContains?: string;
+        /** Optional. Matches if the host name of the URL ends with a specified string.  */
+        hostSuffix?: string;
+        /** Optional. Matches if the host name of the URL starts with a specified string.  */
+        hostPrefix?: string;
+        /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
+        hostContains?: string;
+        /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlContains?: string;
+        /** Optional. Matches if the query segment of the URL ends with a specified string.  */
+        querySuffix?: string;
+        /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlPrefix?: string;
+        /** Optional. Matches if the host name of the URL is equal to a specified string.  */
+        hostEquals?: string;
+        /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlEquals?: string;
+        /** Optional. Matches if the query segment of the URL contains a specified string.  */
+        queryContains?: string;
+        /** Optional. Matches if the path segment of the URL starts with a specified string.  */
+        pathPrefix?: string;
+        /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
+        pathEquals?: string;
+        /** Optional. Matches if the path segment of the URL ends with a specified string.  */
+        pathSuffix?: string;
+        /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
+        queryEquals?: string;
+        /** Optional. Matches if the query segment of the URL starts with a specified string.  */
+        queryPrefix?: string;
+        /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlSuffix?: string;
+        /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
+        ports?: any[];
+        /**
+         * Optional.
+          * Since Chrome 28.
+         * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+         */
+        originAndPathMatches?: string;
+    }
+
+    /** An object which allows the addition and removal of listeners for a Chrome event. */
+    export interface Event<T> {
+        /**
+         * Registers an event listener callback to an event.
+         * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
+         * The callback parameter should be a function that looks like this:
+         * function() {...};
+         */
+        addListener(callback: T): void;
+        /**
+         * Returns currently registered rules.
+         * @param callback Called with registered rules.
+         * The callback parameter should be a function that looks like this:
+         * function(array of Rule rules) {...};
+         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+         */
+        getRules(callback: (rules: Rule[]) => void): void;
+        /**
+         * Returns currently registered rules.
+         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+         * @param callback Called with registered rules.
+         * The callback parameter should be a function that looks like this:
+         * function(array of Rule rules) {...};
+         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+         */
+        getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
+        /**
+         * @param callback Listener whose registration status shall be tested.
+         */
+        hasListener(callback: T): boolean;
+        /**
+         * Unregisters currently registered rules.
+         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+         * @param callback Called when rules were unregistered.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
+        /**
+         * Unregisters currently registered rules.
+         * @param callback Called when rules were unregistered.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        removeRules(callback?: () => void): void;
+        /**
+         * Registers rules to handle events.
+         * @param rules Rules to be registered. These do not replace previously registered rules.
+         * @param callback Called with registered rules.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(array of Rule rules) {...};
+         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+         */
+        addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
+        /**
+         * Deregisters an event listener callback from an event.
+         * @param callback Listener that shall be unregistered.
+         * The callback parameter should be a function that looks like this:
+         * function() {...};
+         */
+        removeListener(callback: T): void;
+        hasListeners(): boolean;
+    }
+
+    /** Description of a declarative rule for handling events. */
+    export interface Rule {
+        /** Optional. Optional priority of this rule. Defaults to 100.  */
+        priority?: number;
+        /** List of conditions that can trigger the actions. */
+        conditions: any[];
+        /** Optional. Optional identifier that allows referencing this rule.  */
+        id?: string;
+        /** List of actions that are triggered if one of the condtions is fulfilled. */
+        actions: any[];
+        /**
+         * Optional.
+          * Since Chrome 28.
+         * Tags can be used to annotate rules and perform operations on sets of rules.
+         */
+        tags?: string[];
+    }
+}
+
+////////////////////
+// Extension Types
+////////////////////
+
+/**
+ * Primary for extensions, but also used in apps.
+ * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
+ **/
+declare namespace chrome.extensionTypes {
+    /**
+     * The format of an image.
+     **/
+    export type ImageFormat = 'jpeg' | 'png';
+    /**
+     * Details about the format and quality of an image.
+     */
+    export interface ImageDetails {
+        /**
+         * @description The format of the resulting image. Default is "jpeg".
+         * @type {ImageFormat}
+         * @memberof ImageDetails
+         */
+        format?: ImageFormat;
+        /**
+         * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
+         * @type {number}
+         * @memberof ImageDetails
+         */
+        quality?: number;
+    }
+    /**
+     * The soonest that the JavaScript or CSS will be injected into the tab.
+     **/
+    export type RunAt = 'document_start' | 'document_end' | 'document_idle';
+    /**
+     * The origin of injected CSS.
+     **/
+    export type CSSOrigin = 'author' | 'user';
+    /**
+     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+     * @interface InjectDetails
+     */
+    export interface InjectDetails {
+        /**
+         * JavaScript or CSS code to inject.
+         * Warning:
+         * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        code?: string;
+        /**
+         * @description JavaScript or CSS file to inject.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        file?: string;
+        /**
+         * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
+         * @type {boolean}
+         * @memberof InjectDetails
+         */
+        allFrames?: boolean;
+        /**
+         * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
+         * @since Since Chrome 50.
+         * @type {number}
+         * @memberof InjectDetails
+         */
+        frameId?: number;
+        /**
+         * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
+         * @type {boolean}
+         * @memberof InjectDetails
+         */
+        matchAboutBlank?: boolean;
+        /**
+         * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+         * @type {RunAt}
+         * @memberof InjectDetails
+         */
+        runAt: RunAt;
+        /**
+         * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
+         * @since Since Chrome 66.
+         * @type {CSSOrigin}
+         * @memberof InjectDetails
+         */
+        cssOrigin: CSSOrigin;
+    }
+}
+
+////////////////////
+// FileSystem
 ////////////////////
 declare namespace chrome.fileSystem {
 
@@ -310,8 +599,65 @@ declare namespace chrome.mediaGalleries {
 }
 
 ////////////////////
-// Sockets
+// Socket
 ////////////////////
+declare namespace chrome.socket {
+    export interface CreateInfo {
+        socketId: number;
+    }
+
+    export interface AcceptInfo {
+        resultCode: number;
+        socketId?: number;
+    }
+
+    export interface ReadInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+    }
+
+    export interface WriteInfo {
+        bytesWritten: number;
+    }
+
+    export interface RecvFromInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+        port: number;
+        address: string;
+    }
+
+    export interface SocketInfo {
+        socketType: string;
+        localPort?: number;
+        peerAddress?: string;
+        peerPort?: number;
+        localAddress?: string;
+        connected: boolean;
+    }
+
+    export interface NetworkInterface {
+        name: string;
+        address: string;
+    }
+
+    export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
+    export function destroy(socketId: number): void;
+    export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
+    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+    export function disconnect(socketId: number): void;
+    export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
+    export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
+    export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
+    export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
+    export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
+    export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
+    export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
+    export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
+    export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
+    export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
+}
+
 declare namespace chrome.sockets.tcp {
     export interface CreateInfo {
         socketId: number;
@@ -1484,3 +1830,1230 @@ declare namespace chrome.networking.onc {
         DeviceEditable?: boolean
     }
 }
+
+///////////////////
+// Webview Tag
+///////////////////
+/**
+ * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
+ */
+declare namespace chrome.webview {
+    /** Options that determine what data should be cleared by `clearData`. */
+    export interface ClearDataOptions {
+        /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
+        since?: number;
+    }
+    export interface WindowEvent extends chrome.events.Event<() => void> { }
+
+    export interface ConsoleEvent extends Event {
+        /**
+         * @description The severity level of the log message. Ranges from 0 to 4.
+         * @type {number}
+         * @memberof ConsoleEvent
+         */
+        level: number;
+        /**
+         * @description The logged message contents.
+         * @type {string}
+         * @memberof ConsoleEvent
+         */
+        message: string;
+        /**
+         * @description The line number of the message source.
+         * @type {number}
+         * @memberof ConsoleEvent
+         */
+        line: number;
+        /**
+         * @description A string identifying the resource which logged the message.
+         * @type {string}
+         * @memberof ConsoleEvent
+         */
+        sourceId: string;
+    }
+
+    export interface ExitEvent extends Event {
+        /**
+         * @description Chrome's internal ID of the process that exited.
+         * @type {number}
+         * @memberof ExitEvent
+         */
+        processID: number;
+        /**
+         * @description String indicating the reason for the exit.
+         * @type {string}
+         * @memberof ExitEvent
+         */
+        reason: 'normal' | 'abnormal' | 'crash' | 'kill';
+    }
+
+    /** Description of a declarative rule for handling events. */
+    export interface Rule {
+        /** Optional priority of this rule. Defaults to 100.  */
+        priority?: number;
+        /** List of conditions that can trigger the actions. */
+        conditions: any[];
+        /** Optional. Optional identifier that allows referencing this rule.  */
+        id?: string;
+        /** List of actions that are triggered if one of the condtions is fulfilled. */
+        actions: any[];
+        /**
+         * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
+         * @since Chrome 28
+         * @type {string[]}
+         * @memberof Rule
+         */
+        tags?: string[];
+    }
+
+    /**
+     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+     * @export
+     * @interface InjectDetails
+     */
+    export interface InjectDetails {
+        /**
+         * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        code?: string,
+        /**
+         * @description JavaScript or CSS file to inject.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        file?: string
+    }
+
+    export interface WebViewElementEventMap extends ElementEventMap {
+        'message': ConsoleEvent,
+        'exit': ExitEvent
+    }
+
+    /**
+     * @description
+     * @export
+     * @interface HTMLWebViewElement
+     * @extends {Element}
+     */
+    export interface HTMLWebViewElement extends Element {
+        executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
+        src: string;
+        contentWindow: Window;
+        addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
+        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+    }
+
+    /**Options that determine what data should be cleared by clearData. */
+    export interface ClearDataOptions {
+
+        /**
+        * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
+         */
+        since?: number;
+    }
+    /**A set of data types. Missing properties are interpreted as false. */
+    export interface ClearDataTypeSet {
+
+        /**
+        * @description Websites' appcaches.
+         */
+        appcache?: boolean
+
+        /**
+        * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
+         */
+        cache?: boolean
+
+        /**
+        * @description The partition's cookies.
+         */
+        cookies?: boolean
+
+        /**
+        * @description The partition's session cookies.
+         */
+        sessionCookies?: boolean
+
+        /**
+        * @description The partition's persistent cookies.
+         */
+        persistentCookies?: boolean
+
+        /**
+        * @description Websites' filesystems.
+         */
+        fileSystems?: boolean
+
+        /**
+        * @description Websites' IndexedDB data.
+         */
+        indexedDB?: boolean
+
+        /**
+        * @description Websites' local storage data.
+         */
+        localStorage?: boolean
+
+        /**
+        * @description Websites' WebSQL data.
+         */
+        webSQL?: boolean
+    }
+    /**
+    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
+    * Enum values:
+    * "all"
+    * "page"
+    * "frame"
+    * "selection"
+    * "link"
+    * "editable"
+    * "image"
+    * "video"
+    * "audio" */
+    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
+    /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
+    export interface InjectDetails {
+
+        /**
+        * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
+         */
+        code?: string
+
+        /**
+        * @description JavaScript or CSS file to inject.
+         */
+        file?: string
+    }
+    /**The type of injection item: code or a set of files. */
+    export interface InjectionItems {
+
+        /**
+        * @description JavaScript code or CSS to be injected into matching pages.
+         */
+        code?: string
+
+        /**
+        * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
+         */
+        files?: any[]
+    }
+    /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
+    export interface ContentScriptDetails {
+
+        /**
+        * @description The name of the content script to inject.
+         */
+        name: string
+
+        /**
+        * @description Specifies which pages this content script will be injected into.
+         */
+        matches: any[]
+
+        /**
+        * @description Excludes pages that this content script would otherwise be injected into.
+         */
+        exclude_matches?: any[]
+
+        /**
+        * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
+         */
+        match_about_blank?: boolean
+
+        /**
+        * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
+         */
+        css?: InjectionItems
+
+        /**
+        * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
+         */
+        js?: InjectionItems
+
+        /**
+        * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+         */
+        run_at?: chrome.extensionTypes.RunAt;
+
+        /**
+        * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
+         */
+        all_frames?: boolean;
+
+        /**
+        * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
+         */
+        include_globs?: string[];
+
+        /**
+        * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
+         */
+        exclude_globs?: string[];
+    }
+    /**@todo Add documentation */
+    export interface ContextMenuCreateProperties {
+
+        /**
+        * @description The type of menu item. Defaults to 'normal' if not specified.
+         */
+        type?: chrome.contextMenus.ItemType
+
+        /**
+        * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+         */
+        id?: string
+
+        /**
+        * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
+         */
+        title?: string
+
+        /**
+        * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+         */
+        checked?: boolean
+
+        /**
+        * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
+         */
+        contexts?: any[]
+
+        /**
+        * @description A function that will be called back when the menu item is clicked.
+        * @param {any} [object Object]
+         */
+        onclick?: (info: any) => void
+
+        /**
+        * @description The ID of a parent menu item; this makes the item a child of a previously added item.
+         */
+        parentId?: number | string
+
+        /**
+        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+         */
+        documentUrlPatterns?: any[]
+
+        /**
+        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+         */
+        targetUrlPatterns?: any[]
+
+        /**
+        * @description Whether this context menu item is enabled or disabled. Defaults to true.
+         */
+        enabled?: boolean
+    }
+    /**@todo Add documentation */
+    export interface ContextMenuUpdateProperties {
+
+        /**
+        * @description The type of menu item.
+         */
+        type?: chrome.webview.ContextType;
+
+        /**
+        * @description The text to be displayed in the item
+         */
+        title?: string
+
+        /**
+        * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+         */
+        checked?: boolean
+
+        /**
+        * @description List of contexts this menu item will appear in.
+         */
+        contexts?: any[]
+
+        /**
+        * @description A function that will be called back when the menu item is clicked.
+        * @param {any} [object Object]
+         */
+        onclick?: (info: any) => void
+
+        /**
+        * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
+         */
+        parentId?: number | string
+
+        /**
+        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+         */
+        documentUrlPatterns?: any[]
+
+        /**
+        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+         */
+        targetUrlPatterns?: any[]
+
+        /**
+        * @description Whether this context menu item is enabled or disabled.
+         */
+        enabled?: boolean
+    }
+    export interface ContextMenus {
+
+        /**
+        * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+        * @param {object} createProperties The properties used to create the item
+        * @param {any} [object Object]
+         */
+        create(createProperties: object, callback?: () => void): void;
+
+        /**
+        * @description Updates a previously created context menu item.
+        * @param {any} id The ID of the item to update.
+        * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
+        * @param {any} [object Object]
+         */
+        update(id: number | string, updateProperties: object, callback?: () => void): void;
+
+        /**
+        * @description Removes a context menu item.
+        * @param {any} menuItemId The ID of the context menu item to remove.
+        * @param {any} [object Object]
+         */
+        remove(menuItemId: number | string, callback?: () => void): void;
+
+        /**
+        * @description Removes all context menu items added to this webview.
+        * @param {any} [object Object]
+         */
+        removeAll(callback?: () => void): void;
+
+
+        /**
+        * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
+         */
+        onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
+
+    }
+    export interface IOnShowEvent {
+        /**
+         * @description Call this to prevent showing the context menu.
+         * @memberof IOnShowEvent
+         */
+        preventDefault: () => void;
+    }
+    export interface ContentWindow {
+
+        /**
+        * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
+        * @param {any} message Message object to send to the guest.
+        * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
+         */
+        postMessage(message: any, targetOrigin: string): void;
+
+    }
+    export interface DialogController {
+
+        /**
+        * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
+        * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
+         */
+        ok(response?: string): void;
+
+        /**
+        * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
+         */
+        cancel(): void;
+
+    }
+    /**Contains all of the results of the find request. */
+    export interface FindCallbackResults {
+
+        /**
+        * @description The number of times searchText was matched on the page.
+         */
+        numberOfMatches: number
+
+        /**
+        * @description The ordinal number of the current match.
+         */
+        activeMatchOrdinal: number
+
+        /**
+        * @description Describes a rectangle around the active match in screen coordinates.
+         */
+        selectionRect: SelectionRect
+
+        /**
+        * @description Indicates whether this find request was canceled.
+         */
+        canceled: boolean
+    }
+    /**Options for the find request. */
+    export interface FindOptions {
+
+        /**
+        * @description Flag to find matches in reverse order. The default value is false.
+         */
+        backward?: boolean
+
+        /**
+        * @description Flag to match with case-sensitivity. The default value is false.
+         */
+        matchCase?: boolean
+    }
+    export interface NewWindow {
+
+        /**
+        * @description Attach the requested target page to an existing webview element.
+        * @param {object} webview The webview element to which the target page should be attached.
+         */
+        attach(webview: object): void;
+
+        /**
+        * @description Cancel the new window request.
+         */
+        discard(): void;
+
+    }
+    export interface MediaPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface GeolocationPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface PointerLockPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface DownloadPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface FileSystemPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request.
+         */
+        deny(): void;
+
+    }
+    export interface FullscreenPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request.
+         */
+        deny(): void;
+
+    }
+    export interface LoadPluginPermissionRequest {
+
+        /**
+        * @description Allow the permission request. This is the default behavior if deny is not called..
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request.
+         */
+        deny(): void;
+
+    }
+    /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
+    export interface SelectionRect {
+
+        /**
+        * @description Distance from the left edge of the screen to the left edge of the rectangle.
+         */
+        left: number
+
+        /**
+        * @description Distance from the top edge of the screen to the top edge of the rectangle.
+         */
+        top: number
+
+        /**
+        * @description Width of the rectangle.
+         */
+        width: number
+
+        /**
+        * @description Height of the rectangle.
+         */
+        height: number
+    }
+    /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
+      function(details) { return {cancel: true}; },
+      {urls: ["*://www.evil.com/*"]},
+      ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
+      conditions: [
+        new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
+      ],
+      actions: [ new chrome.webViewRequest.CancelRequest() ]
+    };
+    myWebview.request.onRequest.addRules([rule]);</pre> */
+    export interface WebRequestEventInterface {
+    }
+    /**
+    * Defines the how zooming is handled in the webview.
+    * Enum values:
+    * "per-origin"
+    * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor.
+    * "per-view"
+    * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
+    * "disabled"
+    * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
+    export type ZoomMode = "per-origin" | "per-view" | "disabled";
+
+    /**
+    * @description Queries audio state.
+    * @param {any} [object Object]
+     */
+    export function getAudioState(callback: (audible: boolean) => void): void;
+
+    /**
+    * @description Sets audio mute state of the webview.
+    * @param {boolean} mute Mute audio value
+     */
+    export function setAudioMuted(mute: boolean): void;
+
+    /**
+    * @description Queries whether audio is muted.
+    * @param {any} [object Object]
+     */
+    export function isAudioMuted(callback: (muted: boolean) => void): void;
+
+    /**
+     * @description Captures the visible region of the webview.
+     * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+     */
+    export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
+    /**
+     * @description Captures the visible region of the webview.
+     * @param {*} options
+     * @param {(dataUrl: string) => void} callback
+     */
+    export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
+
+    /**
+    * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
+      {
+        name: 'myRule',
+        matches: ['http://www.foo.com/*'],
+        css: { files: ['mystyles.css'] },
+        js: { files: ['jquery.js', 'myscript.js'] },
+        run_at: 'document_start'
+      },
+      {
+        name: 'anotherRule',
+        matches: ['http://www.bar.com/*'],
+        js: { code: "document.body.style.backgroundColor = 'red';" },
+        run_at: 'document_end'
+      }]);
+     ...
+
+    // Navigates webview.
+    webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
+        name: 'rule',
+        matches: ['http://www.foo.com/*'],
+        js: { files: ['scriptA.js'] },
+        run_at: 'document_start'}]);
+
+    // Do something.
+    webview.src = 'http://www.foo.com/*';
+     ...
+    // Overwrite 'rule' defined before.
+    webview.addContentScripts([{
+        name: 'rule',
+        matches: ['http://www.bar.com/*'],
+        js: { files: ['scriptB.js'] },
+        run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
+    * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
+     */
+    export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
+
+    /**
+    * @description Navigates backward one history entry if possible. Equivalent to go(-1).
+    * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
+     */
+    export function back(callback?: (success: boolean) => void): void;
+
+    /**
+    * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
+     */
+    export function canGoBack(): void;
+
+    /**
+    * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
+     */
+    export function canGoForward(): void;
+
+    /**
+    * @description <p>Clears browsing data for the webview partition.</p>
+    * @param {any} options Options determining which data to clear.
+    * @param {any} types The types of data to be cleared.
+    * @param {any} [object Object]
+     */
+    export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
+
+    /**
+    * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
+    * @param {any} details Details of the script to run.
+    * @param {any} [object Object]
+     */
+    export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
+
+    /**
+    * @description Initiates a find-in-page request.
+    * @param {string} searchText The string to find in the page.
+    * @param {any} options Options for the find request.
+    * @param {any} [object Object]
+     */
+    export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
+
+    /**
+    * @description Navigates forward one history entry if possible. Equivalent to go(1).
+    * @param {any} [object Object]
+     */
+    export function forward(callback?: (success: boolean) => void): void;
+
+    /**
+    * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
+     */
+    export function getProcessId(): void;
+
+    /**
+    * @description Returns the user agent string used by the webview for guest page requests.
+     */
+    export function getUserAgent(): void;
+
+    /**
+    * @description Gets the current zoom factor.
+    * @param {any} [object Object]
+     */
+    export function getZoom(callback: (zoomFactor: number) => void): void;
+
+    /**
+    * @description Gets the current zoom mode.
+    * @param {any} [object Object]
+     */
+    export function getZoomMode(callback: (ZoomMode: any) => void): void;
+
+    /**
+    * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
+    * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
+    * @param {any} [object Object]
+     */
+    export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
+
+    /**
+    * @description Injects CSS into the guest page.
+    * @param {any} details Details of the CSS to insert.
+    * @param {any} [object Object]
+     */
+    export function insertCSS(details: InjectDetails, callback?: () => void): void;
+
+    /**
+    * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
+     */
+    export function isUserAgentOverridden(): void;
+
+    /**
+    * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
+     */
+    export function print(): void;
+
+    /**
+    * @description Reloads the current top-level page.
+     */
+    export function reload(): void;
+
+    /**
+    * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
+    * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
+     */
+    export function removeContentScripts(scriptNameList?: any[]): void;
+
+    /**
+    * @description Override the user agent string used by the webview for guest page requests.
+    * @param {string} userAgent The user agent string to use.
+     */
+    export function setUserAgentOverride(userAgent: string): void;
+
+    /**
+    * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
+    * @param {number} zoomFactor The new zoom factor.
+    * @param {any} [object Object]
+     */
+    export function setZoom(zoomFactor: number, callback?: () => void): void;
+
+    /**
+    * @description Sets the zoom mode of the webview.
+    * @param {any} ZoomMode Defines how zooming is handled in the webview.
+    * @param {any} [object Object]
+     */
+    export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
+
+    /**
+    * @description Stops loading the current webview navigation if in progress.
+     */
+    export function stop(): void;
+
+    /**
+    * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
+    * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
+     */
+    export function stopFinding(action?: string): void;
+
+    /**
+    * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
+    * @param {string} dataUrl The data URL to load.
+    * @param {string} baseUrl The base URL that will be used for relative links.
+    * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
+     */
+    export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
+
+    /**
+    * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
+     */
+    export function terminate(): void;
+
+    /**
+    * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
+      webview.src = 'about:blank';
+    });</pre>
+     */
+
+    export function close(event: chrome.events.Event<GenericEvent>): void;
+
+    /**
+    * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
+      console.log('Guest page logged a message: ', e.message);
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var consolemessage: chrome.events.Event<IConsolemessage>;
+
+    /**
+    * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
+      webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
+    });</pre>
+     */
+
+    export var contentload: (event: chrome.events.Event<GenericEvent>) => void;
+
+    /**
+    * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
+    * @param {any} [object Object]
+     */
+
+    export var dialog: chrome.events.Event<IDialog>;
+
+    /**
+    * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
+      if (e.reason === 'crash') {
+        webview.src = 'data:text/plain,Goodbye, world!';
+      }
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var exit: chrome.events.Event<IExit>;
+
+    /**
+    * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
+    * @param {any} [object Object]
+     */
+
+    export var findupdate: chrome.events.Event<IFindupdate>;
+
+    /**
+    * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
+    * @param {any} [object Object]
+     */
+
+    export var loadabort: chrome.events.Event<ILoadabort>;
+
+    /**
+    * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
+    * @param {any} [object Object]
+     */
+
+    export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
+
+    /**
+    * @description Fired when a top-level load request has redirected to a different URL.
+    * @param {any} [object Object]
+     */
+
+    export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
+
+    /**
+    * @description Fired when a load has begun.
+    * @param {any} [object Object]
+     */
+
+    export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
+
+    /**
+    * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
+     */
+
+    export function loadstop(event: chrome.events.Event<GenericEvent>): void;
+
+    /**
+    * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
+      var newWebview = document.createElement('webview');
+      document.body.appendChild(newWebview);
+      e.window.attach(newWebview);
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var newwindow: chrome.events.Event<INewwindow>;
+
+    /**
+    * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
+      if (e.permission === 'media') {
+        e.request.allow();
+      }
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var permissionrequest: chrome.events.Event<IPermissionrequest>;
+
+    /**
+    * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
+    webview.addEventListener('unresponsive', function() {
+      webview.style.opacity = '0.5';
+    });
+    webview.addEventListener('responsive', function() {
+      webview.style.opacity = '1';
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
+
+    /**
+    * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
+    * @param {any} [object Object]
+     */
+
+    export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
+
+    /**
+    * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
+    * @param {any} [object Object]
+     */
+
+    export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
+
+    /**
+    * @description Fired when the page's zoom changes.
+    * @param {any} [object Object]
+     */
+
+    export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
+    /**IConsolemessage (Auto generated interface) */
+    export interface IConsolemessage {
+
+        /**
+        * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
+         */
+        level: number
+
+        /**
+        * @description The logged message contents.
+         */
+        message: string
+
+        /**
+        * @description The line number of the message source.
+         */
+        line: number
+
+        /**
+        * @description A string identifying the resource which logged the message.
+         */
+        sourceId: string
+    }
+    /**IDialog (Auto generated interface) */
+    export interface IDialog {
+
+        /**
+        * @description The type of modal dialog requested by the guest.
+         */
+        messageType: 'alert' | 'confirm' | 'prompt'
+
+        /**
+        * @description The text the guest attempted to display in the modal dialog.
+         */
+        messageText: string
+
+        /**
+        * @description An interface that can be used to respond to the guest's modal request.
+         */
+        dialog: DialogController
+    }
+    /**IExit (Auto generated interface) */
+    export interface IExit {
+
+        /**
+        * @description Chrome's internal ID of the process that exited.
+         */
+        processID: number
+
+        /**
+        * @description String indicating the reason for the exit.
+         */
+        reason: 'normal' | 'abnormal' | 'crash' | 'kill'
+    }
+    /**IFindupdate (Auto generated interface) */
+    export interface IFindupdate {
+
+        /**
+        * @description The string that is being searched for in the page.
+         */
+        searchText: string
+
+        /**
+        * @description The number of matches found for searchText on the page so far.
+         */
+        numberOfMatches: number
+
+        /**
+        * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
+         */
+        activeMatchOrdinal: number
+
+        /**
+        * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
+         */
+        selectionRect: SelectionRect
+
+        /**
+        * @description Indicates whether the find request was canceled.
+         */
+        canceled: boolean
+
+        /**
+        * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
+         */
+        finalUpdate: string
+    }
+    /**ILoadabort (Auto generated interface) */
+    export interface ILoadabort {
+
+        /**
+        * @description Requested URL.
+         */
+        url: string
+
+        /**
+        * @description Whether the load was top-level or in a subframe.
+         */
+        isTopLevel: boolean
+
+        /**
+        * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
+         */
+        code: number
+
+        /**
+        * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
+         */
+        reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
+    }
+    /**ILoadcommit (Auto generated interface) */
+    export interface ILoadcommit {
+
+        /**
+        * @description The URL that committed.
+         */
+        url: string
+
+        /**
+        * @description Whether the load is top-level or in a subframe.
+         */
+        isTopLevel: boolean
+    }
+    /**ILoadredirect (Auto generated interface) */
+    export interface ILoadredirect {
+
+        /**
+        * @description The requested URL before the redirect.
+         */
+        oldUrl: string
+
+        /**
+        * @description The new URL after the redirect.
+         */
+        newUrl: string
+
+        /**
+        * @description Whether or not the redirect happened at top-level or in a subframe.
+         */
+        isTopLevel: boolean
+    }
+    /**ILoadstart (Auto generated interface) */
+    export interface ILoadstart {
+
+        /**
+        * @description Requested URL.
+         */
+        url: string
+
+        /**
+        * @description Whether the load is top-level or in a subframe.
+         */
+        isTopLevel: boolean
+    }
+    /**INewwindow (Auto generated interface) */
+    export interface INewwindow {
+
+        /**
+        * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
+         */
+        window: NewWindow
+
+        /**
+        * @description The target URL requested for the new window.
+         */
+        targetUrl: string
+
+        /**
+        * @description The initial width requested for the new window.
+         */
+        initialWidth: number
+
+        /**
+        * @description The initial height requested for the new window.
+         */
+        initialHeight: number
+
+        /**
+        * @description The requested name of the new window.
+         */
+        name: string
+
+        /**
+        * @description The requested disposition of the new window.
+         */
+        windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
+    }
+    /**IPermissionrequest (Auto generated interface) */
+    export interface IPermissionrequest {
+
+        /**
+        * @description The type of permission being requested.
+         */
+        permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
+
+        /**
+        * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
+         */
+        request: object
+    }
+    /**IResponsive (Auto generated interface) */
+    export interface IResponsive {
+
+        /**
+        * @description Chrome's internal ID of the process that became responsive.
+         */
+        processID: number
+    }
+    /**ISizechanged (Auto generated interface) */
+    export interface ISizechanged {
+
+        /**
+        * @description Old width of embedded web content.
+         */
+        oldWidth: number
+
+        /**
+        * @description Old height of embedded web content.
+         */
+        oldHeight: number
+
+        /**
+        * @description New width of embedded web content.
+         */
+        newWidth: number
+
+        /**
+        * @description New height of embedded web content.
+         */
+        newHeight: number
+    }
+    /**IUnresponsive (Auto generated interface) */
+    export interface IUnresponsive {
+
+        /**
+        * @description Chrome's internal ID of the process that has become unresponsive.
+         */
+        processID: number
+    }
+    /**IZoomchange (Auto generated interface) */
+    export interface IZoomchange {
+
+        /**
+        * @description The page's previous zoom factor.
+         */
+        oldZoomFactor: number
+
+        /**
+        * @description The new zoom factor that the page was zoomed to.
+         */
+        newZoomFactor: number
+    }
+
+}
diff --git a/types/chrome-apps/test/chrome-webview.ts b/types/chrome-apps/test/chrome-webview.ts
deleted file mode 100644
index f606486eb7..0000000000
--- a/types/chrome-apps/test/chrome-webview.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import webview = chrome.webview;
-let element: webview.HTMLWebViewElement;
diff --git a/types/chrome-apps/test/index.ts b/types/chrome-apps/test/index.ts
index 8dff00c11f..f4e2fa1cf4 100644
--- a/types/chrome-apps/test/index.ts
+++ b/types/chrome-apps/test/index.ts
@@ -1,3 +1,4 @@
+/// <reference types="chrome-apps" />
 import runtime = chrome.app.runtime;
 import cwindow = chrome.app.window;
 
@@ -323,3 +324,7 @@ function testSystemNetwork() {
         }
     });
 }
+
+import webview = chrome.webview;
+import { chrome } from "chrome-apps";
+let element: webview.HTMLWebViewElement;
diff --git a/types/chrome-apps/tsconfig.json b/types/chrome-apps/tsconfig.json
index 5d8da04531..14d255475e 100644
--- a/types/chrome-apps/tsconfig.json
+++ b/types/chrome-apps/tsconfig.json
@@ -19,8 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "chrome-webview.d.ts",
-        "test/index.ts",
-        "test/chrome-webview.ts"
+        "test/index.ts"
     ]
 }

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 0563/1124] 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 0564/1124] 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 0565/1124] 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 23f6f128b416da1ca9c96fa7cd779a1c248f800c Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 22 May 2018 09:55:58 +0200
Subject: [PATCH 0566/1124] Style fix: Set up browser section label

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

diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index 231812c946..3be5d2f2b5 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -195,7 +195,9 @@ declare namespace chrome.alarms {
     export var onAlarm: AlarmEvent;
 }
 
-
+////////////////////
+// Browser
+////////////////////
 /**
  * Use the chrome.browser API to interact with the Chrome browser associated with
  * the current application and Chrome profile.

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 0567/1124] 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 7d406a675c4bb726011e2c61c94d076a6ff1da3f Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 22 May 2018 10:57:21 +0200
Subject: [PATCH 0568/1124] Implemented missing namespaces under chrome for
 apps.

---
 types/chrome-apps/index.d.ts | 2989 +++++++++++++++++++++++++++++++---
 1 file changed, 2745 insertions(+), 244 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index 606f34fc95..1a4be0e5f9 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Chrome packaged application development
 // Project: http://developer.chrome.com/apps/
-// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>
+// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>, see also the contributers on the chrome types (for extensions)
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // WebView ref: https://chromium.googlesource.com/chromium/src/+/68.0.3432.1/chrome/common/extensions/api/webview_tag.json
 // TypeScript Version: 2.4
@@ -15,6 +15,189 @@ interface Window {
 }
 declare module chrome { }
 
+////////////////////
+// Accessibility Features
+////////////////////
+/**
+ * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features. This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features. In order to get feature states the extension must request accessibilityFeatures.read permission. For modifying feature state, the extension needs accessibilityFeatures.modify permission. Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
+ * Availability: Since Chrome 37.
+ * Permissions: "accessibilityFeatures.read"
+ * Important: This API works only on Chrome OS.
+ */
+declare namespace chrome.accessibilityFeatures {
+    export interface AccessibilityFeaturesGetArg {
+        /** Optional. Whether to return the value that applies to the incognito session (default false).  */
+        incognito?: boolean;
+    }
+
+    export interface AccessibilityFeaturesCallbackArg {
+        /** The value of the setting. */
+        value: any;
+        /**
+         * One of
+         * • not_controllable: cannot be controlled by any extension
+         * • controlled_by_other_extensions: controlled by extensions with higher precedence
+         * • controllable_by_this_extension: can be controlled by this extension
+         * • controlled_by_this_extension: controlled by this extension
+         */
+        levelOfControl: string;
+        /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
+        incognitoSpecific?: boolean;
+    }
+
+    export interface AccessibilityFeaturesSetArg {
+        /**
+         * The value of the setting.
+         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+         */
+        value: any;
+        /**
+         * Optional.
+          * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
+
+    export interface AccessibilityFeaturesClearArg {
+        /**
+         * Optional.
+          * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
+
+    export interface AccessibilityFeaturesSetting {
+        /**
+         * Gets the value of a setting.
+         * @param details Which setting to consider.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function(object details) {...};
+         */
+        get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
+        /**
+         * Sets the value of a setting.
+         * @param details Which setting to change.
+         * @param callback Called at the completion of the set operation.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
+        /**
+         * Clears the setting, restoring any default value.
+         * @param details Which setting to clear.
+         * @param callback Called at the completion of the clear operation.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
+    }
+
+    export var spokenFeedback: AccessibilityFeaturesSetting;
+    export var largeCursor: AccessibilityFeaturesSetting;
+    export var stickyKeys: AccessibilityFeaturesSetting;
+    export var highContrast: AccessibilityFeaturesSetting;
+    export var screenMagnifier: AccessibilityFeaturesSetting;
+    export var autoclick: AccessibilityFeaturesSetting;
+    export var virtualKeyboard: AccessibilityFeaturesSetting;
+    export var animationPolicy: AccessibilityFeaturesSetting;
+}
+
+////////////////////
+// Alarms
+////////////////////
+/**
+ * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
+ * Availability: Since Chrome 22.
+ * Permissions:  "alarms"
+ */
+declare namespace chrome.alarms {
+    export interface AlarmCreateInfo {
+        /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
+        delayInMinutes?: number;
+        /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
+        periodInMinutes?: number;
+        /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
+        when?: number;
+    }
+
+    export interface Alarm {
+        /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
+        periodInMinutes?: number;
+        /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
+        scheduledTime: number;
+        /** Name of this alarm. */
+        name: string;
+    }
+
+    export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
+
+    /**
+     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+     */
+    export function create(alarmInfo: AlarmCreateInfo): void;
+    /**
+     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+     * @param name Optional name to identify this alarm. Defaults to the empty string.
+     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+     */
+    export function create(name: string, alarmInfo: AlarmCreateInfo): void;
+    /**
+     * Gets an array of all the alarms.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function(array of Alarm alarms) {...};
+     */
+    export function getAll(callback: (alarms: Alarm[]) => void): void;
+    /**
+     * Clears all alarms.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clearAll(callback?: (wasCleared: boolean) => void): void;
+    /**
+     * Clears the alarm with the given name.
+     * @param name The name of the alarm to clear. Defaults to the empty string.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
+    /**
+     * Clears the alarm without a name.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clear(callback: (wasCleared: boolean) => void): void;
+    /**
+     * Retrieves details about the specified alarm.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( Alarm alarm) {...};
+     */
+    export function get(callback: (alarm: Alarm) => void): void;
+    /**
+     * Retrieves details about the specified alarm.
+     * @param name The name of the alarm to get. Defaults to the empty string.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( Alarm alarm) {...};
+     */
+    export function get(name: string, callback: (alarm: Alarm) => void): void;
+
+    /** Fired when an alarm has elapsed. Useful for event pages. */
+    export var onAlarm: AlarmEvent;
+}
+
+
 ////////////////////
 // App
 ////////////////////
@@ -184,10 +367,114 @@ declare namespace chrome.app.window {
 }
 
 
+////////////////////
+// Audio
+////////////////////
+/**
+ * The chrome.audio API is provided to allow users to get information about and control the audio devices attached to the system. This API is currently only implemented for ChromeOS.
+ * @since Chrome 59
+ */
+declare namespace chrome.audio {
+    /** NOT IMPLEMENTED YET */
+}
+
+////////////////////
+// Bluetooth
+////////////////////
+/**
+ * Use the chrome.bluetooth API to connect to a Bluetooth device. All functions report failures via chrome.runtime.lastError.
+ * @since Chrome 37
+ */
+declare namespace chrome.bluetooth {
+    /** NOT IMPLEMENTED YET */
+}
+/**
+ * 	The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
+ * @since Chrome 37
+ */
+declare namespace chrome.bluetoothLowEnergy {
+    /** NOT IMPLEMENTED YET */
+}
+/**
+ * 	Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
+ * @since Chrome 37
+ */
+declare namespace chrome.bluetoothSocket {
+    /** NOT IMPLEMENTED YET */
+}
+
+////////////////////
+// Browser
+////////////////////
+/**
+ * Use the chrome.browser API to interact with the Chrome browser associated with
+ * the current application and Chrome profile.
+ */
+declare namespace chrome.browser {
+    export interface Options {
+        /** The URL to navigate to when the new tab is initially opened. */
+        url: string;
+    }
+
+    /**
+     * Opens a new tab in a browser window associated with the current application
+     * and Chrome profile. If no browser window for the Chrome profile is opened,
+     * a new one is opened prior to creating the new tab.
+     * @param options Configures how the tab should be opened.
+     * @param callback Called when the tab was successfully
+     * created, or failed to be created. If failed, runtime.lastError will be set.
+     */
+    export function openTab(options: Options, callback: () => void): void;
+
+    /**
+    * Opens a new tab in a browser window associated with the current application
+    * and Chrome profile. If no browser window for the Chrome profile is opened,
+    * a new one is opened prior to creating the new tab. Since Chrome 42 only.
+    * @param options Configures how the tab should be opened.
+    */
+    export function openTab(options: Options): void;
+}
+
+////////////////////
+// Commands
+////////////////////
+/**
+ * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
+ * Availability: Since Chrome 25.
+ * Manifest:  "commands": {...}
+ */
+declare namespace chrome.commands {
+    export interface Command {
+        /** Optional. The name of the Extension Command  */
+        name?: string;
+        /** Optional. The Extension Command description  */
+        description?: string;
+        /** Optional. The shortcut active for this command, or blank if not active.  */
+        shortcut?: string;
+    }
+
+    export interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
+
+    /**
+     * Returns all the registered extension commands for this extension and their shortcut (if active).
+     * @param callback Called to return the registered commands.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(array of Command commands) {...};
+     */
+    export function getAll(callback: (commands: Command[]) => void): void;
+
+    /** Fired when a registered command is activated using a keyboard shortcut. */
+    export var onCommand: CommandEvent;
+}
+
 ////////////////////
 // Context Menus
 ////////////////////
-
+/**
+ * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
+ * Availability: Since Chrome 6.
+ * Permissions:  "contextMenus"
+ */
 declare namespace chrome.contextMenus {
     /**
     * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
@@ -198,35 +485,231 @@ declare namespace chrome.contextMenus {
     **/
     export type ItemType = "normal" | "checkbox" | "radio" | "separator";
 
-    /**
-    * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-    * @param {any} [object Object]
-     */
-    export function create(createProperties: object, callback?: () => void): void;
+    export interface OnClickData {
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * The text for the context selection, if any.
+         */
+        selectionText?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * A flag indicating the state of a checkbox or radio item after it is clicked.
+         */
+        checked?: boolean;
+        /**
+         * @since Since Chrome 35.
+         * The ID of the menu item that was clicked.
+         */
+        menuItemId: any;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
+         */
+        frameUrl?: string;
+        /**
+         * @since Since Chrome 35.
+         * A flag indicating whether the element is editable (text input, textarea, etc.).
+         */
+        editable: boolean;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+         */
+        mediaType?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * A flag indicating the state of a checkbox or radio item before it was clicked.
+         */
+        wasChecked?: boolean;
+        /**
+         * @since Since Chrome 35.
+         * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
+         */
+        pageUrl: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * If the element is a link, the URL it points to.
+         */
+        linkUrl?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * The parent ID, if any, for the item clicked.
+         */
+        parentMenuItemId?: any;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * Will be present for elements with a 'src' URL.
+         */
+        srcUrl?: string;
+    }
+
+    export interface CreateProperties {
+        /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
+        documentUrlPatterns?: string[];
+        /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
+        checked?: boolean;
+        /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
+        title?: string;
+        /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
+        contexts?: string[];
+        /**
+         * Optional.
+         * Whether this context menu item is enabled or disabled. Defaults to true.
+         * @since Since Chrome 20.
+         */
+        enabled?: boolean;
+        /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
+        targetUrlPatterns?: string[];
+        /**
+         * Optional.
+         * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+         * @param info Information sent when a context menu item is clicked.
+         */
+        onclick?: (info: OnClickData) => void;
+        /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
+        parentId?: any;
+        /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
+        type?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 21.
+         * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+         */
+        id?: string;
+        /**
+         * @description Whether the item is visible in the menu.
+         * @since Since Chrome 62
+         */
+        visible?: boolean;
+    }
+
+    export interface UpdateProperties {
+        documentUrlPatterns?: string[];
+        checked?: boolean;
+        title?: string;
+        contexts?: string[];
+        /**
+         * @since Chrome 20
+         **/
+        enabled?: boolean;
+        targetUrlPatterns?: string[];
+        onclick?: Function;
+        /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
+        parentId?: any;
+        type?: string;
+        /**
+         * @description Whether the item is visible or not.
+         * @since Since Chrome 62
+         */
+        visible?: boolean;
+    }
+
+    export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
 
     /**
-    * @description Updates a previously created context menu item.
-    * @param {any} id The ID of the item to update.
-    * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
-    * @param {any} [object Object]
+     * Since Chrome 38.
+     * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
      */
-    export function update(id: number | string, updateProperties: object, callback?: () => void): void;
+    export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
 
     /**
-    * @description Removes a context menu item.
-    * @param {any} menuItemId The ID of the context menu item to remove.
-    * @param {any} [object Object]
-     */
-    export function remove(menuItemId: number | string, callback?: () => void): void;
-
-    /**
-    * @description Removes all context menu items added by this extension.
-    * @param {any} [object Object]
+     * Removes all context menu items added by this extension.
+     * @param callback Called when removal is complete.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
      */
     export function removeAll(callback?: () => void): void;
+    /**
+     * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+     * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function create(createProperties: CreateProperties, callback?: () => void): void;
+    /**
+     * Updates a previously created context menu item.
+     * @param id The ID of the item to update.
+     * @param updateProperties The properties to update. Accepts the same values as the create function.
+     * @param callback Called when the context menu has been updated.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
+    /**
+     * Updates a previously created context menu item.
+     * @param id The ID of the item to update.
+     * @param updateProperties The properties to update. Accepts the same values as the create function.
+     * @param callback Called when the context menu has been updated.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
+    /**
+     * Removes a context menu item.
+     * @param menuItemId The ID of the context menu item to remove.
+     * @param callback Called when the context menu has been removed.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function remove(menuItemId: string, callback?: () => void): void;
+    /**
+     * Removes a context menu item.
+     * @param menuItemId The ID of the context menu item to remove.
+     * @param callback Called when the context menu has been removed.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function remove(menuItemId: number, callback?: () => void): void;
+
+    /**
+     * Since Chrome 21.
+     * Fired when a context menu item is clicked.
+     */
+    export var onClicked: MenuClickedEvent;
 
 }
 
+////////////////////
+// Document Scan
+////////////////////
+/**
+ * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
+ * Availability: Since Chrome 44.
+ * Permissions:  "documentScan"
+ * Important: This API works only on Chrome OS.
+ */
+declare namespace chrome.documentScan {
+    export interface DocumentScanOptions {
+        /** Optional. The MIME types that are accepted by the caller.  */
+        mimeTypes?: string[];
+        /** Optional. The number of scanned images allowed (defaults to 1).  */
+        maxImages?: number;
+    }
+
+    export interface DocumentScanCallbackArg {
+        /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
+        dataUrls: string[];
+        /** The MIME type of dataUrls. */
+        mimeType: string;
+    }
+
+    /**
+     * Performs a document scan. On success, the PNG data will be sent to the callback.
+     * @param options Object containing scan parameters.
+     * @param callback Called with the result and data from the scan.
+     * The callback parameter should be a function that looks like this:
+     * function(object result) {...};
+     */
+    export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
+}
 
 ////////////////////
 // Events
@@ -494,6 +977,683 @@ declare namespace chrome.fileSystem {
     export function retainEntry(entry: Entry): string;
 }
 
+
+////////////////////
+// File System Provider
+////////////////////
+/**
+ * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
+ * Availability: Since Chrome 40.
+ * Permissions:  "fileSystemProvider"
+ * Important: This API works only on Chrome OS.
+ */
+declare namespace chrome.fileSystemProvider {
+    export interface OpenedFileInfo {
+        /** A request ID to be be used by consecutive read/write and close requests. */
+        openRequestId: number;
+        /** The path of the opened file. */
+        filePath: string;
+        /** Whether the file was opened for reading or writing. */
+        mode: string;
+    }
+
+    export interface FileWatchersInfo {
+        /** The path of the entry being observed. */
+        entryPath: string;
+        /** Whether watching should include all child entries recursively. It can be true for directories only. */
+        recursive: boolean;
+        /** Optional. Tag used by the last notification for the watcher.  */
+        lastTag?: string;
+    }
+
+    export interface EntryMetadata {
+        /** True if it is a directory. */
+        isDirectory: boolean;
+        /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
+        name: string;
+        /** File size in bytes. */
+        size: number;
+        /** The last modified time of this entry. */
+        modificationTime: Date;
+        /** Optional. Mime type for the entry.  */
+        mimeType?: string;
+        /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
+        thumbnail?: string;
+    }
+
+    export interface FileSystemInfo {
+        /** The identifier of the file system. */
+        fileSystemId: string;
+        /** A human-readable name for the file system. */
+        displayName: string;
+        /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
+        writable: boolean;
+        /**
+         * The maximum number of files that can be opened at once. If 0, then not limited.
+         * @since Since Chrome 42.
+         */
+        openedFilesLimit: number;
+        /**
+         * List of currently opened files.
+         * @since Since Chrome 42.
+         */
+        openedFiles: OpenedFileInfo[];
+        /**
+         * Optional.
+          * Whether the file system supports the tag field for observing directories.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        supportsNotifyTag?: boolean;
+        /**
+         * List of watchers.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        watchers: FileWatchersInfo[];
+    }
+
+    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+    export interface GetActionsRequestedOptions {
+        /** The identifier of the file system related to this operation. */
+        fileSystemId: string;
+        /** The unique identifier of this request. */
+        requestId: number;
+        /** The path of the entry to return the list of actions for. */
+        entryPath: string;
+    }
+
+    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+    export interface Action {
+        /** The identifier of the action. Any string or CommonActionId for common actions. */
+        id: string;
+        /** Optional. The title of the action. It may be ignored for common actions.  */
+        title?: string;
+    }
+
+    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+    export interface ExecuteActionRequestedOptions {
+        /** The identifier of the file system related to this operation. */
+        fileSystemId: string;
+        /** The unique identifier of this request. */
+        requestId: number;
+        /** The path of the entry to be used for the action. */
+        entryPath: string;
+        /** The identifier of the action to be executed. */
+        actionId: string;
+    }
+
+    export interface MountOptions {
+        /** The string indentifier of the file system. Must be unique per each extension. */
+        fileSystemId: string;
+        /** A human-readable name for the file system. */
+        displayName: string;
+        /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
+        writable?: boolean;
+        /**
+         * Optional.
+          * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
+         * @since Since Chrome 41.
+         */
+        openedFilesLimit?: number;
+        /**
+         * Optional.
+          * Whether the file system supports the tag field for observed directories.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        supportsNotifyTag?: boolean;
+    }
+
+    export interface UnmountOptions {
+        /** The identifier of the file system to be unmounted. */
+        fileSystemId: string;
+    }
+
+    export interface NotificationChange {
+        /** The path of the changed entry. */
+        entryPath: string;
+        /** The type of the change which happened to the entry. */
+        changeType: string;
+    }
+
+    export interface NotificationOptions {
+        /** The identifier of the file system related to this change. */
+        fileSystemId: string;
+        /** The path of the observed entry. */
+        observedPath: string;
+        /** Mode of the observed entry. */
+        recursive: boolean;
+        /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
+        changeType: string;
+        /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
+        changes?: NotificationChange[];
+        /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
+        tag?: string;
+    }
+
+    export interface RequestedEventOptions {
+        /** The identifier of the file system related to this operation. */
+        fileSystemId: string;
+        /** The unique identifier of this request. */
+        requestId: number;
+    }
+
+    export interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+        /** The path of the entry to which this operation is related to. */
+        entryPath: string;
+    }
+
+    export interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
+        /** Set to true if the thumbnail is requested. */
+        thumbnail: boolean;
+    }
+
+    export interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+        /** The path of the directory which is to be operated on. */
+        directoryPath: string;
+    }
+
+    export interface FilePathRequestedEventOptions extends RequestedEventOptions {
+        /** The path of the entry for the operation */
+        filePath: string;
+    }
+
+    export interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
+        /** Whether the file will be used for reading or writing. */
+        mode: string;
+    }
+
+    export interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+        /** A request ID used to open the file. */
+        openRequestId: number;
+    }
+
+    export interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+        /** Position in the file (in bytes) to start reading from. */
+        offset: number;
+        /** Number of bytes to be returned. */
+        length: number;
+    }
+
+    export interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+        /** Whether the operation is recursive (for directories only). */
+        recursive: boolean;
+    }
+
+    export interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+        /** Whether the operation is recursive (for directories only). */
+        recursive: boolean;
+    }
+
+    export interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+        /** The source path for the operation. */
+        sourcePath: string;
+        /** The destination path for the operation. */
+        targetPath: string;
+    }
+
+    export interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
+        /** Number of bytes to be retained after the operation completes. */
+        length: number;
+    }
+
+    export interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+        /** Position in the file (in bytes) to start operating from. */
+        offset: number;
+        /** Buffer of bytes to be operated on the file. */
+        data: ArrayBuffer;
+    }
+
+    export interface OperationRequestedEventOptions extends RequestedEventOptions {
+        /** An ID of the request to which this operation is related. */
+        operationRequestId: number;
+    }
+
+    export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
+
+    export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+    export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    /**
+     * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
+     * Depending on the type of the file system being mounted, the source option must be set appropriately.
+     * In case of an error, runtime.lastError will be set with a corresponding error code.
+     * @param callback A generic result callback to indicate success or failure.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function mount(options: MountOptions, callback?: () => void): void;
+    /**
+     * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
+     * In case of an error, runtime.lastError will be set with a corresponding error code.
+     * @param callback A generic result callback to indicate success or failure.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function unmount(options: UnmountOptions, callback?: () => void): void;
+    /**
+     * Returns all file systems mounted by the extension.
+     * @param callback Callback to receive the result of getAll function.
+     * The callback parameter should be a function that looks like this:
+     * function(array of FileSystemInfo fileSystems) {...};
+     */
+    export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
+    /**
+     * Returns information about a file system with the passed fileSystemId.
+     * @since Since Chrome 42.
+     * @param callback Callback to receive the result of get function.
+     * The callback parameter should be a function that looks like this:
+     * function(FileSystemInfo fileSystem) {...};
+     */
+    export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
+    /**
+     * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
+     * To use, the file_system_provider.notify manifest option must be set to true.
+     * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
+     * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
+     * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
+     * In case of an error, runtime.lastError will be set will a corresponding error code.
+     * @param callback A generic result callback to indicate success or failure.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function notify(options: NotificationOptions, callback: () => void): void;
+
+    /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
+    export var onUnmountRequested: RequestedEvent;
+    /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
+    export var onGetMetadataRequested: MetadataRequestedEvent;
+    /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
+    export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
+    /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
+    export var onOpenFileRequested: OpenFileRequestedEvent;
+    /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
+    export var onCloseFileRequested: OpenedFileRequestedEvent;
+    /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
+    export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
+    /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
+    export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
+    /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
+    export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
+    /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
+    export var onCreateFileRequested: FilePathRequestedEvent;
+    /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+    export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
+    /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+    export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
+    /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
+    export var onTruncateRequested: FilePathLengthRequestedEvent;
+    /** Raised when writing contents to a file opened previously with openRequestId is requested. */
+    export var onWriteFileRequested: OpenedFileIoRequestedEvent;
+    /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
+    export var onAbortRequested: OperationRequestedEvent;
+    /**
+     * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
+     * @since Since Chrome 44.
+     */
+    export var onConfigureRequested: RequestedEvent;
+    /**
+     * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
+     * @since Since Chrome 44.
+     */
+    export var onMountRequested: OptionlessRequestedEvent;
+    /**
+     * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
+     * @since Since Chrome 45. Warning: this is the current Beta channel.
+     */
+    export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
+    /**
+     * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
+     * @since Since Chrome 45. Warning: this is the current Beta channel.
+     */
+    export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
+}
+
+////////////////////
+// Google Cloud Messaging
+////////////////////
+/**
+ * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
+ * Availability: Since Chrome 35.
+ * Permissions:  "gcm"
+ */
+declare namespace chrome.gcm {
+    export interface OutgoingMessage {
+        /** The ID of the server to send the message to as assigned by Google API Console. */
+        destinationId: string;
+        /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
+        messageId: string;
+        /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
+        timeToLive?: number;
+        /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
+        data: Object;
+    }
+
+    export interface IncomingMessage {
+        /** The message data. */
+        data: Object;
+        /**
+         * Optional.
+         * The sender who issued the message.
+         * @since Since Chrome 41.
+         */
+        from?: string;
+        /**
+         * Optional.
+         * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
+         */
+        collapseKey?: string;
+    }
+
+    export interface GcmError {
+        /** The error message describing the problem. */
+        errorMessage: string;
+        /** Optional. The ID of the message with this error, if error is related to a specific message. */
+        messageId?: string;
+        /** Additional details related to the error, when available. */
+        detail: Object;
+    }
+
+    export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
+
+    export interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
+
+    export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
+
+    /** The maximum size (in bytes) of all key/value pairs in a message. */
+    export var MAX_MESSAGE_SIZE: number;
+
+    /**
+     * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
+     * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
+     * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
+     * The callback parameter should be a function that looks like this:
+     * function(string registrationId) {...};
+     * Parameter registrationId: A registration ID assigned to the application by the GCM.
+     */
+    export function register(senderIds: string[], callback: (registrationId: string) => void): void;
+    /**
+     * Unregisters the application from GCM.
+     * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
+     * The callback parameter should be a function that looks like this:
+     * function() {...};
+     */
+    export function unregister(callback: () => void): void;
+    /**
+     * Sends a message according to its contents.
+     * @param message A message to send to the other party via GCM.
+     * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
+     * The callback parameter should be a function that looks like this:
+     * function(string messageId) {...};
+     * Parameter messageId: The ID of the message that the callback was issued for.
+     */
+    export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
+
+    /** Fired when a message is received through GCM. */
+    export var onMessage: MessageReceptionEvent;
+    /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
+    export var onMessagesDeleted: MessageDeletionEvent;
+    /** Fired when it was not possible to send a message to the GCM server. */
+    export var onSendError: GcmErrorEvent;
+}
+
+////////////////////
+// HID
+////////////////////
+/**
+ * Use the chrome.hid API to interact with connected HID devices. This API provides access to HID operations from within the context of an app. Using this API, apps can function as drivers for hardware devices. Errors generated by this API are reported by setting runtime.lastError and executing the function's regular callback. The callback's regular parameters will be undefined in this case.
+ * @since Chrome 38
+ */
+declare namespace chrome.hid {
+    /** NOT YET IMPLEMENTED */
+}
+
+////////////////////
+// i18n
+////////////////////
+/**
+ * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
+ * @since Chrome 5.
+ */
+declare namespace chrome.i18n {
+    /** Holds detected ISO language code and its percentage in the input string */
+    export interface DetectedLanguage {
+        /** An ISO language code such as 'en' or 'fr'.
+         * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
+         * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
+        language: string;
+
+        /** The percentage of the detected language */
+        percentage: number;
+    }
+
+    /** Holds detected language reliability and array of DetectedLanguage */
+    export interface LanguageDetectionResult {
+        /** CLD detected language reliability */
+        isReliable: boolean;
+
+        /** Array of detectedLanguage */
+        languages: DetectedLanguage[];
+    }
+
+    /**
+     * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function(array of string languages) {...};
+     * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
+     */
+    export function getAcceptLanguages(callback: (languages: string[]) => void): void;
+    /**
+     * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
+     * @param messageName The name of the message, as specified in the messages.json file.
+     * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
+     */
+    export function getMessage(messageName: string, substitutions?: any): string;
+    /**
+     * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+     * @since Chrome 35.
+     */
+    export function getUILanguage(): string;
+
+    /** Detects the language of the provided text using CLD.
+     * @param text User input string to be translated.
+     * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
+     */
+    export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
+}
+
+////////////////////
+// Identity
+////////////////////
+/**
+ * Use the chrome.identity API to get OAuth2 access tokens.
+ * Permissions:  "identity"
+ * @since Chrome 29.
+ */
+declare namespace chrome.identity {
+    /** @since Chrome 32. */
+    export interface AccountInfo {
+        /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+        id: string;
+    }
+
+    export interface TokenDetails {
+        /**
+         * Optional.
+         * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
+         */
+        interactive?: boolean;
+        /**
+         * Optional.
+         * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
+         * account is only supported when the "enable-new-profile-management" flag is set.
+         * @since Chrome 37.
+         */
+        account?: AccountInfo;
+        /**
+         * Optional.
+         * A list of OAuth2 scopes to request.
+         * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
+         * @since Chrome 37.
+         */
+        scopes?: string[];
+    }
+
+    export interface UserInfo {
+        /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
+        email: string;
+        /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
+        id: string;
+    }
+
+    export interface TokenInformation {
+        /** The specific token that should be removed from the cache. */
+        token: string;
+    }
+
+    export interface WebAuthFlowOptions {
+        /** The URL that initiates the auth flow. */
+        url: string;
+        /**
+         * Optional.
+         * Whether to launch auth flow in interactive mode.
+         * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
+         * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
+         */
+        interactive?: boolean;
+    }
+
+    export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
+
+    /**
+     * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
+     * getAccounts is only supported on dev channel.
+     * Dev channel only.
+     */
+    export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
+    /**
+     * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+     * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
+     * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
+     * @param details Token options.
+     * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(string token) {...};
+     */
+    export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
+    /**
+     * Retrieves email address and obfuscated gaia id of the user signed into a profile.
+     * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
+     * @since Chrome 37.
+     */
+    export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
+    /**
+     * Removes an OAuth2 access token from the Identity API's token cache.
+     * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
+     * @param details Token information.
+     * @param callback Called when the token has been removed from the cache.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
+    /**
+     * Starts an auth flow at the specified URL.
+     * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
+     * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
+     * @param details WebAuth flow options.
+     * @param callback Called with the URL redirected back to your application.
+     * The callback parameter should be a function that looks like this:
+     * function(string responseUrl) {...};
+     */
+    export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
+    /**
+     * Generates a redirect URL to be used in launchWebAuthFlow.
+     * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
+     * @since Chrome 33.
+     * @param path Optional. The path appended to the end of the generated URL.
+     */
+    export function getRedirectURL(path?: string): string;
+
+    /**
+     * Fired when signin state changes for an account on the user's profile.
+     * @since Chrome 33.
+     */
+    export var onSignInChanged: SignInChangeEvent;
+}
+
+////////////////////
+// Idle
+////////////////////
+/**
+ * Use the chrome.idle API to detect when the machine's idle state changes.
+ * Permissions:  "idle"
+ * @since Chrome 6.
+ */
+declare namespace chrome.idle {
+    export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
+
+    /**
+     * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+     * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
+     * Since Chrome 25.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( IdleState newState) {...};
+     */
+    export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
+    /**
+     * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
+     * @since Chrome 25.
+     * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
+     */
+    export function setDetectionInterval(intervalInSeconds: number): void;
+
+    /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
+    export var onStateChanged: IdleStateChangedEvent;
+}
+
+////////////////////
+// InstanceID
+////////////////////
+/**
+ * Use chrome.instanceID to access the Instance ID service.
+ * @since Chrome 46
+ */
+declare namespace chrome.instanceID {
+    /** NOT YET IMPLEMENTED */
+}
+
+////////////////////
+// mDNS
+////////////////////
+/**
+ * 	Use the chrome.mdns API to discover services over mDNS. This comprises a subset of the features of the NSD spec: http://www.w3.org/TR/discovery-api/
+ * @since Chrome 31
+ */
+declare namespace chrome.mdns {
+    /** NOT YET IMPLEMENTED */
+}
+
 ////////////////////
 // Media Galleries
 ////////////////////
@@ -598,6 +1758,818 @@ declare namespace chrome.mediaGalleries {
     export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
 }
 
+////////////////////
+// Notifications
+// https://developer.chrome.com/extensions/notifications
+////////////////////
+/**
+ * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
+ * Permissions:  "notifications"
+ * @since Chrome 28.
+ */
+declare namespace chrome.notifications {
+    export interface ButtonOptions {
+        title: string;
+        iconUrl?: string;
+    }
+
+    export interface ItemOptions {
+        /** Title of one item of a list notification. */
+        title: string;
+        /** Additional details about this item. */
+        message: string;
+    }
+
+    export interface NotificationOptions {
+        /** Optional. Which type of notification to display. Required for notifications.create method. */
+        type?: string;
+        /**
+         * Optional.
+         * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
+         * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
+         */
+        iconUrl?: string;
+        /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
+        title?: string;
+        /** Optional. Main notification content. Required for notifications.create method. */
+        message?: string;
+        /**
+         * Optional.
+         * Alternate notification content with a lower-weight font.
+         * @since Chrome 31.
+         */
+        contextMessage?: string;
+        /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
+        priority?: number;
+        /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
+        eventTime?: number;
+        /** Optional. Text and icons for up to two notification action buttons. */
+        buttons?: ButtonOptions[];
+        /** Optional. Items for multi-item notifications. */
+        items?: ItemOptions[];
+        /**
+         * Optional.
+         * Current progress ranges from 0 to 100.
+         * @since Chrome 30.
+         */
+        progress?: number;
+        /**
+         * Optional.
+         * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+         * @since Chrome 32.
+         */
+        isClickable?: boolean;
+        /**
+         * Optional.
+         * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
+         * @since Chrome 38.
+         */
+        appIconMaskUrl?: string;
+        /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
+        imageUrl?: string;
+        /**
+         * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
+         * This defaults to false.
+         * @since Chrome 50
+         */
+        requireInteraction?: boolean;
+    }
+
+    export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
+
+    export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
+
+    export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
+
+    export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
+
+    export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
+
+    /** The notification closed, either by the system or by user action. */
+    export var onClosed: NotificationClosedEvent;
+    /** The user clicked in a non-button area of the notification. */
+    export var onClicked: NotificationClickedEvent;
+    /** The user pressed a button in the notification. */
+    export var onButtonClicked: NotificationButtonClickedEvent;
+    /**
+     * The user changes the permission level.
+     * @since Chrome 32.
+     */
+    export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
+    /**
+     * The user clicked on a link for the app's notification settings.
+     * @since Chrome 32.
+     */
+    export var onShowSettings: NotificationShowSettingsEvent;
+
+    /**
+     * Creates and displays a notification.
+     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+     * The notificationId parameter is required before Chrome 42.
+     * @param options Contents of the notification.
+     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(string notificationId) {...};
+     */
+    export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
+    /**
+     * Creates and displays a notification.
+     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+     * The notificationId parameter is required before Chrome 42.
+     * @param options Contents of the notification.
+     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(string notificationId) {...};
+     */
+    export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
+    /**
+     * Updates an existing notification.
+     * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
+     * @param options Contents of the notification to update to.
+     * @param callback Called to indicate whether a matching notification existed.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasUpdated) {...};
+     */
+    export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
+    /**
+     * Clears the specified notification.
+     * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
+     * @param callback Called to indicate whether a matching notification existed.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
+    /**
+     * Retrieves all the notifications.
+     * @since Chrome 29.
+     * @param callback Returns the set of notification_ids currently in the system.
+     * The callback parameter should be a function that looks like this:
+     * function(object notifications) {...};
+     */
+    export function getAll(callback: (notifications: Object) => void): void;
+    /**
+     * Retrieves whether the user has enabled notifications from this app or extension.
+     * @since Chrome 32.
+     * @param callback Returns the current permission level.
+     * The callback parameter should be a function that looks like this:
+     * function( PermissionLevel level) {...};
+     */
+    export function getPermissionLevel(callback: (level: string) => void): void;
+}
+
+////////////////////
+// Permissions
+////////////////////
+/**
+ * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
+ * @since Chrome 16.
+ */
+declare namespace chrome.permissions {
+    export interface Permissions {
+        /**
+         * Optional.
+         * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
+         */
+        origins?: string[];
+        /**
+         * Optional.
+         * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
+         */
+        permissions?: string[];
+    }
+
+    export interface PermissionsRemovedEvent {
+        /**
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( Permissions permissions) {...};
+         * Parameter permissions: The permissions that have been removed.
+         */
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
+
+    export interface PermissionsAddedEvent {
+        /**
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( Permissions permissions) {...};
+         * Parameter permissions: The newly acquired permissions.
+         */
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
+
+    /**
+     * Checks if the extension has the specified permissions.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function(boolean result) {...};
+     * Parameter result: True if the extension has the specified permissions.
+     */
+    export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+    /**
+     * Gets the extension's current set of permissions.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( Permissions permissions) {...};
+     * Parameter permissions: The extension's active permissions.
+     */
+    export function getAll(callback: (permissions: Permissions) => void): void;
+    /**
+     * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean granted) {...};
+     * Parameter granted: True if the user granted the specified permissions.
+     */
+    export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
+    /**
+     * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean removed) {...};
+     * Parameter removed: True if the permissions were removed.
+     */
+    export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
+
+    /** Fired when access to permissions has been removed from the extension. */
+    export var onRemoved: PermissionsRemovedEvent;
+    /** Fired when the extension acquires new permissions. */
+    export var onAdded: PermissionsAddedEvent;
+}
+
+////////////////////
+// Power
+////////////////////
+/**
+ * Use the chrome.power API to override the system's power management features.
+ * Permissions:  "power"
+ * @since Chrome 27.
+ */
+declare namespace chrome.power {
+    /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
+    export function requestKeepAwake(level: string): void;
+    /** Releases a request previously made via requestKeepAwake(). */
+    export function releaseKeepAwake(): void;
+}
+
+////////////////////
+// Printer Provider
+////////////////////
+/**
+ * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
+ * Permissions:  "printerProvider"
+ * @since Chrome 44.
+ */
+declare namespace chrome.printerProvider {
+    export interface PrinterInfo {
+        /** Unique printer ID. */
+        id: string;
+        /** Printer's human readable name. */
+        name: string;
+        /** Optional. Printer's human readable description. */
+        description?: string;
+    }
+
+    export interface PrinterCapabilities {
+        /** Device capabilities in CDD format. */
+        capabilities: any;
+    }
+
+    export interface PrintJob {
+        /** ID of the printer which should handle the job. */
+        printerId: string;
+        /** The print job title. */
+        title: string;
+        /** Print ticket in  CJT format. */
+        ticket: Object;
+        /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
+        contentType: string;
+        /** Blob containing the document data to print. Format must match |contentType|. */
+        document: Blob;
+    }
+
+    export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
+
+    export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
+
+    export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
+
+    export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
+
+    /** Event fired when print manager requests printers provided by extensions. */
+    export var onGetPrintersRequested: PrinterRequestedEvent;
+    /**
+     * Event fired when print manager requests information about a USB device that may be a printer.
+     * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
+     * @since Chrome 45.
+     */
+    export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
+    /** Event fired when print manager requests printer capabilities. */
+    export var onGetCapabilityRequested: CapabilityRequestedEvent;
+    /** Event fired when print manager requests printing. */
+    export var onPrintRequested: PrintRequestedEvent;
+}
+
+////////////////////
+// Runtime
+////////////////////
+/**
+ * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
+ * @since Chrome 22
+ */
+declare namespace chrome.runtime {
+    /** This will be defined during an API method callback if there was an error */
+    export var lastError: LastError | undefined;
+    /** The ID of the extension/app. */
+    export var id: string;
+
+    export interface LastError {
+        /** Optional. Details about the error which occurred.  */
+        message?: string;
+    }
+
+    export interface ConnectInfo {
+        name?: string;
+    }
+
+    export interface InstalledDetails {
+        /**
+         * The reason that this event is being dispatched.
+         * One of: "install", "update", "chrome_update", or "shared_module_update"
+         */
+        reason: string;
+        /**
+         * Optional.
+         * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
+         */
+        previousVersion?: string;
+        /**
+         * Optional.
+         * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
+         * @since Chrome 29.
+         */
+        id?: string;
+    }
+
+    export interface MessageOptions {
+        /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
+        includeTlsChannelId?: boolean;
+    }
+
+    /**
+     * An object containing information about the script context that sent a message or request.
+     * @since Chrome 26.
+     */
+    export interface MessageSender {
+        /** The ID of the extension or app that opened the connection, if any. */
+        id?: string;
+        /**
+         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
+         * @since Chrome 41.
+         */
+        frameId?: number;
+        /**
+         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
+         * @since Chrome 28.
+         */
+        url?: string;
+        /**
+         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
+         * @since Chrome 32.
+         */
+        tlsChannelId?: string;
+    }
+
+    /**
+     * An object containing information about the current platform.
+     * @since Chrome 36.
+     */
+    export interface PlatformInfo {
+        /**
+         * The operating system chrome is running on.
+         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
+         */
+        os: string;
+        /**
+         * The machine's processor architecture.
+         * One of: "arm", "x86-32", or "x86-64"
+         */
+        arch: string;
+        /**
+         * The native client architecture. This may be different from arch on some platforms.
+         * One of: "arm", "x86-32", or "x86-64"
+         */
+        nacl_arch: string;
+    }
+
+    /**
+     * An object which allows two way communication with other pages.
+     * @since Chrome 26.
+     */
+    export interface Port {
+        postMessage: (message: Object) => void;
+        disconnect: () => void;
+        /**
+         * Optional.
+         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
+         */
+        sender?: MessageSender;
+        /** An object which allows the addition and removal of listeners for a Chrome event. */
+        onDisconnect: PortDisconnectEvent;
+        /** An object which allows the addition and removal of listeners for a Chrome event. */
+        onMessage: PortMessageEvent;
+        name: string;
+    }
+
+    export interface UpdateAvailableDetails {
+        /** The version number of the available update. */
+        version: string;
+    }
+
+    export interface UpdateCheckDetails {
+        /** The version of the available update. */
+        version: string;
+    }
+
+    export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
+
+    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
+
+    export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+    export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
+
+    export interface RuntimeEvent extends chrome.events.Event<() => void> { }
+
+    export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
+
+    export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
+
+    export interface ManifestIcons {
+        [size: number]: string;
+    }
+
+    export interface ManifestAction {
+        default_icon?: ManifestIcons;
+        default_title?: string;
+        default_popup?: string;
+    }
+
+    export interface SearchProvider {
+        name?: string;
+        keyword?: string;
+        favicon_url?: string;
+        search_url: string;
+        encoding?: string;
+        suggest_url?: string;
+        instant_url?: string;
+        image_url?: string;
+        search_url_post_params?: string;
+        suggest_url_post_params?: string;
+        instant_url_post_params?: string;
+        image_url_post_params?: string;
+        alternate_urls?: string[];
+        prepopulated_id?: number;
+        is_default?: boolean;
+    }
+
+    export interface Manifest {
+        /** Required */
+        app: {
+            background: {
+                scripts?: string[];
+            }
+        }
+        /** Should be set to 2 */
+        manifest_version: number;
+        name: string;
+        version: string;
+
+        // Recommended
+        default_locale?: string;
+        description?: string;
+        icons?: ManifestIcons;
+        // Optional
+        action_handlers?: string[];
+        author?: any;
+        automation?: any;
+        bluetooth?: {
+            uuids?: string[];
+            socket?: boolean;
+            low_energy?: boolean;
+            peripheral?: boolean;
+        };
+        commands?: {
+            [name: string]: {
+                suggested_key?: {
+                    default?: string;
+                    windows?: string;
+                    mac?: string;
+                    chromeos?: string;
+                    linux?: string;
+                };
+                description?: string;
+                global?: boolean
+            }
+        };
+        current_locale?: string;
+        event_rules?: {
+            event?: string;
+            actions?: {
+                type: string;
+            }[];
+            conditions?: {
+                type: string,
+                css?: string[]
+            }[];
+        }[];
+        file_handlers?: {
+            [key: string]: {
+                extensions?: Array<'*' | string | { include_directories: boolean }>;
+                types?: Array<'*' | string | { include_directories: boolean }>;
+            }
+        }[];
+        file_system_provider_capabilities?: {
+            configurable?: boolean;
+            multiple_mounts?: boolean;
+            source?: string;
+        };
+        import?: {
+            id: string;
+        }[];
+        key?: string;
+        kiosk?: {
+            always_update: any;
+            required_platform_version: any;
+        };
+        kiosk_enabled?: boolean,
+        kiosk_only?: boolean,
+        kiosk_secondary_apps: any;
+        minimum_chrome_version?: string;
+        nacl_modules?: {
+            path: string;
+            mime_type: string;
+        }[];
+        oauth2?: {
+            client_id: string;
+            scopes?: string[];
+        };
+        offline_enabled?: boolean;
+        optional_permissions?: string[];
+        permissions?: string[];
+        platforms?: {
+            nacl_arch?: string;
+            sub_package_path: string;
+        }[];
+        /**
+         * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
+         */
+        requirements?: {
+            /**
+             * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
+             * "requirements": {
+             *   "3D": {
+             *     "features": ["webgl"]
+             *   }
+             * }
+             */
+            '3D'?: {
+                features?: Array<string | 'webgl'>;
+            };
+            /**
+             * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
+             * "requirements": {
+             *   "plugins": {
+             *     "npapi": true
+             *   }
+             * }
+             */
+            plugins?: {
+                npapi?: boolean;
+            }
+
+            [key: string]: any;
+        };
+        /**
+         * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
+         */
+        sandbox?: {
+            pages: string[];
+            content_security_policy?: string;
+        };
+        short_name?: string;
+        signature?: any;
+        sockets?: {
+            tcp?: {
+                connect: string | '*';
+            };
+            udp?: {
+                send: string | '*';
+            }
+        };
+        storage?: {
+            managed_schema: string
+        };
+        system_indicator?: any;
+        update_url?: string;
+        url_handlers?: {
+            [name: string]: {
+                matches: string[];
+                title?: string;
+            }
+        };
+        usb_printers?: {
+            filters: {
+                vendorId?: number;
+                productId?: number;
+                interfaceClass?: number;
+                interfaceSubclass?: number;
+                interfaceProtocol?: number;
+            }[]
+        };
+        version_name?: string;
+        webview?: {
+            partitions?: {
+                name: string;
+                accessible_resources: string[];
+            }[]
+        }
+        [key: string]: any;
+    }
+
+    /**
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+     * @since Chrome 26.
+     */
+    export function connect(connectInfo?: ConnectInfo): Port;
+    /**
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+     * @since Chrome 26.
+     * @param extensionId Optional.
+     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
+     */
+    export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
+    /**
+     * Connects to a native application in the host machine.
+     * @since Chrome 28.
+     * @param application The name of the registered application to connect to.
+     */
+    export function connectNative(application: string): Port;
+    /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
+    export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
+    /**
+     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
+     * @returns The manifest details.
+     */
+    export function getManifest(): Manifest;
+    /**
+     * Returns a DirectoryEntry for the package directory.
+     * @since Chrome 29.
+     */
+    export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
+    /**
+     * Returns information about the current platform.
+     * @since Chrome 29.
+     * @param callback Called with results
+     */
+    export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
+    /**
+     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+     * @param path A path to a resource within an app/extension expressed relative to its install directory.
+     */
+    export function getURL(path: string): string;
+    /**
+     * Reloads the app or extension.
+     * @since Chrome 25.
+     */
+    export function reload(): void;
+    /**
+     * Requests an update check for this app/extension.
+     * @since Chrome 25.
+     * @param callback
+     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+     * Optional parameter details: If an update is available, this contains more information about the available update.
+     */
+    export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
+    /**
+     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
+     * @since Chrome 32.
+     */
+    export function restart(): void;
+    /**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 26.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
+    /**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 32.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+    /**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 26.
+     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
+    /**
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 32.
+     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+    /**
+     * Send a single message to a native application.
+     * @since Chrome 28.
+     * @param application The of the native messaging host.
+     * @param message The message that will be passed to the native messaging host.
+     * @param responseCallback Optional.
+     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+     */
+    export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
+    /**
+     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
+     * @since Chrome 41.
+     * @param url Since Chrome 34.
+     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
+     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
+     */
+    export function setUninstallURL(url: string, callback?: () => void): void;
+    /**
+     * Open your Extension's options page, if possible.
+     * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
+     * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
+     * @since Chrome 42.
+     */
+    export function openOptionsPage(callback?: () => void): void;
+
+    /**
+     * Fired when a connection is made from either an extension process or a content script.
+     * @since Chrome 26.
+     */
+    export var onConnect: ExtensionConnectEvent;
+    /**
+     * Fired when a connection is made from another extension.
+     * @since Chrome 26.
+     */
+    export var onConnectExternal: ExtensionConnectEvent;
+    /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
+    export var onSuspend: RuntimeEvent;
+    /**
+     * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
+     * @since Chrome 23.
+     */
+    export var onStartup: RuntimeEvent;
+    /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
+    export var onInstalled: RuntimeInstalledEvent;
+    /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
+    export var onSuspendCanceled: RuntimeEvent;
+    /**
+     * Fired when a message is sent from either an extension process or a content script.
+     * @since Chrome 26.
+     */
+    export var onMessage: ExtensionMessageEvent;
+    /**
+     * Fired when a message is sent from another extension/app. Cannot be used in a content script.
+     * @since Chrome 26.
+     */
+    export var onMessageExternal: ExtensionMessageEvent;
+    /**
+     * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
+     * @since Chrome 29.
+     */
+    export var onRestartRequired: RuntimeRestartRequiredEvent;
+    /**
+     * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
+     * @since Chrome 25.
+     */
+    export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+    /**
+     * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
+     * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
+     */
+    export var onBrowserUpdateAvailable: RuntimeEvent;
+}
+
+////////////////////
+// Serial
+////////////////////
+/**
+ * Use the chrome.serial API to read from and write to a device connected to a serial port.
+ * @since Chrome 23
+ */
+declare namespace chrome.serial {
+    /** NOT YET IMPLEMENTED */
+}
+
 ////////////////////
 // Socket
 ////////////////////
@@ -721,6 +2693,206 @@ declare namespace chrome.sockets.tcp {
     export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
+/**
+ * Use the chrome.sockets.tcpServer API to create server applications using TCP
+ * connections. This API supersedes the TCP functionality previously found in
+ * the chrome.socket API.
+ *
+ * @since Chrome 33
+ * @see https://developer.chrome.com/apps/sockets_tcpServer
+ */
+declare namespace chrome.sockets.tcpServer {
+    export interface CreateInfo {
+        socketId: number;
+    }
+
+    export interface AcceptEventArgs {
+        socketId: number;
+        clientSocketId: number;
+    }
+
+    export interface AcceptErrorEventArgs {
+        socketId: number;
+        resultCode: number;
+    }
+
+    /**
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
+     */
+    export interface SocketProperties {
+        /**
+         * Flag indicating if the socket remains open when the event page of the
+         * application is unloaded. The default value is "false." When the
+         * application is loaded, any sockets previously opened with
+         * persistent=true can be fetched with getSockets.
+         *
+         * @see http://developer.chrome.com/apps/app_lifecycle.html
+         */
+        persistent?: boolean;
+
+        /** An application-defined string associated with the socket. */
+        name?: string;
+    }
+
+    /**
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
+     */
+    export interface SocketInfo {
+        /** The socket identifier. */
+        socketId: number;
+
+        /**
+         * Flag indicating if the socket remains open when the event page of the
+         * application is unloaded (see SocketProperties.persistent). The
+         * default value is "false".
+         */
+        persistent: boolean;
+
+        /** Application-defined string associated with the socket. */
+        name?: string;
+
+        /**
+         * Flag indicating whether connection requests on a listening socket are
+         * dispatched through the onAccept event or queued up in the listen
+         * queue backlog. See setPaused. The default value is "false"
+         */
+        paused: boolean;
+
+        /** If the socket is listening, contains its local IPv4/6 address. */
+        localAddress?: string;
+
+        /** If the socket is listening, contains its local port. */
+        localPort?: number;
+    }
+
+    /**
+     * Creates a TCP server socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+     * @param callback Called when the socket has been created.
+     */
+    export function create(callback: (createInfo: CreateInfo) => void): void;
+
+    /**
+     * Creates a TCP server socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+     * @param properties The socket properties.
+     * @param callback   Called when the socket has been created.
+     */
+    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+
+    /**
+     * Updates the socket properties.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
+     * @param socketId   The socket identifier.
+     * @param properties The properties to update.
+     * @param callback   Called when the properties are updated.
+     */
+    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+
+    /**
+     * Enables or disables a listening socket from accepting new connections.
+     * When paused, a listening socket accepts new connections until its backlog
+     * (see listen function) is full then refuses additional connection
+     * requests. onAccept events are raised only when the socket is un-paused.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
+     * @param callback Callback from the setPaused method.
+     */
+    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+
+    /**
+     * Listens for connections on the specified port and address. If the
+     * port/address is in use, the callback indicates a failure.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+     * @param socketId The socket identifier.
+     * @param address  The address of the local machine.
+     * @param port     The port of the local machine. When set to 0, a free port
+     *                 is chosen dynamically. The dynamically allocated port can
+     *                 be found by calling getInfo.
+     * @param backlog  Length of the socket's listen queue. The default value
+     *                 depends on the Operating System (SOMAXCONN), which
+     *                 ensures a reasonable queue length for most applications.
+     * @param callback Called when listen operation completes.
+     */
+    export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
+
+    /**
+     * Listens for connections on the specified port and address. If the
+     * port/address is in use, the callback indicates a failure.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+     * @param socketId The socket identifier.
+     * @param address  The address of the local machine.
+     * @param port     The port of the local machine. When set to 0, a free port
+     *                 is chosen dynamically. The dynamically allocated port can
+     *                 be found by calling getInfo.
+     * @param callback Called when listen operation completes.
+     */
+    export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+
+    /**
+     * Disconnects the listening socket, i.e. stops accepting new connections
+     * and releases the address/port the socket is bound to. The socket
+     * identifier remains valid, e.g. it can be used with listen to accept
+     * connections on a new port and address.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
+     * @param socketId The socket identifier.
+     * @param callback Called when the disconnect attempt is complete.
+     */
+    export function disconnect(socketId: number, callback?: () => void): void;
+
+    /**
+     * Disconnects and destroys the socket. Each socket created should be closed
+     * after use. The socket id is no longer valid as soon at the function is
+     * called. However, the socket is guaranteed to be closed only when the
+     * callback is invoked.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
+     * @param socketId The socket identifier.
+     * @param callback Called when the close operation completes.
+     */
+    export function close(socketId: number, callback?: () => void): void;
+
+    /**
+     * Retrieves the state of the given socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
+     * @param socketId The socket identifier.
+     * @param callback Called when the socket state is available.
+     */
+    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+
+    /**
+     * Retrieves the list of currently opened sockets owned by the application.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
+     * @param callback Called when the list of sockets is available.
+     */
+    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+
+    /**
+     * Event raised when a connection has been made to the server socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
+     */
+    export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
+
+    /**
+     * Event raised when a network error occured while the runtime was waiting
+     * for new connections on the socket address and port. Once this event is
+     * raised, the socket is set to paused and no more onAccept events are
+     * raised for this socket until the socket is resumed.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
+     */
+    export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
+}
+
 /**
  * Use the chrome.sockets.udp API to send and receive data over the network
  * using UDP connections. This API supersedes the UDP functionality previously
@@ -1015,204 +3187,172 @@ declare namespace chrome.sockets.udp {
     export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
+////////////////////
+// Storage
+////////////////////
 /**
- * Use the chrome.sockets.tcpServer API to create server applications using TCP
- * connections. This API supersedes the TCP functionality previously found in
- * the chrome.socket API.
- *
- * @since Chrome 33
- * @see https://developer.chrome.com/apps/sockets_tcpServer
+ * Use the chrome.storage API to store, retrieve, and track changes to user data.
+ * Permissions:  "storage"
+ * @since Chrome 20.
  */
-declare namespace chrome.sockets.tcpServer {
-    export interface CreateInfo {
-        socketId: number;
-    }
-
-    export interface AcceptEventArgs {
-        socketId: number;
-        clientSocketId: number;
-    }
-
-    export interface AcceptErrorEventArgs {
-        socketId: number;
-        resultCode: number;
-    }
-
-    /**
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
-     */
-    export interface SocketProperties {
+declare namespace chrome.storage {
+    export interface StorageArea {
         /**
-         * Flag indicating if the socket remains open when the event page of the
-         * application is unloaded. The default value is "false." When the
-         * application is loaded, any sockets previously opened with
-         * persistent=true can be fetched with getSockets.
-         *
-         * @see http://developer.chrome.com/apps/app_lifecycle.html
+         * Gets the amount of space (in bytes) being used by one or more items.
+         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
          */
-        persistent?: boolean;
-
-        /** An application-defined string associated with the socket. */
-        name?: string;
+        getBytesInUse(callback: (bytesInUse: number) => void): void;
+        /**
+         * Gets the amount of space (in bytes) being used by one or more items.
+         * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+         */
+        getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
+        /**
+         * Removes all items from storage.
+         * @param callback Optional.
+         * Callback on success, or on failure (in which case runtime.lastError will be set).
+         */
+        clear(callback?: () => void): void;
+        /**
+         * Sets multiple items.
+         * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
+         * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
+         * @param callback Optional.
+         * Callback on success, or on failure (in which case runtime.lastError will be set).
+         */
+        set(items: Object, callback?: () => void): void;
+        /**
+         * Removes one or more items from storage.
+         * @param A single key or a list of keys for items to remove.
+         * @param callback Optional.
+         * Callback on success, or on failure (in which case runtime.lastError will be set).
+         */
+        remove(keys: string | string[], callback?: () => void): void;
+        /**
+         * Gets one or more items from storage.
+         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+         * Parameter items: Object with items in their key-value mappings.
+         */
+        get(callback: (items: { [key: string]: any }) => void): void;
+        /**
+         * Gets one or more items from storage.
+         * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
+         * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+         * Parameter items: Object with items in their key-value mappings.
+         */
+        get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
     }
 
-    /**
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
-     */
-    export interface SocketInfo {
-        /** The socket identifier. */
-        socketId: number;
-
-        /**
-         * Flag indicating if the socket remains open when the event page of the
-         * application is unloaded (see SocketProperties.persistent). The
-         * default value is "false".
-         */
-        persistent: boolean;
-
-        /** Application-defined string associated with the socket. */
-        name?: string;
-
-        /**
-         * Flag indicating whether connection requests on a listening socket are
-         * dispatched through the onAccept event or queued up in the listen
-         * queue backlog. See setPaused. The default value is "false"
-         */
-        paused: boolean;
-
-        /** If the socket is listening, contains its local IPv4/6 address. */
-        localAddress?: string;
-
-        /** If the socket is listening, contains its local port. */
-        localPort?: number;
+    export interface StorageChange {
+        /** Optional. The new value of the item, if there is a new value. */
+        newValue?: any;
+        /** Optional. The old value of the item, if there was an old value. */
+        oldValue?: any;
     }
 
-    /**
-     * Creates a TCP server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-     * @param callback Called when the socket has been created.
-     */
-    export function create(callback: (createInfo: CreateInfo) => void): void;
+    export interface LocalStorageArea extends StorageArea {
+        /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+        QUOTA_BYTES: number;
+    }
+
+    export interface SyncStorageArea extends StorageArea {
+        /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
+        MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+        /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+        QUOTA_BYTES: number;
+        /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
+        QUOTA_BYTES_PER_ITEM: number;
+        /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
+        MAX_ITEMS: number;
+        /**
+         * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
+         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+         */
+        MAX_WRITE_OPERATIONS_PER_HOUR: number;
+        /**
+         * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
+         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+         * @since Chrome 40.
+         */
+        MAX_WRITE_OPERATIONS_PER_MINUTE: number;
+    }
+
+    export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
+
+    /** Items in the local storage area are local to each machine. */
+    export var local: LocalStorageArea;
+    /** Items in the sync storage area are synced using Chrome Sync. */
+    export var sync: SyncStorageArea;
 
     /**
-     * Creates a TCP server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-     * @param properties The socket properties.
-     * @param callback   Called when the socket has been created.
+     * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error.
+     * @since Chrome 33.
      */
-    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+    export var managed: StorageArea;
 
-    /**
-     * Updates the socket properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
-     * @param socketId   The socket identifier.
-     * @param properties The properties to update.
-     * @param callback   Called when the properties are updated.
-     */
-    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+    /** Fired when one or more items change. */
+    export var onChanged: StorageChangedEvent;
+}
 
-    /**
-     * Enables or disables a listening socket from accepting new connections.
-     * When paused, a listening socket accepts new connections until its backlog
-     * (see listen function) is full then refuses additional connection
-     * requests. onAccept events are raised only when the socket is un-paused.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
-     * @param callback Callback from the setPaused method.
-     */
-    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+////////////////////
+// SyncFileSystem
+////////////////////
+/**
+ * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive. This API is NOT for accessing arbitrary user docs stored in Google Drive. It provides app-specific syncable storage for offline and caching usage so that the same data can be available across different clients. Read Manage Data for more on using this API.
+ * @since Chrome 27
+ */
+declare namespace chrome.syncFileSystem {
+    /** NOT YET IMPLEMENTED */
+}
 
-    /**
-     * Listens for connections on the specified port and address. If the
-     * port/address is in use, the callback indicates a failure.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-     * @param socketId The socket identifier.
-     * @param address  The address of the local machine.
-     * @param port     The port of the local machine. When set to 0, a free port
-     *                 is chosen dynamically. The dynamically allocated port can
-     *                 be found by calling getInfo.
-     * @param backlog  Length of the socket's listen queue. The default value
-     *                 depends on the Operating System (SOMAXCONN), which
-     *                 ensures a reasonable queue length for most applications.
-     * @param callback Called when listen operation completes.
-     */
-    export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
 
-    /**
-     * Listens for connections on the specified port and address. If the
-     * port/address is in use, the callback indicates a failure.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-     * @param socketId The socket identifier.
-     * @param address  The address of the local machine.
-     * @param port     The port of the local machine. When set to 0, a free port
-     *                 is chosen dynamically. The dynamically allocated port can
-     *                 be found by calling getInfo.
-     * @param callback Called when listen operation completes.
-     */
-    export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+////////////////////
+// System CPU
+////////////////////
+/**
+ * Use the system.cpu API to query CPU metadata.
+ * Permissions: "system.cpu"
+ * @since Chrome 32.
+ */
+declare namespace chrome.system.cpu {
+    export interface ProcessorUsage {
+        /** The cumulative time used by userspace programs on this processor. */
+        user: number;
+        /** The cumulative time used by kernel programs on this processor. */
+        kernel: number;
+        /** The cumulative time spent idle by this processor. */
+        idle: number;
+        /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
+        total: number;
+    }
 
-    /**
-     * Disconnects the listening socket, i.e. stops accepting new connections
-     * and releases the address/port the socket is bound to. The socket
-     * identifier remains valid, e.g. it can be used with listen to accept
-     * connections on a new port and address.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
-     * @param socketId The socket identifier.
-     * @param callback Called when the disconnect attempt is complete.
-     */
-    export function disconnect(socketId: number, callback?: () => void): void;
+    export interface ProcessorInfo {
+        /** Cumulative usage info for this logical processor. */
+        usage: ProcessorUsage;
+    }
 
-    /**
-     * Disconnects and destroys the socket. Each socket created should be closed
-     * after use. The socket id is no longer valid as soon at the function is
-     * called. However, the socket is guaranteed to be closed only when the
-     * callback is invoked.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
-     * @param socketId The socket identifier.
-     * @param callback Called when the close operation completes.
-     */
-    export function close(socketId: number, callback?: () => void): void;
+    export interface CpuInfo {
+        /** The number of logical processors. */
+        numOfProcessors: number;
+        /** The architecture name of the processors. */
+        archName: string;
+        /** The model name of the processors. */
+        modelName: string;
+        /**
+         * A set of feature codes indicating some of the processor's capabilities.
+         * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
+         */
+        features: string[];
+        /** Information about each logical processor. */
+        processors: ProcessorInfo[];
+    }
 
-    /**
-     * Retrieves the state of the given socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
-     * @param socketId The socket identifier.
-     * @param callback Called when the socket state is available.
-     */
-    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-
-    /**
-     * Retrieves the list of currently opened sockets owned by the application.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
-     * @param callback Called when the list of sockets is available.
-     */
-    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
-
-    /**
-     * Event raised when a connection has been made to the server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
-     */
-    export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
-
-    /**
-     * Event raised when a network error occured while the runtime was waiting
-     * for new connections on the socket address and port. Once this event is
-     * raised, the socket is set to paused and no more onAccept events are
-     * raised for this socket until the socket is resumed.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
-     */
-    export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
+    /** Queries basic CPU information of the system. */
+    export function getInfo(callback: (info: CpuInfo) => void): void;
 }
 
 ////////////////////
@@ -1551,6 +3691,26 @@ declare namespace chrome.system.display {
     export var onDisplayChanged: DisplayChangedEvent;
 }
 
+////////////////////
+// System Memory
+////////////////////
+/**
+ * The chrome.system.memory API.
+ * Permissions:  "system.memory"
+ * @since Chrome 32.
+ */
+declare namespace chrome.system.memory {
+    export interface MemoryInfo {
+        /** The total amount of physical memory capacity, in bytes. */
+        capacity: number;
+        /** The amount of available capacity, in bytes. */
+        availableCapacity: number;
+    }
+
+    /** Get physical memory information. */
+    export function getInfo(callback: (info: MemoryInfo) => void): void;
+}
+
 ////////////////////
 // System - Network
 ////////////////////
@@ -1564,49 +3724,267 @@ declare namespace chrome.system.network {
     export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
 }
 
-declare namespace chrome.runtime {
-    export interface Manifest {
-        app?: {
-            background?: {
-                scripts?: string[];
-            }
-        },
-        bluetooth?: {
-            uuids?: string[];
-            socket?: boolean;
-            low_energy?: boolean;
-            peripheral?: boolean;
-        },
-        file_handlers?: {
-            [name: string]: {
-                types?: string[];
-                extensions?: string[];
-                title?: string;
-            }
-        },
-        kiosk_enabled?: boolean,
-        kiosk_only?: boolean,
-        url_handlers?: {
-            [name: string]: {
-                matches: string[];
-                title?: string;
-            }
-        },
-        usb_printers?: {
-            filters: {
-                vendorId?: number;
-                productId?: number;
-                interfaceClass?: number;
-                interfaceSubclass?: number;
-                interfaceProtocol?: number;
-            }[]
-        },
-        webview?: {
-            partitions?: {
-                name: string;
-                accessible_resources: string[];
-            }[]
-        }
+
+////////////////////
+// System Storage
+////////////////////
+/**
+ * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
+ * Permissions:  "system.storage"
+ * @since Chrome 30.
+ */
+declare namespace chrome.system.storage {
+    export interface StorageUnitInfo {
+        /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
+        id: string;
+        /** The name of the storage unit. */
+        name: string;
+        /**
+         * The media type of the storage unit.
+         * fixed: The storage has fixed media, e.g. hard disk or SSD.
+         * removable: The storage is removable, e.g. USB flash drive.
+         * unknown: The storage type is unknown.
+         */
+        type: string;
+        /** The total amount of the storage space, in bytes. */
+        capacity: number;
+    }
+
+    export interface StorageCapacityInfo {
+        /** A copied |id| of getAvailableCapacity function parameter |id|. */
+        id: string;
+        /** The available capacity of the storage device, in bytes. */
+        availableCapacity: number;
+    }
+
+    export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
+
+    export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
+
+    /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
+    export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
+    /**
+     * Ejects a removable storage device.
+     * @param callback
+     * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
+     */
+    export function ejectDevice(id: string, callback: (result: string) => void): void;
+    /**
+     * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
+     * @since Dev channel only.
+     */
+    export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
+
+    /** Fired when a new removable storage is attached to the system. */
+    export var onAttached: SystemStorageAttachedEvent;
+    /** Fired when a removable storage is detached from the system. */
+    export var onDetached: SystemStorageDetachedEvent;
+}
+
+////////////////////
+// Text to Speech
+////////////////////
+/**
+ * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
+ * Permissions:  "tts"
+ * @since Chrome 14.
+ */
+declare namespace chrome.tts {
+    /** An event from the TTS engine to communicate the status of an utterance. */
+    export interface TtsEvent {
+        /** Optional. The index of the current character in the utterance. */
+        charIndex?: number;
+        /** Optional. The error description, if the event type is 'error'. */
+        errorMessage?: string;
+        /**
+         * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
+         * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
+         */
+        type: string;
+    }
+
+    /** A description of a voice available for speech synthesis. */
+    export interface TtsVoice {
+        /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+        lang?: string;
+        /**
+         * Optional. This voice's gender.
+         * One of: "male", or "female"
+         */
+        gender?: string;
+        /** Optional. The name of the voice. */
+        voiceName?: string;
+        /** The ID of the extension providing this voice. */
+        extensionsId?: string;
+        /** All of the callback event types that this voice is capable of sending. */
+        eventTypes?: string[];
+        /**
+         * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
+         * @since Chrome 33.
+         */
+        remote?: boolean;
+    }
+
+    export interface SpeakOptions {
+        /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+        volume?: number;
+        /**
+         * Optional.
+         * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
+         */
+        enqueue?: boolean;
+        /**
+         * Optional.
+         * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
+         */
+        rate?: number;
+        /**
+         * Optional. This function is called with events that occur in the process of speaking the utterance.
+         * @param event The update event from the text-to-speech engine indicating the status of this utterance.
+         */
+        onEvent?: (event: TtsEvent) => void;
+        /**
+         * Optional.
+         * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
+         */
+        pitch?: number;
+        /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+        lang?: string;
+        /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
+        voiceName?: string;
+        /** Optional. The extension ID of the speech engine to use, if known. */
+        extensionId?: string;
+        /**
+         * Optional. Gender of voice for synthesized speech.
+         * One of: "male", or "female"
+         */
+        gender?: string;
+        /** Optional. The TTS event types the voice must support. */
+        requiredEventTypes?: string[];
+        /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
+        desiredEventTypes?: string[];
+    }
+
+    /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
+    export function isSpeaking(callback?: (speaking: boolean) => void): void;
+    /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
+    export function stop(): void;
+    /** Gets an array of all available voices. */
+    export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
+    /**
+     * Speaks text using a text-to-speech engine.
+     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+     */
+    export function speak(utterance: string, callback?: Function): void;
+    /**
+     * Speaks text using a text-to-speech engine.
+     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+     * @param options Optional. The speech options.
+     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+     */
+    export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
+    /**
+     * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
+     * @since Chrome 29.
+     */
+    export function pause(): void;
+    /**
+     * If speech was paused, resumes speaking where it left off.
+     * @since Chrome 29.
+     */
+    export function resume(): void;
+}
+
+////////////////////
+// Types
+////////////////////
+/**
+ * The chrome.types API contains type declarations for Chrome.
+ * @since Chrome 13.
+ */
+declare namespace chrome.types {
+    export interface ChromeSettingClearDetails {
+        /**
+         * Optional.
+         * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
+
+    export interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+        /**
+         * The value of the setting.
+         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+         */
+        value: any;
+        /**
+         * Optional.
+         * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
+
+    export interface ChromeSettingGetDetails {
+        /** Optional. Whether to return the value that applies to the incognito session (default false). */
+        incognito?: boolean;
+    }
+
+    /**
+     * @param details Details of the currently effective value.
+     */
+    export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+
+    export interface ChromeSettingGetResultDetails {
+        /**
+         * One of
+         * • not_controllable: cannot be controlled by any extension
+         * • controlled_by_other_extensions: controlled by extensions with higher precedence
+         * • controllable_by_this_extension: can be controlled by this extension
+         * • controlled_by_this_extension: controlled by this extension
+         */
+        levelOfControl: string;
+        /** The value of the setting. */
+        value: any;
+        /**
+         * Optional.
+         * Whether the effective value is specific to the incognito session.
+         * This property will only be present if the incognito property in the details parameter of get() was true.
+         */
+        incognitoSpecific?: boolean;
+    }
+
+    export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
+
+    /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
+    export interface ChromeSetting {
+        /**
+         * Sets the value of a setting.
+         * @param details Which setting to change.
+         * @param callback Optional. Called at the completion of the set operation.
+         */
+        set(details: ChromeSettingSetDetails, callback?: Function): void;
+        /**
+         * Gets the value of a setting.
+         * @param details Which setting to consider.
+         */
+        get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
+        /**
+         * Clears the setting, restoring any default value.
+         * @param details Which setting to clear.
+         * @param callback Optional. Called at the completion of the clear operation.
+         */
+        clear(details: ChromeSettingClearDetails, callback?: Function): void;
+        /** Fired after the setting changes. */
+        onChange: ChromeSettingChangedEvent;
     }
 }
 
@@ -1831,6 +4209,129 @@ declare namespace chrome.networking.onc {
     }
 }
 
+
+////////////////////
+// VPN Provider
+////////////////////
+/**
+ * Use the chrome.vpnProvider API to implement a VPN client.
+ * Permissions:  "vpnProvider"
+ * Important: This API works only on Chrome OS.
+ * @since Chrome 43.
+ */
+declare namespace chrome.vpnProvider {
+    export interface VpnSessionParameters {
+        /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
+        address: string;
+        /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
+        broadcastAddress?: string;
+        /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
+        mtu?: string;
+        /**
+         * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+         */
+        exclusionList: string[];
+        /**
+         * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+         */
+        inclusionList: string[];
+        /** Optional. A list of search domains. (default: no search domain) */
+        domainSearch?: string[];
+        /** A list of IPs for the DNS servers. */
+        dnsServer: string[];
+    }
+
+    export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
+
+    export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
+
+    export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
+
+    export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
+
+    export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
+
+    /**
+     * Creates a new VPN configuration that persists across multiple login sessions of the user.
+     * @param name The name of the VPN configuration.
+     * @param callback Called when the configuration is created or if there is an error.
+     * Parameter id: A unique ID for the created configuration, empty string on failure.
+     */
+    export function createConfig(name: string, callback: (id: string) => void): void;
+    /**
+     * Destroys a VPN configuration created by the extension.
+     * @param id ID of the VPN configuration to destroy.
+     * @param callback Optional. Called when the configuration is destroyed or if there is an error.
+     */
+    export function destroyConfig(id: string, callback?: Function): void;
+    /**
+     * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+     * @param parameters The parameters for the VPN session.
+     * @param callback Called when the parameters are set or if there is an error.
+     */
+    export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
+    /**
+     * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
+     * @param data The IP packet to be sent to the platform.
+     * @param callback Optional. Called when the packet is sent or if there is an error.
+     */
+    export function sendPacket(data: ArrayBuffer, callback?: Function): void;
+    /**
+     * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
+     * @param state The VPN session state of the VPN client.
+     * connected: VPN connection was successful.
+     * failure: VPN connection failed.
+     * @param callback Optional. Called when the notification is complete or if there is an error.
+     */
+    export function notifyConnectionStateChanged(state: string, callback?: Function): void;
+
+    /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
+    export var onPlatformMessage: VpnPlatformMessageEvent;
+    /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
+    export var onPacketReceived: VpnPacketReceptionEvent;
+    /** Triggered when a configuration created by the extension is removed by the platform. */
+    export var onConfigRemoved: VpnConfigRemovalEvent;
+    /** Triggered when a configuration is created by the platform for the extension. */
+    export var onConfigCreated: VpnConfigCreationEvent;
+    /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
+    export var onUIEvent: VpnUiEvent;
+}
+
+////////////////////
+// Wallpaper
+////////////////////
+/**
+ * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
+ * Permissions:  "wallpaper"
+ * Important: This API works only on Chrome OS.
+ * @since Chrome 43.
+ */
+declare namespace chrome.wallpaper {
+    export interface WallpaperDetails {
+        /** Optional. The jpeg or png encoded wallpaper image. */
+        data?: any;
+        /** Optional. The URL of the wallpaper to be set. */
+        url?: string;
+        /**
+         * The supported wallpaper layouts.
+         * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
+         */
+        layout: string;
+        /** The file name of the saved wallpaper. */
+        filename: string;
+        /** Optional. True if a 128x60 thumbnail should be generated. */
+        thumbnail?: boolean;
+    }
+
+    /**
+     * Sets wallpaper to the image at url or wallpaperData with the specified layout
+     * @param callback
+     * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
+     */
+    export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
+}
+
+
 ///////////////////
 // Webview Tag
 ///////////////////

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 0569/1124] 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 0570/1124] 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 0571/1124] 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 0572/1124] 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 0573/1124] 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 0574/1124] 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 0575/1124] 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 0576/1124] 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 4cc56aed611a9a8cab03d1f1d29e24f3a91788a3 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 22 May 2018 11:39:01 +0200
Subject: [PATCH 0577/1124] Chrome apps: Bluetooth API typings

---
 types/chrome-apps/index.d.ts | 191 ++++++++++++++++++++++++++++++++++-
 1 file changed, 189 insertions(+), 2 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index 1a4be0e5f9..17c70bb270 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -375,7 +375,120 @@ declare namespace chrome.app.window {
  * @since Chrome 59
  */
 declare namespace chrome.audio {
-    /** NOT IMPLEMENTED YET */
+    export type StreamType = 'INPUT' | 'OUTPUT';
+    export interface AudioDeviceInfo {
+        /** The unique identifier of the audio device. */
+        id: string;
+        /** Stream type associated with this device. */
+        streamType: StreamType;
+        /** Type of the device. */
+        deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
+        /** The user-friendly name (e.g. "USB Microphone"). */
+        displayName: string;
+        /** Device name. */
+        deviceName: string;
+        /** True if this is the current active device. */
+        isActive: boolean;
+        /** The sound level of the device, volume for output, gain for input. */
+        level: number;
+        /** The stable/persisted device id string when available. */
+        stableDeviceId?: string;
+    }
+    export interface DeviceIdLists {
+        /**
+         * List of input devices specified by their ID.
+         * To indicate input devices should be unaffected, leave this property unset.
+         */
+        input?: string[];
+        /**
+         * List of output devices specified by their ID.
+         * To indicate output devices should be unaffected, leave this property unset.
+         */
+        output?: string[];
+    }
+    export interface SetDeviceProperties {
+        /**
+         * The audio device's desired sound level. Defaults to the device's current sound level.
+         * If used with audio input device, represents audio device gain.
+         * If used with audio output device, represents audio device volume.
+         *
+         * Type: integer
+         */
+        level?: number;
+    }
+    export interface OnLevelChangedEvent {
+        /**
+         * The callback parameter should be a function that looks like this:
+         *   function(object event) {...};
+         * @param {(event: {
+         *             deviceId: string,
+         *             level: number
+         *         }) => void} callback
+         */
+        addListener(callback: (event: {
+            deviceId: string,
+            level: number
+        }) => void): void;
+    }
+    export interface OnMuteChangedEvent {
+        /**
+         * The callback parameter should be a function that looks like this:
+         * function(object event) {...};
+         */
+        addListener(callback: (event: {
+            streamType: StreamType[],
+            isMuted: boolean
+        }) => void): void;
+    }
+    export interface OnDeviceListChangedEvent {
+        /**
+         * The callback parameter should be a function that looks like this:
+         *   function(array of AudioDeviceInfo devices) {...};
+         * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
+         */
+        addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
+    }
+    /**
+     * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
+     */
+    export interface Filter {
+        /**
+         * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
+         */
+        streamTypes?: StreamType[];
+        /**
+         * @description If set, only audio devices whose active state matches this value will satisfy the filter.
+         */
+        isActive?: boolean;
+    }
+    /**
+     * @description Gets a list of audio devices filtered based on |filter|.
+     */
+    export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => {});
+    export function getDevices(callback: (devices: AudioDeviceInfo[]) => {});
+    /** Sets lists of active input and/or output devices. */
+    export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void);
+    /** Sets the properties for the input or output device. */
+    export function setProperties(id: string, properties: SetDeviceProperties, callback: () => {});
+    /**
+     * @description Gets the system-wide mute state for the specified stream type.
+     * @param {StreamType} streamType Stream type for which mute state should be fetched.
+     * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
+     */
+    export function getMute(streamType: StreamType, callback: (value: boolean) => {});
+    /**
+     * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
+     * @param {StreamType} streamType Stream type for which mute state should be set.
+     * @param {boolean} isMuted New mute value.
+     * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
+     */
+    export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => {});
+    /** Fired when sound level changes for an active audio device. */
+    export var onLevelChanged: OnLevelChangedEvent;
+    /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
+    export var onMuteChanged: OnMuteChangedEvent;
+    /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
+    export var onDeviceListChanged: OnDeviceListChangedEvent;
 }
 
 ////////////////////
@@ -386,7 +499,81 @@ declare namespace chrome.audio {
  * @since Chrome 37
  */
 declare namespace chrome.bluetooth {
-    /** NOT IMPLEMENTED YET */
+    export interface AdapterState {
+        address: string;
+        name: string;
+        powered: boolean;
+        available: boolean;
+        discovering: boolean;
+    }
+    export interface Device {
+        address: string;
+        name?: string;
+        deviceClass?: number;
+        vendorIdSource?: 'bluetooth' | 'usb';
+        vendorId?: number;
+        productId?: number;
+        deviceId?: number;
+        type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
+        paired?: boolean;
+        connected?: boolean;
+        /**
+         * @since Chrome 48
+         */
+        connecting?: boolean;
+        /**
+         * @since Chrome 48
+         */
+        connectable?: boolean;
+        uuids?: string[];
+        /**
+         * @since Chrome 44
+         */
+        inquiryRssi: number;
+        /**
+         * @since Chrome 44
+         */
+        inquiryTxPower: number;
+    }
+
+    export interface BluetoothEvent<T> {
+        addListener(callback: (event: T) => void);
+    }
+
+    /**
+     * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+     */
+    export interface DeviceFilter {
+        /** Type of filter to apply to the device list. Default is all. */
+        filterType?: 'all' | 'known';
+        /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
+        limit?: number;
+    }
+    /** Get information about the Bluetooth adapter. */
+    export function getAdapterState(callback: (adapterInfo: AdapterState) => void);
+    /** Get information about a Bluetooth device known to the system. */
+    export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void);
+    /**
+     * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
+     * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+     * @param callback Called when the search is completed.
+     */
+    export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void);
+    /**
+     * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
+     * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
+     */
+    export function startDiscovery(callback: () => void);
+    /** Stop discovery. */
+    export function stopDiscovery(callback: () => void);
+    /** Fired when the state of the Bluetooth adapter changes. */
+    export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
+    /** Fired when information about a new Bluetooth device is available. */
+    export var onDeviceAdded: BluetoothEvent<Device>;
+    /** Fired when information about a known Bluetooth device has changed. */
+    export var onDeviceChanged: BluetoothEvent<Device>;
+    /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
+    export var onDeviceRemoved: BluetoothEvent<Device>;
 }
 /**
  * 	The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).

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 0578/1124] 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 0579/1124] 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 0580/1124] 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 0581/1124] 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 0582/1124] 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 18559b830168f2943dddec065ff106b86c128fb4 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 22 May 2018 14:22:46 +0200
Subject: [PATCH 0583/1124] Submodule package

---
 types/chrome-apps/index.d.ts   | 244 ++++++++++++++++++---------------
 types/chrome-apps/package.json |  21 +++
 2 files changed, 151 insertions(+), 114 deletions(-)
 create mode 100644 types/chrome-apps/package.json

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index 17c70bb270..ca17f75e1d 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -13,7 +13,7 @@
 interface Window {
     chrome: typeof chrome;
 }
-declare module chrome { }
+declare module 'chrome' {}
 
 ////////////////////
 // Accessibility Features
@@ -496,6 +496,7 @@ declare namespace chrome.audio {
 ////////////////////
 /**
  * Use the chrome.bluetooth API to connect to a Bluetooth device. All functions report failures via chrome.runtime.lastError.
+ * Manifest: "bluetooth": {...}
  * @since Chrome 37
  */
 declare namespace chrome.bluetooth {
@@ -576,15 +577,23 @@ declare namespace chrome.bluetooth {
     export var onDeviceRemoved: BluetoothEvent<Device>;
 }
 /**
- * 	The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
+ * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
+ * Manifest: "bluetooth": {...}
  * @since Chrome 37
+ * Important: This API works only on Chrome OS.
+ * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
  */
 declare namespace chrome.bluetoothLowEnergy {
-    /** NOT IMPLEMENTED YET */
+    /**
+     * NOT IMPLEMENTED YET
+     * @see https://developer.chrome.com/apps/bluetoothLowEnergy
+     * */
 }
 /**
- * 	Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
+ * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
  * @since Chrome 37
+ * Manifest: "bluetooth": {...}
+ * Important: This API works only on OS X, Windows and Chrome OS.
  */
 declare namespace chrome.bluetoothSocket {
     /** NOT IMPLEMENTED YET */
@@ -1945,6 +1954,123 @@ declare namespace chrome.mediaGalleries {
     export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
 }
 
+////////////////////////////////////
+// Open Network Configuration (ONC)
+////////////////////////////////////
+/**
+ * The chrome.networking.onc API is used for configuring network connections (Cellular, Ethernet, VPN, WiFi or WiMAX). This API is available in Chrome OS kiosk sessions.
+ * Network connection configurations are specified following Open Network Configuration (ONC) specification.
+ * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
+ */
+declare namespace chrome.networking.onc {
+    export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
+    export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
+    export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
+    export type IPConfigType = 'DHCP' | 'Static';
+    export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
+    export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
+    export interface ManagedBoolean {
+        /**
+         * @description The active value currently used by the network configuration manager (e.g. Shill).
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        Active?: boolean,
+        /**
+         * @description The source from which the effective property value was determined.
+         * @type {string}
+         * @memberof ManagedBoolean
+         */
+        Effective?: string,
+        /**
+         * @description The property value provided by the user policy.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserPolicy?: boolean,
+        /**
+         * @description The property value provided by the device policy.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        DevicePolicy?: boolean,
+        /**
+         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserSettings?: boolean,
+        /**
+         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        SharedSettings?: boolean,
+        /**
+         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserEditable?: boolean,
+        /**
+         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        DeviceEditable?: boolean
+    }
+    export interface ManagedLong {
+        /**
+         * @description The active value currently used by the network configuration manager (e.g. Shill).
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        Active?: number,
+        /**
+         * @description The source from which the effective property value was determined.
+         * @type {string}
+         * @memberof ManagedLong
+         */
+        Effective?: string,
+        /**
+         * @description The property value provided by the user policy.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        UserPolicy?: number,
+        /**
+         * @description The property value provided by the device policy.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        DevicePolicy?: number,
+        /**
+         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        UserSettings?: number,
+        /**
+         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        SharedSettings?: number,
+        /**
+         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedLong
+         */
+        UserEditable?: boolean,
+        /**
+         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedLong
+         */
+        DeviceEditable?: boolean
+    }
+}
+
 ////////////////////
 // Notifications
 // https://developer.chrome.com/extensions/notifications
@@ -3911,7 +4037,6 @@ declare namespace chrome.system.network {
     export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
 }
 
-
 ////////////////////
 // System Storage
 ////////////////////
@@ -4287,115 +4412,6 @@ declare namespace chrome.usb {
     export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
 }
 
-declare namespace chrome.networking.onc {
-    export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
-    export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
-    export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
-    export type IPConfigType = 'DHCP' | 'Static';
-    export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
-    export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
-    export interface ManagedBoolean {
-        /**
-         * @description The active value currently used by the network configuration manager (e.g. Shill).
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        Active?: boolean,
-        /**
-         * @description The source from which the effective property value was determined.
-         * @type {string}
-         * @memberof ManagedBoolean
-         */
-        Effective?: string,
-        /**
-         * @description The property value provided by the user policy.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserPolicy?: boolean,
-        /**
-         * @description The property value provided by the device policy.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        DevicePolicy?: boolean,
-        /**
-         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserSettings?: boolean,
-        /**
-         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        SharedSettings?: boolean,
-        /**
-         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserEditable?: boolean,
-        /**
-         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        DeviceEditable?: boolean
-    }
-    export interface ManagedLong {
-        /**
-         * @description The active value currently used by the network configuration manager (e.g. Shill).
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        Active?: number,
-        /**
-         * @description The source from which the effective property value was determined.
-         * @type {string}
-         * @memberof ManagedLong
-         */
-        Effective?: string,
-        /**
-         * @description The property value provided by the user policy.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        UserPolicy?: number,
-        /**
-         * @description The property value provided by the device policy.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        DevicePolicy?: number,
-        /**
-         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        UserSettings?: number,
-        /**
-         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        SharedSettings?: number,
-        /**
-         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedLong
-         */
-        UserEditable?: boolean,
-        /**
-         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedLong
-         */
-        DeviceEditable?: boolean
-    }
-}
-
 
 ////////////////////
 // VPN Provider
diff --git a/types/chrome-apps/package.json b/types/chrome-apps/package.json
new file mode 100644
index 0000000000..3798524bb9
--- /dev/null
+++ b/types/chrome-apps/package.json
@@ -0,0 +1,21 @@
+{
+    "name": "@types/chrome-apps",
+    "version": "1.0.0",
+    "description": "TypeScript definitions for chrome-apps",
+    "license": "MIT",
+    "contributors": [
+        {
+            "name": "Nikolai Ommundsen",
+            "url": "https://github.com/niikoo",
+            "githubUsername": "niikoo"
+        }
+    ],
+    "main": "",
+    "repository": {
+        "type": "git",
+        "url": "https://www.github.com/DefinitelyTyped/DefinitelyTyped.git"
+    },
+    "scripts": {},
+    "dependencies": {},
+    "typeScriptVersion": "2.4"
+}
\ No newline at end of file

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 0584/1124] 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 0585/1124] [@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 0586/1124] [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 5760bb169b56c8bf8333bf219ee442c6bf995d16 Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Tue, 22 May 2018 10:13:41 -0400
Subject: [PATCH 0587/1124] [cesium] add global test

---
 types/cesium/test/cesium-global.test.ts | 48 +++++++++++++++++++++++++
 types/cesium/tsconfig.json              |  3 +-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 types/cesium/test/cesium-global.test.ts

diff --git a/types/cesium/test/cesium-global.test.ts b/types/cesium/test/cesium-global.test.ts
new file mode 100644
index 0000000000..8974e56542
--- /dev/null
+++ b/types/cesium/test/cesium-global.test.ts
@@ -0,0 +1,48 @@
+Cesium.buildModuleUrl.setBaseUrl('/assets/cesium/');
+
+const viewer = new Cesium.Viewer('#cesium', {
+    sceneMode: Cesium.SceneMode.COLUMBUS_VIEW,
+    imageryProvider: new Cesium.IonImageryProvider({ assetId: 3845 }),
+    baseLayerPicker: false,
+    geocoder: false,
+});
+
+const midnight = Cesium.JulianDate.fromDate(new Date(2018, 5, 14));
+const prop = new Cesium.SampledPositionProperty();
+
+const pos = Cesium.Cartesian3.fromDegrees(1, 2, 3);
+const time = Cesium.JulianDate.addSeconds(midnight, 12345, new Cesium.JulianDate());
+prop.addSample(time, pos);
+viewer.entities.add(new Cesium.Entity({
+    position: pos,
+    point: new Cesium.PointGraphics({
+        color: Cesium.Color.fromCssColorString('#123123'),
+        pixelSize: 2
+    })
+}));
+
+const objStart = Cesium.JulianDate.addSeconds(midnight, 12340, new Cesium.JulianDate());
+const objStop = Cesium.JulianDate.addSeconds(midnight, 12350, new Cesium.JulianDate());
+
+const entity = new Cesium.Entity({
+    name: 'TEST',
+    availability: new Cesium.TimeIntervalCollection([
+        new Cesium.TimeInterval({
+            start: objStart,
+            stop: objStop
+        })
+    ]),
+    position: prop,
+    orientation: new Cesium.VelocityOrientationProperty(prop),
+    path: new Cesium.PathGraphics({
+        resolution: 5,
+        width: 3,
+        material: new Cesium.ColorMaterialProperty(Cesium.Color.fromCssColorString('#223344')),
+        leadTime: 0
+    }),
+    model: new Cesium.ModelGraphics({
+        uri: 'http://assets.agi.com/models/rv1.gltf',
+        minimumPixelSize: 48
+    })
+});
+viewer.entities.add(entity);
diff --git a/types/cesium/tsconfig.json b/types/cesium/tsconfig.json
index 71e6b79545..e8c231d442 100644
--- a/types/cesium/tsconfig.json
+++ b/types/cesium/tsconfig.json
@@ -18,6 +18,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "test/cesium-global.test.ts"
     ]
 }

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 0588/1124] 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 0589/1124] 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 0590/1124] 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 0591/1124] 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 0592/1124] 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 0593/1124] 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 0594/1124] 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 a761e4477db0d7ab909a8f58acd44af217839fb9 Mon Sep 17 00:00:00 2001
From: Ali Afroozeh <ali.afroozeh@mendix.com>
Date: Tue, 22 May 2018 22:02:52 +0200
Subject: [PATCH 0595/1124] Add ReadyState typing as static fields

---
 types/eventsource/eventsource-tests.ts               | 12 ++++++++++++
 types/eventsource/index.d.ts                         |  5 +++++
 .../eventsource/lib/eventsource-polyfill/index.d.ts  |  5 +++++
 3 files changed, 22 insertions(+)

diff --git a/types/eventsource/eventsource-tests.ts b/types/eventsource/eventsource-tests.ts
index 3cef9cfc78..c1b53030cd 100644
--- a/types/eventsource/eventsource-tests.ts
+++ b/types/eventsource/eventsource-tests.ts
@@ -2,6 +2,12 @@ import EventSource = require("eventsource");
 
 const eventSource = new EventSource("http://foobar");
 let readyState: number = eventSource.readyState;
+let closedState: number = eventSource.CLOSED;
+closedState = EventSource.CLOSED;
+let connectingState: number = eventSource.CONNECTING;
+connectingState = EventSource.CONNECTING;
+let openState: number = eventSource.OPEN;
+openState = EventSource.OPEN;
 let url: string = eventSource.url;
 let withCredentials: boolean = eventSource.withCredentials;
 eventSource.onmessage = (event: Event) => {};
@@ -16,6 +22,12 @@ import EventSourcePolyfill = require("eventsource/lib/eventsource-polyfill");
 
 const eventSourcePolyfill = new EventSourcePolyfill("http://foobar");
 readyState = eventSourcePolyfill.readyState;
+closedState = eventSource.CLOSED;
+closedState = EventSource.CLOSED;
+connectingState = eventSource.CONNECTING;
+connectingState = EventSource.CONNECTING;
+openState = eventSource.OPEN;
+openState = EventSource.OPEN;
 url = eventSourcePolyfill.url;
 withCredentials = eventSource.withCredentials;
 eventSourcePolyfill.onmessage = (event: Event) => {};
diff --git a/types/eventsource/index.d.ts b/types/eventsource/index.d.ts
index 613745e7a5..1308515917 100644
--- a/types/eventsource/index.d.ts
+++ b/types/eventsource/index.d.ts
@@ -6,7 +6,12 @@
 // TypeScript Version: 2.8
 
 declare class EventSource {
+  static readonly CLOSED: number;
+  static readonly CONNECTING: number;
+  static readonly OPEN: number;
+
   constructor(url: string, eventSourceInitDict?: EventSource.EventSourceInitDict);
+
   readonly CLOSED: number;
   readonly CONNECTING: number;
   readonly OPEN: number;
diff --git a/types/eventsource/lib/eventsource-polyfill/index.d.ts b/types/eventsource/lib/eventsource-polyfill/index.d.ts
index 1d4347d0aa..86b82105cc 100644
--- a/types/eventsource/lib/eventsource-polyfill/index.d.ts
+++ b/types/eventsource/lib/eventsource-polyfill/index.d.ts
@@ -1,5 +1,10 @@
 declare class EventSource {
+  static readonly CLOSED: number;
+  static readonly CONNECTING: number;
+  static readonly OPEN: number;
+
   constructor(url: string, eventSourceInitDict?: EventSource.EventSourceInitDict);
+
   readonly CLOSED: number;
   readonly CONNECTING: number;
   readonly OPEN: number;

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 0596/1124] [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 0597/1124] 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 0598/1124] 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 0599/1124] 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 0600/1124] 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 0601/1124] 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 0602/1124] 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 0603/1124] 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 0604/1124] 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 0605/1124] 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 0606/1124] 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 0607/1124] 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 0608/1124] 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 0609/1124] 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 0610/1124] 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 0611/1124] 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 e0d51f9360e50d0d25c77dc0d32cb09d14707c6a Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 23 May 2018 13:33:37 +0200
Subject: [PATCH 0612/1124] Declare root namespace for chrome apps

---
 types/chrome-apps/index.d.ts | 9559 +++++++++++++++++-----------------
 1 file changed, 4778 insertions(+), 4781 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index ca17f75e1d..065771379a 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -10,11 +10,8 @@
 ////////////////////
 // Global object
 ////////////////////
-interface Window {
-    chrome: typeof chrome;
-}
-declare module 'chrome' {}
 
+declare namespace chrome {}
 ////////////////////
 // Accessibility Features
 ////////////////////
@@ -25,89 +22,89 @@ declare module 'chrome' {}
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.accessibilityFeatures {
-    export interface AccessibilityFeaturesGetArg {
-        /** Optional. Whether to return the value that applies to the incognito session (default false).  */
-        incognito?: boolean;
-    }
+  export interface AccessibilityFeaturesGetArg {
+    /** Optional. Whether to return the value that applies to the incognito session (default false).  */
+    incognito?: boolean;
+  }
 
-    export interface AccessibilityFeaturesCallbackArg {
-        /** The value of the setting. */
-        value: any;
-        /**
-         * One of
-         * • not_controllable: cannot be controlled by any extension
-         * • controlled_by_other_extensions: controlled by extensions with higher precedence
-         * • controllable_by_this_extension: can be controlled by this extension
-         * • controlled_by_this_extension: controlled by this extension
-         */
-        levelOfControl: string;
-        /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
-        incognitoSpecific?: boolean;
-    }
+  export interface AccessibilityFeaturesCallbackArg {
+    /** The value of the setting. */
+    value: any;
+    /**
+     * One of
+     * • not_controllable: cannot be controlled by any extension
+     * • controlled_by_other_extensions: controlled by extensions with higher precedence
+     * • controllable_by_this_extension: can be controlled by this extension
+     * • controlled_by_this_extension: controlled by this extension
+     */
+    levelOfControl: string;
+    /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
+    incognitoSpecific?: boolean;
+  }
 
-    export interface AccessibilityFeaturesSetArg {
-        /**
-         * The value of the setting.
-         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-         */
-        value: any;
-        /**
-         * Optional.
-          * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
-    }
+  export interface AccessibilityFeaturesSetArg {
+    /**
+     * The value of the setting.
+     * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+     */
+    value: any;
+    /**
+     * Optional.
+      * The scope of the ChromeSetting. One of
+     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+     */
+    scope?: string;
+  }
 
-    export interface AccessibilityFeaturesClearArg {
-        /**
-         * Optional.
-          * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
-    }
+  export interface AccessibilityFeaturesClearArg {
+    /**
+     * Optional.
+      * The scope of the ChromeSetting. One of
+     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+     */
+    scope?: string;
+  }
 
-    export interface AccessibilityFeaturesSetting {
-        /**
-         * Gets the value of a setting.
-         * @param details Which setting to consider.
-         * @param callback The callback parameter should be a function that looks like this:
-         * function(object details) {...};
-         */
-        get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
-        /**
-         * Sets the value of a setting.
-         * @param details Which setting to change.
-         * @param callback Called at the completion of the set operation.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
-        /**
-         * Clears the setting, restoring any default value.
-         * @param details Which setting to clear.
-         * @param callback Called at the completion of the clear operation.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
-    }
+  export interface AccessibilityFeaturesSetting {
+    /**
+     * Gets the value of a setting.
+     * @param details Which setting to consider.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function(object details) {...};
+     */
+    get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
+    /**
+     * Sets the value of a setting.
+     * @param details Which setting to change.
+     * @param callback Called at the completion of the set operation.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
+    /**
+     * Clears the setting, restoring any default value.
+     * @param details Which setting to clear.
+     * @param callback Called at the completion of the clear operation.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
+  }
 
-    export var spokenFeedback: AccessibilityFeaturesSetting;
-    export var largeCursor: AccessibilityFeaturesSetting;
-    export var stickyKeys: AccessibilityFeaturesSetting;
-    export var highContrast: AccessibilityFeaturesSetting;
-    export var screenMagnifier: AccessibilityFeaturesSetting;
-    export var autoclick: AccessibilityFeaturesSetting;
-    export var virtualKeyboard: AccessibilityFeaturesSetting;
-    export var animationPolicy: AccessibilityFeaturesSetting;
+  export var spokenFeedback: AccessibilityFeaturesSetting;
+  export var largeCursor: AccessibilityFeaturesSetting;
+  export var stickyKeys: AccessibilityFeaturesSetting;
+  export var highContrast: AccessibilityFeaturesSetting;
+  export var screenMagnifier: AccessibilityFeaturesSetting;
+  export var autoclick: AccessibilityFeaturesSetting;
+  export var virtualKeyboard: AccessibilityFeaturesSetting;
+  export var animationPolicy: AccessibilityFeaturesSetting;
 }
 
 ////////////////////
@@ -119,82 +116,82 @@ declare namespace chrome.accessibilityFeatures {
  * Permissions:  "alarms"
  */
 declare namespace chrome.alarms {
-    export interface AlarmCreateInfo {
-        /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
-        delayInMinutes?: number;
-        /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
-        periodInMinutes?: number;
-        /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
-        when?: number;
-    }
+  export interface AlarmCreateInfo {
+    /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
+    delayInMinutes?: number;
+    /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
+    periodInMinutes?: number;
+    /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
+    when?: number;
+  }
 
-    export interface Alarm {
-        /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
-        periodInMinutes?: number;
-        /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
-        scheduledTime: number;
-        /** Name of this alarm. */
-        name: string;
-    }
+  export interface Alarm {
+    /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
+    periodInMinutes?: number;
+    /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
+    scheduledTime: number;
+    /** Name of this alarm. */
+    name: string;
+  }
 
-    export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
+  export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
 
-    /**
-     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-     */
-    export function create(alarmInfo: AlarmCreateInfo): void;
-    /**
-     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-     * @param name Optional name to identify this alarm. Defaults to the empty string.
-     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-     */
-    export function create(name: string, alarmInfo: AlarmCreateInfo): void;
-    /**
-     * Gets an array of all the alarms.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function(array of Alarm alarms) {...};
-     */
-    export function getAll(callback: (alarms: Alarm[]) => void): void;
-    /**
-     * Clears all alarms.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clearAll(callback?: (wasCleared: boolean) => void): void;
-    /**
-     * Clears the alarm with the given name.
-     * @param name The name of the alarm to clear. Defaults to the empty string.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
-    /**
-     * Clears the alarm without a name.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clear(callback: (wasCleared: boolean) => void): void;
-    /**
-     * Retrieves details about the specified alarm.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( Alarm alarm) {...};
-     */
-    export function get(callback: (alarm: Alarm) => void): void;
-    /**
-     * Retrieves details about the specified alarm.
-     * @param name The name of the alarm to get. Defaults to the empty string.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( Alarm alarm) {...};
-     */
-    export function get(name: string, callback: (alarm: Alarm) => void): void;
+  /**
+   * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+   * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+   * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+   * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+   */
+  export function create(alarmInfo: AlarmCreateInfo): void;
+  /**
+   * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+   * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+   * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+   * @param name Optional name to identify this alarm. Defaults to the empty string.
+   * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+   */
+  export function create(name: string, alarmInfo: AlarmCreateInfo): void;
+  /**
+   * Gets an array of all the alarms.
+   * @param callback The callback parameter should be a function that looks like this:
+   * function(array of Alarm alarms) {...};
+   */
+  export function getAll(callback: (alarms: Alarm[]) => void): void;
+  /**
+   * Clears all alarms.
+   * @param callback If you specify the callback parameter, it should be a function that looks like this:
+   * function(boolean wasCleared) {...};
+   */
+  export function clearAll(callback?: (wasCleared: boolean) => void): void;
+  /**
+   * Clears the alarm with the given name.
+   * @param name The name of the alarm to clear. Defaults to the empty string.
+   * @param callback If you specify the callback parameter, it should be a function that looks like this:
+   * function(boolean wasCleared) {...};
+   */
+  export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
+  /**
+   * Clears the alarm without a name.
+   * @param callback If you specify the callback parameter, it should be a function that looks like this:
+   * function(boolean wasCleared) {...};
+   */
+  export function clear(callback: (wasCleared: boolean) => void): void;
+  /**
+   * Retrieves details about the specified alarm.
+   * @param callback The callback parameter should be a function that looks like this:
+   * function( Alarm alarm) {...};
+   */
+  export function get(callback: (alarm: Alarm) => void): void;
+  /**
+   * Retrieves details about the specified alarm.
+   * @param name The name of the alarm to get. Defaults to the empty string.
+   * @param callback The callback parameter should be a function that looks like this:
+   * function( Alarm alarm) {...};
+   */
+  export function get(name: string, callback: (alarm: Alarm) => void): void;
 
-    /** Fired when an alarm has elapsed. Useful for event pages. */
-    export var onAlarm: AlarmEvent;
+  /** Fired when an alarm has elapsed. Useful for event pages. */
+  export var onAlarm: AlarmEvent;
 }
 
 
@@ -202,11 +199,11 @@ declare namespace chrome.alarms {
 // App
 ////////////////////
 declare namespace chrome.app {
-    export interface AppDetails extends chrome.runtime.Manifest {
-        id: string;
-    }
+  export interface AppDetails extends chrome.runtime.Manifest {
+    id: string;
+  }
 
-    export function getDetails(): AppDetails;
+  export function getDetails(): AppDetails;
 }
 
 export type GenericEvent = Event;
@@ -215,155 +212,155 @@ export type GenericEvent = Event;
 // App Runtime
 ////////////////////
 declare namespace chrome.app.runtime {
-    type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
-        'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
-        'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
-        'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
+  type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
+    'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
+    'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
+    'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
 
-    interface LaunchData {
-        id?: string;
-        items?: LaunchDataItem[];
-        url?: string;
-        referrerUrl?: string;
-        isKioskSession?: boolean;
-        isPublicSession?: boolean;
-        source?: LaunchSource;
-        actionData?: {};
-    }
+  interface LaunchData {
+    id?: string;
+    items?: LaunchDataItem[];
+    url?: string;
+    referrerUrl?: string;
+    isKioskSession?: boolean;
+    isPublicSession?: boolean;
+    source?: LaunchSource;
+    actionData?: {};
+  }
 
-    export interface LaunchDataItem {
-        entry: FileEntry;
-        type: string;
-    }
+  export interface LaunchDataItem {
+    entry: FileEntry;
+    type: string;
+  }
 
-    export interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
+  export interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
 
-    export interface RestartedEvent extends chrome.events.Event<() => void> { }
+  export interface RestartedEvent extends chrome.events.Event<() => void> { }
 
-    export var onLaunched: LaunchedEvent;
-    export var onRestarted: RestartedEvent;
+  export var onLaunched: LaunchedEvent;
+  export var onRestarted: RestartedEvent;
 }
 
 ////////////////////
 // App Window
 ////////////////////
 declare namespace chrome.app.window {
-    export interface ContentBounds {
-        left?: number;
-        top?: number;
-        width?: number;
-        height?: number;
-    }
+  export interface ContentBounds {
+    left?: number;
+    top?: number;
+    width?: number;
+    height?: number;
+  }
 
-    export interface BoundsSpecification {
-        left?: number;
-        top?: number;
-        width?: number;
-        height?: number;
-        minWidth?: number;
-        minHeight?: number;
-        maxWidth?: number;
-        maxHeight?: number;
-    }
+  export interface BoundsSpecification {
+    left?: number;
+    top?: number;
+    width?: number;
+    height?: number;
+    minWidth?: number;
+    minHeight?: number;
+    maxWidth?: number;
+    maxHeight?: number;
+  }
 
-    export interface Bounds {
-        left: number;
-        top: number;
-        width: number;
-        height: number;
-        minWidth?: number;
-        minHeight?: number;
-        maxWidth?: number;
-        maxHeight?: number;
-        setPosition(left: number, top: number): void;
-        setSize(width: number, height: number): void;
-        setMinimumSize(minWidth: number, minHeight: number): void;
-        setMaximumSize(maxWidth: number, maxHeight: number): void;
-    }
-    export interface FrameOptions {
-        type?: string;
-        color?: string;
-        activeColor?: string;
-        inactiveColor?: string;
-    }
+  export interface Bounds {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+    minWidth?: number;
+    minHeight?: number;
+    maxWidth?: number;
+    maxHeight?: number;
+    setPosition(left: number, top: number): void;
+    setSize(width: number, height: number): void;
+    setMinimumSize(minWidth: number, minHeight: number): void;
+    setMaximumSize(maxWidth: number, maxHeight: number): void;
+  }
+  export interface FrameOptions {
+    type?: string;
+    color?: string;
+    activeColor?: string;
+    inactiveColor?: string;
+  }
 
-    export interface CreateWindowOptions {
-        id?: string;
-        innerBounds?: BoundsSpecification;
-        outerBounds?: BoundsSpecification;
-        minWidth?: number;
-        minHeight?: number;
-        maxWidth?: number;
-        maxHeight?: number;
-        /**
-         * @description
-         * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
-         * @memberof CreateWindowOptions
-         */
-        frame?: string | FrameOptions;
-        bounds?: ContentBounds;
-        alphaEnabled?: boolean;
-        /**
-         * @description
-         * @type {string} "normal", "fullscreen", "maximized", "minimized"
-         * @memberof CreateWindowOptions
-         */
-        state?: string;
-        hidden?: boolean;
-        resizable?: boolean;
-        singleton?: boolean;
-        alwaysOnTop?: boolean;
-        focused?: boolean;
-        visibleOnAllWorkspaces?: boolean;
-    }
+  export interface CreateWindowOptions {
+    id?: string;
+    innerBounds?: BoundsSpecification;
+    outerBounds?: BoundsSpecification;
+    minWidth?: number;
+    minHeight?: number;
+    maxWidth?: number;
+    maxHeight?: number;
+    /**
+     * @description
+     * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
+     * @memberof CreateWindowOptions
+     */
+    frame?: string | FrameOptions;
+    bounds?: ContentBounds;
+    alphaEnabled?: boolean;
+    /**
+     * @description
+     * @type {string} "normal", "fullscreen", "maximized", "minimized"
+     * @memberof CreateWindowOptions
+     */
+    state?: string;
+    hidden?: boolean;
+    resizable?: boolean;
+    singleton?: boolean;
+    alwaysOnTop?: boolean;
+    focused?: boolean;
+    visibleOnAllWorkspaces?: boolean;
+  }
 
-    export interface AppWindow {
-        focus: () => void;
-        fullscreen: () => void;
-        isFullscreen: () => boolean;
-        minimize: () => void;
-        isMinimized: () => boolean;
-        maximize: () => void;
-        isMaximized: () => boolean;
-        restore: () => void;
-        moveTo: (left: number, top: number) => void;
-        resizeTo: (width: number, height: number) => void;
-        drawAttention: () => void;
-        clearAttention: () => void;
-        close: () => void;
-        show: () => void;
-        hide: () => void;
-        getBounds: () => ContentBounds;
-        setBounds: (bounds: ContentBounds) => void;
-        isAlwaysOnTop: () => boolean;
-        setAlwaysOnTop: (alwaysOnTop: boolean) => void;
-        setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
-        contentWindow: Window;
-        id: string;
-        innerBounds: Bounds;
-        outerBounds: Bounds;
-        onBoundsChanged: WindowEvent;
-        onClosed: WindowEvent;
-        onFullscreened: WindowEvent;
-        onMaximized: WindowEvent;
-        onMinimized: WindowEvent;
-        onRestored: WindowEvent;
-    }
+  export interface AppWindow {
+    focus: () => void;
+    fullscreen: () => void;
+    isFullscreen: () => boolean;
+    minimize: () => void;
+    isMinimized: () => boolean;
+    maximize: () => void;
+    isMaximized: () => boolean;
+    restore: () => void;
+    moveTo: (left: number, top: number) => void;
+    resizeTo: (width: number, height: number) => void;
+    drawAttention: () => void;
+    clearAttention: () => void;
+    close: () => void;
+    show: () => void;
+    hide: () => void;
+    getBounds: () => ContentBounds;
+    setBounds: (bounds: ContentBounds) => void;
+    isAlwaysOnTop: () => boolean;
+    setAlwaysOnTop: (alwaysOnTop: boolean) => void;
+    setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
+    contentWindow: Window;
+    id: string;
+    innerBounds: Bounds;
+    outerBounds: Bounds;
+    onBoundsChanged: WindowEvent;
+    onClosed: WindowEvent;
+    onFullscreened: WindowEvent;
+    onMaximized: WindowEvent;
+    onMinimized: WindowEvent;
+    onRestored: WindowEvent;
+  }
 
-    export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
-    export function current(): AppWindow;
-    export function get(id: string): AppWindow;
-    export function getAll(): AppWindow[];
-    export function canSetVisibleOnAllWorkspaces(): boolean;
+  export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
+  export function current(): AppWindow;
+  export function get(id: string): AppWindow;
+  export function getAll(): AppWindow[];
+  export function canSetVisibleOnAllWorkspaces(): boolean;
 
-    export interface WindowEvent extends chrome.events.Event<() => void> { }
+  export interface WindowEvent extends chrome.events.Event<() => void> { }
 
-    export var onBoundsChanged: WindowEvent;
-    export var onClosed: WindowEvent;
-    export var onFullscreened: WindowEvent;
-    export var onMaximized: WindowEvent;
-    export var onMinimized: WindowEvent;
-    export var onRestored: WindowEvent;
+  export var onBoundsChanged: WindowEvent;
+  export var onClosed: WindowEvent;
+  export var onFullscreened: WindowEvent;
+  export var onMaximized: WindowEvent;
+  export var onMinimized: WindowEvent;
+  export var onRestored: WindowEvent;
 }
 
 
@@ -375,120 +372,120 @@ declare namespace chrome.app.window {
  * @since Chrome 59
  */
 declare namespace chrome.audio {
-    export type StreamType = 'INPUT' | 'OUTPUT';
-    export interface AudioDeviceInfo {
-        /** The unique identifier of the audio device. */
-        id: string;
-        /** Stream type associated with this device. */
-        streamType: StreamType;
-        /** Type of the device. */
-        deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
-        /** The user-friendly name (e.g. "USB Microphone"). */
-        displayName: string;
-        /** Device name. */
-        deviceName: string;
-        /** True if this is the current active device. */
-        isActive: boolean;
-        /** The sound level of the device, volume for output, gain for input. */
-        level: number;
-        /** The stable/persisted device id string when available. */
-        stableDeviceId?: string;
-    }
-    export interface DeviceIdLists {
-        /**
-         * List of input devices specified by their ID.
-         * To indicate input devices should be unaffected, leave this property unset.
-         */
-        input?: string[];
-        /**
-         * List of output devices specified by their ID.
-         * To indicate output devices should be unaffected, leave this property unset.
-         */
-        output?: string[];
-    }
-    export interface SetDeviceProperties {
-        /**
-         * The audio device's desired sound level. Defaults to the device's current sound level.
-         * If used with audio input device, represents audio device gain.
-         * If used with audio output device, represents audio device volume.
-         *
-         * Type: integer
-         */
-        level?: number;
-    }
-    export interface OnLevelChangedEvent {
-        /**
-         * The callback parameter should be a function that looks like this:
-         *   function(object event) {...};
-         * @param {(event: {
-         *             deviceId: string,
-         *             level: number
-         *         }) => void} callback
-         */
-        addListener(callback: (event: {
-            deviceId: string,
-            level: number
-        }) => void): void;
-    }
-    export interface OnMuteChangedEvent {
-        /**
-         * The callback parameter should be a function that looks like this:
-         * function(object event) {...};
-         */
-        addListener(callback: (event: {
-            streamType: StreamType[],
-            isMuted: boolean
-        }) => void): void;
-    }
-    export interface OnDeviceListChangedEvent {
-        /**
-         * The callback parameter should be a function that looks like this:
-         *   function(array of AudioDeviceInfo devices) {...};
-         * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
-         */
-        addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
-    }
+  export type StreamType = 'INPUT' | 'OUTPUT';
+  export interface AudioDeviceInfo {
+    /** The unique identifier of the audio device. */
+    id: string;
+    /** Stream type associated with this device. */
+    streamType: StreamType;
+    /** Type of the device. */
+    deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
+    /** The user-friendly name (e.g. "USB Microphone"). */
+    displayName: string;
+    /** Device name. */
+    deviceName: string;
+    /** True if this is the current active device. */
+    isActive: boolean;
+    /** The sound level of the device, volume for output, gain for input. */
+    level: number;
+    /** The stable/persisted device id string when available. */
+    stableDeviceId?: string;
+  }
+  export interface DeviceIdLists {
     /**
-     * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
+     * List of input devices specified by their ID.
+     * To indicate input devices should be unaffected, leave this property unset.
      */
-    export interface Filter {
-        /**
-         * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
-         */
-        streamTypes?: StreamType[];
-        /**
-         * @description If set, only audio devices whose active state matches this value will satisfy the filter.
-         */
-        isActive?: boolean;
-    }
+    input?: string[];
     /**
-     * @description Gets a list of audio devices filtered based on |filter|.
+     * List of output devices specified by their ID.
+     * To indicate output devices should be unaffected, leave this property unset.
      */
-    export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => {});
-    export function getDevices(callback: (devices: AudioDeviceInfo[]) => {});
-    /** Sets lists of active input and/or output devices. */
-    export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void);
-    /** Sets the properties for the input or output device. */
-    export function setProperties(id: string, properties: SetDeviceProperties, callback: () => {});
+    output?: string[];
+  }
+  export interface SetDeviceProperties {
     /**
-     * @description Gets the system-wide mute state for the specified stream type.
-     * @param {StreamType} streamType Stream type for which mute state should be fetched.
-     * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
+     * The audio device's desired sound level. Defaults to the device's current sound level.
+     * If used with audio input device, represents audio device gain.
+     * If used with audio output device, represents audio device volume.
+     *
+     * Type: integer
      */
-    export function getMute(streamType: StreamType, callback: (value: boolean) => {});
+    level?: number;
+  }
+  export interface OnLevelChangedEvent {
     /**
-     * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
-     * @param {StreamType} streamType Stream type for which mute state should be set.
-     * @param {boolean} isMuted New mute value.
-     * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
+     * The callback parameter should be a function that looks like this:
+     *   function(object event) {...};
+     * @param {(event: {
+     *             deviceId: string,
+     *             level: number
+     *         }) => void} callback
      */
-    export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => {});
-    /** Fired when sound level changes for an active audio device. */
-    export var onLevelChanged: OnLevelChangedEvent;
-    /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
-    export var onMuteChanged: OnMuteChangedEvent;
-    /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
-    export var onDeviceListChanged: OnDeviceListChangedEvent;
+    addListener(callback: (event: {
+      deviceId: string,
+      level: number
+    }) => void): void;
+  }
+  export interface OnMuteChangedEvent {
+    /**
+     * The callback parameter should be a function that looks like this:
+     * function(object event) {...};
+     */
+    addListener(callback: (event: {
+      streamType: StreamType[],
+      isMuted: boolean
+    }) => void): void;
+  }
+  export interface OnDeviceListChangedEvent {
+    /**
+     * The callback parameter should be a function that looks like this:
+     *   function(array of AudioDeviceInfo devices) {...};
+     * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
+     */
+    addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
+  }
+  /**
+   * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
+   */
+  export interface Filter {
+    /**
+     * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
+     */
+    streamTypes?: StreamType[];
+    /**
+     * @description If set, only audio devices whose active state matches this value will satisfy the filter.
+     */
+    isActive?: boolean;
+  }
+  /**
+   * @description Gets a list of audio devices filtered based on |filter|.
+   */
+  export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => {});
+  export function getDevices(callback: (devices: AudioDeviceInfo[]) => {});
+  /** Sets lists of active input and/or output devices. */
+  export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void);
+  /** Sets the properties for the input or output device. */
+  export function setProperties(id: string, properties: SetDeviceProperties, callback: () => {});
+  /**
+   * @description Gets the system-wide mute state for the specified stream type.
+   * @param {StreamType} streamType Stream type for which mute state should be fetched.
+   * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
+   */
+  export function getMute(streamType: StreamType, callback: (value: boolean) => {});
+  /**
+   * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
+   * @param {StreamType} streamType Stream type for which mute state should be set.
+   * @param {boolean} isMuted New mute value.
+   * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
+   */
+  export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => {});
+  /** Fired when sound level changes for an active audio device. */
+  export var onLevelChanged: OnLevelChangedEvent;
+  /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
+  export var onMuteChanged: OnMuteChangedEvent;
+  /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
+  export var onDeviceListChanged: OnDeviceListChangedEvent;
 }
 
 ////////////////////
@@ -500,81 +497,81 @@ declare namespace chrome.audio {
  * @since Chrome 37
  */
 declare namespace chrome.bluetooth {
-    export interface AdapterState {
-        address: string;
-        name: string;
-        powered: boolean;
-        available: boolean;
-        discovering: boolean;
-    }
-    export interface Device {
-        address: string;
-        name?: string;
-        deviceClass?: number;
-        vendorIdSource?: 'bluetooth' | 'usb';
-        vendorId?: number;
-        productId?: number;
-        deviceId?: number;
-        type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
-        paired?: boolean;
-        connected?: boolean;
-        /**
-         * @since Chrome 48
-         */
-        connecting?: boolean;
-        /**
-         * @since Chrome 48
-         */
-        connectable?: boolean;
-        uuids?: string[];
-        /**
-         * @since Chrome 44
-         */
-        inquiryRssi: number;
-        /**
-         * @since Chrome 44
-         */
-        inquiryTxPower: number;
-    }
+  export interface AdapterState {
+    address: string;
+    name: string;
+    powered: boolean;
+    available: boolean;
+    discovering: boolean;
+  }
+  export interface Device {
+    address: string;
+    name?: string;
+    deviceClass?: number;
+    vendorIdSource?: 'bluetooth' | 'usb';
+    vendorId?: number;
+    productId?: number;
+    deviceId?: number;
+    type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
+    paired?: boolean;
+    connected?: boolean;
+    /**
+     * @since Chrome 48
+     */
+    connecting?: boolean;
+    /**
+     * @since Chrome 48
+     */
+    connectable?: boolean;
+    uuids?: string[];
+    /**
+     * @since Chrome 44
+     */
+    inquiryRssi: number;
+    /**
+     * @since Chrome 44
+     */
+    inquiryTxPower: number;
+  }
 
-    export interface BluetoothEvent<T> {
-        addListener(callback: (event: T) => void);
-    }
+  export interface BluetoothEvent<T> {
+    addListener(callback: (event: T) => void);
+  }
 
-    /**
-     * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
-     */
-    export interface DeviceFilter {
-        /** Type of filter to apply to the device list. Default is all. */
-        filterType?: 'all' | 'known';
-        /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
-        limit?: number;
-    }
-    /** Get information about the Bluetooth adapter. */
-    export function getAdapterState(callback: (adapterInfo: AdapterState) => void);
-    /** Get information about a Bluetooth device known to the system. */
-    export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void);
-    /**
-     * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
-     * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
-     * @param callback Called when the search is completed.
-     */
-    export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void);
-    /**
-     * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
-     * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
-     */
-    export function startDiscovery(callback: () => void);
-    /** Stop discovery. */
-    export function stopDiscovery(callback: () => void);
-    /** Fired when the state of the Bluetooth adapter changes. */
-    export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
-    /** Fired when information about a new Bluetooth device is available. */
-    export var onDeviceAdded: BluetoothEvent<Device>;
-    /** Fired when information about a known Bluetooth device has changed. */
-    export var onDeviceChanged: BluetoothEvent<Device>;
-    /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
-    export var onDeviceRemoved: BluetoothEvent<Device>;
+  /**
+   * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+   */
+  export interface DeviceFilter {
+    /** Type of filter to apply to the device list. Default is all. */
+    filterType?: 'all' | 'known';
+    /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
+    limit?: number;
+  }
+  /** Get information about the Bluetooth adapter. */
+  export function getAdapterState(callback: (adapterInfo: AdapterState) => void);
+  /** Get information about a Bluetooth device known to the system. */
+  export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void);
+  /**
+   * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
+   * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+   * @param callback Called when the search is completed.
+   */
+  export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void);
+  /**
+   * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
+   * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
+   */
+  export function startDiscovery(callback: () => void);
+  /** Stop discovery. */
+  export function stopDiscovery(callback: () => void);
+  /** Fired when the state of the Bluetooth adapter changes. */
+  export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
+  /** Fired when information about a new Bluetooth device is available. */
+  export var onDeviceAdded: BluetoothEvent<Device>;
+  /** Fired when information about a known Bluetooth device has changed. */
+  export var onDeviceChanged: BluetoothEvent<Device>;
+  /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
+  export var onDeviceRemoved: BluetoothEvent<Device>;
 }
 /**
  * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
@@ -584,10 +581,10 @@ declare namespace chrome.bluetooth {
  * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
  */
 declare namespace chrome.bluetoothLowEnergy {
-    /**
-     * NOT IMPLEMENTED YET
-     * @see https://developer.chrome.com/apps/bluetoothLowEnergy
-     * */
+  /**
+   * NOT IMPLEMENTED YET
+   * @see https://developer.chrome.com/apps/bluetoothLowEnergy
+   * */
 }
 /**
  * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
@@ -596,7 +593,7 @@ declare namespace chrome.bluetoothLowEnergy {
  * Important: This API works only on OS X, Windows and Chrome OS.
  */
 declare namespace chrome.bluetoothSocket {
-    /** NOT IMPLEMENTED YET */
+  /** NOT IMPLEMENTED YET */
 }
 
 ////////////////////
@@ -607,28 +604,28 @@ declare namespace chrome.bluetoothSocket {
  * the current application and Chrome profile.
  */
 declare namespace chrome.browser {
-    export interface Options {
-        /** The URL to navigate to when the new tab is initially opened. */
-        url: string;
-    }
+  export interface Options {
+    /** The URL to navigate to when the new tab is initially opened. */
+    url: string;
+  }
 
-    /**
-     * Opens a new tab in a browser window associated with the current application
-     * and Chrome profile. If no browser window for the Chrome profile is opened,
-     * a new one is opened prior to creating the new tab.
-     * @param options Configures how the tab should be opened.
-     * @param callback Called when the tab was successfully
-     * created, or failed to be created. If failed, runtime.lastError will be set.
-     */
-    export function openTab(options: Options, callback: () => void): void;
+  /**
+   * Opens a new tab in a browser window associated with the current application
+   * and Chrome profile. If no browser window for the Chrome profile is opened,
+   * a new one is opened prior to creating the new tab.
+   * @param options Configures how the tab should be opened.
+   * @param callback Called when the tab was successfully
+   * created, or failed to be created. If failed, runtime.lastError will be set.
+   */
+  export function openTab(options: Options, callback: () => void): void;
 
-    /**
-    * Opens a new tab in a browser window associated with the current application
-    * and Chrome profile. If no browser window for the Chrome profile is opened,
-    * a new one is opened prior to creating the new tab. Since Chrome 42 only.
-    * @param options Configures how the tab should be opened.
-    */
-    export function openTab(options: Options): void;
+  /**
+  * Opens a new tab in a browser window associated with the current application
+  * and Chrome profile. If no browser window for the Chrome profile is opened,
+  * a new one is opened prior to creating the new tab. Since Chrome 42 only.
+  * @param options Configures how the tab should be opened.
+  */
+  export function openTab(options: Options): void;
 }
 
 ////////////////////
@@ -640,27 +637,27 @@ declare namespace chrome.browser {
  * Manifest:  "commands": {...}
  */
 declare namespace chrome.commands {
-    export interface Command {
-        /** Optional. The name of the Extension Command  */
-        name?: string;
-        /** Optional. The Extension Command description  */
-        description?: string;
-        /** Optional. The shortcut active for this command, or blank if not active.  */
-        shortcut?: string;
-    }
+  export interface Command {
+    /** Optional. The name of the Extension Command  */
+    name?: string;
+    /** Optional. The Extension Command description  */
+    description?: string;
+    /** Optional. The shortcut active for this command, or blank if not active.  */
+    shortcut?: string;
+  }
 
-    export interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
+  export interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
 
-    /**
-     * Returns all the registered extension commands for this extension and their shortcut (if active).
-     * @param callback Called to return the registered commands.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(array of Command commands) {...};
-     */
-    export function getAll(callback: (commands: Command[]) => void): void;
+  /**
+   * Returns all the registered extension commands for this extension and their shortcut (if active).
+   * @param callback Called to return the registered commands.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function(array of Command commands) {...};
+   */
+  export function getAll(callback: (commands: Command[]) => void): void;
 
-    /** Fired when a registered command is activated using a keyboard shortcut. */
-    export var onCommand: CommandEvent;
+  /** Fired when a registered command is activated using a keyboard shortcut. */
+  export var onCommand: CommandEvent;
 }
 
 ////////////////////
@@ -672,204 +669,204 @@ declare namespace chrome.commands {
  * Permissions:  "contextMenus"
  */
 declare namespace chrome.contextMenus {
-    /**
-    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
-    **/
-    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
-    /**
-    * The type of menu item.
-    **/
-    export type ItemType = "normal" | "checkbox" | "radio" | "separator";
+  /**
+  * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
+  **/
+  export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
+  /**
+  * The type of menu item.
+  **/
+  export type ItemType = "normal" | "checkbox" | "radio" | "separator";
 
-    export interface OnClickData {
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * The text for the context selection, if any.
-         */
-        selectionText?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * A flag indicating the state of a checkbox or radio item after it is clicked.
-         */
-        checked?: boolean;
-        /**
-         * @since Since Chrome 35.
-         * The ID of the menu item that was clicked.
-         */
-        menuItemId: any;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
-         */
-        frameUrl?: string;
-        /**
-         * @since Since Chrome 35.
-         * A flag indicating whether the element is editable (text input, textarea, etc.).
-         */
-        editable: boolean;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
-         */
-        mediaType?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * A flag indicating the state of a checkbox or radio item before it was clicked.
-         */
-        wasChecked?: boolean;
-        /**
-         * @since Since Chrome 35.
-         * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
-         */
-        pageUrl: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * If the element is a link, the URL it points to.
-         */
-        linkUrl?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * The parent ID, if any, for the item clicked.
-         */
-        parentMenuItemId?: any;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * Will be present for elements with a 'src' URL.
-         */
-        srcUrl?: string;
-    }
+  export interface OnClickData {
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * The text for the context selection, if any.
+     */
+    selectionText?: string;
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * A flag indicating the state of a checkbox or radio item after it is clicked.
+     */
+    checked?: boolean;
+    /**
+     * @since Since Chrome 35.
+     * The ID of the menu item that was clicked.
+     */
+    menuItemId: any;
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
+     */
+    frameUrl?: string;
+    /**
+     * @since Since Chrome 35.
+     * A flag indicating whether the element is editable (text input, textarea, etc.).
+     */
+    editable: boolean;
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+     */
+    mediaType?: string;
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * A flag indicating the state of a checkbox or radio item before it was clicked.
+     */
+    wasChecked?: boolean;
+    /**
+     * @since Since Chrome 35.
+     * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
+     */
+    pageUrl: string;
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * If the element is a link, the URL it points to.
+     */
+    linkUrl?: string;
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * The parent ID, if any, for the item clicked.
+     */
+    parentMenuItemId?: any;
+    /**
+     * Optional.
+     * @since Since Chrome 35.
+     * Will be present for elements with a 'src' URL.
+     */
+    srcUrl?: string;
+  }
 
-    export interface CreateProperties {
-        /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
-        documentUrlPatterns?: string[];
-        /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
-        checked?: boolean;
-        /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
-        title?: string;
-        /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
-        contexts?: string[];
-        /**
-         * Optional.
-         * Whether this context menu item is enabled or disabled. Defaults to true.
-         * @since Since Chrome 20.
-         */
-        enabled?: boolean;
-        /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
-        targetUrlPatterns?: string[];
-        /**
-         * Optional.
-         * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
-         * @param info Information sent when a context menu item is clicked.
-         */
-        onclick?: (info: OnClickData) => void;
-        /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
-        parentId?: any;
-        /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
-        type?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 21.
-         * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-         */
-        id?: string;
-        /**
-         * @description Whether the item is visible in the menu.
-         * @since Since Chrome 62
-         */
-        visible?: boolean;
-    }
+  export interface CreateProperties {
+    /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
+    documentUrlPatterns?: string[];
+    /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
+    checked?: boolean;
+    /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
+    title?: string;
+    /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
+    contexts?: string[];
+    /**
+     * Optional.
+     * Whether this context menu item is enabled or disabled. Defaults to true.
+     * @since Since Chrome 20.
+     */
+    enabled?: boolean;
+    /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
+    targetUrlPatterns?: string[];
+    /**
+     * Optional.
+     * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+     * @param info Information sent when a context menu item is clicked.
+     */
+    onclick?: (info: OnClickData) => void;
+    /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
+    parentId?: any;
+    /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
+    type?: string;
+    /**
+     * Optional.
+     * @since Since Chrome 21.
+     * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+     */
+    id?: string;
+    /**
+     * @description Whether the item is visible in the menu.
+     * @since Since Chrome 62
+     */
+    visible?: boolean;
+  }
 
-    export interface UpdateProperties {
-        documentUrlPatterns?: string[];
-        checked?: boolean;
-        title?: string;
-        contexts?: string[];
-        /**
-         * @since Chrome 20
-         **/
-        enabled?: boolean;
-        targetUrlPatterns?: string[];
-        onclick?: Function;
-        /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
-        parentId?: any;
-        type?: string;
-        /**
-         * @description Whether the item is visible or not.
-         * @since Since Chrome 62
-         */
-        visible?: boolean;
-    }
+  export interface UpdateProperties {
+    documentUrlPatterns?: string[];
+    checked?: boolean;
+    title?: string;
+    contexts?: string[];
+    /**
+     * @since Chrome 20
+     **/
+    enabled?: boolean;
+    targetUrlPatterns?: string[];
+    onclick?: Function;
+    /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
+    parentId?: any;
+    type?: string;
+    /**
+     * @description Whether the item is visible or not.
+     * @since Since Chrome 62
+     */
+    visible?: boolean;
+  }
 
-    export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
+  export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
 
-    /**
-     * Since Chrome 38.
-     * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
-     */
-    export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
+  /**
+   * Since Chrome 38.
+   * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
+   */
+  export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
 
-    /**
-     * Removes all context menu items added by this extension.
-     * @param callback Called when removal is complete.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function removeAll(callback?: () => void): void;
-    /**
-     * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-     * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function create(createProperties: CreateProperties, callback?: () => void): void;
-    /**
-     * Updates a previously created context menu item.
-     * @param id The ID of the item to update.
-     * @param updateProperties The properties to update. Accepts the same values as the create function.
-     * @param callback Called when the context menu has been updated.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
-    /**
-     * Updates a previously created context menu item.
-     * @param id The ID of the item to update.
-     * @param updateProperties The properties to update. Accepts the same values as the create function.
-     * @param callback Called when the context menu has been updated.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
-    /**
-     * Removes a context menu item.
-     * @param menuItemId The ID of the context menu item to remove.
-     * @param callback Called when the context menu has been removed.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function remove(menuItemId: string, callback?: () => void): void;
-    /**
-     * Removes a context menu item.
-     * @param menuItemId The ID of the context menu item to remove.
-     * @param callback Called when the context menu has been removed.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function remove(menuItemId: number, callback?: () => void): void;
+  /**
+   * Removes all context menu items added by this extension.
+   * @param callback Called when removal is complete.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function removeAll(callback?: () => void): void;
+  /**
+   * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+   * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function create(createProperties: CreateProperties, callback?: () => void): void;
+  /**
+   * Updates a previously created context menu item.
+   * @param id The ID of the item to update.
+   * @param updateProperties The properties to update. Accepts the same values as the create function.
+   * @param callback Called when the context menu has been updated.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
+  /**
+   * Updates a previously created context menu item.
+   * @param id The ID of the item to update.
+   * @param updateProperties The properties to update. Accepts the same values as the create function.
+   * @param callback Called when the context menu has been updated.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
+  /**
+   * Removes a context menu item.
+   * @param menuItemId The ID of the context menu item to remove.
+   * @param callback Called when the context menu has been removed.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function remove(menuItemId: string, callback?: () => void): void;
+  /**
+   * Removes a context menu item.
+   * @param menuItemId The ID of the context menu item to remove.
+   * @param callback Called when the context menu has been removed.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function remove(menuItemId: number, callback?: () => void): void;
 
-    /**
-     * Since Chrome 21.
-     * Fired when a context menu item is clicked.
-     */
-    export var onClicked: MenuClickedEvent;
+  /**
+   * Since Chrome 21.
+   * Fired when a context menu item is clicked.
+   */
+  export var onClicked: MenuClickedEvent;
 
 }
 
@@ -883,171 +880,171 @@ declare namespace chrome.contextMenus {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.documentScan {
-    export interface DocumentScanOptions {
-        /** Optional. The MIME types that are accepted by the caller.  */
-        mimeTypes?: string[];
-        /** Optional. The number of scanned images allowed (defaults to 1).  */
-        maxImages?: number;
-    }
+  export interface DocumentScanOptions {
+    /** Optional. The MIME types that are accepted by the caller.  */
+    mimeTypes?: string[];
+    /** Optional. The number of scanned images allowed (defaults to 1).  */
+    maxImages?: number;
+  }
 
-    export interface DocumentScanCallbackArg {
-        /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
-        dataUrls: string[];
-        /** The MIME type of dataUrls. */
-        mimeType: string;
-    }
+  export interface DocumentScanCallbackArg {
+    /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
+    dataUrls: string[];
+    /** The MIME type of dataUrls. */
+    mimeType: string;
+  }
 
-    /**
-     * Performs a document scan. On success, the PNG data will be sent to the callback.
-     * @param options Object containing scan parameters.
-     * @param callback Called with the result and data from the scan.
-     * The callback parameter should be a function that looks like this:
-     * function(object result) {...};
-     */
-    export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
+  /**
+   * Performs a document scan. On success, the PNG data will be sent to the callback.
+   * @param options Object containing scan parameters.
+   * @param callback Called with the result and data from the scan.
+   * The callback parameter should be a function that looks like this:
+   * function(object result) {...};
+   */
+  export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
 }
 
 ////////////////////
 // Events
 ////////////////////
 /**
- * The chrome.events namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
+ * The chrome.events declare namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
  * Availability: Since Chrome 21.
  */
 declare namespace chrome.events {
-    /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
-    export interface UrlFilter {
-        /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-        schemes?: string[];
-        /**
-         * Optional.
-          * Since Chrome 23.
-         * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-         */
-        urlMatches?: string;
-        /** Optional. Matches if the path segment of the URL contains a specified string.  */
-        pathContains?: string;
-        /** Optional. Matches if the host name of the URL ends with a specified string.  */
-        hostSuffix?: string;
-        /** Optional. Matches if the host name of the URL starts with a specified string.  */
-        hostPrefix?: string;
-        /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
-        hostContains?: string;
-        /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlContains?: string;
-        /** Optional. Matches if the query segment of the URL ends with a specified string.  */
-        querySuffix?: string;
-        /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlPrefix?: string;
-        /** Optional. Matches if the host name of the URL is equal to a specified string.  */
-        hostEquals?: string;
-        /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlEquals?: string;
-        /** Optional. Matches if the query segment of the URL contains a specified string.  */
-        queryContains?: string;
-        /** Optional. Matches if the path segment of the URL starts with a specified string.  */
-        pathPrefix?: string;
-        /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-        pathEquals?: string;
-        /** Optional. Matches if the path segment of the URL ends with a specified string.  */
-        pathSuffix?: string;
-        /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-        queryEquals?: string;
-        /** Optional. Matches if the query segment of the URL starts with a specified string.  */
-        queryPrefix?: string;
-        /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlSuffix?: string;
-        /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-        ports?: any[];
-        /**
-         * Optional.
-          * Since Chrome 28.
-         * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-         */
-        originAndPathMatches?: string;
-    }
+  /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
+  export interface UrlFilter {
+    /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
+    schemes?: string[];
+    /**
+     * Optional.
+      * Since Chrome 23.
+     * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+     */
+    urlMatches?: string;
+    /** Optional. Matches if the path segment of the URL contains a specified string.  */
+    pathContains?: string;
+    /** Optional. Matches if the host name of the URL ends with a specified string.  */
+    hostSuffix?: string;
+    /** Optional. Matches if the host name of the URL starts with a specified string.  */
+    hostPrefix?: string;
+    /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
+    hostContains?: string;
+    /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+    urlContains?: string;
+    /** Optional. Matches if the query segment of the URL ends with a specified string.  */
+    querySuffix?: string;
+    /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+    urlPrefix?: string;
+    /** Optional. Matches if the host name of the URL is equal to a specified string.  */
+    hostEquals?: string;
+    /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+    urlEquals?: string;
+    /** Optional. Matches if the query segment of the URL contains a specified string.  */
+    queryContains?: string;
+    /** Optional. Matches if the path segment of the URL starts with a specified string.  */
+    pathPrefix?: string;
+    /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
+    pathEquals?: string;
+    /** Optional. Matches if the path segment of the URL ends with a specified string.  */
+    pathSuffix?: string;
+    /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
+    queryEquals?: string;
+    /** Optional. Matches if the query segment of the URL starts with a specified string.  */
+    queryPrefix?: string;
+    /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+    urlSuffix?: string;
+    /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
+    ports?: any[];
+    /**
+     * Optional.
+      * Since Chrome 28.
+     * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+     */
+    originAndPathMatches?: string;
+  }
 
-    /** An object which allows the addition and removal of listeners for a Chrome event. */
-    export interface Event<T> {
-        /**
-         * Registers an event listener callback to an event.
-         * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
-         * The callback parameter should be a function that looks like this:
-         * function() {...};
-         */
-        addListener(callback: T): void;
-        /**
-         * Returns currently registered rules.
-         * @param callback Called with registered rules.
-         * The callback parameter should be a function that looks like this:
-         * function(array of Rule rules) {...};
-         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-         */
-        getRules(callback: (rules: Rule[]) => void): void;
-        /**
-         * Returns currently registered rules.
-         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
-         * @param callback Called with registered rules.
-         * The callback parameter should be a function that looks like this:
-         * function(array of Rule rules) {...};
-         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-         */
-        getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
-        /**
-         * @param callback Listener whose registration status shall be tested.
-         */
-        hasListener(callback: T): boolean;
-        /**
-         * Unregisters currently registered rules.
-         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
-         * @param callback Called when rules were unregistered.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
-        /**
-         * Unregisters currently registered rules.
-         * @param callback Called when rules were unregistered.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        removeRules(callback?: () => void): void;
-        /**
-         * Registers rules to handle events.
-         * @param rules Rules to be registered. These do not replace previously registered rules.
-         * @param callback Called with registered rules.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(array of Rule rules) {...};
-         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-         */
-        addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
-        /**
-         * Deregisters an event listener callback from an event.
-         * @param callback Listener that shall be unregistered.
-         * The callback parameter should be a function that looks like this:
-         * function() {...};
-         */
-        removeListener(callback: T): void;
-        hasListeners(): boolean;
-    }
+  /** An object which allows the addition and removal of listeners for a Chrome event. */
+  export interface Event<T> {
+    /**
+     * Registers an event listener callback to an event.
+     * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
+     * The callback parameter should be a function that looks like this:
+     * function() {...};
+     */
+    addListener(callback: T): void;
+    /**
+     * Returns currently registered rules.
+     * @param callback Called with registered rules.
+     * The callback parameter should be a function that looks like this:
+     * function(array of Rule rules) {...};
+     * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+     */
+    getRules(callback: (rules: Rule[]) => void): void;
+    /**
+     * Returns currently registered rules.
+     * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+     * @param callback Called with registered rules.
+     * The callback parameter should be a function that looks like this:
+     * function(array of Rule rules) {...};
+     * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+     */
+    getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
+    /**
+     * @param callback Listener whose registration status shall be tested.
+     */
+    hasListener(callback: T): boolean;
+    /**
+     * Unregisters currently registered rules.
+     * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+     * @param callback Called when rules were unregistered.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
+    /**
+     * Unregisters currently registered rules.
+     * @param callback Called when rules were unregistered.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    removeRules(callback?: () => void): void;
+    /**
+     * Registers rules to handle events.
+     * @param rules Rules to be registered. These do not replace previously registered rules.
+     * @param callback Called with registered rules.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(array of Rule rules) {...};
+     * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+     */
+    addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
+    /**
+     * Deregisters an event listener callback from an event.
+     * @param callback Listener that shall be unregistered.
+     * The callback parameter should be a function that looks like this:
+     * function() {...};
+     */
+    removeListener(callback: T): void;
+    hasListeners(): boolean;
+  }
 
-    /** Description of a declarative rule for handling events. */
-    export interface Rule {
-        /** Optional. Optional priority of this rule. Defaults to 100.  */
-        priority?: number;
-        /** List of conditions that can trigger the actions. */
-        conditions: any[];
-        /** Optional. Optional identifier that allows referencing this rule.  */
-        id?: string;
-        /** List of actions that are triggered if one of the condtions is fulfilled. */
-        actions: any[];
-        /**
-         * Optional.
-          * Since Chrome 28.
-         * Tags can be used to annotate rules and perform operations on sets of rules.
-         */
-        tags?: string[];
-    }
+  /** Description of a declarative rule for handling events. */
+  export interface Rule {
+    /** Optional. Optional priority of this rule. Defaults to 100.  */
+    priority?: number;
+    /** List of conditions that can trigger the actions. */
+    conditions: any[];
+    /** Optional. Optional identifier that allows referencing this rule.  */
+    id?: string;
+    /** List of actions that are triggered if one of the condtions is fulfilled. */
+    actions: any[];
+    /**
+     * Optional.
+      * Since Chrome 28.
+     * Tags can be used to annotate rules and perform operations on sets of rules.
+     */
+    tags?: string[];
+  }
 }
 
 ////////////////////
@@ -1059,87 +1056,87 @@ declare namespace chrome.events {
  * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
  **/
 declare namespace chrome.extensionTypes {
+  /**
+   * The format of an image.
+   **/
+  export type ImageFormat = 'jpeg' | 'png';
+  /**
+   * Details about the format and quality of an image.
+   */
+  export interface ImageDetails {
     /**
-     * The format of an image.
-     **/
-    export type ImageFormat = 'jpeg' | 'png';
-    /**
-     * Details about the format and quality of an image.
+     * @description The format of the resulting image. Default is "jpeg".
+     * @type {ImageFormat}
+     * @memberof ImageDetails
      */
-    export interface ImageDetails {
-        /**
-         * @description The format of the resulting image. Default is "jpeg".
-         * @type {ImageFormat}
-         * @memberof ImageDetails
-         */
-        format?: ImageFormat;
-        /**
-         * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
-         * @type {number}
-         * @memberof ImageDetails
-         */
-        quality?: number;
-    }
+    format?: ImageFormat;
     /**
-     * The soonest that the JavaScript or CSS will be injected into the tab.
-     **/
-    export type RunAt = 'document_start' | 'document_end' | 'document_idle';
-    /**
-     * The origin of injected CSS.
-     **/
-    export type CSSOrigin = 'author' | 'user';
-    /**
-     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-     * @interface InjectDetails
+     * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
+     * @type {number}
+     * @memberof ImageDetails
      */
-    export interface InjectDetails {
-        /**
-         * JavaScript or CSS code to inject.
-         * Warning:
-         * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        code?: string;
-        /**
-         * @description JavaScript or CSS file to inject.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        file?: string;
-        /**
-         * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
-         * @type {boolean}
-         * @memberof InjectDetails
-         */
-        allFrames?: boolean;
-        /**
-         * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
-         * @since Since Chrome 50.
-         * @type {number}
-         * @memberof InjectDetails
-         */
-        frameId?: number;
-        /**
-         * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
-         * @type {boolean}
-         * @memberof InjectDetails
-         */
-        matchAboutBlank?: boolean;
-        /**
-         * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-         * @type {RunAt}
-         * @memberof InjectDetails
-         */
-        runAt: RunAt;
-        /**
-         * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
-         * @since Since Chrome 66.
-         * @type {CSSOrigin}
-         * @memberof InjectDetails
-         */
-        cssOrigin: CSSOrigin;
-    }
+    quality?: number;
+  }
+  /**
+   * The soonest that the JavaScript or CSS will be injected into the tab.
+   **/
+  export type RunAt = 'document_start' | 'document_end' | 'document_idle';
+  /**
+   * The origin of injected CSS.
+   **/
+  export type CSSOrigin = 'author' | 'user';
+  /**
+   * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+   * @interface InjectDetails
+   */
+  export interface InjectDetails {
+    /**
+     * JavaScript or CSS code to inject.
+     * Warning:
+     * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
+     * @type {string}
+     * @memberof InjectDetails
+     */
+    code?: string;
+    /**
+     * @description JavaScript or CSS file to inject.
+     * @type {string}
+     * @memberof InjectDetails
+     */
+    file?: string;
+    /**
+     * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
+     * @type {boolean}
+     * @memberof InjectDetails
+     */
+    allFrames?: boolean;
+    /**
+     * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
+     * @since Since Chrome 50.
+     * @type {number}
+     * @memberof InjectDetails
+     */
+    frameId?: number;
+    /**
+     * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
+     * @type {boolean}
+     * @memberof InjectDetails
+     */
+    matchAboutBlank?: boolean;
+    /**
+     * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+     * @type {RunAt}
+     * @memberof InjectDetails
+     */
+    runAt: RunAt;
+    /**
+     * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
+     * @since Since Chrome 66.
+     * @type {CSSOrigin}
+     * @memberof InjectDetails
+     */
+    cssOrigin: CSSOrigin;
+  }
 }
 
 ////////////////////
@@ -1147,30 +1144,30 @@ declare namespace chrome.extensionTypes {
 ////////////////////
 declare namespace chrome.fileSystem {
 
-    export interface AcceptOptions {
-        description?: string;
-        mimeTypes?: string[];
-        extensions?: string[];
-    }
+  export interface AcceptOptions {
+    description?: string;
+    mimeTypes?: string[];
+    extensions?: string[];
+  }
 
-    export interface ChooseEntryOptions {
-        type?: string;
-        suggestedName?: string;
-        accepts?: AcceptOptions[];
-        acceptsAllTypes?: boolean;
-        acceptsMultiple?: boolean;
-    }
+  export interface ChooseEntryOptions {
+    type?: string;
+    suggestedName?: string;
+    accepts?: AcceptOptions[];
+    acceptsAllTypes?: boolean;
+    acceptsMultiple?: boolean;
+  }
 
-    export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
-    export function getWritableEntry(entry: Entry, callback: (entry: Entry) => void): void;
-    export function isWritableEntry(entry: Entry, callback: (isWritable: boolean) => void): void;
-    export function chooseEntry(callback: (entry: Entry) => void): void;
-    export function chooseEntry(callback: (fileEntries: FileEntry[]) => void): void;
-    export function chooseEntry(options: ChooseEntryOptions, callback: (entry: Entry) => void): void;
-    export function chooseEntry(options: ChooseEntryOptions, callback: (fileEntries: FileEntry[]) => void): void;
-    export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
-    export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
-    export function retainEntry(entry: Entry): string;
+  export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
+  export function getWritableEntry(entry: Entry, callback: (entry: Entry) => void): void;
+  export function isWritableEntry(entry: Entry, callback: (isWritable: boolean) => void): void;
+  export function chooseEntry(callback: (entry: Entry) => void): void;
+  export function chooseEntry(callback: (fileEntries: FileEntry[]) => void): void;
+  export function chooseEntry(options: ChooseEntryOptions, callback: (entry: Entry) => void): void;
+  export function chooseEntry(options: ChooseEntryOptions, callback: (fileEntries: FileEntry[]) => void): void;
+  export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
+  export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
+  export function retainEntry(entry: Entry): string;
 }
 
 
@@ -1184,346 +1181,346 @@ declare namespace chrome.fileSystem {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.fileSystemProvider {
-    export interface OpenedFileInfo {
-        /** A request ID to be be used by consecutive read/write and close requests. */
-        openRequestId: number;
-        /** The path of the opened file. */
-        filePath: string;
-        /** Whether the file was opened for reading or writing. */
-        mode: string;
-    }
+  export interface OpenedFileInfo {
+    /** A request ID to be be used by consecutive read/write and close requests. */
+    openRequestId: number;
+    /** The path of the opened file. */
+    filePath: string;
+    /** Whether the file was opened for reading or writing. */
+    mode: string;
+  }
 
-    export interface FileWatchersInfo {
-        /** The path of the entry being observed. */
-        entryPath: string;
-        /** Whether watching should include all child entries recursively. It can be true for directories only. */
-        recursive: boolean;
-        /** Optional. Tag used by the last notification for the watcher.  */
-        lastTag?: string;
-    }
+  export interface FileWatchersInfo {
+    /** The path of the entry being observed. */
+    entryPath: string;
+    /** Whether watching should include all child entries recursively. It can be true for directories only. */
+    recursive: boolean;
+    /** Optional. Tag used by the last notification for the watcher.  */
+    lastTag?: string;
+  }
 
-    export interface EntryMetadata {
-        /** True if it is a directory. */
-        isDirectory: boolean;
-        /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
-        name: string;
-        /** File size in bytes. */
-        size: number;
-        /** The last modified time of this entry. */
-        modificationTime: Date;
-        /** Optional. Mime type for the entry.  */
-        mimeType?: string;
-        /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
-        thumbnail?: string;
-    }
-
-    export interface FileSystemInfo {
-        /** The identifier of the file system. */
-        fileSystemId: string;
-        /** A human-readable name for the file system. */
-        displayName: string;
-        /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
-        writable: boolean;
-        /**
-         * The maximum number of files that can be opened at once. If 0, then not limited.
-         * @since Since Chrome 42.
-         */
-        openedFilesLimit: number;
-        /**
-         * List of currently opened files.
-         * @since Since Chrome 42.
-         */
-        openedFiles: OpenedFileInfo[];
-        /**
-         * Optional.
-          * Whether the file system supports the tag field for observing directories.
-         * @since Since Chrome 45. Warning: this is the current Beta channel.
-         */
-        supportsNotifyTag?: boolean;
-        /**
-         * List of watchers.
-         * @since Since Chrome 45. Warning: this is the current Beta channel.
-         */
-        watchers: FileWatchersInfo[];
-    }
-
-    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    export interface GetActionsRequestedOptions {
-        /** The identifier of the file system related to this operation. */
-        fileSystemId: string;
-        /** The unique identifier of this request. */
-        requestId: number;
-        /** The path of the entry to return the list of actions for. */
-        entryPath: string;
-    }
-
-    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    export interface Action {
-        /** The identifier of the action. Any string or CommonActionId for common actions. */
-        id: string;
-        /** Optional. The title of the action. It may be ignored for common actions.  */
-        title?: string;
-    }
-
-    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    export interface ExecuteActionRequestedOptions {
-        /** The identifier of the file system related to this operation. */
-        fileSystemId: string;
-        /** The unique identifier of this request. */
-        requestId: number;
-        /** The path of the entry to be used for the action. */
-        entryPath: string;
-        /** The identifier of the action to be executed. */
-        actionId: string;
-    }
-
-    export interface MountOptions {
-        /** The string indentifier of the file system. Must be unique per each extension. */
-        fileSystemId: string;
-        /** A human-readable name for the file system. */
-        displayName: string;
-        /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
-        writable?: boolean;
-        /**
-         * Optional.
-          * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
-         * @since Since Chrome 41.
-         */
-        openedFilesLimit?: number;
-        /**
-         * Optional.
-          * Whether the file system supports the tag field for observed directories.
-         * @since Since Chrome 45. Warning: this is the current Beta channel.
-         */
-        supportsNotifyTag?: boolean;
-    }
-
-    export interface UnmountOptions {
-        /** The identifier of the file system to be unmounted. */
-        fileSystemId: string;
-    }
-
-    export interface NotificationChange {
-        /** The path of the changed entry. */
-        entryPath: string;
-        /** The type of the change which happened to the entry. */
-        changeType: string;
-    }
-
-    export interface NotificationOptions {
-        /** The identifier of the file system related to this change. */
-        fileSystemId: string;
-        /** The path of the observed entry. */
-        observedPath: string;
-        /** Mode of the observed entry. */
-        recursive: boolean;
-        /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
-        changeType: string;
-        /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
-        changes?: NotificationChange[];
-        /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
-        tag?: string;
-    }
-
-    export interface RequestedEventOptions {
-        /** The identifier of the file system related to this operation. */
-        fileSystemId: string;
-        /** The unique identifier of this request. */
-        requestId: number;
-    }
-
-    export interface EntryPathRequestedEventOptions extends RequestedEventOptions {
-        /** The path of the entry to which this operation is related to. */
-        entryPath: string;
-    }
-
-    export interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
-        /** Set to true if the thumbnail is requested. */
-        thumbnail: boolean;
-    }
-
-    export interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
-        /** The path of the directory which is to be operated on. */
-        directoryPath: string;
-    }
-
-    export interface FilePathRequestedEventOptions extends RequestedEventOptions {
-        /** The path of the entry for the operation */
-        filePath: string;
-    }
-
-    export interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
-        /** Whether the file will be used for reading or writing. */
-        mode: string;
-    }
-
-    export interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
-        /** A request ID used to open the file. */
-        openRequestId: number;
-    }
-
-    export interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
-        /** Position in the file (in bytes) to start reading from. */
-        offset: number;
-        /** Number of bytes to be returned. */
-        length: number;
-    }
-
-    export interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
-        /** Whether the operation is recursive (for directories only). */
-        recursive: boolean;
-    }
-
-    export interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
-        /** Whether the operation is recursive (for directories only). */
-        recursive: boolean;
-    }
-
-    export interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
-        /** The source path for the operation. */
-        sourcePath: string;
-        /** The destination path for the operation. */
-        targetPath: string;
-    }
-
-    export interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
-        /** Number of bytes to be retained after the operation completes. */
-        length: number;
-    }
-
-    export interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
-        /** Position in the file (in bytes) to start operating from. */
-        offset: number;
-        /** Buffer of bytes to be operated on the file. */
-        data: ArrayBuffer;
-    }
-
-    export interface OperationRequestedEventOptions extends RequestedEventOptions {
-        /** An ID of the request to which this operation is related. */
-        operationRequestId: number;
-    }
-
-    export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
-
-    export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
-
-    export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
-
-    export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
+  export interface EntryMetadata {
+    /** True if it is a directory. */
+    isDirectory: boolean;
+    /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
+    name: string;
+    /** File size in bytes. */
+    size: number;
+    /** The last modified time of this entry. */
+    modificationTime: Date;
+    /** Optional. Mime type for the entry.  */
+    mimeType?: string;
+    /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
+    thumbnail?: string;
+  }
 
+  export interface FileSystemInfo {
+    /** The identifier of the file system. */
+    fileSystemId: string;
+    /** A human-readable name for the file system. */
+    displayName: string;
+    /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
+    writable: boolean;
     /**
-     * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
-     * Depending on the type of the file system being mounted, the source option must be set appropriately.
-     * In case of an error, runtime.lastError will be set with a corresponding error code.
-     * @param callback A generic result callback to indicate success or failure.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function mount(options: MountOptions, callback?: () => void): void;
-    /**
-     * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
-     * In case of an error, runtime.lastError will be set with a corresponding error code.
-     * @param callback A generic result callback to indicate success or failure.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function unmount(options: UnmountOptions, callback?: () => void): void;
-    /**
-     * Returns all file systems mounted by the extension.
-     * @param callback Callback to receive the result of getAll function.
-     * The callback parameter should be a function that looks like this:
-     * function(array of FileSystemInfo fileSystems) {...};
-     */
-    export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
-    /**
-     * Returns information about a file system with the passed fileSystemId.
+     * The maximum number of files that can be opened at once. If 0, then not limited.
      * @since Since Chrome 42.
-     * @param callback Callback to receive the result of get function.
-     * The callback parameter should be a function that looks like this:
-     * function(FileSystemInfo fileSystem) {...};
      */
-    export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
+    openedFilesLimit: number;
     /**
-     * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
-     * To use, the file_system_provider.notify manifest option must be set to true.
-     * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
-     * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
-     * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
-     * In case of an error, runtime.lastError will be set will a corresponding error code.
-     * @param callback A generic result callback to indicate success or failure.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
+     * List of currently opened files.
+     * @since Since Chrome 42.
      */
-    export function notify(options: NotificationOptions, callback: () => void): void;
+    openedFiles: OpenedFileInfo[];
+    /**
+     * Optional.
+      * Whether the file system supports the tag field for observing directories.
+     * @since Since Chrome 45. Warning: this is the current Beta channel.
+     */
+    supportsNotifyTag?: boolean;
+    /**
+     * List of watchers.
+     * @since Since Chrome 45. Warning: this is the current Beta channel.
+     */
+    watchers: FileWatchersInfo[];
+  }
 
-    /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
-    export var onUnmountRequested: RequestedEvent;
-    /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
-    export var onGetMetadataRequested: MetadataRequestedEvent;
-    /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
-    export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
-    /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
-    export var onOpenFileRequested: OpenFileRequestedEvent;
-    /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
-    export var onCloseFileRequested: OpenedFileRequestedEvent;
-    /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
-    export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
-    /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
-    export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
-    /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
-    export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
-    /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
-    export var onCreateFileRequested: FilePathRequestedEvent;
-    /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-    export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
-    /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-    export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
-    /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
-    export var onTruncateRequested: FilePathLengthRequestedEvent;
-    /** Raised when writing contents to a file opened previously with openRequestId is requested. */
-    export var onWriteFileRequested: OpenedFileIoRequestedEvent;
-    /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
-    export var onAbortRequested: OperationRequestedEvent;
+  /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+  export interface GetActionsRequestedOptions {
+    /** The identifier of the file system related to this operation. */
+    fileSystemId: string;
+    /** The unique identifier of this request. */
+    requestId: number;
+    /** The path of the entry to return the list of actions for. */
+    entryPath: string;
+  }
+
+  /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+  export interface Action {
+    /** The identifier of the action. Any string or CommonActionId for common actions. */
+    id: string;
+    /** Optional. The title of the action. It may be ignored for common actions.  */
+    title?: string;
+  }
+
+  /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+  export interface ExecuteActionRequestedOptions {
+    /** The identifier of the file system related to this operation. */
+    fileSystemId: string;
+    /** The unique identifier of this request. */
+    requestId: number;
+    /** The path of the entry to be used for the action. */
+    entryPath: string;
+    /** The identifier of the action to be executed. */
+    actionId: string;
+  }
+
+  export interface MountOptions {
+    /** The string indentifier of the file system. Must be unique per each extension. */
+    fileSystemId: string;
+    /** A human-readable name for the file system. */
+    displayName: string;
+    /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
+    writable?: boolean;
     /**
-     * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
-     * @since Since Chrome 44.
+     * Optional.
+      * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
+     * @since Since Chrome 41.
      */
-    export var onConfigureRequested: RequestedEvent;
+    openedFilesLimit?: number;
     /**
-     * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
-     * @since Since Chrome 44.
-     */
-    export var onMountRequested: OptionlessRequestedEvent;
-    /**
-     * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
+     * Optional.
+      * Whether the file system supports the tag field for observed directories.
      * @since Since Chrome 45. Warning: this is the current Beta channel.
      */
-    export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
-    /**
-     * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
-     * @since Since Chrome 45. Warning: this is the current Beta channel.
-     */
-    export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
+    supportsNotifyTag?: boolean;
+  }
+
+  export interface UnmountOptions {
+    /** The identifier of the file system to be unmounted. */
+    fileSystemId: string;
+  }
+
+  export interface NotificationChange {
+    /** The path of the changed entry. */
+    entryPath: string;
+    /** The type of the change which happened to the entry. */
+    changeType: string;
+  }
+
+  export interface NotificationOptions {
+    /** The identifier of the file system related to this change. */
+    fileSystemId: string;
+    /** The path of the observed entry. */
+    observedPath: string;
+    /** Mode of the observed entry. */
+    recursive: boolean;
+    /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
+    changeType: string;
+    /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
+    changes?: NotificationChange[];
+    /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
+    tag?: string;
+  }
+
+  export interface RequestedEventOptions {
+    /** The identifier of the file system related to this operation. */
+    fileSystemId: string;
+    /** The unique identifier of this request. */
+    requestId: number;
+  }
+
+  export interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+    /** The path of the entry to which this operation is related to. */
+    entryPath: string;
+  }
+
+  export interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
+    /** Set to true if the thumbnail is requested. */
+    thumbnail: boolean;
+  }
+
+  export interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+    /** The path of the directory which is to be operated on. */
+    directoryPath: string;
+  }
+
+  export interface FilePathRequestedEventOptions extends RequestedEventOptions {
+    /** The path of the entry for the operation */
+    filePath: string;
+  }
+
+  export interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
+    /** Whether the file will be used for reading or writing. */
+    mode: string;
+  }
+
+  export interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+    /** A request ID used to open the file. */
+    openRequestId: number;
+  }
+
+  export interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+    /** Position in the file (in bytes) to start reading from. */
+    offset: number;
+    /** Number of bytes to be returned. */
+    length: number;
+  }
+
+  export interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+    /** Whether the operation is recursive (for directories only). */
+    recursive: boolean;
+  }
+
+  export interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+    /** Whether the operation is recursive (for directories only). */
+    recursive: boolean;
+  }
+
+  export interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+    /** The source path for the operation. */
+    sourcePath: string;
+    /** The destination path for the operation. */
+    targetPath: string;
+  }
+
+  export interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
+    /** Number of bytes to be retained after the operation completes. */
+    length: number;
+  }
+
+  export interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+    /** Position in the file (in bytes) to start operating from. */
+    offset: number;
+    /** Buffer of bytes to be operated on the file. */
+    data: ArrayBuffer;
+  }
+
+  export interface OperationRequestedEventOptions extends RequestedEventOptions {
+    /** An ID of the request to which this operation is related. */
+    operationRequestId: number;
+  }
+
+  export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
+
+  export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+  export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+  export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+  /**
+   * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
+   * Depending on the type of the file system being mounted, the source option must be set appropriately.
+   * In case of an error, runtime.lastError will be set with a corresponding error code.
+   * @param callback A generic result callback to indicate success or failure.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function mount(options: MountOptions, callback?: () => void): void;
+  /**
+   * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
+   * In case of an error, runtime.lastError will be set with a corresponding error code.
+   * @param callback A generic result callback to indicate success or failure.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function unmount(options: UnmountOptions, callback?: () => void): void;
+  /**
+   * Returns all file systems mounted by the extension.
+   * @param callback Callback to receive the result of getAll function.
+   * The callback parameter should be a function that looks like this:
+   * function(array of FileSystemInfo fileSystems) {...};
+   */
+  export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
+  /**
+   * Returns information about a file system with the passed fileSystemId.
+   * @since Since Chrome 42.
+   * @param callback Callback to receive the result of get function.
+   * The callback parameter should be a function that looks like this:
+   * function(FileSystemInfo fileSystem) {...};
+   */
+  export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
+  /**
+   * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
+   * To use, the file_system_provider.notify manifest option must be set to true.
+   * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
+   * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
+   * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
+   * In case of an error, runtime.lastError will be set will a corresponding error code.
+   * @param callback A generic result callback to indicate success or failure.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function notify(options: NotificationOptions, callback: () => void): void;
+
+  /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
+  export var onUnmountRequested: RequestedEvent;
+  /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
+  export var onGetMetadataRequested: MetadataRequestedEvent;
+  /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
+  export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
+  /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
+  export var onOpenFileRequested: OpenFileRequestedEvent;
+  /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
+  export var onCloseFileRequested: OpenedFileRequestedEvent;
+  /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
+  export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
+  /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
+  export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
+  /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
+  export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
+  /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
+  export var onCreateFileRequested: FilePathRequestedEvent;
+  /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+  export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
+  /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+  export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
+  /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
+  export var onTruncateRequested: FilePathLengthRequestedEvent;
+  /** Raised when writing contents to a file opened previously with openRequestId is requested. */
+  export var onWriteFileRequested: OpenedFileIoRequestedEvent;
+  /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
+  export var onAbortRequested: OperationRequestedEvent;
+  /**
+   * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
+   * @since Since Chrome 44.
+   */
+  export var onConfigureRequested: RequestedEvent;
+  /**
+   * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
+   * @since Since Chrome 44.
+   */
+  export var onMountRequested: OptionlessRequestedEvent;
+  /**
+   * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
+   * @since Since Chrome 45. Warning: this is the current Beta channel.
+   */
+  export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
+  /**
+   * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
+   * @since Since Chrome 45. Warning: this is the current Beta channel.
+   */
+  export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
 }
 
 ////////////////////
@@ -1535,83 +1532,83 @@ declare namespace chrome.fileSystemProvider {
  * Permissions:  "gcm"
  */
 declare namespace chrome.gcm {
-    export interface OutgoingMessage {
-        /** The ID of the server to send the message to as assigned by Google API Console. */
-        destinationId: string;
-        /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
-        messageId: string;
-        /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
-        timeToLive?: number;
-        /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
-        data: Object;
-    }
-
-    export interface IncomingMessage {
-        /** The message data. */
-        data: Object;
-        /**
-         * Optional.
-         * The sender who issued the message.
-         * @since Since Chrome 41.
-         */
-        from?: string;
-        /**
-         * Optional.
-         * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
-         */
-        collapseKey?: string;
-    }
-
-    export interface GcmError {
-        /** The error message describing the problem. */
-        errorMessage: string;
-        /** Optional. The ID of the message with this error, if error is related to a specific message. */
-        messageId?: string;
-        /** Additional details related to the error, when available. */
-        detail: Object;
-    }
-
-    export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
-
-    export interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
-
-    export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
-
-    /** The maximum size (in bytes) of all key/value pairs in a message. */
-    export var MAX_MESSAGE_SIZE: number;
+  export interface OutgoingMessage {
+    /** The ID of the server to send the message to as assigned by Google API Console. */
+    destinationId: string;
+    /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
+    messageId: string;
+    /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
+    timeToLive?: number;
+    /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
+    data: Object;
+  }
 
+  export interface IncomingMessage {
+    /** The message data. */
+    data: Object;
     /**
-     * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
-     * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
-     * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
-     * The callback parameter should be a function that looks like this:
-     * function(string registrationId) {...};
-     * Parameter registrationId: A registration ID assigned to the application by the GCM.
+     * Optional.
+     * The sender who issued the message.
+     * @since Since Chrome 41.
      */
-    export function register(senderIds: string[], callback: (registrationId: string) => void): void;
+    from?: string;
     /**
-     * Unregisters the application from GCM.
-     * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
-     * The callback parameter should be a function that looks like this:
-     * function() {...};
+     * Optional.
+     * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
      */
-    export function unregister(callback: () => void): void;
-    /**
-     * Sends a message according to its contents.
-     * @param message A message to send to the other party via GCM.
-     * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
-     * The callback parameter should be a function that looks like this:
-     * function(string messageId) {...};
-     * Parameter messageId: The ID of the message that the callback was issued for.
-     */
-    export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
+    collapseKey?: string;
+  }
 
-    /** Fired when a message is received through GCM. */
-    export var onMessage: MessageReceptionEvent;
-    /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
-    export var onMessagesDeleted: MessageDeletionEvent;
-    /** Fired when it was not possible to send a message to the GCM server. */
-    export var onSendError: GcmErrorEvent;
+  export interface GcmError {
+    /** The error message describing the problem. */
+    errorMessage: string;
+    /** Optional. The ID of the message with this error, if error is related to a specific message. */
+    messageId?: string;
+    /** Additional details related to the error, when available. */
+    detail: Object;
+  }
+
+  export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
+
+  export interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
+
+  export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
+
+  /** The maximum size (in bytes) of all key/value pairs in a message. */
+  export var MAX_MESSAGE_SIZE: number;
+
+  /**
+   * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
+   * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
+   * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
+   * The callback parameter should be a function that looks like this:
+   * function(string registrationId) {...};
+   * Parameter registrationId: A registration ID assigned to the application by the GCM.
+   */
+  export function register(senderIds: string[], callback: (registrationId: string) => void): void;
+  /**
+   * Unregisters the application from GCM.
+   * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
+   * The callback parameter should be a function that looks like this:
+   * function() {...};
+   */
+  export function unregister(callback: () => void): void;
+  /**
+   * Sends a message according to its contents.
+   * @param message A message to send to the other party via GCM.
+   * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
+   * The callback parameter should be a function that looks like this:
+   * function(string messageId) {...};
+   * Parameter messageId: The ID of the message that the callback was issued for.
+   */
+  export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
+
+  /** Fired when a message is received through GCM. */
+  export var onMessage: MessageReceptionEvent;
+  /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
+  export var onMessagesDeleted: MessageDeletionEvent;
+  /** Fired when it was not possible to send a message to the GCM server. */
+  export var onSendError: GcmErrorEvent;
 }
 
 ////////////////////
@@ -1622,7 +1619,7 @@ declare namespace chrome.gcm {
  * @since Chrome 38
  */
 declare namespace chrome.hid {
-    /** NOT YET IMPLEMENTED */
+  /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
@@ -1633,50 +1630,50 @@ declare namespace chrome.hid {
  * @since Chrome 5.
  */
 declare namespace chrome.i18n {
-    /** Holds detected ISO language code and its percentage in the input string */
-    export interface DetectedLanguage {
-        /** An ISO language code such as 'en' or 'fr'.
-         * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
-         * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
-        language: string;
+  /** Holds detected ISO language code and its percentage in the input string */
+  export interface DetectedLanguage {
+    /** An ISO language code such as 'en' or 'fr'.
+     * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
+     * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
+    language: string;
 
-        /** The percentage of the detected language */
-        percentage: number;
-    }
+    /** The percentage of the detected language */
+    percentage: number;
+  }
 
-    /** Holds detected language reliability and array of DetectedLanguage */
-    export interface LanguageDetectionResult {
-        /** CLD detected language reliability */
-        isReliable: boolean;
+  /** Holds detected language reliability and array of DetectedLanguage */
+  export interface LanguageDetectionResult {
+    /** CLD detected language reliability */
+    isReliable: boolean;
 
-        /** Array of detectedLanguage */
-        languages: DetectedLanguage[];
-    }
+    /** Array of detectedLanguage */
+    languages: DetectedLanguage[];
+  }
 
-    /**
-     * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function(array of string languages) {...};
-     * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
-     */
-    export function getAcceptLanguages(callback: (languages: string[]) => void): void;
-    /**
-     * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
-     * @param messageName The name of the message, as specified in the messages.json file.
-     * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
-     */
-    export function getMessage(messageName: string, substitutions?: any): string;
-    /**
-     * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
-     * @since Chrome 35.
-     */
-    export function getUILanguage(): string;
+  /**
+   * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
+   * @param callback The callback parameter should be a function that looks like this:
+   * function(array of string languages) {...};
+   * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
+   */
+  export function getAcceptLanguages(callback: (languages: string[]) => void): void;
+  /**
+   * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
+   * @param messageName The name of the message, as specified in the messages.json file.
+   * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
+   */
+  export function getMessage(messageName: string, substitutions?: any): string;
+  /**
+   * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+   * @since Chrome 35.
+   */
+  export function getUILanguage(): string;
 
-    /** Detects the language of the provided text using CLD.
-     * @param text User input string to be translated.
-     * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
-     */
-    export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
+  /** Detects the language of the provided text using CLD.
+   * @param text User input string to be translated.
+   * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
+   */
+  export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
 }
 
 ////////////////////
@@ -1688,114 +1685,114 @@ declare namespace chrome.i18n {
  * @since Chrome 29.
  */
 declare namespace chrome.identity {
-    /** @since Chrome 32. */
-    export interface AccountInfo {
-        /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
-        id: string;
-    }
-
-    export interface TokenDetails {
-        /**
-         * Optional.
-         * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
-         */
-        interactive?: boolean;
-        /**
-         * Optional.
-         * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
-         * account is only supported when the "enable-new-profile-management" flag is set.
-         * @since Chrome 37.
-         */
-        account?: AccountInfo;
-        /**
-         * Optional.
-         * A list of OAuth2 scopes to request.
-         * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
-         * @since Chrome 37.
-         */
-        scopes?: string[];
-    }
-
-    export interface UserInfo {
-        /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
-        email: string;
-        /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
-        id: string;
-    }
-
-    export interface TokenInformation {
-        /** The specific token that should be removed from the cache. */
-        token: string;
-    }
-
-    export interface WebAuthFlowOptions {
-        /** The URL that initiates the auth flow. */
-        url: string;
-        /**
-         * Optional.
-         * Whether to launch auth flow in interactive mode.
-         * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
-         * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
-         */
-        interactive?: boolean;
-    }
-
-    export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
+  /** @since Chrome 32. */
+  export interface AccountInfo {
+    /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+    id: string;
+  }
 
+  export interface TokenDetails {
     /**
-     * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
-     * getAccounts is only supported on dev channel.
-     * Dev channel only.
+     * Optional.
+     * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
      */
-    export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
+    interactive?: boolean;
     /**
-     * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
-     * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
-     * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
-     * @param details Token options.
-     * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(string token) {...};
-     */
-    export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
-    /**
-     * Retrieves email address and obfuscated gaia id of the user signed into a profile.
-     * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
+     * Optional.
+     * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
+     * account is only supported when the "enable-new-profile-management" flag is set.
      * @since Chrome 37.
      */
-    export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
+    account?: AccountInfo;
     /**
-     * Removes an OAuth2 access token from the Identity API's token cache.
-     * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
-     * @param details Token information.
-     * @param callback Called when the token has been removed from the cache.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
+     * Optional.
+     * A list of OAuth2 scopes to request.
+     * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
+     * @since Chrome 37.
      */
-    export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
-    /**
-     * Starts an auth flow at the specified URL.
-     * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
-     * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
-     * @param details WebAuth flow options.
-     * @param callback Called with the URL redirected back to your application.
-     * The callback parameter should be a function that looks like this:
-     * function(string responseUrl) {...};
-     */
-    export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
-    /**
-     * Generates a redirect URL to be used in launchWebAuthFlow.
-     * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
-     * @since Chrome 33.
-     * @param path Optional. The path appended to the end of the generated URL.
-     */
-    export function getRedirectURL(path?: string): string;
+    scopes?: string[];
+  }
 
+  export interface UserInfo {
+    /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
+    email: string;
+    /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
+    id: string;
+  }
+
+  export interface TokenInformation {
+    /** The specific token that should be removed from the cache. */
+    token: string;
+  }
+
+  export interface WebAuthFlowOptions {
+    /** The URL that initiates the auth flow. */
+    url: string;
     /**
-     * Fired when signin state changes for an account on the user's profile.
-     * @since Chrome 33.
+     * Optional.
+     * Whether to launch auth flow in interactive mode.
+     * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
+     * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
      */
-    export var onSignInChanged: SignInChangeEvent;
+    interactive?: boolean;
+  }
+
+  export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
+
+  /**
+   * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
+   * getAccounts is only supported on dev channel.
+   * Dev channel only.
+   */
+  export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
+  /**
+   * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+   * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
+   * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
+   * @param details Token options.
+   * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function(string token) {...};
+   */
+  export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
+  /**
+   * Retrieves email address and obfuscated gaia id of the user signed into a profile.
+   * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
+   * @since Chrome 37.
+   */
+  export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
+  /**
+   * Removes an OAuth2 access token from the Identity API's token cache.
+   * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
+   * @param details Token information.
+   * @param callback Called when the token has been removed from the cache.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function() {...};
+   */
+  export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
+  /**
+   * Starts an auth flow at the specified URL.
+   * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
+   * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
+   * @param details WebAuth flow options.
+   * @param callback Called with the URL redirected back to your application.
+   * The callback parameter should be a function that looks like this:
+   * function(string responseUrl) {...};
+   */
+  export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
+  /**
+   * Generates a redirect URL to be used in launchWebAuthFlow.
+   * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
+   * @since Chrome 33.
+   * @param path Optional. The path appended to the end of the generated URL.
+   */
+  export function getRedirectURL(path?: string): string;
+
+  /**
+   * Fired when signin state changes for an account on the user's profile.
+   * @since Chrome 33.
+   */
+  export var onSignInChanged: SignInChangeEvent;
 }
 
 ////////////////////
@@ -1807,25 +1804,25 @@ declare namespace chrome.identity {
  * @since Chrome 6.
  */
 declare namespace chrome.idle {
-    export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
+  export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
 
-    /**
-     * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
-     * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
-     * Since Chrome 25.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( IdleState newState) {...};
-     */
-    export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
-    /**
-     * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
-     * @since Chrome 25.
-     * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
-     */
-    export function setDetectionInterval(intervalInSeconds: number): void;
+  /**
+   * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+   * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
+   * Since Chrome 25.
+   * @param callback The callback parameter should be a function that looks like this:
+   * function( IdleState newState) {...};
+   */
+  export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
+  /**
+   * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
+   * @since Chrome 25.
+   * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
+   */
+  export function setDetectionInterval(intervalInSeconds: number): void;
 
-    /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
-    export var onStateChanged: IdleStateChangedEvent;
+  /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
+  export var onStateChanged: IdleStateChangedEvent;
 }
 
 ////////////////////
@@ -1836,7 +1833,7 @@ declare namespace chrome.idle {
  * @since Chrome 46
  */
 declare namespace chrome.instanceID {
-    /** NOT YET IMPLEMENTED */
+  /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
@@ -1847,111 +1844,111 @@ declare namespace chrome.instanceID {
  * @since Chrome 31
  */
 declare namespace chrome.mdns {
-    /** NOT YET IMPLEMENTED */
+  /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
 // Media Galleries
 ////////////////////
 declare namespace chrome.mediaGalleries {
-    export interface MediaFileSystemsOptions {
-        interactive?: 'no' | 'yes' | 'if_needed';
-    }
+  export interface MediaFileSystemsOptions {
+    interactive?: 'no' | 'yes' | 'if_needed';
+  }
 
-    export interface MediaFileSystemMetadata {
-        name: string;
-        galleryId: string;
-        deviceId?: string;
-        isRemovable: boolean;
-        isMediaDevice: boolean;
-        isAvailable: boolean;
-    }
+  export interface MediaFileSystemMetadata {
+    name: string;
+    galleryId: string;
+    deviceId?: string;
+    isRemovable: boolean;
+    isMediaDevice: boolean;
+    isAvailable: boolean;
+  }
 
-    export interface MetadataOptions {
-        metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
-    }
+  export interface MetadataOptions {
+    metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
+  }
 
-    export interface RawTag {
-        type: string;
-        tags: { [name: string]: string; };
-    }
+  export interface RawTag {
+    type: string;
+    tags: { [name: string]: string; };
+  }
 
-    export interface Metadata {
-        // The browser sniffed mime type.
-        mimeType: string;
-        // Defined for images and video. In pixels.
-        height?: number;
-        width?: number;
-        // Defined for images only.
-        xResolution?: number;
-        yResolution?: number;
-        // Defined for audio and video. In seconds.
-        duration?: number;
-        // Defined for images and video. In degrees.
-        rotation?: number;
-        // Defined for images only.
-        cameraMake?: string;
-        cameraModel?: string;
-        exposureTimeSeconds?: number;
-        flashFired?: boolean;
-        fNumber?: number;
-        focalLengthMm?: number;
-        isoEquivalent?: number;
-        // Defined for audio and video only.
-        album?: string;
-        artist?: string;
-        comment?: string;
-        copyright?: string;
-        disc?: number;
-        genre?: string;
-        language?: string;
-        title?: string;
-        track?: number;
-        // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
-        rawTags: RawTag[];
-        // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
-        attachedImages: Blob[];
-    }
+  export interface Metadata {
+    // The browser sniffed mime type.
+    mimeType: string;
+    // Defined for images and video. In pixels.
+    height?: number;
+    width?: number;
+    // Defined for images only.
+    xResolution?: number;
+    yResolution?: number;
+    // Defined for audio and video. In seconds.
+    duration?: number;
+    // Defined for images and video. In degrees.
+    rotation?: number;
+    // Defined for images only.
+    cameraMake?: string;
+    cameraModel?: string;
+    exposureTimeSeconds?: number;
+    flashFired?: boolean;
+    fNumber?: number;
+    focalLengthMm?: number;
+    isoEquivalent?: number;
+    // Defined for audio and video only.
+    album?: string;
+    artist?: string;
+    comment?: string;
+    copyright?: string;
+    disc?: number;
+    genre?: string;
+    language?: string;
+    title?: string;
+    track?: number;
+    // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
+    rawTags: RawTag[];
+    // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
+    attachedImages: Blob[];
+  }
 
-    export interface GalleryWatchResult {
-        galleryId: string;
-        success: boolean;
-    }
+  export interface GalleryWatchResult {
+    galleryId: string;
+    success: boolean;
+  }
 
-    export interface GalleryChangedEventArgs {
-        type: 'contents_changed' | 'watch_dropped';
-        galleryId: string;
-    }
+  export interface GalleryChangedEventArgs {
+    type: 'contents_changed' | 'watch_dropped';
+    galleryId: string;
+  }
 
-    export interface ScanProgressEventArgs {
-        // The type of progress event, i.e. start, finish, etc.
-        type: 'start' | 'cancel' | 'finish' | 'error';
-        // The number of Galleries found.
-        galleryCount?: number;
-        // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
-        audioCount?: number;
-        imageCount?: number;
-        videoCount?: number;
-    }
+  export interface ScanProgressEventArgs {
+    // The type of progress event, i.e. start, finish, etc.
+    type: 'start' | 'cancel' | 'finish' | 'error';
+    // The number of Galleries found.
+    galleryCount?: number;
+    // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
+    audioCount?: number;
+    imageCount?: number;
+    videoCount?: number;
+  }
 
-    export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
-    export function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
-    export function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
-    export function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
-    export function startMediaScan(): void;
-    export function cancelMediaScan(): void;
-    export function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
-    export function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
-    export function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
-    export function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
-    export function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
-    export function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
-    export function removeGalleryWatch(galleryId: string): void;
-    export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
-    export function removeAllGalleryWatch(): void;
+  export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
+  export function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
+  export function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
+  export function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
+  export function startMediaScan(): void;
+  export function cancelMediaScan(): void;
+  export function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
+  export function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
+  export function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
+  export function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
+  export function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
+  export function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
+  export function removeGalleryWatch(galleryId: string): void;
+  export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
+  export function removeAllGalleryWatch(): void;
 
-    export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
-    export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
+  export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
+  export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
 }
 
 ////////////////////////////////////
@@ -1963,112 +1960,112 @@ declare namespace chrome.mediaGalleries {
  * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
  */
 declare namespace chrome.networking.onc {
-    export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
-    export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
-    export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
-    export type IPConfigType = 'DHCP' | 'Static';
-    export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
-    export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
-    export interface ManagedBoolean {
-        /**
-         * @description The active value currently used by the network configuration manager (e.g. Shill).
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        Active?: boolean,
-        /**
-         * @description The source from which the effective property value was determined.
-         * @type {string}
-         * @memberof ManagedBoolean
-         */
-        Effective?: string,
-        /**
-         * @description The property value provided by the user policy.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserPolicy?: boolean,
-        /**
-         * @description The property value provided by the device policy.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        DevicePolicy?: boolean,
-        /**
-         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserSettings?: boolean,
-        /**
-         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        SharedSettings?: boolean,
-        /**
-         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserEditable?: boolean,
-        /**
-         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        DeviceEditable?: boolean
-    }
-    export interface ManagedLong {
-        /**
-         * @description The active value currently used by the network configuration manager (e.g. Shill).
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        Active?: number,
-        /**
-         * @description The source from which the effective property value was determined.
-         * @type {string}
-         * @memberof ManagedLong
-         */
-        Effective?: string,
-        /**
-         * @description The property value provided by the user policy.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        UserPolicy?: number,
-        /**
-         * @description The property value provided by the device policy.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        DevicePolicy?: number,
-        /**
-         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        UserSettings?: number,
-        /**
-         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        SharedSettings?: number,
-        /**
-         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedLong
-         */
-        UserEditable?: boolean,
-        /**
-         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedLong
-         */
-        DeviceEditable?: boolean
-    }
+  export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
+  export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
+  export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
+  export type IPConfigType = 'DHCP' | 'Static';
+  export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
+  export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
+  export interface ManagedBoolean {
+    /**
+     * @description The active value currently used by the network configuration manager (e.g. Shill).
+     * @type {boolean}
+     * @memberof ManagedBoolean
+     */
+    Active?: boolean,
+    /**
+     * @description The source from which the effective property value was determined.
+     * @type {string}
+     * @memberof ManagedBoolean
+     */
+    Effective?: string,
+    /**
+     * @description The property value provided by the user policy.
+     * @type {boolean}
+     * @memberof ManagedBoolean
+     */
+    UserPolicy?: boolean,
+    /**
+     * @description The property value provided by the device policy.
+     * @type {boolean}
+     * @memberof ManagedBoolean
+     */
+    DevicePolicy?: boolean,
+    /**
+     * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+     * @type {boolean}
+     * @memberof ManagedBoolean
+     */
+    UserSettings?: boolean,
+    /**
+     * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+     * @type {boolean}
+     * @memberof ManagedBoolean
+     */
+    SharedSettings?: boolean,
+    /**
+     * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+     * @type {boolean}
+     * @memberof ManagedBoolean
+     */
+    UserEditable?: boolean,
+    /**
+     * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+     * @type {boolean}
+     * @memberof ManagedBoolean
+     */
+    DeviceEditable?: boolean
+  }
+  export interface ManagedLong {
+    /**
+     * @description The active value currently used by the network configuration manager (e.g. Shill).
+     * @type {number}
+     * @memberof ManagedLong
+     */
+    Active?: number,
+    /**
+     * @description The source from which the effective property value was determined.
+     * @type {string}
+     * @memberof ManagedLong
+     */
+    Effective?: string,
+    /**
+     * @description The property value provided by the user policy.
+     * @type {number}
+     * @memberof ManagedLong
+     */
+    UserPolicy?: number,
+    /**
+     * @description The property value provided by the device policy.
+     * @type {number}
+     * @memberof ManagedLong
+     */
+    DevicePolicy?: number,
+    /**
+     * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+     * @type {number}
+     * @memberof ManagedLong
+     */
+    UserSettings?: number,
+    /**
+     * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+     * @type {number}
+     * @memberof ManagedLong
+     */
+    SharedSettings?: number,
+    /**
+     * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+     * @type {boolean}
+     * @memberof ManagedLong
+     */
+    UserEditable?: boolean,
+    /**
+     * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+     * @type {boolean}
+     * @memberof ManagedLong
+     */
+    DeviceEditable?: boolean
+  }
 }
 
 ////////////////////
@@ -2081,157 +2078,157 @@ declare namespace chrome.networking.onc {
  * @since Chrome 28.
  */
 declare namespace chrome.notifications {
-    export interface ButtonOptions {
-        title: string;
-        iconUrl?: string;
-    }
+  export interface ButtonOptions {
+    title: string;
+    iconUrl?: string;
+  }
 
-    export interface ItemOptions {
-        /** Title of one item of a list notification. */
-        title: string;
-        /** Additional details about this item. */
-        message: string;
-    }
+  export interface ItemOptions {
+    /** Title of one item of a list notification. */
+    title: string;
+    /** Additional details about this item. */
+    message: string;
+  }
 
-    export interface NotificationOptions {
-        /** Optional. Which type of notification to display. Required for notifications.create method. */
-        type?: string;
-        /**
-         * Optional.
-         * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
-         * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
-         */
-        iconUrl?: string;
-        /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
-        title?: string;
-        /** Optional. Main notification content. Required for notifications.create method. */
-        message?: string;
-        /**
-         * Optional.
-         * Alternate notification content with a lower-weight font.
-         * @since Chrome 31.
-         */
-        contextMessage?: string;
-        /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
-        priority?: number;
-        /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
-        eventTime?: number;
-        /** Optional. Text and icons for up to two notification action buttons. */
-        buttons?: ButtonOptions[];
-        /** Optional. Items for multi-item notifications. */
-        items?: ItemOptions[];
-        /**
-         * Optional.
-         * Current progress ranges from 0 to 100.
-         * @since Chrome 30.
-         */
-        progress?: number;
-        /**
-         * Optional.
-         * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
-         * @since Chrome 32.
-         */
-        isClickable?: boolean;
-        /**
-         * Optional.
-         * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
-         * @since Chrome 38.
-         */
-        appIconMaskUrl?: string;
-        /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
-        imageUrl?: string;
-        /**
-         * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
-         * This defaults to false.
-         * @since Chrome 50
-         */
-        requireInteraction?: boolean;
-    }
-
-    export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
-
-    export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
-
-    export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
-
-    export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
-
-    export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
-
-    /** The notification closed, either by the system or by user action. */
-    export var onClosed: NotificationClosedEvent;
-    /** The user clicked in a non-button area of the notification. */
-    export var onClicked: NotificationClickedEvent;
-    /** The user pressed a button in the notification. */
-    export var onButtonClicked: NotificationButtonClickedEvent;
+  export interface NotificationOptions {
+    /** Optional. Which type of notification to display. Required for notifications.create method. */
+    type?: string;
     /**
-     * The user changes the permission level.
+     * Optional.
+     * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
+     * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
+     */
+    iconUrl?: string;
+    /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
+    title?: string;
+    /** Optional. Main notification content. Required for notifications.create method. */
+    message?: string;
+    /**
+     * Optional.
+     * Alternate notification content with a lower-weight font.
+     * @since Chrome 31.
+     */
+    contextMessage?: string;
+    /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
+    priority?: number;
+    /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
+    eventTime?: number;
+    /** Optional. Text and icons for up to two notification action buttons. */
+    buttons?: ButtonOptions[];
+    /** Optional. Items for multi-item notifications. */
+    items?: ItemOptions[];
+    /**
+     * Optional.
+     * Current progress ranges from 0 to 100.
+     * @since Chrome 30.
+     */
+    progress?: number;
+    /**
+     * Optional.
+     * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
      * @since Chrome 32.
      */
-    export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
+    isClickable?: boolean;
     /**
-     * The user clicked on a link for the app's notification settings.
-     * @since Chrome 32.
+     * Optional.
+     * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
+     * @since Chrome 38.
      */
-    export var onShowSettings: NotificationShowSettingsEvent;
+    appIconMaskUrl?: string;
+    /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
+    imageUrl?: string;
+    /**
+     * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
+     * This defaults to false.
+     * @since Chrome 50
+     */
+    requireInteraction?: boolean;
+  }
 
-    /**
-     * Creates and displays a notification.
-     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-     * The notificationId parameter is required before Chrome 42.
-     * @param options Contents of the notification.
-     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(string notificationId) {...};
-     */
-    export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
-    /**
-     * Creates and displays a notification.
-     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-     * The notificationId parameter is required before Chrome 42.
-     * @param options Contents of the notification.
-     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(string notificationId) {...};
-     */
-    export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
-    /**
-     * Updates an existing notification.
-     * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
-     * @param options Contents of the notification to update to.
-     * @param callback Called to indicate whether a matching notification existed.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasUpdated) {...};
-     */
-    export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
-    /**
-     * Clears the specified notification.
-     * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
-     * @param callback Called to indicate whether a matching notification existed.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
-    /**
-     * Retrieves all the notifications.
-     * @since Chrome 29.
-     * @param callback Returns the set of notification_ids currently in the system.
-     * The callback parameter should be a function that looks like this:
-     * function(object notifications) {...};
-     */
-    export function getAll(callback: (notifications: Object) => void): void;
-    /**
-     * Retrieves whether the user has enabled notifications from this app or extension.
-     * @since Chrome 32.
-     * @param callback Returns the current permission level.
-     * The callback parameter should be a function that looks like this:
-     * function( PermissionLevel level) {...};
-     */
-    export function getPermissionLevel(callback: (level: string) => void): void;
+  export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
+
+  export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
+
+  export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
+
+  export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
+
+  export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
+
+  /** The notification closed, either by the system or by user action. */
+  export var onClosed: NotificationClosedEvent;
+  /** The user clicked in a non-button area of the notification. */
+  export var onClicked: NotificationClickedEvent;
+  /** The user pressed a button in the notification. */
+  export var onButtonClicked: NotificationButtonClickedEvent;
+  /**
+   * The user changes the permission level.
+   * @since Chrome 32.
+   */
+  export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
+  /**
+   * The user clicked on a link for the app's notification settings.
+   * @since Chrome 32.
+   */
+  export var onShowSettings: NotificationShowSettingsEvent;
+
+  /**
+   * Creates and displays a notification.
+   * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+   * The notificationId parameter is required before Chrome 42.
+   * @param options Contents of the notification.
+   * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+   * The callback is required before Chrome 42.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function(string notificationId) {...};
+   */
+  export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
+  /**
+   * Creates and displays a notification.
+   * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+   * The notificationId parameter is required before Chrome 42.
+   * @param options Contents of the notification.
+   * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+   * The callback is required before Chrome 42.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function(string notificationId) {...};
+   */
+  export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
+  /**
+   * Updates an existing notification.
+   * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
+   * @param options Contents of the notification to update to.
+   * @param callback Called to indicate whether a matching notification existed.
+   * The callback is required before Chrome 42.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function(boolean wasUpdated) {...};
+   */
+  export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
+  /**
+   * Clears the specified notification.
+   * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
+   * @param callback Called to indicate whether a matching notification existed.
+   * The callback is required before Chrome 42.
+   * If you specify the callback parameter, it should be a function that looks like this:
+   * function(boolean wasCleared) {...};
+   */
+  export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
+  /**
+   * Retrieves all the notifications.
+   * @since Chrome 29.
+   * @param callback Returns the set of notification_ids currently in the system.
+   * The callback parameter should be a function that looks like this:
+   * function(object notifications) {...};
+   */
+  export function getAll(callback: (notifications: Object) => void): void;
+  /**
+   * Retrieves whether the user has enabled notifications from this app or extension.
+   * @since Chrome 32.
+   * @param callback Returns the current permission level.
+   * The callback parameter should be a function that looks like this:
+   * function( PermissionLevel level) {...};
+   */
+  export function getPermissionLevel(callback: (level: string) => void): void;
 }
 
 ////////////////////
@@ -2242,70 +2239,70 @@ declare namespace chrome.notifications {
  * @since Chrome 16.
  */
 declare namespace chrome.permissions {
-    export interface Permissions {
-        /**
-         * Optional.
-         * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
-         */
-        origins?: string[];
-        /**
-         * Optional.
-         * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
-         */
-        permissions?: string[];
-    }
-
-    export interface PermissionsRemovedEvent {
-        /**
-         * @param callback The callback parameter should be a function that looks like this:
-         * function( Permissions permissions) {...};
-         * Parameter permissions: The permissions that have been removed.
-         */
-        addListener(callback: (permissions: Permissions) => void): void;
-    }
-
-    export interface PermissionsAddedEvent {
-        /**
-         * @param callback The callback parameter should be a function that looks like this:
-         * function( Permissions permissions) {...};
-         * Parameter permissions: The newly acquired permissions.
-         */
-        addListener(callback: (permissions: Permissions) => void): void;
-    }
-
+  export interface Permissions {
     /**
-     * Checks if the extension has the specified permissions.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function(boolean result) {...};
-     * Parameter result: True if the extension has the specified permissions.
+     * Optional.
+     * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
      */
-    export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+    origins?: string[];
+    /**
+     * Optional.
+     * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
+     */
+    permissions?: string[];
+  }
+
+  export interface PermissionsRemovedEvent {
     /**
-     * Gets the extension's current set of permissions.
      * @param callback The callback parameter should be a function that looks like this:
      * function( Permissions permissions) {...};
-     * Parameter permissions: The extension's active permissions.
+     * Parameter permissions: The permissions that have been removed.
      */
-    export function getAll(callback: (permissions: Permissions) => void): void;
-    /**
-     * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean granted) {...};
-     * Parameter granted: True if the user granted the specified permissions.
-     */
-    export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
-    /**
-     * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean removed) {...};
-     * Parameter removed: True if the permissions were removed.
-     */
-    export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
+    addListener(callback: (permissions: Permissions) => void): void;
+  }
 
-    /** Fired when access to permissions has been removed from the extension. */
-    export var onRemoved: PermissionsRemovedEvent;
-    /** Fired when the extension acquires new permissions. */
-    export var onAdded: PermissionsAddedEvent;
+  export interface PermissionsAddedEvent {
+    /**
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( Permissions permissions) {...};
+     * Parameter permissions: The newly acquired permissions.
+     */
+    addListener(callback: (permissions: Permissions) => void): void;
+  }
+
+  /**
+   * Checks if the extension has the specified permissions.
+   * @param callback The callback parameter should be a function that looks like this:
+   * function(boolean result) {...};
+   * Parameter result: True if the extension has the specified permissions.
+   */
+  export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+  /**
+   * Gets the extension's current set of permissions.
+   * @param callback The callback parameter should be a function that looks like this:
+   * function( Permissions permissions) {...};
+   * Parameter permissions: The extension's active permissions.
+   */
+  export function getAll(callback: (permissions: Permissions) => void): void;
+  /**
+   * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
+   * @param callback If you specify the callback parameter, it should be a function that looks like this:
+   * function(boolean granted) {...};
+   * Parameter granted: True if the user granted the specified permissions.
+   */
+  export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
+  /**
+   * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
+   * @param callback If you specify the callback parameter, it should be a function that looks like this:
+   * function(boolean removed) {...};
+   * Parameter removed: True if the permissions were removed.
+   */
+  export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
+
+  /** Fired when access to permissions has been removed from the extension. */
+  export var onRemoved: PermissionsRemovedEvent;
+  /** Fired when the extension acquires new permissions. */
+  export var onAdded: PermissionsAddedEvent;
 }
 
 ////////////////////
@@ -2317,10 +2314,10 @@ declare namespace chrome.permissions {
  * @since Chrome 27.
  */
 declare namespace chrome.power {
-    /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
-    export function requestKeepAwake(level: string): void;
-    /** Releases a request previously made via requestKeepAwake(). */
-    export function releaseKeepAwake(): void;
+  /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
+  export function requestKeepAwake(level: string): void;
+  /** Releases a request previously made via requestKeepAwake(). */
+  export function releaseKeepAwake(): void;
 }
 
 ////////////////////
@@ -2332,53 +2329,53 @@ declare namespace chrome.power {
  * @since Chrome 44.
  */
 declare namespace chrome.printerProvider {
-    export interface PrinterInfo {
-        /** Unique printer ID. */
-        id: string;
-        /** Printer's human readable name. */
-        name: string;
-        /** Optional. Printer's human readable description. */
-        description?: string;
-    }
+  export interface PrinterInfo {
+    /** Unique printer ID. */
+    id: string;
+    /** Printer's human readable name. */
+    name: string;
+    /** Optional. Printer's human readable description. */
+    description?: string;
+  }
 
-    export interface PrinterCapabilities {
-        /** Device capabilities in CDD format. */
-        capabilities: any;
-    }
+  export interface PrinterCapabilities {
+    /** Device capabilities in CDD format. */
+    capabilities: any;
+  }
 
-    export interface PrintJob {
-        /** ID of the printer which should handle the job. */
-        printerId: string;
-        /** The print job title. */
-        title: string;
-        /** Print ticket in  CJT format. */
-        ticket: Object;
-        /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
-        contentType: string;
-        /** Blob containing the document data to print. Format must match |contentType|. */
-        document: Blob;
-    }
+  export interface PrintJob {
+    /** ID of the printer which should handle the job. */
+    printerId: string;
+    /** The print job title. */
+    title: string;
+    /** Print ticket in  CJT format. */
+    ticket: Object;
+    /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
+    contentType: string;
+    /** Blob containing the document data to print. Format must match |contentType|. */
+    document: Blob;
+  }
 
-    export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
+  export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
 
-    export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
+  export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
 
-    export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
+  export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
 
-    export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
+  export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
 
-    /** Event fired when print manager requests printers provided by extensions. */
-    export var onGetPrintersRequested: PrinterRequestedEvent;
-    /**
-     * Event fired when print manager requests information about a USB device that may be a printer.
-     * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
-     * @since Chrome 45.
-     */
-    export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
-    /** Event fired when print manager requests printer capabilities. */
-    export var onGetCapabilityRequested: CapabilityRequestedEvent;
-    /** Event fired when print manager requests printing. */
-    export var onPrintRequested: PrintRequestedEvent;
+  /** Event fired when print manager requests printers provided by extensions. */
+  export var onGetPrintersRequested: PrinterRequestedEvent;
+  /**
+   * Event fired when print manager requests information about a USB device that may be a printer.
+   * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
+   * @since Chrome 45.
+   */
+  export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
+  /** Event fired when print manager requests printer capabilities. */
+  export var onGetCapabilityRequested: CapabilityRequestedEvent;
+  /** Event fired when print manager requests printing. */
+  export var onPrintRequested: PrintRequestedEvent;
 }
 
 ////////////////////
@@ -2389,487 +2386,487 @@ declare namespace chrome.printerProvider {
  * @since Chrome 22
  */
 declare namespace chrome.runtime {
-    /** This will be defined during an API method callback if there was an error */
-    export var lastError: LastError | undefined;
-    /** The ID of the extension/app. */
-    export var id: string;
+  /** This will be defined during an API method callback if there was an error */
+  export var lastError: LastError | undefined;
+  /** The ID of the extension/app. */
+  export var id: string;
 
-    export interface LastError {
-        /** Optional. Details about the error which occurred.  */
-        message?: string;
-    }
+  export interface LastError {
+    /** Optional. Details about the error which occurred.  */
+    message?: string;
+  }
 
-    export interface ConnectInfo {
-        name?: string;
-    }
-
-    export interface InstalledDetails {
-        /**
-         * The reason that this event is being dispatched.
-         * One of: "install", "update", "chrome_update", or "shared_module_update"
-         */
-        reason: string;
-        /**
-         * Optional.
-         * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
-         */
-        previousVersion?: string;
-        /**
-         * Optional.
-         * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
-         * @since Chrome 29.
-         */
-        id?: string;
-    }
-
-    export interface MessageOptions {
-        /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
-        includeTlsChannelId?: boolean;
-    }
+  export interface ConnectInfo {
+    name?: string;
+  }
 
+  export interface InstalledDetails {
     /**
-     * An object containing information about the script context that sent a message or request.
-     * @since Chrome 26.
+     * The reason that this event is being dispatched.
+     * One of: "install", "update", "chrome_update", or "shared_module_update"
      */
-    export interface MessageSender {
-        /** The ID of the extension or app that opened the connection, if any. */
-        id?: string;
-        /**
-         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
-         * @since Chrome 41.
-         */
-        frameId?: number;
-        /**
-         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
-         * @since Chrome 28.
-         */
-        url?: string;
-        /**
-         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
-         * @since Chrome 32.
-         */
-        tlsChannelId?: string;
-    }
-
+    reason: string;
     /**
-     * An object containing information about the current platform.
-     * @since Chrome 36.
+     * Optional.
+     * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
      */
-    export interface PlatformInfo {
-        /**
-         * The operating system chrome is running on.
-         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
-         */
-        os: string;
-        /**
-         * The machine's processor architecture.
-         * One of: "arm", "x86-32", or "x86-64"
-         */
-        arch: string;
-        /**
-         * The native client architecture. This may be different from arch on some platforms.
-         * One of: "arm", "x86-32", or "x86-64"
-         */
-        nacl_arch: string;
-    }
-
+    previousVersion?: string;
     /**
-     * An object which allows two way communication with other pages.
-     * @since Chrome 26.
-     */
-    export interface Port {
-        postMessage: (message: Object) => void;
-        disconnect: () => void;
-        /**
-         * Optional.
-         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
-         */
-        sender?: MessageSender;
-        /** An object which allows the addition and removal of listeners for a Chrome event. */
-        onDisconnect: PortDisconnectEvent;
-        /** An object which allows the addition and removal of listeners for a Chrome event. */
-        onMessage: PortMessageEvent;
-        name: string;
-    }
-
-    export interface UpdateAvailableDetails {
-        /** The version number of the available update. */
-        version: string;
-    }
-
-    export interface UpdateCheckDetails {
-        /** The version of the available update. */
-        version: string;
-    }
-
-    export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
-
-    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
-
-    export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-    export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
-
-    export interface RuntimeEvent extends chrome.events.Event<() => void> { }
-
-    export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
-
-    export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
-
-    export interface ManifestIcons {
-        [size: number]: string;
-    }
-
-    export interface ManifestAction {
-        default_icon?: ManifestIcons;
-        default_title?: string;
-        default_popup?: string;
-    }
-
-    export interface SearchProvider {
-        name?: string;
-        keyword?: string;
-        favicon_url?: string;
-        search_url: string;
-        encoding?: string;
-        suggest_url?: string;
-        instant_url?: string;
-        image_url?: string;
-        search_url_post_params?: string;
-        suggest_url_post_params?: string;
-        instant_url_post_params?: string;
-        image_url_post_params?: string;
-        alternate_urls?: string[];
-        prepopulated_id?: number;
-        is_default?: boolean;
-    }
-
-    export interface Manifest {
-        /** Required */
-        app: {
-            background: {
-                scripts?: string[];
-            }
-        }
-        /** Should be set to 2 */
-        manifest_version: number;
-        name: string;
-        version: string;
-
-        // Recommended
-        default_locale?: string;
-        description?: string;
-        icons?: ManifestIcons;
-        // Optional
-        action_handlers?: string[];
-        author?: any;
-        automation?: any;
-        bluetooth?: {
-            uuids?: string[];
-            socket?: boolean;
-            low_energy?: boolean;
-            peripheral?: boolean;
-        };
-        commands?: {
-            [name: string]: {
-                suggested_key?: {
-                    default?: string;
-                    windows?: string;
-                    mac?: string;
-                    chromeos?: string;
-                    linux?: string;
-                };
-                description?: string;
-                global?: boolean
-            }
-        };
-        current_locale?: string;
-        event_rules?: {
-            event?: string;
-            actions?: {
-                type: string;
-            }[];
-            conditions?: {
-                type: string,
-                css?: string[]
-            }[];
-        }[];
-        file_handlers?: {
-            [key: string]: {
-                extensions?: Array<'*' | string | { include_directories: boolean }>;
-                types?: Array<'*' | string | { include_directories: boolean }>;
-            }
-        }[];
-        file_system_provider_capabilities?: {
-            configurable?: boolean;
-            multiple_mounts?: boolean;
-            source?: string;
-        };
-        import?: {
-            id: string;
-        }[];
-        key?: string;
-        kiosk?: {
-            always_update: any;
-            required_platform_version: any;
-        };
-        kiosk_enabled?: boolean,
-        kiosk_only?: boolean,
-        kiosk_secondary_apps: any;
-        minimum_chrome_version?: string;
-        nacl_modules?: {
-            path: string;
-            mime_type: string;
-        }[];
-        oauth2?: {
-            client_id: string;
-            scopes?: string[];
-        };
-        offline_enabled?: boolean;
-        optional_permissions?: string[];
-        permissions?: string[];
-        platforms?: {
-            nacl_arch?: string;
-            sub_package_path: string;
-        }[];
-        /**
-         * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
-         */
-        requirements?: {
-            /**
-             * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
-             * "requirements": {
-             *   "3D": {
-             *     "features": ["webgl"]
-             *   }
-             * }
-             */
-            '3D'?: {
-                features?: Array<string | 'webgl'>;
-            };
-            /**
-             * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
-             * "requirements": {
-             *   "plugins": {
-             *     "npapi": true
-             *   }
-             * }
-             */
-            plugins?: {
-                npapi?: boolean;
-            }
-
-            [key: string]: any;
-        };
-        /**
-         * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
-         */
-        sandbox?: {
-            pages: string[];
-            content_security_policy?: string;
-        };
-        short_name?: string;
-        signature?: any;
-        sockets?: {
-            tcp?: {
-                connect: string | '*';
-            };
-            udp?: {
-                send: string | '*';
-            }
-        };
-        storage?: {
-            managed_schema: string
-        };
-        system_indicator?: any;
-        update_url?: string;
-        url_handlers?: {
-            [name: string]: {
-                matches: string[];
-                title?: string;
-            }
-        };
-        usb_printers?: {
-            filters: {
-                vendorId?: number;
-                productId?: number;
-                interfaceClass?: number;
-                interfaceSubclass?: number;
-                interfaceProtocol?: number;
-            }[]
-        };
-        version_name?: string;
-        webview?: {
-            partitions?: {
-                name: string;
-                accessible_resources: string[];
-            }[]
-        }
-        [key: string]: any;
-    }
-
-    /**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-     * @since Chrome 26.
-     */
-    export function connect(connectInfo?: ConnectInfo): Port;
-    /**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-     * @since Chrome 26.
-     * @param extensionId Optional.
-     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
-     */
-    export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
-    /**
-     * Connects to a native application in the host machine.
-     * @since Chrome 28.
-     * @param application The name of the registered application to connect to.
-     */
-    export function connectNative(application: string): Port;
-    /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
-    export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
-    /**
-     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
-     * @returns The manifest details.
-     */
-    export function getManifest(): Manifest;
-    /**
-     * Returns a DirectoryEntry for the package directory.
+     * Optional.
+     * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
      * @since Chrome 29.
      */
-    export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
+    id?: string;
+  }
+
+  export interface MessageOptions {
+    /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
+    includeTlsChannelId?: boolean;
+  }
+
+  /**
+   * An object containing information about the script context that sent a message or request.
+   * @since Chrome 26.
+   */
+  export interface MessageSender {
+    /** The ID of the extension or app that opened the connection, if any. */
+    id?: string;
     /**
-     * Returns information about the current platform.
-     * @since Chrome 29.
-     * @param callback Called with results
-     */
-    export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
-    /**
-     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
-     * @param path A path to a resource within an app/extension expressed relative to its install directory.
-     */
-    export function getURL(path: string): string;
-    /**
-     * Reloads the app or extension.
-     * @since Chrome 25.
-     */
-    export function reload(): void;
-    /**
-     * Requests an update check for this app/extension.
-     * @since Chrome 25.
-     * @param callback
-     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
-     * Optional parameter details: If an update is available, this contains more information about the available update.
-     */
-    export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
-    /**
-     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
-     * @since Chrome 32.
-     */
-    export function restart(): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 26.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 32.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 26.
-     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 32.
-     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-    /**
-     * Send a single message to a native application.
-     * @since Chrome 28.
-     * @param application The of the native messaging host.
-     * @param message The message that will be passed to the native messaging host.
-     * @param responseCallback Optional.
-     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
-    /**
-     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
+     * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
      * @since Chrome 41.
-     * @param url Since Chrome 34.
-     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
-     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
      */
-    export function setUninstallURL(url: string, callback?: () => void): void;
+    frameId?: number;
     /**
-     * Open your Extension's options page, if possible.
-     * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
-     * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
-     * @since Chrome 42.
+     * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
+     * @since Chrome 28.
      */
-    export function openOptionsPage(callback?: () => void): void;
+    url?: string;
+    /**
+     * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
+     * @since Chrome 32.
+     */
+    tlsChannelId?: string;
+  }
 
+  /**
+   * An object containing information about the current platform.
+   * @since Chrome 36.
+   */
+  export interface PlatformInfo {
     /**
-     * Fired when a connection is made from either an extension process or a content script.
-     * @since Chrome 26.
+     * The operating system chrome is running on.
+     * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
      */
-    export var onConnect: ExtensionConnectEvent;
+    os: string;
     /**
-     * Fired when a connection is made from another extension.
-     * @since Chrome 26.
+     * The machine's processor architecture.
+     * One of: "arm", "x86-32", or "x86-64"
      */
-    export var onConnectExternal: ExtensionConnectEvent;
-    /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
-    export var onSuspend: RuntimeEvent;
+    arch: string;
     /**
-     * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
-     * @since Chrome 23.
+     * The native client architecture. This may be different from arch on some platforms.
+     * One of: "arm", "x86-32", or "x86-64"
      */
-    export var onStartup: RuntimeEvent;
-    /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
-    export var onInstalled: RuntimeInstalledEvent;
-    /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
-    export var onSuspendCanceled: RuntimeEvent;
+    nacl_arch: string;
+  }
+
+  /**
+   * An object which allows two way communication with other pages.
+   * @since Chrome 26.
+   */
+  export interface Port {
+    postMessage: (message: Object) => void;
+    disconnect: () => void;
     /**
-     * Fired when a message is sent from either an extension process or a content script.
-     * @since Chrome 26.
+     * Optional.
+     * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
      */
-    export var onMessage: ExtensionMessageEvent;
+    sender?: MessageSender;
+    /** An object which allows the addition and removal of listeners for a Chrome event. */
+    onDisconnect: PortDisconnectEvent;
+    /** An object which allows the addition and removal of listeners for a Chrome event. */
+    onMessage: PortMessageEvent;
+    name: string;
+  }
+
+  export interface UpdateAvailableDetails {
+    /** The version number of the available update. */
+    version: string;
+  }
+
+  export interface UpdateCheckDetails {
+    /** The version of the available update. */
+    version: string;
+  }
+
+  export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+  export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
+
+  export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
+
+  export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+  export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
+
+  export interface RuntimeEvent extends chrome.events.Event<() => void> { }
+
+  export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
+
+  export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
+
+  export interface ManifestIcons {
+    [size: number]: string;
+  }
+
+  export interface ManifestAction {
+    default_icon?: ManifestIcons;
+    default_title?: string;
+    default_popup?: string;
+  }
+
+  export interface SearchProvider {
+    name?: string;
+    keyword?: string;
+    favicon_url?: string;
+    search_url: string;
+    encoding?: string;
+    suggest_url?: string;
+    instant_url?: string;
+    image_url?: string;
+    search_url_post_params?: string;
+    suggest_url_post_params?: string;
+    instant_url_post_params?: string;
+    image_url_post_params?: string;
+    alternate_urls?: string[];
+    prepopulated_id?: number;
+    is_default?: boolean;
+  }
+
+  export interface Manifest {
+    /** Required */
+    app: {
+      background: {
+        scripts?: string[];
+      }
+    }
+    /** Should be set to 2 */
+    manifest_version: number;
+    name: string;
+    version: string;
+
+    // Recommended
+    default_locale?: string;
+    description?: string;
+    icons?: ManifestIcons;
+    // Optional
+    action_handlers?: string[];
+    author?: any;
+    automation?: any;
+    bluetooth?: {
+      uuids?: string[];
+      socket?: boolean;
+      low_energy?: boolean;
+      peripheral?: boolean;
+    };
+    commands?: {
+      [name: string]: {
+        suggested_key?: {
+          default?: string;
+          windows?: string;
+          mac?: string;
+          chromeos?: string;
+          linux?: string;
+        };
+        description?: string;
+        global?: boolean
+      }
+    };
+    current_locale?: string;
+    event_rules?: {
+      event?: string;
+      actions?: {
+        type: string;
+      }[];
+      conditions?: {
+        type: string,
+        css?: string[]
+      }[];
+    }[];
+    file_handlers?: {
+      [key: string]: {
+        extensions?: Array<'*' | string | { include_directories: boolean }>;
+        types?: Array<'*' | string | { include_directories: boolean }>;
+      }
+    }[];
+    file_system_provider_capabilities?: {
+      configurable?: boolean;
+      multiple_mounts?: boolean;
+      source?: string;
+    };
+    import?: {
+      id: string;
+    }[];
+    key?: string;
+    kiosk?: {
+      always_update: any;
+      required_platform_version: any;
+    };
+    kiosk_enabled?: boolean,
+    kiosk_only?: boolean,
+    kiosk_secondary_apps: any;
+    minimum_chrome_version?: string;
+    nacl_modules?: {
+      path: string;
+      mime_type: string;
+    }[];
+    oauth2?: {
+      client_id: string;
+      scopes?: string[];
+    };
+    offline_enabled?: boolean;
+    optional_permissions?: string[];
+    permissions?: string[];
+    platforms?: {
+      nacl_arch?: string;
+      sub_package_path: string;
+    }[];
     /**
-     * Fired when a message is sent from another extension/app. Cannot be used in a content script.
-     * @since Chrome 26.
+     * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
      */
-    export var onMessageExternal: ExtensionMessageEvent;
+    requirements?: {
+      /**
+       * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
+       * "requirements": {
+       *   "3D": {
+       *     "features": ["webgl"]
+       *   }
+       * }
+       */
+      '3D'?: {
+        features?: Array<string | 'webgl'>;
+      };
+      /**
+       * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
+       * "requirements": {
+       *   "plugins": {
+       *     "npapi": true
+       *   }
+       * }
+       */
+      plugins?: {
+        npapi?: boolean;
+      }
+
+      [key: string]: any;
+    };
     /**
-     * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
-     * @since Chrome 29.
+     * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
      */
-    export var onRestartRequired: RuntimeRestartRequiredEvent;
-    /**
-     * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
-     * @since Chrome 25.
-     */
-    export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
-    /**
-     * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
-     * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
-     */
-    export var onBrowserUpdateAvailable: RuntimeEvent;
+    sandbox?: {
+      pages: string[];
+      content_security_policy?: string;
+    };
+    short_name?: string;
+    signature?: any;
+    sockets?: {
+      tcp?: {
+        connect: string | '*';
+      };
+      udp?: {
+        send: string | '*';
+      }
+    };
+    storage?: {
+      managed_schema: string
+    };
+    system_indicator?: any;
+    update_url?: string;
+    url_handlers?: {
+      [name: string]: {
+        matches: string[];
+        title?: string;
+      }
+    };
+    usb_printers?: {
+      filters: {
+        vendorId?: number;
+        productId?: number;
+        interfaceClass?: number;
+        interfaceSubclass?: number;
+        interfaceProtocol?: number;
+      }[]
+    };
+    version_name?: string;
+    webview?: {
+      partitions?: {
+        name: string;
+        accessible_resources: string[];
+      }[]
+    }
+    [key: string]: any;
+  }
+
+  /**
+   * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+   * @since Chrome 26.
+   */
+  export function connect(connectInfo?: ConnectInfo): Port;
+  /**
+   * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+   * @since Chrome 26.
+   * @param extensionId Optional.
+   * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
+   */
+  export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
+  /**
+   * Connects to a native application in the host machine.
+   * @since Chrome 28.
+   * @param application The name of the registered application to connect to.
+   */
+  export function connectNative(application: string): Port;
+  /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
+  export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
+  /**
+   * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
+   * @returns The manifest details.
+   */
+  export function getManifest(): Manifest;
+  /**
+   * Returns a DirectoryEntry for the package directory.
+   * @since Chrome 29.
+   */
+  export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
+  /**
+   * Returns information about the current platform.
+   * @since Chrome 29.
+   * @param callback Called with results
+   */
+  export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
+  /**
+   * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+   * @param path A path to a resource within an app/extension expressed relative to its install directory.
+   */
+  export function getURL(path: string): string;
+  /**
+   * Reloads the app or extension.
+   * @since Chrome 25.
+   */
+  export function reload(): void;
+  /**
+   * Requests an update check for this app/extension.
+   * @since Chrome 25.
+   * @param callback
+   * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+   * Optional parameter details: If an update is available, this contains more information about the available update.
+   */
+  export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
+  /**
+   * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
+   * @since Chrome 32.
+   */
+  export function restart(): void;
+  /**
+   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+   * @since Chrome 26.
+   * @param responseCallback Optional
+   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+   */
+  export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
+  /**
+   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+   * @since Chrome 32.
+   * @param responseCallback Optional
+   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+   */
+  export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+  /**
+   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+   * @since Chrome 26.
+   * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+   * @param responseCallback Optional
+   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+   */
+  export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
+  /**
+   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+   * @since Chrome 32.
+   * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+   * @param responseCallback Optional
+   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+   */
+  export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+  /**
+   * Send a single message to a native application.
+   * @since Chrome 28.
+   * @param application The of the native messaging host.
+   * @param message The message that will be passed to the native messaging host.
+   * @param responseCallback Optional.
+   * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+   */
+  export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
+  /**
+   * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
+   * @since Chrome 41.
+   * @param url Since Chrome 34.
+   * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
+   * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
+   */
+  export function setUninstallURL(url: string, callback?: () => void): void;
+  /**
+   * Open your Extension's options page, if possible.
+   * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
+   * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
+   * @since Chrome 42.
+   */
+  export function openOptionsPage(callback?: () => void): void;
+
+  /**
+   * Fired when a connection is made from either an extension process or a content script.
+   * @since Chrome 26.
+   */
+  export var onConnect: ExtensionConnectEvent;
+  /**
+   * Fired when a connection is made from another extension.
+   * @since Chrome 26.
+   */
+  export var onConnectExternal: ExtensionConnectEvent;
+  /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
+  export var onSuspend: RuntimeEvent;
+  /**
+   * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
+   * @since Chrome 23.
+   */
+  export var onStartup: RuntimeEvent;
+  /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
+  export var onInstalled: RuntimeInstalledEvent;
+  /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
+  export var onSuspendCanceled: RuntimeEvent;
+  /**
+   * Fired when a message is sent from either an extension process or a content script.
+   * @since Chrome 26.
+   */
+  export var onMessage: ExtensionMessageEvent;
+  /**
+   * Fired when a message is sent from another extension/app. Cannot be used in a content script.
+   * @since Chrome 26.
+   */
+  export var onMessageExternal: ExtensionMessageEvent;
+  /**
+   * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
+   * @since Chrome 29.
+   */
+  export var onRestartRequired: RuntimeRestartRequiredEvent;
+  /**
+   * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
+   * @since Chrome 25.
+   */
+  export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+  /**
+   * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
+   * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
+   */
+  export var onBrowserUpdateAvailable: RuntimeEvent;
 }
 
 ////////////////////
@@ -2880,130 +2877,130 @@ declare namespace chrome.runtime {
  * @since Chrome 23
  */
 declare namespace chrome.serial {
-    /** NOT YET IMPLEMENTED */
+  /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
 // Socket
 ////////////////////
 declare namespace chrome.socket {
-    export interface CreateInfo {
-        socketId: number;
-    }
+  export interface CreateInfo {
+    socketId: number;
+  }
 
-    export interface AcceptInfo {
-        resultCode: number;
-        socketId?: number;
-    }
+  export interface AcceptInfo {
+    resultCode: number;
+    socketId?: number;
+  }
 
-    export interface ReadInfo {
-        resultCode: number;
-        data: ArrayBuffer;
-    }
+  export interface ReadInfo {
+    resultCode: number;
+    data: ArrayBuffer;
+  }
 
-    export interface WriteInfo {
-        bytesWritten: number;
-    }
+  export interface WriteInfo {
+    bytesWritten: number;
+  }
 
-    export interface RecvFromInfo {
-        resultCode: number;
-        data: ArrayBuffer;
-        port: number;
-        address: string;
-    }
+  export interface RecvFromInfo {
+    resultCode: number;
+    data: ArrayBuffer;
+    port: number;
+    address: string;
+  }
 
-    export interface SocketInfo {
-        socketType: string;
-        localPort?: number;
-        peerAddress?: string;
-        peerPort?: number;
-        localAddress?: string;
-        connected: boolean;
-    }
+  export interface SocketInfo {
+    socketType: string;
+    localPort?: number;
+    peerAddress?: string;
+    peerPort?: number;
+    localAddress?: string;
+    connected: boolean;
+  }
 
-    export interface NetworkInterface {
-        name: string;
-        address: string;
-    }
+  export interface NetworkInterface {
+    name: string;
+    address: string;
+  }
 
-    export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
-    export function destroy(socketId: number): void;
-    export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
-    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-    export function disconnect(socketId: number): void;
-    export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
-    export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
-    export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
-    export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
-    export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
-    export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
-    export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
-    export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
-    export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
-    export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
+  export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
+  export function destroy(socketId: number): void;
+  export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
+  export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+  export function disconnect(socketId: number): void;
+  export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
+  export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
+  export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
+  export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
+  export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
+  export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
+  export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
+  export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
+  export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
+  export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
 }
 
 declare namespace chrome.sockets.tcp {
-    export interface CreateInfo {
-        socketId: number;
-    }
+  export interface CreateInfo {
+    socketId: number;
+  }
 
-    export interface SendInfo {
-        resultCode: number;
-        bytesSent?: number;
-    }
+  export interface SendInfo {
+    resultCode: number;
+    bytesSent?: number;
+  }
 
-    export interface ReceiveEventArgs {
-        socketId: number;
-        data: ArrayBuffer;
-    }
+  export interface ReceiveEventArgs {
+    socketId: number;
+    data: ArrayBuffer;
+  }
 
-    export interface ReceiveErrorEventArgs {
-        socketId: number;
-        resultCode: number;
-    }
+  export interface ReceiveErrorEventArgs {
+    socketId: number;
+    resultCode: number;
+  }
 
-    export interface SocketProperties {
-        persistent?: boolean;
-        name?: string;
-        bufferSize?: number;
-    }
+  export interface SocketProperties {
+    persistent?: boolean;
+    name?: string;
+    bufferSize?: number;
+  }
 
-    export interface SocketInfo {
-        socketId: number;
-        persistent: boolean;
-        name?: string;
-        bufferSize?: number;
-        paused: boolean;
-        connected: boolean;
-        localAddress?: string;
-        localPort?: number;
-        peerAddress?: string;
-        peerPort?: number;
-    }
+  export interface SocketInfo {
+    socketId: number;
+    persistent: boolean;
+    name?: string;
+    bufferSize?: number;
+    paused: boolean;
+    connected: boolean;
+    localAddress?: string;
+    localPort?: number;
+    peerAddress?: string;
+    peerPort?: number;
+  }
 
-    export function create(callback: (createInfo: CreateInfo) => void): void;
-    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+  export function create(callback: (createInfo: CreateInfo) => void): void;
+  export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
-    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
-    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+  export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+  export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
 
-    export function setKeepAlive(socketId: number,
-        enable: boolean, callback: (result: number) => void): void;
-    export function setKeepAlive(socketId: number,
-        enable: boolean, delay: number, callback: (result: number) => void): void;
+  export function setKeepAlive(socketId: number,
+    enable: boolean, callback: (result: number) => void): void;
+  export function setKeepAlive(socketId: number,
+    enable: boolean, delay: number, callback: (result: number) => void): void;
 
-    export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
-    export function connect(socketId: number,
-        peerAddress: string, peerPort: number, callback: (result: number) => void): void;
-    export function disconnect(socketId: number, callback?: () => void): void;
-    export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
-    export function close(socketId: number, callback?: () => void): void;
-    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+  export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
+  export function connect(socketId: number,
+    peerAddress: string, peerPort: number, callback: (result: number) => void): void;
+  export function disconnect(socketId: number, callback?: () => void): void;
+  export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
+  export function close(socketId: number, callback?: () => void): void;
+  export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+  export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
-    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
-    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+  export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+  export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
 /**
@@ -3015,195 +3012,195 @@ declare namespace chrome.sockets.tcp {
  * @see https://developer.chrome.com/apps/sockets_tcpServer
  */
 declare namespace chrome.sockets.tcpServer {
-    export interface CreateInfo {
-        socketId: number;
-    }
+  export interface CreateInfo {
+    socketId: number;
+  }
 
-    export interface AcceptEventArgs {
-        socketId: number;
-        clientSocketId: number;
-    }
+  export interface AcceptEventArgs {
+    socketId: number;
+    clientSocketId: number;
+  }
 
-    export interface AcceptErrorEventArgs {
-        socketId: number;
-        resultCode: number;
-    }
+  export interface AcceptErrorEventArgs {
+    socketId: number;
+    resultCode: number;
+  }
 
+  /**
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
+   */
+  export interface SocketProperties {
     /**
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
-     */
-    export interface SocketProperties {
-        /**
-         * Flag indicating if the socket remains open when the event page of the
-         * application is unloaded. The default value is "false." When the
-         * application is loaded, any sockets previously opened with
-         * persistent=true can be fetched with getSockets.
-         *
-         * @see http://developer.chrome.com/apps/app_lifecycle.html
-         */
-        persistent?: boolean;
-
-        /** An application-defined string associated with the socket. */
-        name?: string;
-    }
-
-    /**
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
-     */
-    export interface SocketInfo {
-        /** The socket identifier. */
-        socketId: number;
-
-        /**
-         * Flag indicating if the socket remains open when the event page of the
-         * application is unloaded (see SocketProperties.persistent). The
-         * default value is "false".
-         */
-        persistent: boolean;
-
-        /** Application-defined string associated with the socket. */
-        name?: string;
-
-        /**
-         * Flag indicating whether connection requests on a listening socket are
-         * dispatched through the onAccept event or queued up in the listen
-         * queue backlog. See setPaused. The default value is "false"
-         */
-        paused: boolean;
-
-        /** If the socket is listening, contains its local IPv4/6 address. */
-        localAddress?: string;
-
-        /** If the socket is listening, contains its local port. */
-        localPort?: number;
-    }
-
-    /**
-     * Creates a TCP server socket.
+     * Flag indicating if the socket remains open when the event page of the
+     * application is unloaded. The default value is "false." When the
+     * application is loaded, any sockets previously opened with
+     * persistent=true can be fetched with getSockets.
      *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-     * @param callback Called when the socket has been created.
+     * @see http://developer.chrome.com/apps/app_lifecycle.html
      */
-    export function create(callback: (createInfo: CreateInfo) => void): void;
+    persistent?: boolean;
+
+    /** An application-defined string associated with the socket. */
+    name?: string;
+  }
+
+  /**
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
+   */
+  export interface SocketInfo {
+    /** The socket identifier. */
+    socketId: number;
 
     /**
-     * Creates a TCP server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-     * @param properties The socket properties.
-     * @param callback   Called when the socket has been created.
+     * Flag indicating if the socket remains open when the event page of the
+     * application is unloaded (see SocketProperties.persistent). The
+     * default value is "false".
      */
-    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+    persistent: boolean;
+
+    /** Application-defined string associated with the socket. */
+    name?: string;
 
     /**
-     * Updates the socket properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
-     * @param socketId   The socket identifier.
-     * @param properties The properties to update.
-     * @param callback   Called when the properties are updated.
+     * Flag indicating whether connection requests on a listening socket are
+     * dispatched through the onAccept event or queued up in the listen
+     * queue backlog. See setPaused. The default value is "false"
      */
-    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+    paused: boolean;
 
-    /**
-     * Enables or disables a listening socket from accepting new connections.
-     * When paused, a listening socket accepts new connections until its backlog
-     * (see listen function) is full then refuses additional connection
-     * requests. onAccept events are raised only when the socket is un-paused.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
-     * @param callback Callback from the setPaused method.
-     */
-    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+    /** If the socket is listening, contains its local IPv4/6 address. */
+    localAddress?: string;
 
-    /**
-     * Listens for connections on the specified port and address. If the
-     * port/address is in use, the callback indicates a failure.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-     * @param socketId The socket identifier.
-     * @param address  The address of the local machine.
-     * @param port     The port of the local machine. When set to 0, a free port
-     *                 is chosen dynamically. The dynamically allocated port can
-     *                 be found by calling getInfo.
-     * @param backlog  Length of the socket's listen queue. The default value
-     *                 depends on the Operating System (SOMAXCONN), which
-     *                 ensures a reasonable queue length for most applications.
-     * @param callback Called when listen operation completes.
-     */
-    export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
+    /** If the socket is listening, contains its local port. */
+    localPort?: number;
+  }
 
-    /**
-     * Listens for connections on the specified port and address. If the
-     * port/address is in use, the callback indicates a failure.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-     * @param socketId The socket identifier.
-     * @param address  The address of the local machine.
-     * @param port     The port of the local machine. When set to 0, a free port
-     *                 is chosen dynamically. The dynamically allocated port can
-     *                 be found by calling getInfo.
-     * @param callback Called when listen operation completes.
-     */
-    export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+  /**
+   * Creates a TCP server socket.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+   * @param callback Called when the socket has been created.
+   */
+  export function create(callback: (createInfo: CreateInfo) => void): void;
 
-    /**
-     * Disconnects the listening socket, i.e. stops accepting new connections
-     * and releases the address/port the socket is bound to. The socket
-     * identifier remains valid, e.g. it can be used with listen to accept
-     * connections on a new port and address.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
-     * @param socketId The socket identifier.
-     * @param callback Called when the disconnect attempt is complete.
-     */
-    export function disconnect(socketId: number, callback?: () => void): void;
+  /**
+   * Creates a TCP server socket.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+   * @param properties The socket properties.
+   * @param callback   Called when the socket has been created.
+   */
+  export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
-    /**
-     * Disconnects and destroys the socket. Each socket created should be closed
-     * after use. The socket id is no longer valid as soon at the function is
-     * called. However, the socket is guaranteed to be closed only when the
-     * callback is invoked.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
-     * @param socketId The socket identifier.
-     * @param callback Called when the close operation completes.
-     */
-    export function close(socketId: number, callback?: () => void): void;
+  /**
+   * Updates the socket properties.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
+   * @param socketId   The socket identifier.
+   * @param properties The properties to update.
+   * @param callback   Called when the properties are updated.
+   */
+  export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
 
-    /**
-     * Retrieves the state of the given socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
-     * @param socketId The socket identifier.
-     * @param callback Called when the socket state is available.
-     */
-    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+  /**
+   * Enables or disables a listening socket from accepting new connections.
+   * When paused, a listening socket accepts new connections until its backlog
+   * (see listen function) is full then refuses additional connection
+   * requests. onAccept events are raised only when the socket is un-paused.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
+   * @param callback Callback from the setPaused method.
+   */
+  export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
 
-    /**
-     * Retrieves the list of currently opened sockets owned by the application.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
-     * @param callback Called when the list of sockets is available.
-     */
-    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+  /**
+   * Listens for connections on the specified port and address. If the
+   * port/address is in use, the callback indicates a failure.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+   * @param socketId The socket identifier.
+   * @param address  The address of the local machine.
+   * @param port     The port of the local machine. When set to 0, a free port
+   *                 is chosen dynamically. The dynamically allocated port can
+   *                 be found by calling getInfo.
+   * @param backlog  Length of the socket's listen queue. The default value
+   *                 depends on the Operating System (SOMAXCONN), which
+   *                 ensures a reasonable queue length for most applications.
+   * @param callback Called when listen operation completes.
+   */
+  export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
 
-    /**
-     * Event raised when a connection has been made to the server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
-     */
-    export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
+  /**
+   * Listens for connections on the specified port and address. If the
+   * port/address is in use, the callback indicates a failure.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+   * @param socketId The socket identifier.
+   * @param address  The address of the local machine.
+   * @param port     The port of the local machine. When set to 0, a free port
+   *                 is chosen dynamically. The dynamically allocated port can
+   *                 be found by calling getInfo.
+   * @param callback Called when listen operation completes.
+   */
+  export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
 
-    /**
-     * Event raised when a network error occured while the runtime was waiting
-     * for new connections on the socket address and port. Once this event is
-     * raised, the socket is set to paused and no more onAccept events are
-     * raised for this socket until the socket is resumed.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
-     */
-    export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
+  /**
+   * Disconnects the listening socket, i.e. stops accepting new connections
+   * and releases the address/port the socket is bound to. The socket
+   * identifier remains valid, e.g. it can be used with listen to accept
+   * connections on a new port and address.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
+   * @param socketId The socket identifier.
+   * @param callback Called when the disconnect attempt is complete.
+   */
+  export function disconnect(socketId: number, callback?: () => void): void;
+
+  /**
+   * Disconnects and destroys the socket. Each socket created should be closed
+   * after use. The socket id is no longer valid as soon at the function is
+   * called. However, the socket is guaranteed to be closed only when the
+   * callback is invoked.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
+   * @param socketId The socket identifier.
+   * @param callback Called when the close operation completes.
+   */
+  export function close(socketId: number, callback?: () => void): void;
+
+  /**
+   * Retrieves the state of the given socket.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
+   * @param socketId The socket identifier.
+   * @param callback Called when the socket state is available.
+   */
+  export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+
+  /**
+   * Retrieves the list of currently opened sockets owned by the application.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
+   * @param callback Called when the list of sockets is available.
+   */
+  export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+
+  /**
+   * Event raised when a connection has been made to the server socket.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
+   */
+  export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
+
+  /**
+   * Event raised when a network error occured while the runtime was waiting
+   * for new connections on the socket address and port. Once this event is
+   * raised, the socket is set to paused and no more onAccept events are
+   * raised for this socket until the socket is resumed.
+   *
+   * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
+   */
+  export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
 }
 
 /**
@@ -3215,289 +3212,289 @@ declare namespace chrome.sockets.tcpServer {
  * @see https://developer.chrome.com/apps/sockets_udp
  */
 declare namespace chrome.sockets.udp {
-    export interface CreateInfo {
-        socketId: number;
-    }
+  export interface CreateInfo {
+    socketId: number;
+  }
 
-    export interface SendInfo {
-        resultCode: number;
-        bytesSent?: number;
-    }
+  export interface SendInfo {
+    resultCode: number;
+    bytesSent?: number;
+  }
 
-    export interface ReceiveEventArgs {
-        socketId: number;
-        data: ArrayBuffer;
-        remoteAddress: string;
-        remotePort: number;
-    }
+  export interface ReceiveEventArgs {
+    socketId: number;
+    data: ArrayBuffer;
+    remoteAddress: string;
+    remotePort: number;
+  }
 
-    export interface ReceiveErrorEventArgs {
-        socketId: number;
-        resultCode: number;
-    }
+  export interface ReceiveErrorEventArgs {
+    socketId: number;
+    resultCode: number;
+  }
+
+  /**
+   * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
+   */
+  export interface SocketProperties {
+    /**
+     * Flag indicating if the socket is left open when the event page of the
+     * application is unloaded. The default value is "false." When the
+     * application is loaded, any sockets previously opened with
+     * persistent=true can be fetched with getSockets.
+     * @see http://developer.chrome.com/apps/app_lifecycle.html
+     */
+    persistent?: boolean;
+
+    /** An application-defined string associated with the socket. */
+    name?: string;
 
     /**
-     * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
+     * The size of the buffer used to receive data. If the buffer is too
+     * small to receive the UDP packet, data is lost. The default value is
+     * 4096.
      */
-    export interface SocketProperties {
-        /**
-         * Flag indicating if the socket is left open when the event page of the
-         * application is unloaded. The default value is "false." When the
-         * application is loaded, any sockets previously opened with
-         * persistent=true can be fetched with getSockets.
-         * @see http://developer.chrome.com/apps/app_lifecycle.html
-         */
-        persistent?: boolean;
+    bufferSize?: number;
+  }
 
-        /** An application-defined string associated with the socket. */
-        name?: string;
-
-        /**
-         * The size of the buffer used to receive data. If the buffer is too
-         * small to receive the UDP packet, data is lost. The default value is
-         * 4096.
-         */
-        bufferSize?: number;
-    }
+  /**
+   * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
+   */
+  export interface SocketInfo {
+    /** The socket identifier. */
+    socketId: number;
 
     /**
-     * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
+     * Flag indicating whether the socket is left open when the application
+     * is suspended (see SocketProperties.persistent).
      */
-    export interface SocketInfo {
-        /** The socket identifier. */
-        socketId: number;
+    persistent: boolean;
 
-        /**
-         * Flag indicating whether the socket is left open when the application
-         * is suspended (see SocketProperties.persistent).
-         */
-        persistent: boolean;
-
-        /** Application-defined string associated with the socket. */
-        name?: string;
-
-        /**
-         * The size of the buffer used to receive data. If no buffer size ha
-         * been specified explictly, the value is not provided.
-         */
-        bufferSize?: number;
-
-        /**
-         * Flag indicating whether the socket is blocked from firing onReceive
-         * events.
-         */
-        paused: boolean;
-
-        /**
-         * If the underlying socket is bound, contains its local IPv4/6 address.
-         */
-        localAddress?: string;
-
-        /**
-         * If the underlying socket is bound, contains its local port.
-         */
-        localPort?: number;
-    }
+    /** Application-defined string associated with the socket. */
+    name?: string;
 
     /**
-     * Creates a UDP socket with default properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-create
-     * @param createInfo.socketId The ID of the newly created socket.
+     * The size of the buffer used to receive data. If no buffer size ha
+     * been specified explictly, the value is not provided.
      */
-    export function create(callback: (createInfo: CreateInfo) => void): void;
+    bufferSize?: number;
 
     /**
-     * Creates a UDP socket with the given properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-create
-     * @param properties          The socket properties.
-     * @param createInfo.socketId The ID of the newly created socket.
+     * Flag indicating whether the socket is blocked from firing onReceive
+     * events.
      */
-    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+    paused: boolean;
 
     /**
-     * Updates the socket properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-update
-     * @param socketId   The socket ID.
-     * @param properties The properties to update.
-     * @param callback   Called when the properties are updated.
+     * If the underlying socket is bound, contains its local IPv4/6 address.
      */
-    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+    localAddress?: string;
 
     /**
-     * Pauses or unpauses a socket. A paused socket is blocked from firing
-     * onReceive events.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setPaused
-     * @param socketId The socket ID.
-     * @param paused   Flag to indicate whether to pause or unpause.
-     * @param callback Called when the socket has been successfully paused or
-     *                 unpaused.
+     * If the underlying socket is bound, contains its local port.
      */
-    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+    localPort?: number;
+  }
 
-    /**
-     * Binds the local address and port for the socket. For a client socket, it
-     * is recommended to use port 0 to let the platform pick a free port.
-     *
-     * Once the bind operation completes successfully, onReceive events are
-     * raised when UDP packets arrive on the address/port specified -- unless
-     * the socket is paused.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-bind
-     * @param socketId The socket ID.
-     * @param address  The address of the local machine. DNS name, IPv4 and IPv6
-     *                 formats are supported. Use "0.0.0.0" to accept packets
-     *                 from all local available network interfaces.
-     * @param port     The port of the local machine. Use "0" to bind to a free
-     *                 port.
-     * @param callback Called when the bind operation completes.
-     */
-    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+  /**
+   * Creates a UDP socket with default properties.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-create
+   * @param createInfo.socketId The ID of the newly created socket.
+   */
+  export function create(callback: (createInfo: CreateInfo) => void): void;
 
-    /**
-     * Sends data on the given socket to the given address and port. The socket
-     * must be bound to a local port before calling this method.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-send
-     * @param socketId The socket ID.
-     * @param data     The data to send.
-     * @param address  The address of the remote machine.
-     * @param port     The port of the remote machine.
-     * @param callback Called when the send operation completes.
-     */
-    export function send(socketId: number, data: ArrayBuffer, address: string, port: number, callback: (sendInfo: SendInfo) => void): void;
+  /**
+   * Creates a UDP socket with the given properties.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-create
+   * @param properties          The socket properties.
+   * @param createInfo.socketId The ID of the newly created socket.
+   */
+  export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
-    /**
-     * Closes the socket and releases the address/port the socket is bound to.
-     * Each socket created should be closed after use. The socket id is no
-     * longer valid as soon at the function is called. However, the socket is
-     * guaranteed to be closed only when the callback is invoked.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-close
-     * @param socketId The socket ID.
-     * @param callback Called when the close operation completes.
-     */
-    export function close(socketId: number, callback?: () => void): void;
+  /**
+   * Updates the socket properties.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-update
+   * @param socketId   The socket ID.
+   * @param properties The properties to update.
+   * @param callback   Called when the properties are updated.
+   */
+  export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
 
-    /**
-     * Retrieves the state of the given socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-getInfo
-     * @param socketId The socket ID.
-     * @param callback Called when the socket state is available.
-     */
-    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+  /**
+   * Pauses or unpauses a socket. A paused socket is blocked from firing
+   * onReceive events.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-setPaused
+   * @param socketId The socket ID.
+   * @param paused   Flag to indicate whether to pause or unpause.
+   * @param callback Called when the socket has been successfully paused or
+   *                 unpaused.
+   */
+  export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
 
-    /**
-     * Retrieves the list of currently opened sockets owned by the application.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-getSockets
-     * @param callback Called when the list of sockets is available.
-     */
-    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+  /**
+   * Binds the local address and port for the socket. For a client socket, it
+   * is recommended to use port 0 to let the platform pick a free port.
+   *
+   * Once the bind operation completes successfully, onReceive events are
+   * raised when UDP packets arrive on the address/port specified -- unless
+   * the socket is paused.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-bind
+   * @param socketId The socket ID.
+   * @param address  The address of the local machine. DNS name, IPv4 and IPv6
+   *                 formats are supported. Use "0.0.0.0" to accept packets
+   *                 from all local available network interfaces.
+   * @param port     The port of the local machine. Use "0" to bind to a free
+   *                 port.
+   * @param callback Called when the bind operation completes.
+   */
+  export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
 
-    /**
-     * Joins the multicast group and starts to receive packets from that group.
-     * The socket must be bound to a local port before calling this method.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-joinGroup
-     * @param socketId The socket ID.
-     * @param address  The group address to join. Domain names are not supported.
-     * @param callback Called when the joinGroup operation completes.
-     */
-    export function joinGroup(socketId: number, address: string, callback: (result: number) => void): void;
+  /**
+   * Sends data on the given socket to the given address and port. The socket
+   * must be bound to a local port before calling this method.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-send
+   * @param socketId The socket ID.
+   * @param data     The data to send.
+   * @param address  The address of the remote machine.
+   * @param port     The port of the remote machine.
+   * @param callback Called when the send operation completes.
+   */
+  export function send(socketId: number, data: ArrayBuffer, address: string, port: number, callback: (sendInfo: SendInfo) => void): void;
 
-    /**
-     * Leaves the multicast group previously joined using joinGroup. This is
-     * only necessary to call if you plan to keep using the socket afterwards,
-     * since it will be done automatically by the OS when the socket is closed.
-     *
-     * Leaving the group will prevent the router from sending multicast
-     * datagrams to the local host, presuming no other process on the host is
-     * still joined to the group.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-leaveGroup
-     * @param socketId The socket ID.
-     * @param address  The group address to leave. Domain names are not
-     *                 supported.
-     * @param callback Called when the leaveGroup operation completes.
-     */
-    export function leaveGroup(socketId: number, address: string, callback: (result: number) => void): void;
+  /**
+   * Closes the socket and releases the address/port the socket is bound to.
+   * Each socket created should be closed after use. The socket id is no
+   * longer valid as soon at the function is called. However, the socket is
+   * guaranteed to be closed only when the callback is invoked.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-close
+   * @param socketId The socket ID.
+   * @param callback Called when the close operation completes.
+   */
+  export function close(socketId: number, callback?: () => void): void;
 
-    /**
-     * Sets the time-to-live of multicast packets sent to the multicast group.
-     *
-     * Calling this method does not require multicast permissions.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastTimeToLive
-     * @param socketId The socket ID.
-     * @param ttl      The time-to-live value.
-     * @param callback Called when the configuration operation completes.
-     */
-    export function setMulticastTimeToLive(socketId: number, ttl: number, callback: (result: number) => void): void;
+  /**
+   * Retrieves the state of the given socket.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-getInfo
+   * @param socketId The socket ID.
+   * @param callback Called when the socket state is available.
+   */
+  export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
 
-    /**
-     * Sets whether multicast packets sent from the host to the multicast group
-     * will be looped back to the host.
-     *
-     * Note: the behavior of setMulticastLoopbackMode is slightly different
-     * between Windows and Unix-like systems. The inconsistency happens only
-     * when there is more than one application on the same host joined to the
-     * same multicast group while having different settings on multicast
-     * loopback mode. On Windows, the applications with loopback off will not
-     * RECEIVE the loopback packets; while on Unix-like systems, the
-     * applications with loopback off will not SEND the loopback packets to
-     * other applications on the same host.
-     * @see MSDN: http://goo.gl/6vqbj
-     *
-     * Calling this method does not require multicast permissions.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastLoopbackMode
-     * @param socketId The socket ID.
-     * @param enabled  Indicate whether to enable loopback mode.
-     * @param callback Called when the configuration operation completes.
-     */
-    export function setMulticastLoopbackMode(socketId: number, enabled: boolean, callback: (result: number) => void): void;
+  /**
+   * Retrieves the list of currently opened sockets owned by the application.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-getSockets
+   * @param callback Called when the list of sockets is available.
+   */
+  export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
-    /**
-     * Gets the multicast group addresses the socket is currently joined to.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-getJoinedGroups
-     * @param socketId The socket ID.
-     * @param callback Called with an array of strings of the result.
-     */
-    export function getJoinedGroups(socketId: number, callback: (groups: string[]) => void): void;
+  /**
+   * Joins the multicast group and starts to receive packets from that group.
+   * The socket must be bound to a local port before calling this method.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-joinGroup
+   * @param socketId The socket ID.
+   * @param address  The group address to join. Domain names are not supported.
+   * @param callback Called when the joinGroup operation completes.
+   */
+  export function joinGroup(socketId: number, address: string, callback: (result: number) => void): void;
 
-    /**
-     * Enables or disables broadcast packets on this socket.
-     *
-     * @since Chrome 44
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setBroadcast
-     * @param socketId The socket ID.
-     * @param enabled  true to enable broadcast packets, false to disable them.
-     * @param callback Callback from the setBroadcast method.
-     */
-    export function setBroadcast(socketId: number, enabled: boolean, callback?: (result: number) => void): void;
+  /**
+   * Leaves the multicast group previously joined using joinGroup. This is
+   * only necessary to call if you plan to keep using the socket afterwards,
+   * since it will be done automatically by the OS when the socket is closed.
+   *
+   * Leaving the group will prevent the router from sending multicast
+   * datagrams to the local host, presuming no other process on the host is
+   * still joined to the group.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-leaveGroup
+   * @param socketId The socket ID.
+   * @param address  The group address to leave. Domain names are not
+   *                 supported.
+   * @param callback Called when the leaveGroup operation completes.
+   */
+  export function leaveGroup(socketId: number, address: string, callback: (result: number) => void): void;
 
-    /**
-     * Event raised when a UDP packet has been received for the given socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
-     */
-    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+  /**
+   * Sets the time-to-live of multicast packets sent to the multicast group.
+   *
+   * Calling this method does not require multicast permissions.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastTimeToLive
+   * @param socketId The socket ID.
+   * @param ttl      The time-to-live value.
+   * @param callback Called when the configuration operation completes.
+   */
+  export function setMulticastTimeToLive(socketId: number, ttl: number, callback: (result: number) => void): void;
 
-    /**
-     * Event raised when a network error occured while the runtime was waiting
-     * for data on the socket address and port. Once this event is raised, the
-     * socket is paused and no more onReceive events will be raised for this
-     * socket until the socket is resumed.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
-     */
-    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+  /**
+   * Sets whether multicast packets sent from the host to the multicast group
+   * will be looped back to the host.
+   *
+   * Note: the behavior of setMulticastLoopbackMode is slightly different
+   * between Windows and Unix-like systems. The inconsistency happens only
+   * when there is more than one application on the same host joined to the
+   * same multicast group while having different settings on multicast
+   * loopback mode. On Windows, the applications with loopback off will not
+   * RECEIVE the loopback packets; while on Unix-like systems, the
+   * applications with loopback off will not SEND the loopback packets to
+   * other applications on the same host.
+   * @see MSDN: http://goo.gl/6vqbj
+   *
+   * Calling this method does not require multicast permissions.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastLoopbackMode
+   * @param socketId The socket ID.
+   * @param enabled  Indicate whether to enable loopback mode.
+   * @param callback Called when the configuration operation completes.
+   */
+  export function setMulticastLoopbackMode(socketId: number, enabled: boolean, callback: (result: number) => void): void;
+
+  /**
+   * Gets the multicast group addresses the socket is currently joined to.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#method-getJoinedGroups
+   * @param socketId The socket ID.
+   * @param callback Called with an array of strings of the result.
+   */
+  export function getJoinedGroups(socketId: number, callback: (groups: string[]) => void): void;
+
+  /**
+   * Enables or disables broadcast packets on this socket.
+   *
+   * @since Chrome 44
+   * @see https://developer.chrome.com/apps/sockets_udp#method-setBroadcast
+   * @param socketId The socket ID.
+   * @param enabled  true to enable broadcast packets, false to disable them.
+   * @param callback Callback from the setBroadcast method.
+   */
+  export function setBroadcast(socketId: number, enabled: boolean, callback?: (result: number) => void): void;
+
+  /**
+   * Event raised when a UDP packet has been received for the given socket.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
+   */
+  export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+
+  /**
+   * Event raised when a network error occured while the runtime was waiting
+   * for data on the socket address and port. Once this event is raised, the
+   * socket is paused and no more onReceive events will be raised for this
+   * socket until the socket is resumed.
+   *
+   * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
+   */
+  export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
 ////////////////////
@@ -3509,106 +3506,106 @@ declare namespace chrome.sockets.udp {
  * @since Chrome 20.
  */
 declare namespace chrome.storage {
-    export interface StorageArea {
-        /**
-         * Gets the amount of space (in bytes) being used by one or more items.
-         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-         */
-        getBytesInUse(callback: (bytesInUse: number) => void): void;
-        /**
-         * Gets the amount of space (in bytes) being used by one or more items.
-         * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
-         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-         */
-        getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
-        /**
-         * Removes all items from storage.
-         * @param callback Optional.
-         * Callback on success, or on failure (in which case runtime.lastError will be set).
-         */
-        clear(callback?: () => void): void;
-        /**
-         * Sets multiple items.
-         * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
-         * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
-         * @param callback Optional.
-         * Callback on success, or on failure (in which case runtime.lastError will be set).
-         */
-        set(items: Object, callback?: () => void): void;
-        /**
-         * Removes one or more items from storage.
-         * @param A single key or a list of keys for items to remove.
-         * @param callback Optional.
-         * Callback on success, or on failure (in which case runtime.lastError will be set).
-         */
-        remove(keys: string | string[], callback?: () => void): void;
-        /**
-         * Gets one or more items from storage.
-         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-         * Parameter items: Object with items in their key-value mappings.
-         */
-        get(callback: (items: { [key: string]: any }) => void): void;
-        /**
-         * Gets one or more items from storage.
-         * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
-         * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
-         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-         * Parameter items: Object with items in their key-value mappings.
-         */
-        get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
-    }
-
-    export interface StorageChange {
-        /** Optional. The new value of the item, if there is a new value. */
-        newValue?: any;
-        /** Optional. The old value of the item, if there was an old value. */
-        oldValue?: any;
-    }
-
-    export interface LocalStorageArea extends StorageArea {
-        /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-        QUOTA_BYTES: number;
-    }
-
-    export interface SyncStorageArea extends StorageArea {
-        /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
-        MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
-        /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-        QUOTA_BYTES: number;
-        /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
-        QUOTA_BYTES_PER_ITEM: number;
-        /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
-        MAX_ITEMS: number;
-        /**
-         * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
-         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-         */
-        MAX_WRITE_OPERATIONS_PER_HOUR: number;
-        /**
-         * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
-         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-         * @since Chrome 40.
-         */
-        MAX_WRITE_OPERATIONS_PER_MINUTE: number;
-    }
-
-    export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
-
-    /** Items in the local storage area are local to each machine. */
-    export var local: LocalStorageArea;
-    /** Items in the sync storage area are synced using Chrome Sync. */
-    export var sync: SyncStorageArea;
-
+  export interface StorageArea {
     /**
-     * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace results in an error.
-     * @since Chrome 33.
+     * Gets the amount of space (in bytes) being used by one or more items.
+     * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+     * Parameter bytesInUse: Amount of space being used in storage, in bytes.
      */
-    export var managed: StorageArea;
+    getBytesInUse(callback: (bytesInUse: number) => void): void;
+    /**
+     * Gets the amount of space (in bytes) being used by one or more items.
+     * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+     * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+     * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+     */
+    getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
+    /**
+     * Removes all items from storage.
+     * @param callback Optional.
+     * Callback on success, or on failure (in which case runtime.lastError will be set).
+     */
+    clear(callback?: () => void): void;
+    /**
+     * Sets multiple items.
+     * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
+     * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
+     * @param callback Optional.
+     * Callback on success, or on failure (in which case runtime.lastError will be set).
+     */
+    set(items: Object, callback?: () => void): void;
+    /**
+     * Removes one or more items from storage.
+     * @param A single key or a list of keys for items to remove.
+     * @param callback Optional.
+     * Callback on success, or on failure (in which case runtime.lastError will be set).
+     */
+    remove(keys: string | string[], callback?: () => void): void;
+    /**
+     * Gets one or more items from storage.
+     * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+     * Parameter items: Object with items in their key-value mappings.
+     */
+    get(callback: (items: { [key: string]: any }) => void): void;
+    /**
+     * Gets one or more items from storage.
+     * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
+     * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+     * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+     * Parameter items: Object with items in their key-value mappings.
+     */
+    get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
+  }
 
-    /** Fired when one or more items change. */
-    export var onChanged: StorageChangedEvent;
+  export interface StorageChange {
+    /** Optional. The new value of the item, if there is a new value. */
+    newValue?: any;
+    /** Optional. The old value of the item, if there was an old value. */
+    oldValue?: any;
+  }
+
+  export interface LocalStorageArea extends StorageArea {
+    /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+    QUOTA_BYTES: number;
+  }
+
+  export interface SyncStorageArea extends StorageArea {
+    /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
+    MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+    /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+    QUOTA_BYTES: number;
+    /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
+    QUOTA_BYTES_PER_ITEM: number;
+    /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
+    MAX_ITEMS: number;
+    /**
+     * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
+     * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+     */
+    MAX_WRITE_OPERATIONS_PER_HOUR: number;
+    /**
+     * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
+     * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+     * @since Chrome 40.
+     */
+    MAX_WRITE_OPERATIONS_PER_MINUTE: number;
+  }
+
+  export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
+
+  /** Items in the local storage area are local to each machine. */
+  export var local: LocalStorageArea;
+  /** Items in the sync storage area are synced using Chrome Sync. */
+  export var sync: SyncStorageArea;
+
+  /**
+   * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this declare namespace results in an error.
+   * @since Chrome 33.
+   */
+  export var managed: StorageArea;
+
+  /** Fired when one or more items change. */
+  export var onChanged: StorageChangedEvent;
 }
 
 ////////////////////
@@ -3619,7 +3616,7 @@ declare namespace chrome.storage {
  * @since Chrome 27
  */
 declare namespace chrome.syncFileSystem {
-    /** NOT YET IMPLEMENTED */
+  /** NOT YET IMPLEMENTED */
 }
 
 
@@ -3632,40 +3629,40 @@ declare namespace chrome.syncFileSystem {
  * @since Chrome 32.
  */
 declare namespace chrome.system.cpu {
-    export interface ProcessorUsage {
-        /** The cumulative time used by userspace programs on this processor. */
-        user: number;
-        /** The cumulative time used by kernel programs on this processor. */
-        kernel: number;
-        /** The cumulative time spent idle by this processor. */
-        idle: number;
-        /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
-        total: number;
-    }
+  export interface ProcessorUsage {
+    /** The cumulative time used by userspace programs on this processor. */
+    user: number;
+    /** The cumulative time used by kernel programs on this processor. */
+    kernel: number;
+    /** The cumulative time spent idle by this processor. */
+    idle: number;
+    /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
+    total: number;
+  }
 
-    export interface ProcessorInfo {
-        /** Cumulative usage info for this logical processor. */
-        usage: ProcessorUsage;
-    }
+  export interface ProcessorInfo {
+    /** Cumulative usage info for this logical processor. */
+    usage: ProcessorUsage;
+  }
 
-    export interface CpuInfo {
-        /** The number of logical processors. */
-        numOfProcessors: number;
-        /** The architecture name of the processors. */
-        archName: string;
-        /** The model name of the processors. */
-        modelName: string;
-        /**
-         * A set of feature codes indicating some of the processor's capabilities.
-         * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
-         */
-        features: string[];
-        /** Information about each logical processor. */
-        processors: ProcessorInfo[];
-    }
+  export interface CpuInfo {
+    /** The number of logical processors. */
+    numOfProcessors: number;
+    /** The architecture name of the processors. */
+    archName: string;
+    /** The model name of the processors. */
+    modelName: string;
+    /**
+     * A set of feature codes indicating some of the processor's capabilities.
+     * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
+     */
+    features: string[];
+    /** Information about each logical processor. */
+    processors: ProcessorInfo[];
+  }
 
-    /** Queries basic CPU information of the system. */
-    export function getInfo(callback: (info: CpuInfo) => void): void;
+  /** Queries basic CPU information of the system. */
+  export function getInfo(callback: (info: CpuInfo) => void): void;
 }
 
 ////////////////////
@@ -3677,331 +3674,331 @@ declare namespace chrome.system.cpu {
  * @since Chrome 30.
  */
 declare namespace chrome.system.display {
-    export interface Bounds {
-        /**  The x-coordinate of the upper-left corner. */
-        left: number;
-        /**  The y-coordinate of the upper-left corner. */
-        top: number;
-        /** The width of the display in pixels. */
-        width: number;
-        /** The height of the display in pixels. */
-        height: number;
-    }
+  export interface Bounds {
+    /**  The x-coordinate of the upper-left corner. */
+    left: number;
+    /**  The y-coordinate of the upper-left corner. */
+    top: number;
+    /** The width of the display in pixels. */
+    width: number;
+    /** The height of the display in pixels. */
+    height: number;
+  }
 
-    export interface Insets {
-        /** The x-axis distance from the left bound. */
-        left: number;
-        /** The y-axis distance from the top bound. */
-        top: number;
-        /** The x-axis distance from the right bound. */
-        right: number;
-        /** The y-axis distance from the bottom bound. */
-        bottom: number;
-    }
+  export interface Insets {
+    /** The x-axis distance from the left bound. */
+    left: number;
+    /** The y-axis distance from the top bound. */
+    top: number;
+    /** The x-axis distance from the right bound. */
+    right: number;
+    /** The y-axis distance from the bottom bound. */
+    bottom: number;
+  }
+
+  /**
+   * @since Chrome 57
+   */
+  export interface Point {
+    /** The x-coordinate of the point. */
+    x: number;
+    /** The y-coordinate of the point. */
+    y: number;
+  }
+
+  /**
+   * @since Chrome 57
+   */
+  export interface TouchCalibrationPair {
+    /**	The coordinates of the display point. */
+    displayPoint: Point;
+    /** The coordinates of the touch point corresponding to the display point. */
+    touchPoint: Point;
+  }
+
+  /**
+   * @since Chrome 52
+   */
+  export interface DisplayMode {
+    /** The display mode width in device independent (user visible) pixels. */
+    width: number;
+
+    /** The display mode height in device independent (user visible) pixels. */
+    height: number;
+
+    /** The display mode width in native pixels. */
+    widthInNativePixels: number;
+
+    /** The display mode height in native pixels. */
+    heightInNativePixels: number;
+
+    /** The display mode UI scale factor. */
+    uiScale: number;
+
+    /** The display mode device scale factor. */
+    deviceScaleFactor: number;
+
+    /** True if the mode is the display's native mode. */
+    isNative: boolean;
+
+    /** True if the display mode is currently selected. */
+    isSelected: boolean;
+  }
+
+  /**
+   * @since Chrome 53
+   */
+  export interface DisplayLayout {
+    /** The unique identifier of the display. */
+    id: string;
+    /** The unique identifier of the parent display. Empty if this is the root. */
+    parentId: string;
+    /** The layout position of this display relative to the parent. This will be ignored for the root. */
+    position: 'top' | 'right' | 'bottom' | 'left';
+    /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
+    offset: number;
+  }
+
+  /**
+   * @description The pairs of point used to calibrate the display.
+   * @export
+   * @interface TouchCalibrationPairs
+   */
+  export interface TouchCalibrationPairs {
+    /** First pair of touch and display point required for touch calibration. */
+    pair1: TouchCalibrationPair,
+    /** Second pair of touch and display point required for touch calibration. */
+    pair2: TouchCalibrationPair,
+    /** Third pair of touch and display point required for touch calibration. */
+    pair3: TouchCalibrationPair,
+    /** Fourth pair of touch and display point required for touch calibration. */
+    pair4: TouchCalibrationPair
+  }
+
+  /**
+   * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
+   * @export
+   * @interface DisplayPropertiesInfo
+   */
+  export interface DisplayPropertiesInfo {
+    /**
+     * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
+     * @since Chrome 59
+     * */
+    isUnified?: boolean;
 
     /**
-     * @since Chrome 57
+     * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
      */
-    export interface Point {
-        /** The x-coordinate of the point. */
-        x: number;
-        /** The y-coordinate of the point. */
-        y: number;
-    }
+    mirroringSourceId?: string;
 
-    /**
-     * @since Chrome 57
-     */
-    export interface TouchCalibrationPair {
-        /**	The coordinates of the display point. */
-        displayPoint: Point;
-        /** The coordinates of the touch point corresponding to the display point. */
-        touchPoint: Point;
-    }
+    /** If set to true, makes the display primary. No-op if set to false. */
+    isPrimary?: boolean;
+
+    /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+    overscan?: Insets;
+
+    /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+    rotation?: 0 | 90 | 180 | 270;
+
+    /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+    boundsOriginX?: number;
+
+    /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+    boundsOriginY: number;
 
     /**
      * @since Chrome 52
+     * @description If set, updates the display mode to the mode matching this value.
      */
-    export interface DisplayMode {
-        /** The display mode width in device independent (user visible) pixels. */
-        width: number;
-
-        /** The display mode height in device independent (user visible) pixels. */
-        height: number;
-
-        /** The display mode width in native pixels. */
-        widthInNativePixels: number;
-
-        /** The display mode height in native pixels. */
-        heightInNativePixels: number;
-
-        /** The display mode UI scale factor. */
-        uiScale: number;
-
-        /** The display mode device scale factor. */
-        deviceScaleFactor: number;
-
-        /** True if the mode is the display's native mode. */
-        isNative: boolean;
-
-        /** True if the display mode is currently selected. */
-        isSelected: boolean;
-    }
+    displayMode?: DisplayMode;
+  }
 
+  /**
+   * @description Options affecting how the information is returned.
+   * @since Chrome 59
+   * @export
+   * @interface DisplayInfoFlags
+   */
+  export interface DisplayInfoFlags {
     /**
-     * @since Chrome 53
+     * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
+     * @type {boolean}
+     * @memberof DisplayInfoFlags
      */
-    export interface DisplayLayout {
-        /** The unique identifier of the display. */
-        id: string;
-        /** The unique identifier of the parent display. Empty if this is the root. */
-        parentId: string;
-        /** The layout position of this display relative to the parent. This will be ignored for the root. */
-        position: 'top' | 'right' | 'bottom' | 'left';
-        /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
-        offset: number;
-    }
+    singleUnified?: boolean;
+  }
 
-    /**
-     * @description The pairs of point used to calibrate the display.
-     * @export
-     * @interface TouchCalibrationPairs
-     */
-    export interface TouchCalibrationPairs {
-        /** First pair of touch and display point required for touch calibration. */
-        pair1: TouchCalibrationPair,
-        /** Second pair of touch and display point required for touch calibration. */
-        pair2: TouchCalibrationPair,
-        /** Third pair of touch and display point required for touch calibration. */
-        pair3: TouchCalibrationPair,
-        /** Fourth pair of touch and display point required for touch calibration. */
-        pair4: TouchCalibrationPair
-    }
+  /** Information about display properties. */
+  export interface DisplayInfo {
+    /** The unique identifier of the display. */
+    id: string;
+    /** The user-friendly name (e.g. "HP LCD monitor"). */
+    name: string;
+    /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
+    mirroringSourceId: string;
+    /** True if this is the primary display. */
+    isPrimary: boolean;
+    /** True if this is an internal display. */
+    isInternal: boolean;
+    /** True if this display is enabled. */
+    isEnabled: boolean;
+    /** The number of pixels per inch along the x-axis. */
+    dpiX: number;
+    /** The number of pixels per inch along the y-axis. */
+    dpiY: number;
+    /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
+    rotation: number;
+    /** The display's logical bounds. */
+    bounds: Bounds;
+    /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
+    overscan: Insets;
+    /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
+    workArea: Bounds;
+  }
 
-    /**
-     * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
-     * @export
-     * @interface DisplayPropertiesInfo
-     */
-    export interface DisplayPropertiesInfo {
-        /**
-         * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
-         * @since Chrome 59
-         * */
-        isUnified?: boolean;
+  /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
+  export interface DisplayProps {
+    /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
+    mirroringSourceId?: string;
+    /** If set to true, makes the display primary. No-op if set to false. */
+    isPrimary?: boolean;
+    /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+    overscan?: Insets;
+    /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+    rotation?: number;
+    /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+    boundsOriginX?: number;
+    /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+    boundsOriginY?: number;
+  }
 
-        /**
-         * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
-         */
-        mirroringSourceId?: string;
+  /**
+   * @description Fired when anything changes to the display configuration.
+   * @export
+   * @interface DisplayChangedEvent
+   * @extends {chrome.events.Event<() => void>}
+   */
+  export interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
 
-        /** If set to true, makes the display primary. No-op if set to false. */
-        isPrimary?: boolean;
+  /**
+   * @description Requests the information for all attached display devices.
+   * @export
+   * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+   */
+  export function getInfo(callback: (info: DisplayInfo[]) => void): void;
+  /**
+   * @description Requests the information for all attached display devices.
+   * @export
+   * @since Chrome 59
+   * @param {DisplayInfoFlags} [flags] Options affecting how the information is returned.
+   * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+   */
+  export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
 
-        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-        overscan?: Insets;
+  /**
+   * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+   * @since Chrome 53
+   * @export
+   * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
+   */
+  export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
 
-        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-        rotation?: 0 | 90 | 180 | 270;
+  /**
+   * @description Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+   * @export
+   * @param {string} id The display's unique identifier.
+   * @param {DisplayPropertiesInfo} info The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|.
+   * @param {() => void} [callback] Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+   */
+  export function setDisplayProperties(id: string, info: DisplayPropertiesInfo, callback?: () => void): void;
 
-        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-        boundsOriginX?: number;
+  /**
+   * @description Set the layout for all displays. Any display not included will use the default layout. If a layout would overlap or be otherwise invalid it will be adjusted to a valid layout. After layout is resolved, an onDisplayChanged event will be triggered. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+   * @since Chrome 53
+   * @export
+   * @param {DisplayLayout[]} layouts The layout information, required for all displays except the primary display.
+   * @param {() => void} callback Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+   */
+  export function setDisplayLayout(layouts: DisplayLayout[], callback?: () => void): void;
 
-        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-        boundsOriginY: number;
+  /**
+   * @description Enables/disables the unified desktop feature. Note that this simply enables the feature, but will not change the actual desktop mode. (That is, if the desktop is in mirror mode, it will stay in mirror mode) NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+   * @since Chrome 46
+   * @export
+   * @param {boolean} enabled True if unified desktop should be enabled.
+   */
+  export function enableUnifiedDesktop(enabled: boolean): void;
+  /**
+   * @description Starts overscan calibration for a display. This will show an overlay on the screen indicating the current overscan insets. If overscan calibration for display |id| is in progress this will reset calibration.
+   * @since Chrome 53
+   * @export
+   * @param {string} id The display's unique identifier.
+   */
+  export function overscanCalibrationStart(id: string): void;
+  /**
+   * @description Adjusts the current overscan insets for a display. Typically this should etiher move the display along an axis (e.g. left+right have the same value) or scale it along an axis (e.g. top+bottom have opposite values). Each Adjust call is cumulative with previous calls since Start.
+   * @since Chrome 53
+   * @export
+   * @param {string} id The display's unique identifier.
+   * @param {Insets} delta The amount to change the overscan insets.
+   */
+  export function overscanCalibrationAdjust(id: string, delta: Insets): void;
 
-        /**
-         * @since Chrome 52
-         * @description If set, updates the display mode to the mode matching this value.
-         */
-        displayMode?: DisplayMode;
-    }
+  /**
+   * @description Resets the overscan insets for a display to the last saved value (i.e before Start was called).
+   * @since Chrome 53
+   * @export
+   * @param {string} id The display's unique identifier.
+   */
+  export function overscanCalibrationReset(id: string): void;
 
-    /**
-     * @description Options affecting how the information is returned.
-     * @since Chrome 59
-     * @export
-     * @interface DisplayInfoFlags
-     */
-    export interface DisplayInfoFlags {
-        /**
-         * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
-         * @type {boolean}
-         * @memberof DisplayInfoFlags
-         */
-        singleUnified?: boolean;
-    }
+  /**
+   * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
+   * @since Chrome 53
+   * @export
+   * @param {string} id The display's unique identifier.
+   */
+  export function overscanCalibrationComplete(id: string): void;
 
-    /** Information about display properties. */
-    export interface DisplayInfo {
-        /** The unique identifier of the display. */
-        id: string;
-        /** The user-friendly name (e.g. "HP LCD monitor"). */
-        name: string;
-        /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
-        mirroringSourceId: string;
-        /** True if this is the primary display. */
-        isPrimary: boolean;
-        /** True if this is an internal display. */
-        isInternal: boolean;
-        /** True if this display is enabled. */
-        isEnabled: boolean;
-        /** The number of pixels per inch along the x-axis. */
-        dpiX: number;
-        /** The number of pixels per inch along the y-axis. */
-        dpiY: number;
-        /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
-        rotation: number;
-        /** The display's logical bounds. */
-        bounds: Bounds;
-        /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
-        overscan: Insets;
-        /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
-        workArea: Bounds;
-    }
+  /**
+   * @description Displays the native touch calibration UX for the display with |id| as display id. This will show an overlay on the screen with required instructions on how to proceed. The callback will be invoked in case of successful calibraion only. If the calibration fails, this will throw an error.
+   * @since Chrome 57
+   * @export
+   * @param {string} id The display's unique identifier.
+   * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
+   */
+  export function showNativeTouchCalibration(id: string, callback: (success: boolean) => void): void;
 
-    /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
-    export interface DisplayProps {
-        /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
-        mirroringSourceId?: string;
-        /** If set to true, makes the display primary. No-op if set to false. */
-        isPrimary?: boolean;
-        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-        overscan?: Insets;
-        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-        rotation?: number;
-        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-        boundsOriginX?: number;
-        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-        boundsOriginY?: number;
-    }
+  /**
+   * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.
+   * @since Chrome 57
+   * @export
+   * @param {string} id The display's unique identifier.
+   */
+  export function startCustomTouchCalibration(id: string): void;
 
-    /**
-     * @description Fired when anything changes to the display configuration.
-     * @export
-     * @interface DisplayChangedEvent
-     * @extends {chrome.events.Event<() => void>}
-     */
-    export interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
+  /**
+   * @description Sets the touch calibration pairs for a display. These |pairs| would be used to calibrate the touch screen for display with |id| called in startCustomTouchCalibration(). Always call |startCustomTouchCalibration| before calling this method. If another touch calibration is already in progress this will throw an error.
+   * @since Chrome 57
+   * @export
+   * @param {TouchCalibrationPairs} pairs The pairs of point used to calibrate the display.
+   * @param {Bounds} bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
+   */
+  export function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
+  /**
+   * @description Resets the touch calibration for the display and brings it back to its default state by clearing any touch calibration data associated with the display.
+   * @since Chrome 57
+   * @export
+   * @param {string} id The display's unique identifier.
+   */
+  export function clearTouchCalibration(id: string): void;
 
-    /**
-     * @description Requests the information for all attached display devices.
-     * @export
-     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
-     */
-    export function getInfo(callback: (info: DisplayInfo[]) => void): void;
-    /**
-     * @description Requests the information for all attached display devices.
-     * @export
-     * @since Chrome 59
-     * @param {DisplayInfoFlags} [flags] Options affecting how the information is returned.
-     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
-     */
-    export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
-
-    /**
-     * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-     * @since Chrome 53
-     * @export
-     * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
-     */
-    export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
-
-    /**
-     * @description Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-     * @export
-     * @param {string} id The display's unique identifier.
-     * @param {DisplayPropertiesInfo} info The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|.
-     * @param {() => void} [callback] Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
-     */
-    export function setDisplayProperties(id: string, info: DisplayPropertiesInfo, callback?: () => void): void;
-
-    /**
-     * @description Set the layout for all displays. Any display not included will use the default layout. If a layout would overlap or be otherwise invalid it will be adjusted to a valid layout. After layout is resolved, an onDisplayChanged event will be triggered. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-     * @since Chrome 53
-     * @export
-     * @param {DisplayLayout[]} layouts The layout information, required for all displays except the primary display.
-     * @param {() => void} callback Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
-     */
-    export function setDisplayLayout(layouts: DisplayLayout[], callback?: () => void): void;
-
-    /**
-     * @description Enables/disables the unified desktop feature. Note that this simply enables the feature, but will not change the actual desktop mode. (That is, if the desktop is in mirror mode, it will stay in mirror mode) NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-     * @since Chrome 46
-     * @export
-     * @param {boolean} enabled True if unified desktop should be enabled.
-     */
-    export function enableUnifiedDesktop(enabled: boolean): void;
-    /**
-     * @description Starts overscan calibration for a display. This will show an overlay on the screen indicating the current overscan insets. If overscan calibration for display |id| is in progress this will reset calibration.
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function overscanCalibrationStart(id: string): void;
-    /**
-     * @description Adjusts the current overscan insets for a display. Typically this should etiher move the display along an axis (e.g. left+right have the same value) or scale it along an axis (e.g. top+bottom have opposite values). Each Adjust call is cumulative with previous calls since Start.
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     * @param {Insets} delta The amount to change the overscan insets.
-     */
-    export function overscanCalibrationAdjust(id: string, delta: Insets): void;
-
-    /**
-     * @description Resets the overscan insets for a display to the last saved value (i.e before Start was called).
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function overscanCalibrationReset(id: string): void;
-
-    /**
-     * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function overscanCalibrationComplete(id: string): void;
-
-    /**
-     * @description Displays the native touch calibration UX for the display with |id| as display id. This will show an overlay on the screen with required instructions on how to proceed. The callback will be invoked in case of successful calibraion only. If the calibration fails, this will throw an error.
-     * @since Chrome 57
-     * @export
-     * @param {string} id The display's unique identifier.
-     * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
-     */
-    export function showNativeTouchCalibration(id: string, callback: (success: boolean) => void): void;
-
-    /**
-     * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.
-     * @since Chrome 57
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function startCustomTouchCalibration(id: string): void;
-
-    /**
-     * @description Sets the touch calibration pairs for a display. These |pairs| would be used to calibrate the touch screen for display with |id| called in startCustomTouchCalibration(). Always call |startCustomTouchCalibration| before calling this method. If another touch calibration is already in progress this will throw an error.
-     * @since Chrome 57
-     * @export
-     * @param {TouchCalibrationPairs} pairs The pairs of point used to calibrate the display.
-     * @param {Bounds} bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
-     */
-    export function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
-    /**
-     * @description Resets the touch calibration for the display and brings it back to its default state by clearing any touch calibration data associated with the display.
-     * @since Chrome 57
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function clearTouchCalibration(id: string): void;
-
-    /**
-     * @description Fired when anything changes to the display configuration.
-     * @export
-     */
-    export var onDisplayChanged: DisplayChangedEvent;
+  /**
+   * @description Fired when anything changes to the display configuration.
+   * @export
+   */
+  export var onDisplayChanged: DisplayChangedEvent;
 }
 
 ////////////////////
@@ -4013,28 +4010,28 @@ declare namespace chrome.system.display {
  * @since Chrome 32.
  */
 declare namespace chrome.system.memory {
-    export interface MemoryInfo {
-        /** The total amount of physical memory capacity, in bytes. */
-        capacity: number;
-        /** The amount of available capacity, in bytes. */
-        availableCapacity: number;
-    }
+  export interface MemoryInfo {
+    /** The total amount of physical memory capacity, in bytes. */
+    capacity: number;
+    /** The amount of available capacity, in bytes. */
+    availableCapacity: number;
+  }
 
-    /** Get physical memory information. */
-    export function getInfo(callback: (info: MemoryInfo) => void): void;
+  /** Get physical memory information. */
+  export function getInfo(callback: (info: MemoryInfo) => void): void;
 }
 
 ////////////////////
 // System - Network
 ////////////////////
 declare namespace chrome.system.network {
-    export interface NetworkInterface {
-        name: string;
-        address: string;
-        prefixLength: number;
-    }
+  export interface NetworkInterface {
+    name: string;
+    address: string;
+    prefixLength: number;
+  }
 
-    export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
+  export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
 }
 
 ////////////////////
@@ -4046,51 +4043,51 @@ declare namespace chrome.system.network {
  * @since Chrome 30.
  */
 declare namespace chrome.system.storage {
-    export interface StorageUnitInfo {
-        /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
-        id: string;
-        /** The name of the storage unit. */
-        name: string;
-        /**
-         * The media type of the storage unit.
-         * fixed: The storage has fixed media, e.g. hard disk or SSD.
-         * removable: The storage is removable, e.g. USB flash drive.
-         * unknown: The storage type is unknown.
-         */
-        type: string;
-        /** The total amount of the storage space, in bytes. */
-        capacity: number;
-    }
-
-    export interface StorageCapacityInfo {
-        /** A copied |id| of getAvailableCapacity function parameter |id|. */
-        id: string;
-        /** The available capacity of the storage device, in bytes. */
-        availableCapacity: number;
-    }
-
-    export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
-
-    export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
-
-    /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
-    export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
+  export interface StorageUnitInfo {
+    /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
+    id: string;
+    /** The name of the storage unit. */
+    name: string;
     /**
-     * Ejects a removable storage device.
-     * @param callback
-     * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
+     * The media type of the storage unit.
+     * fixed: The storage has fixed media, e.g. hard disk or SSD.
+     * removable: The storage is removable, e.g. USB flash drive.
+     * unknown: The storage type is unknown.
      */
-    export function ejectDevice(id: string, callback: (result: string) => void): void;
-    /**
-     * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
-     * @since Dev channel only.
-     */
-    export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
+    type: string;
+    /** The total amount of the storage space, in bytes. */
+    capacity: number;
+  }
 
-    /** Fired when a new removable storage is attached to the system. */
-    export var onAttached: SystemStorageAttachedEvent;
-    /** Fired when a removable storage is detached from the system. */
-    export var onDetached: SystemStorageDetachedEvent;
+  export interface StorageCapacityInfo {
+    /** A copied |id| of getAvailableCapacity function parameter |id|. */
+    id: string;
+    /** The available capacity of the storage device, in bytes. */
+    availableCapacity: number;
+  }
+
+  export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
+
+  export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
+
+  /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
+  export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
+  /**
+   * Ejects a removable storage device.
+   * @param callback
+   * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
+   */
+  export function ejectDevice(id: string, callback: (result: string) => void): void;
+  /**
+   * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
+   * @since Dev channel only.
+   */
+  export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
+
+  /** Fired when a new removable storage is attached to the system. */
+  export var onAttached: SystemStorageAttachedEvent;
+  /** Fired when a removable storage is detached from the system. */
+  export var onDetached: SystemStorageDetachedEvent;
 }
 
 ////////////////////
@@ -4102,110 +4099,110 @@ declare namespace chrome.system.storage {
  * @since Chrome 14.
  */
 declare namespace chrome.tts {
-    /** An event from the TTS engine to communicate the status of an utterance. */
-    export interface TtsEvent {
-        /** Optional. The index of the current character in the utterance. */
-        charIndex?: number;
-        /** Optional. The error description, if the event type is 'error'. */
-        errorMessage?: string;
-        /**
-         * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
-         * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
-         */
-        type: string;
-    }
+  /** An event from the TTS engine to communicate the status of an utterance. */
+  export interface TtsEvent {
+    /** Optional. The index of the current character in the utterance. */
+    charIndex?: number;
+    /** Optional. The error description, if the event type is 'error'. */
+    errorMessage?: string;
+    /**
+     * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
+     * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
+     */
+    type: string;
+  }
 
-    /** A description of a voice available for speech synthesis. */
-    export interface TtsVoice {
-        /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-        lang?: string;
-        /**
-         * Optional. This voice's gender.
-         * One of: "male", or "female"
-         */
-        gender?: string;
-        /** Optional. The name of the voice. */
-        voiceName?: string;
-        /** The ID of the extension providing this voice. */
-        extensionsId?: string;
-        /** All of the callback event types that this voice is capable of sending. */
-        eventTypes?: string[];
-        /**
-         * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
-         * @since Chrome 33.
-         */
-        remote?: boolean;
-    }
+  /** A description of a voice available for speech synthesis. */
+  export interface TtsVoice {
+    /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+    lang?: string;
+    /**
+     * Optional. This voice's gender.
+     * One of: "male", or "female"
+     */
+    gender?: string;
+    /** Optional. The name of the voice. */
+    voiceName?: string;
+    /** The ID of the extension providing this voice. */
+    extensionsId?: string;
+    /** All of the callback event types that this voice is capable of sending. */
+    eventTypes?: string[];
+    /**
+     * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
+     * @since Chrome 33.
+     */
+    remote?: boolean;
+  }
 
-    export interface SpeakOptions {
-        /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-        volume?: number;
-        /**
-         * Optional.
-         * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
-         */
-        enqueue?: boolean;
-        /**
-         * Optional.
-         * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
-         */
-        rate?: number;
-        /**
-         * Optional. This function is called with events that occur in the process of speaking the utterance.
-         * @param event The update event from the text-to-speech engine indicating the status of this utterance.
-         */
-        onEvent?: (event: TtsEvent) => void;
-        /**
-         * Optional.
-         * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
-         */
-        pitch?: number;
-        /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-        lang?: string;
-        /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
-        voiceName?: string;
-        /** Optional. The extension ID of the speech engine to use, if known. */
-        extensionId?: string;
-        /**
-         * Optional. Gender of voice for synthesized speech.
-         * One of: "male", or "female"
-         */
-        gender?: string;
-        /** Optional. The TTS event types the voice must support. */
-        requiredEventTypes?: string[];
-        /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
-        desiredEventTypes?: string[];
-    }
+  export interface SpeakOptions {
+    /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+    volume?: number;
+    /**
+     * Optional.
+     * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
+     */
+    enqueue?: boolean;
+    /**
+     * Optional.
+     * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
+     */
+    rate?: number;
+    /**
+     * Optional. This function is called with events that occur in the process of speaking the utterance.
+     * @param event The update event from the text-to-speech engine indicating the status of this utterance.
+     */
+    onEvent?: (event: TtsEvent) => void;
+    /**
+     * Optional.
+     * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
+     */
+    pitch?: number;
+    /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+    lang?: string;
+    /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
+    voiceName?: string;
+    /** Optional. The extension ID of the speech engine to use, if known. */
+    extensionId?: string;
+    /**
+     * Optional. Gender of voice for synthesized speech.
+     * One of: "male", or "female"
+     */
+    gender?: string;
+    /** Optional. The TTS event types the voice must support. */
+    requiredEventTypes?: string[];
+    /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
+    desiredEventTypes?: string[];
+  }
 
-    /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
-    export function isSpeaking(callback?: (speaking: boolean) => void): void;
-    /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
-    export function stop(): void;
-    /** Gets an array of all available voices. */
-    export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
-    /**
-     * Speaks text using a text-to-speech engine.
-     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-     */
-    export function speak(utterance: string, callback?: Function): void;
-    /**
-     * Speaks text using a text-to-speech engine.
-     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-     * @param options Optional. The speech options.
-     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-     */
-    export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
-    /**
-     * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
-     * @since Chrome 29.
-     */
-    export function pause(): void;
-    /**
-     * If speech was paused, resumes speaking where it left off.
-     * @since Chrome 29.
-     */
-    export function resume(): void;
+  /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
+  export function isSpeaking(callback?: (speaking: boolean) => void): void;
+  /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
+  export function stop(): void;
+  /** Gets an array of all available voices. */
+  export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
+  /**
+   * Speaks text using a text-to-speech engine.
+   * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+   * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+   */
+  export function speak(utterance: string, callback?: Function): void;
+  /**
+   * Speaks text using a text-to-speech engine.
+   * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+   * @param options Optional. The speech options.
+   * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+   */
+  export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
+  /**
+   * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
+   * @since Chrome 29.
+   */
+  export function pause(): void;
+  /**
+   * If speech was paused, resumes speaking where it left off.
+   * @since Chrome 29.
+   */
+  export function resume(): void;
 }
 
 ////////////////////
@@ -4216,200 +4213,200 @@ declare namespace chrome.tts {
  * @since Chrome 13.
  */
 declare namespace chrome.types {
-    export interface ChromeSettingClearDetails {
-        /**
-         * Optional.
-         * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
-    }
-
-    export interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
-        /**
-         * The value of the setting.
-         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-         */
-        value: any;
-        /**
-         * Optional.
-         * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
-    }
-
-    export interface ChromeSettingGetDetails {
-        /** Optional. Whether to return the value that applies to the incognito session (default false). */
-        incognito?: boolean;
-    }
-
+  export interface ChromeSettingClearDetails {
     /**
-     * @param details Details of the currently effective value.
+     * Optional.
+     * The scope of the ChromeSetting. One of
+     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
      */
-    export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+    scope?: string;
+  }
 
-    export interface ChromeSettingGetResultDetails {
-        /**
-         * One of
-         * • not_controllable: cannot be controlled by any extension
-         * • controlled_by_other_extensions: controlled by extensions with higher precedence
-         * • controllable_by_this_extension: can be controlled by this extension
-         * • controlled_by_this_extension: controlled by this extension
-         */
-        levelOfControl: string;
-        /** The value of the setting. */
-        value: any;
-        /**
-         * Optional.
-         * Whether the effective value is specific to the incognito session.
-         * This property will only be present if the incognito property in the details parameter of get() was true.
-         */
-        incognitoSpecific?: boolean;
-    }
+  export interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+    /**
+     * The value of the setting.
+     * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+     */
+    value: any;
+    /**
+     * Optional.
+     * The scope of the ChromeSetting. One of
+     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+     */
+    scope?: string;
+  }
 
-    export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
+  export interface ChromeSettingGetDetails {
+    /** Optional. Whether to return the value that applies to the incognito session (default false). */
+    incognito?: boolean;
+  }
 
-    /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
-    export interface ChromeSetting {
-        /**
-         * Sets the value of a setting.
-         * @param details Which setting to change.
-         * @param callback Optional. Called at the completion of the set operation.
-         */
-        set(details: ChromeSettingSetDetails, callback?: Function): void;
-        /**
-         * Gets the value of a setting.
-         * @param details Which setting to consider.
-         */
-        get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
-        /**
-         * Clears the setting, restoring any default value.
-         * @param details Which setting to clear.
-         * @param callback Optional. Called at the completion of the clear operation.
-         */
-        clear(details: ChromeSettingClearDetails, callback?: Function): void;
-        /** Fired after the setting changes. */
-        onChange: ChromeSettingChangedEvent;
-    }
+  /**
+   * @param details Details of the currently effective value.
+   */
+  export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+
+  export interface ChromeSettingGetResultDetails {
+    /**
+     * One of
+     * • not_controllable: cannot be controlled by any extension
+     * • controlled_by_other_extensions: controlled by extensions with higher precedence
+     * • controllable_by_this_extension: can be controlled by this extension
+     * • controlled_by_this_extension: controlled by this extension
+     */
+    levelOfControl: string;
+    /** The value of the setting. */
+    value: any;
+    /**
+     * Optional.
+     * Whether the effective value is specific to the incognito session.
+     * This property will only be present if the incognito property in the details parameter of get() was true.
+     */
+    incognitoSpecific?: boolean;
+  }
+
+  export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
+
+  /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
+  export interface ChromeSetting {
+    /**
+     * Sets the value of a setting.
+     * @param details Which setting to change.
+     * @param callback Optional. Called at the completion of the set operation.
+     */
+    set(details: ChromeSettingSetDetails, callback?: Function): void;
+    /**
+     * Gets the value of a setting.
+     * @param details Which setting to consider.
+     */
+    get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
+    /**
+     * Clears the setting, restoring any default value.
+     * @param details Which setting to clear.
+     * @param callback Optional. Called at the completion of the clear operation.
+     */
+    clear(details: ChromeSettingClearDetails, callback?: Function): void;
+    /** Fired after the setting changes. */
+    onChange: ChromeSettingChangedEvent;
+  }
 }
 
 ////////////////////
 // USB
 ////////////////////
 declare namespace chrome.usb {
-    type Direction = 'in' | 'out';
+  type Direction = 'in' | 'out';
 
-    export interface Device {
-        device: number,
-        vendorId: number,
-        productId: number,
-        productName: string,
-        manufacturerName: string,
-        serialNumber: string
-    }
+  export interface Device {
+    device: number,
+    vendorId: number,
+    productId: number,
+    productName: string,
+    manufacturerName: string,
+    serialNumber: string
+  }
 
-    export interface ConnectionHandle {
-        handle: number,
-        vendorId: number,
-        productId: number
-    }
+  export interface ConnectionHandle {
+    handle: number,
+    vendorId: number,
+    productId: number
+  }
 
-    export interface EndpointDescriptor {
-        address: number,
-        type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
-        direction: Direction,
-        maximumPacketSize: number,
-        synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
-        usage?: 'data' | 'feedback' | 'explicitFeedback',
-        pollingInterval?: number,
-        extra_data: ArrayBuffer
-    }
+  export interface EndpointDescriptor {
+    address: number,
+    type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
+    direction: Direction,
+    maximumPacketSize: number,
+    synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
+    usage?: 'data' | 'feedback' | 'explicitFeedback',
+    pollingInterval?: number,
+    extra_data: ArrayBuffer
+  }
 
-    export interface InterfaceDescriptor {
-        interfaceNumber: number,
-        alternateSetting: number,
-        interfaceClass: number,
-        interfaceSubclass: number,
-        interfaceProtocol: number,
-        description?: string,
-        endpoints: EndpointDescriptor[],
-        extra_data: ArrayBuffer
-    }
+  export interface InterfaceDescriptor {
+    interfaceNumber: number,
+    alternateSetting: number,
+    interfaceClass: number,
+    interfaceSubclass: number,
+    interfaceProtocol: number,
+    description?: string,
+    endpoints: EndpointDescriptor[],
+    extra_data: ArrayBuffer
+  }
 
-    export interface ConfigDescriptor {
-        active: boolean,
-        configurationValue: number,
-        description?: string,
-        selfPowered: boolean,
-        remoteWakeup: boolean,
-        maxPower: number,
-        interfaces: InterfaceDescriptor[],
-        extra_data: ArrayBuffer
-    }
+  export interface ConfigDescriptor {
+    active: boolean,
+    configurationValue: number,
+    description?: string,
+    selfPowered: boolean,
+    remoteWakeup: boolean,
+    maxPower: number,
+    interfaces: InterfaceDescriptor[],
+    extra_data: ArrayBuffer
+  }
 
-    export interface GenericTransferInfo {
-        direction: Direction,
-        endpoint: number,
-        length?: number,
-        data?: ArrayBuffer,
-        timeout?: number
-    }
+  export interface GenericTransferInfo {
+    direction: Direction,
+    endpoint: number,
+    length?: number,
+    data?: ArrayBuffer,
+    timeout?: number
+  }
 
-    export interface TransferResultInfo {
-        resultCode: number,
-        data?: ArrayBuffer
-    }
+  export interface TransferResultInfo {
+    resultCode: number,
+    data?: ArrayBuffer
+  }
 
-    export interface DeviceFilter {
-        vendorId?: number,
-        productId?: number,
-        interfaceClass?: number,
-        interfaceSubclass?: number,
-        interfaceProtocol?: number
-    }
+  export interface DeviceFilter {
+    vendorId?: number,
+    productId?: number,
+    interfaceClass?: number,
+    interfaceSubclass?: number,
+    interfaceProtocol?: number
+  }
 
-    export interface TransferInfo {
-        direction: Direction;
-        recipient: 'device' | 'interface' | 'endpoint' | 'other';
-        requestType: 'standard' | 'class' | 'vendor' | 'reserved';
-        request: number;
-        value: number;
-        index: number;
-        length?: number;
-        data?: ArrayBuffer;
-        timeout?: number;
-    }
+  export interface TransferInfo {
+    direction: Direction;
+    recipient: 'device' | 'interface' | 'endpoint' | 'other';
+    requestType: 'standard' | 'class' | 'vendor' | 'reserved';
+    request: number;
+    value: number;
+    index: number;
+    length?: number;
+    data?: ArrayBuffer;
+    timeout?: number;
+  }
 
-    export interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
+  export interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
 
-    export var onDeviceAdded: DeviceEvent;
-    export var onDeviceRemoved: DeviceEvent;
+  export var onDeviceAdded: DeviceEvent;
+  export var onDeviceRemoved: DeviceEvent;
 
-    export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-    export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-    export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
-    export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
-    export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
-    export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
-    export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
-    export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
-    export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
-    export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
-    export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-    export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-    export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
-    export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
-    export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-    export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-    export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
-    export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
+  export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+  export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+  export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
+  export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
+  export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
+  export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
+  export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
+  export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
+  export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
+  export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
+  export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+  export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+  export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
+  export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
+  export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+  export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+  export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
+  export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
 }
 
 
@@ -4423,81 +4420,81 @@ declare namespace chrome.usb {
  * @since Chrome 43.
  */
 declare namespace chrome.vpnProvider {
-    export interface VpnSessionParameters {
-        /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
-        address: string;
-        /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
-        broadcastAddress?: string;
-        /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
-        mtu?: string;
-        /**
-         * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-         */
-        exclusionList: string[];
-        /**
-         * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-         */
-        inclusionList: string[];
-        /** Optional. A list of search domains. (default: no search domain) */
-        domainSearch?: string[];
-        /** A list of IPs for the DNS servers. */
-        dnsServer: string[];
-    }
-
-    export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
-
-    export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
-
-    export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
-
-    export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
-
-    export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
-
+  export interface VpnSessionParameters {
+    /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
+    address: string;
+    /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
+    broadcastAddress?: string;
+    /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
+    mtu?: string;
     /**
-     * Creates a new VPN configuration that persists across multiple login sessions of the user.
-     * @param name The name of the VPN configuration.
-     * @param callback Called when the configuration is created or if there is an error.
-     * Parameter id: A unique ID for the created configuration, empty string on failure.
+     * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
      */
-    export function createConfig(name: string, callback: (id: string) => void): void;
+    exclusionList: string[];
     /**
-     * Destroys a VPN configuration created by the extension.
-     * @param id ID of the VPN configuration to destroy.
-     * @param callback Optional. Called when the configuration is destroyed or if there is an error.
+     * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
      */
-    export function destroyConfig(id: string, callback?: Function): void;
-    /**
-     * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
-     * @param parameters The parameters for the VPN session.
-     * @param callback Called when the parameters are set or if there is an error.
-     */
-    export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
-    /**
-     * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
-     * @param data The IP packet to be sent to the platform.
-     * @param callback Optional. Called when the packet is sent or if there is an error.
-     */
-    export function sendPacket(data: ArrayBuffer, callback?: Function): void;
-    /**
-     * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
-     * @param state The VPN session state of the VPN client.
-     * connected: VPN connection was successful.
-     * failure: VPN connection failed.
-     * @param callback Optional. Called when the notification is complete or if there is an error.
-     */
-    export function notifyConnectionStateChanged(state: string, callback?: Function): void;
+    inclusionList: string[];
+    /** Optional. A list of search domains. (default: no search domain) */
+    domainSearch?: string[];
+    /** A list of IPs for the DNS servers. */
+    dnsServer: string[];
+  }
 
-    /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
-    export var onPlatformMessage: VpnPlatformMessageEvent;
-    /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
-    export var onPacketReceived: VpnPacketReceptionEvent;
-    /** Triggered when a configuration created by the extension is removed by the platform. */
-    export var onConfigRemoved: VpnConfigRemovalEvent;
-    /** Triggered when a configuration is created by the platform for the extension. */
-    export var onConfigCreated: VpnConfigCreationEvent;
-    /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
-    export var onUIEvent: VpnUiEvent;
+  export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
+
+  export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
+
+  export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
+
+  export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
+
+  export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
+
+  /**
+   * Creates a new VPN configuration that persists across multiple login sessions of the user.
+   * @param name The name of the VPN configuration.
+   * @param callback Called when the configuration is created or if there is an error.
+   * Parameter id: A unique ID for the created configuration, empty string on failure.
+   */
+  export function createConfig(name: string, callback: (id: string) => void): void;
+  /**
+   * Destroys a VPN configuration created by the extension.
+   * @param id ID of the VPN configuration to destroy.
+   * @param callback Optional. Called when the configuration is destroyed or if there is an error.
+   */
+  export function destroyConfig(id: string, callback?: Function): void;
+  /**
+   * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+   * @param parameters The parameters for the VPN session.
+   * @param callback Called when the parameters are set or if there is an error.
+   */
+  export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
+  /**
+   * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
+   * @param data The IP packet to be sent to the platform.
+   * @param callback Optional. Called when the packet is sent or if there is an error.
+   */
+  export function sendPacket(data: ArrayBuffer, callback?: Function): void;
+  /**
+   * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
+   * @param state The VPN session state of the VPN client.
+   * connected: VPN connection was successful.
+   * failure: VPN connection failed.
+   * @param callback Optional. Called when the notification is complete or if there is an error.
+   */
+  export function notifyConnectionStateChanged(state: string, callback?: Function): void;
+
+  /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
+  export var onPlatformMessage: VpnPlatformMessageEvent;
+  /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
+  export var onPacketReceived: VpnPacketReceptionEvent;
+  /** Triggered when a configuration created by the extension is removed by the platform. */
+  export var onConfigRemoved: VpnConfigRemovalEvent;
+  /** Triggered when a configuration is created by the platform for the extension. */
+  export var onConfigCreated: VpnConfigCreationEvent;
+  /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
+  export var onUIEvent: VpnUiEvent;
 }
 
 ////////////////////
@@ -4510,28 +4507,28 @@ declare namespace chrome.vpnProvider {
  * @since Chrome 43.
  */
 declare namespace chrome.wallpaper {
-    export interface WallpaperDetails {
-        /** Optional. The jpeg or png encoded wallpaper image. */
-        data?: any;
-        /** Optional. The URL of the wallpaper to be set. */
-        url?: string;
-        /**
-         * The supported wallpaper layouts.
-         * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
-         */
-        layout: string;
-        /** The file name of the saved wallpaper. */
-        filename: string;
-        /** Optional. True if a 128x60 thumbnail should be generated. */
-        thumbnail?: boolean;
-    }
-
+  export interface WallpaperDetails {
+    /** Optional. The jpeg or png encoded wallpaper image. */
+    data?: any;
+    /** Optional. The URL of the wallpaper to be set. */
+    url?: string;
     /**
-     * Sets wallpaper to the image at url or wallpaperData with the specified layout
-     * @param callback
-     * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
+     * The supported wallpaper layouts.
+     * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
      */
-    export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
+    layout: string;
+    /** The file name of the saved wallpaper. */
+    filename: string;
+    /** Optional. True if a 128x60 thumbnail should be generated. */
+    thumbnail?: boolean;
+  }
+
+  /**
+   * Sets wallpaper to the image at url or wallpaperData with the specified layout
+   * @param callback
+   * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
+   */
+  export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
 }
 
 
@@ -4542,1222 +4539,1222 @@ declare namespace chrome.wallpaper {
  * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
  */
 declare namespace chrome.webview {
-    /** Options that determine what data should be cleared by `clearData`. */
-    export interface ClearDataOptions {
-        /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
-        since?: number;
-    }
-    export interface WindowEvent extends chrome.events.Event<() => void> { }
-
-    export interface ConsoleEvent extends Event {
-        /**
-         * @description The severity level of the log message. Ranges from 0 to 4.
-         * @type {number}
-         * @memberof ConsoleEvent
-         */
-        level: number;
-        /**
-         * @description The logged message contents.
-         * @type {string}
-         * @memberof ConsoleEvent
-         */
-        message: string;
-        /**
-         * @description The line number of the message source.
-         * @type {number}
-         * @memberof ConsoleEvent
-         */
-        line: number;
-        /**
-         * @description A string identifying the resource which logged the message.
-         * @type {string}
-         * @memberof ConsoleEvent
-         */
-        sourceId: string;
-    }
-
-    export interface ExitEvent extends Event {
-        /**
-         * @description Chrome's internal ID of the process that exited.
-         * @type {number}
-         * @memberof ExitEvent
-         */
-        processID: number;
-        /**
-         * @description String indicating the reason for the exit.
-         * @type {string}
-         * @memberof ExitEvent
-         */
-        reason: 'normal' | 'abnormal' | 'crash' | 'kill';
-    }
-
-    /** Description of a declarative rule for handling events. */
-    export interface Rule {
-        /** Optional priority of this rule. Defaults to 100.  */
-        priority?: number;
-        /** List of conditions that can trigger the actions. */
-        conditions: any[];
-        /** Optional. Optional identifier that allows referencing this rule.  */
-        id?: string;
-        /** List of actions that are triggered if one of the condtions is fulfilled. */
-        actions: any[];
-        /**
-         * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
-         * @since Chrome 28
-         * @type {string[]}
-         * @memberof Rule
-         */
-        tags?: string[];
-    }
+  /** Options that determine what data should be cleared by `clearData`. */
+  export interface ClearDataOptions {
+    /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
+    since?: number;
+  }
+  export interface WindowEvent extends chrome.events.Event<() => void> { }
 
+  export interface ConsoleEvent extends Event {
     /**
-     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-     * @export
-     * @interface InjectDetails
+     * @description The severity level of the log message. Ranges from 0 to 4.
+     * @type {number}
+     * @memberof ConsoleEvent
      */
-    export interface InjectDetails {
-        /**
-         * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        code?: string,
-        /**
-         * @description JavaScript or CSS file to inject.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        file?: string
-    }
-
-    export interface WebViewElementEventMap extends ElementEventMap {
-        'message': ConsoleEvent,
-        'exit': ExitEvent
-    }
-
+    level: number;
     /**
-     * @description
-     * @export
-     * @interface HTMLWebViewElement
-     * @extends {Element}
+     * @description The logged message contents.
+     * @type {string}
+     * @memberof ConsoleEvent
      */
-    export interface HTMLWebViewElement extends Element {
-        executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
-        src: string;
-        contentWindow: Window;
-        addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
-        addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-    }
-
-    /**Options that determine what data should be cleared by clearData. */
-    export interface ClearDataOptions {
-
-        /**
-        * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
-         */
-        since?: number;
-    }
-    /**A set of data types. Missing properties are interpreted as false. */
-    export interface ClearDataTypeSet {
-
-        /**
-        * @description Websites' appcaches.
-         */
-        appcache?: boolean
-
-        /**
-        * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
-         */
-        cache?: boolean
-
-        /**
-        * @description The partition's cookies.
-         */
-        cookies?: boolean
-
-        /**
-        * @description The partition's session cookies.
-         */
-        sessionCookies?: boolean
-
-        /**
-        * @description The partition's persistent cookies.
-         */
-        persistentCookies?: boolean
-
-        /**
-        * @description Websites' filesystems.
-         */
-        fileSystems?: boolean
-
-        /**
-        * @description Websites' IndexedDB data.
-         */
-        indexedDB?: boolean
-
-        /**
-        * @description Websites' local storage data.
-         */
-        localStorage?: boolean
-
-        /**
-        * @description Websites' WebSQL data.
-         */
-        webSQL?: boolean
-    }
+    message: string;
     /**
-    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
-    * Enum values:
-    * "all"
-    * "page"
-    * "frame"
-    * "selection"
-    * "link"
-    * "editable"
-    * "image"
-    * "video"
-    * "audio" */
-    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
-    /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
-    export interface InjectDetails {
-
-        /**
-        * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
-         */
-        code?: string
-
-        /**
-        * @description JavaScript or CSS file to inject.
-         */
-        file?: string
-    }
-    /**The type of injection item: code or a set of files. */
-    export interface InjectionItems {
-
-        /**
-        * @description JavaScript code or CSS to be injected into matching pages.
-         */
-        code?: string
-
-        /**
-        * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
-         */
-        files?: any[]
-    }
-    /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
-    export interface ContentScriptDetails {
-
-        /**
-        * @description The name of the content script to inject.
-         */
-        name: string
-
-        /**
-        * @description Specifies which pages this content script will be injected into.
-         */
-        matches: any[]
-
-        /**
-        * @description Excludes pages that this content script would otherwise be injected into.
-         */
-        exclude_matches?: any[]
-
-        /**
-        * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
-         */
-        match_about_blank?: boolean
-
-        /**
-        * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
-         */
-        css?: InjectionItems
-
-        /**
-        * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
-         */
-        js?: InjectionItems
-
-        /**
-        * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-         */
-        run_at?: chrome.extensionTypes.RunAt;
-
-        /**
-        * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
-         */
-        all_frames?: boolean;
-
-        /**
-        * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
-         */
-        include_globs?: string[];
-
-        /**
-        * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
-         */
-        exclude_globs?: string[];
-    }
-    /**@todo Add documentation */
-    export interface ContextMenuCreateProperties {
-
-        /**
-        * @description The type of menu item. Defaults to 'normal' if not specified.
-         */
-        type?: chrome.contextMenus.ItemType
-
-        /**
-        * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-         */
-        id?: string
-
-        /**
-        * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
-         */
-        title?: string
-
-        /**
-        * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-         */
-        checked?: boolean
-
-        /**
-        * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
-         */
-        contexts?: any[]
-
-        /**
-        * @description A function that will be called back when the menu item is clicked.
-        * @param {any} [object Object]
-         */
-        onclick?: (info: any) => void
-
-        /**
-        * @description The ID of a parent menu item; this makes the item a child of a previously added item.
-         */
-        parentId?: number | string
-
-        /**
-        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-         */
-        documentUrlPatterns?: any[]
-
-        /**
-        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-         */
-        targetUrlPatterns?: any[]
-
-        /**
-        * @description Whether this context menu item is enabled or disabled. Defaults to true.
-         */
-        enabled?: boolean
-    }
-    /**@todo Add documentation */
-    export interface ContextMenuUpdateProperties {
-
-        /**
-        * @description The type of menu item.
-         */
-        type?: chrome.webview.ContextType;
-
-        /**
-        * @description The text to be displayed in the item
-         */
-        title?: string
-
-        /**
-        * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-         */
-        checked?: boolean
-
-        /**
-        * @description List of contexts this menu item will appear in.
-         */
-        contexts?: any[]
-
-        /**
-        * @description A function that will be called back when the menu item is clicked.
-        * @param {any} [object Object]
-         */
-        onclick?: (info: any) => void
-
-        /**
-        * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
-         */
-        parentId?: number | string
-
-        /**
-        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-         */
-        documentUrlPatterns?: any[]
-
-        /**
-        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-         */
-        targetUrlPatterns?: any[]
-
-        /**
-        * @description Whether this context menu item is enabled or disabled.
-         */
-        enabled?: boolean
-    }
-    export interface ContextMenus {
-
-        /**
-        * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-        * @param {object} createProperties The properties used to create the item
-        * @param {any} [object Object]
-         */
-        create(createProperties: object, callback?: () => void): void;
-
-        /**
-        * @description Updates a previously created context menu item.
-        * @param {any} id The ID of the item to update.
-        * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
-        * @param {any} [object Object]
-         */
-        update(id: number | string, updateProperties: object, callback?: () => void): void;
-
-        /**
-        * @description Removes a context menu item.
-        * @param {any} menuItemId The ID of the context menu item to remove.
-        * @param {any} [object Object]
-         */
-        remove(menuItemId: number | string, callback?: () => void): void;
-
-        /**
-        * @description Removes all context menu items added to this webview.
-        * @param {any} [object Object]
-         */
-        removeAll(callback?: () => void): void;
-
-
-        /**
-        * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
-         */
-        onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
-
-    }
-    export interface IOnShowEvent {
-        /**
-         * @description Call this to prevent showing the context menu.
-         * @memberof IOnShowEvent
-         */
-        preventDefault: () => void;
-    }
-    export interface ContentWindow {
-
-        /**
-        * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
-        * @param {any} message Message object to send to the guest.
-        * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
-         */
-        postMessage(message: any, targetOrigin: string): void;
-
-    }
-    export interface DialogController {
-
-        /**
-        * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
-        * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
-         */
-        ok(response?: string): void;
-
-        /**
-        * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
-         */
-        cancel(): void;
-
-    }
-    /**Contains all of the results of the find request. */
-    export interface FindCallbackResults {
-
-        /**
-        * @description The number of times searchText was matched on the page.
-         */
-        numberOfMatches: number
-
-        /**
-        * @description The ordinal number of the current match.
-         */
-        activeMatchOrdinal: number
-
-        /**
-        * @description Describes a rectangle around the active match in screen coordinates.
-         */
-        selectionRect: SelectionRect
-
-        /**
-        * @description Indicates whether this find request was canceled.
-         */
-        canceled: boolean
-    }
-    /**Options for the find request. */
-    export interface FindOptions {
-
-        /**
-        * @description Flag to find matches in reverse order. The default value is false.
-         */
-        backward?: boolean
-
-        /**
-        * @description Flag to match with case-sensitivity. The default value is false.
-         */
-        matchCase?: boolean
-    }
-    export interface NewWindow {
-
-        /**
-        * @description Attach the requested target page to an existing webview element.
-        * @param {object} webview The webview element to which the target page should be attached.
-         */
-        attach(webview: object): void;
-
-        /**
-        * @description Cancel the new window request.
-         */
-        discard(): void;
-
-    }
-    export interface MediaPermissionRequest {
-
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
-
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
-
-    }
-    export interface GeolocationPermissionRequest {
-
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
-
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
-
-    }
-    export interface PointerLockPermissionRequest {
-
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
-
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
-
-    }
-    export interface DownloadPermissionRequest {
-
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
-
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
-
-    }
-    export interface FileSystemPermissionRequest {
-
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
-
-        /**
-        * @description Deny the permission request.
-         */
-        deny(): void;
-
-    }
-    export interface FullscreenPermissionRequest {
-
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
-
-        /**
-        * @description Deny the permission request.
-         */
-        deny(): void;
-
-    }
-    export interface LoadPluginPermissionRequest {
-
-        /**
-        * @description Allow the permission request. This is the default behavior if deny is not called..
-         */
-        allow(): void;
-
-        /**
-        * @description Deny the permission request.
-         */
-        deny(): void;
-
-    }
-    /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
-    export interface SelectionRect {
-
-        /**
-        * @description Distance from the left edge of the screen to the left edge of the rectangle.
-         */
-        left: number
-
-        /**
-        * @description Distance from the top edge of the screen to the top edge of the rectangle.
-         */
-        top: number
-
-        /**
-        * @description Width of the rectangle.
-         */
-        width: number
-
-        /**
-        * @description Height of the rectangle.
-         */
-        height: number
-    }
-    /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
-      function(details) { return {cancel: true}; },
-      {urls: ["*://www.evil.com/*"]},
-      ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
-      conditions: [
-        new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
-      ],
-      actions: [ new chrome.webViewRequest.CancelRequest() ]
-    };
-    myWebview.request.onRequest.addRules([rule]);</pre> */
-    export interface WebRequestEventInterface {
-    }
+     * @description The line number of the message source.
+     * @type {number}
+     * @memberof ConsoleEvent
+     */
+    line: number;
     /**
-    * Defines the how zooming is handled in the webview.
-    * Enum values:
-    * "per-origin"
-    * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor.
-    * "per-view"
-    * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
-    * "disabled"
-    * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
-    export type ZoomMode = "per-origin" | "per-view" | "disabled";
+     * @description A string identifying the resource which logged the message.
+     * @type {string}
+     * @memberof ConsoleEvent
+     */
+    sourceId: string;
+  }
+
+  export interface ExitEvent extends Event {
+    /**
+     * @description Chrome's internal ID of the process that exited.
+     * @type {number}
+     * @memberof ExitEvent
+     */
+    processID: number;
+    /**
+     * @description String indicating the reason for the exit.
+     * @type {string}
+     * @memberof ExitEvent
+     */
+    reason: 'normal' | 'abnormal' | 'crash' | 'kill';
+  }
+
+  /** Description of a declarative rule for handling events. */
+  export interface Rule {
+    /** Optional priority of this rule. Defaults to 100.  */
+    priority?: number;
+    /** List of conditions that can trigger the actions. */
+    conditions: any[];
+    /** Optional. Optional identifier that allows referencing this rule.  */
+    id?: string;
+    /** List of actions that are triggered if one of the condtions is fulfilled. */
+    actions: any[];
+    /**
+     * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
+     * @since Chrome 28
+     * @type {string[]}
+     * @memberof Rule
+     */
+    tags?: string[];
+  }
+
+  /**
+   * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+   * @export
+   * @interface InjectDetails
+   */
+  export interface InjectDetails {
+    /**
+     * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
+     * @type {string}
+     * @memberof InjectDetails
+     */
+    code?: string,
+    /**
+     * @description JavaScript or CSS file to inject.
+     * @type {string}
+     * @memberof InjectDetails
+     */
+    file?: string
+  }
+
+  export interface WebViewElementEventMap extends ElementEventMap {
+    'message': ConsoleEvent,
+    'exit': ExitEvent
+  }
+
+  /**
+   * @description
+   * @export
+   * @interface HTMLWebViewElement
+   * @extends {Element}
+   */
+  export interface HTMLWebViewElement extends Element {
+    executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
+    src: string;
+    contentWindow: Window;
+    addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+  }
+
+  /**Options that determine what data should be cleared by clearData. */
+  export interface ClearDataOptions {
 
     /**
-    * @description Queries audio state.
+    * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
+     */
+    since?: number;
+  }
+  /**A set of data types. Missing properties are interpreted as false. */
+  export interface ClearDataTypeSet {
+
+    /**
+    * @description Websites' appcaches.
+     */
+    appcache?: boolean
+
+    /**
+    * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
+     */
+    cache?: boolean
+
+    /**
+    * @description The partition's cookies.
+     */
+    cookies?: boolean
+
+    /**
+    * @description The partition's session cookies.
+     */
+    sessionCookies?: boolean
+
+    /**
+    * @description The partition's persistent cookies.
+     */
+    persistentCookies?: boolean
+
+    /**
+    * @description Websites' filesystems.
+     */
+    fileSystems?: boolean
+
+    /**
+    * @description Websites' IndexedDB data.
+     */
+    indexedDB?: boolean
+
+    /**
+    * @description Websites' local storage data.
+     */
+    localStorage?: boolean
+
+    /**
+    * @description Websites' WebSQL data.
+     */
+    webSQL?: boolean
+  }
+  /**
+  * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
+  * Enum values:
+  * "all"
+  * "page"
+  * "frame"
+  * "selection"
+  * "link"
+  * "editable"
+  * "image"
+  * "video"
+  * "audio" */
+  export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
+  /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
+  export interface InjectDetails {
+
+    /**
+    * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
+     */
+    code?: string
+
+    /**
+    * @description JavaScript or CSS file to inject.
+     */
+    file?: string
+  }
+  /**The type of injection item: code or a set of files. */
+  export interface InjectionItems {
+
+    /**
+    * @description JavaScript code or CSS to be injected into matching pages.
+     */
+    code?: string
+
+    /**
+    * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
+     */
+    files?: any[]
+  }
+  /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
+  export interface ContentScriptDetails {
+
+    /**
+    * @description The name of the content script to inject.
+     */
+    name: string
+
+    /**
+    * @description Specifies which pages this content script will be injected into.
+     */
+    matches: any[]
+
+    /**
+    * @description Excludes pages that this content script would otherwise be injected into.
+     */
+    exclude_matches?: any[]
+
+    /**
+    * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
+     */
+    match_about_blank?: boolean
+
+    /**
+    * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
+     */
+    css?: InjectionItems
+
+    /**
+    * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
+     */
+    js?: InjectionItems
+
+    /**
+    * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+     */
+    run_at?: chrome.extensionTypes.RunAt;
+
+    /**
+    * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
+     */
+    all_frames?: boolean;
+
+    /**
+    * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
+     */
+    include_globs?: string[];
+
+    /**
+    * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
+     */
+    exclude_globs?: string[];
+  }
+  /**@todo Add documentation */
+  export interface ContextMenuCreateProperties {
+
+    /**
+    * @description The type of menu item. Defaults to 'normal' if not specified.
+     */
+    type?: chrome.contextMenus.ItemType
+
+    /**
+    * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+     */
+    id?: string
+
+    /**
+    * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
+     */
+    title?: string
+
+    /**
+    * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+     */
+    checked?: boolean
+
+    /**
+    * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
+     */
+    contexts?: any[]
+
+    /**
+    * @description A function that will be called back when the menu item is clicked.
     * @param {any} [object Object]
      */
-    export function getAudioState(callback: (audible: boolean) => void): void;
+    onclick?: (info: any) => void
 
     /**
-    * @description Sets audio mute state of the webview.
-    * @param {boolean} mute Mute audio value
+    * @description The ID of a parent menu item; this makes the item a child of a previously added item.
      */
-    export function setAudioMuted(mute: boolean): void;
+    parentId?: number | string
 
     /**
-    * @description Queries whether audio is muted.
+    * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+     */
+    documentUrlPatterns?: any[]
+
+    /**
+    * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+     */
+    targetUrlPatterns?: any[]
+
+    /**
+    * @description Whether this context menu item is enabled or disabled. Defaults to true.
+     */
+    enabled?: boolean
+  }
+  /**@todo Add documentation */
+  export interface ContextMenuUpdateProperties {
+
+    /**
+    * @description The type of menu item.
+     */
+    type?: chrome.webview.ContextType;
+
+    /**
+    * @description The text to be displayed in the item
+     */
+    title?: string
+
+    /**
+    * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+     */
+    checked?: boolean
+
+    /**
+    * @description List of contexts this menu item will appear in.
+     */
+    contexts?: any[]
+
+    /**
+    * @description A function that will be called back when the menu item is clicked.
     * @param {any} [object Object]
      */
-    export function isAudioMuted(callback: (muted: boolean) => void): void;
+    onclick?: (info: any) => void
 
     /**
-     * @description Captures the visible region of the webview.
-     * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+    * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
      */
-    export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
+    parentId?: number | string
+
     /**
-     * @description Captures the visible region of the webview.
-     * @param {*} options
-     * @param {(dataUrl: string) => void} callback
+    * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
      */
-    export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
+    documentUrlPatterns?: any[]
 
     /**
-    * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
-      {
-        name: 'myRule',
-        matches: ['http://www.foo.com/*'],
-        css: { files: ['mystyles.css'] },
-        js: { files: ['jquery.js', 'myscript.js'] },
-        run_at: 'document_start'
-      },
-      {
-        name: 'anotherRule',
-        matches: ['http://www.bar.com/*'],
-        js: { code: "document.body.style.backgroundColor = 'red';" },
-        run_at: 'document_end'
-      }]);
-     ...
-
-    // Navigates webview.
-    webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
-        name: 'rule',
-        matches: ['http://www.foo.com/*'],
-        js: { files: ['scriptA.js'] },
-        run_at: 'document_start'}]);
-
-    // Do something.
-    webview.src = 'http://www.foo.com/*';
-     ...
-    // Overwrite 'rule' defined before.
-    webview.addContentScripts([{
-        name: 'rule',
-        matches: ['http://www.bar.com/*'],
-        js: { files: ['scriptB.js'] },
-        run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
-    * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
+    * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
      */
-    export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
+    targetUrlPatterns?: any[]
 
     /**
-    * @description Navigates backward one history entry if possible. Equivalent to go(-1).
-    * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
+    * @description Whether this context menu item is enabled or disabled.
      */
-    export function back(callback?: (success: boolean) => void): void;
+    enabled?: boolean
+  }
+  export interface ContextMenus {
 
     /**
-    * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-     */
-    export function canGoBack(): void;
-
-    /**
-    * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-     */
-    export function canGoForward(): void;
-
-    /**
-    * @description <p>Clears browsing data for the webview partition.</p>
-    * @param {any} options Options determining which data to clear.
-    * @param {any} types The types of data to be cleared.
+    * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+    * @param {object} createProperties The properties used to create the item
     * @param {any} [object Object]
      */
-    export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
+    create(createProperties: object, callback?: () => void): void;
 
     /**
-    * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
-    * @param {any} details Details of the script to run.
+    * @description Updates a previously created context menu item.
+    * @param {any} id The ID of the item to update.
+    * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
     * @param {any} [object Object]
      */
-    export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
+    update(id: number | string, updateProperties: object, callback?: () => void): void;
 
     /**
-    * @description Initiates a find-in-page request.
-    * @param {string} searchText The string to find in the page.
-    * @param {any} options Options for the find request.
+    * @description Removes a context menu item.
+    * @param {any} menuItemId The ID of the context menu item to remove.
     * @param {any} [object Object]
      */
-    export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
+    remove(menuItemId: number | string, callback?: () => void): void;
 
     /**
-    * @description Navigates forward one history entry if possible. Equivalent to go(1).
+    * @description Removes all context menu items added to this webview.
     * @param {any} [object Object]
      */
-    export function forward(callback?: (success: boolean) => void): void;
+    removeAll(callback?: () => void): void;
+
 
     /**
-    * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
+    * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
      */
-    export function getProcessId(): void;
+    onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
+
+  }
+  export interface IOnShowEvent {
+    /**
+     * @description Call this to prevent showing the context menu.
+     * @memberof IOnShowEvent
+     */
+    preventDefault: () => void;
+  }
+  export interface ContentWindow {
 
     /**
-    * @description Returns the user agent string used by the webview for guest page requests.
+    * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
+    * @param {any} message Message object to send to the guest.
+    * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
      */
-    export function getUserAgent(): void;
+    postMessage(message: any, targetOrigin: string): void;
+
+  }
+  export interface DialogController {
 
     /**
-    * @description Gets the current zoom factor.
-    * @param {any} [object Object]
+    * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
+    * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
      */
-    export function getZoom(callback: (zoomFactor: number) => void): void;
+    ok(response?: string): void;
 
     /**
-    * @description Gets the current zoom mode.
-    * @param {any} [object Object]
+    * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
      */
-    export function getZoomMode(callback: (ZoomMode: any) => void): void;
+    cancel(): void;
+
+  }
+  /**Contains all of the results of the find request. */
+  export interface FindCallbackResults {
 
     /**
-    * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
-    * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
-    * @param {any} [object Object]
+    * @description The number of times searchText was matched on the page.
      */
-    export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
+    numberOfMatches: number
 
     /**
-    * @description Injects CSS into the guest page.
-    * @param {any} details Details of the CSS to insert.
-    * @param {any} [object Object]
+    * @description The ordinal number of the current match.
      */
-    export function insertCSS(details: InjectDetails, callback?: () => void): void;
+    activeMatchOrdinal: number
 
     /**
-    * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
+    * @description Describes a rectangle around the active match in screen coordinates.
      */
-    export function isUserAgentOverridden(): void;
+    selectionRect: SelectionRect
 
     /**
-    * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
+    * @description Indicates whether this find request was canceled.
      */
-    export function print(): void;
+    canceled: boolean
+  }
+  /**Options for the find request. */
+  export interface FindOptions {
 
     /**
-    * @description Reloads the current top-level page.
+    * @description Flag to find matches in reverse order. The default value is false.
      */
-    export function reload(): void;
+    backward?: boolean
 
     /**
-    * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
-    * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
+    * @description Flag to match with case-sensitivity. The default value is false.
      */
-    export function removeContentScripts(scriptNameList?: any[]): void;
+    matchCase?: boolean
+  }
+  export interface NewWindow {
 
     /**
-    * @description Override the user agent string used by the webview for guest page requests.
-    * @param {string} userAgent The user agent string to use.
+    * @description Attach the requested target page to an existing webview element.
+    * @param {object} webview The webview element to which the target page should be attached.
      */
-    export function setUserAgentOverride(userAgent: string): void;
+    attach(webview: object): void;
 
     /**
-    * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
-    * @param {number} zoomFactor The new zoom factor.
-    * @param {any} [object Object]
+    * @description Cancel the new window request.
      */
-    export function setZoom(zoomFactor: number, callback?: () => void): void;
+    discard(): void;
+
+  }
+  export interface MediaPermissionRequest {
 
     /**
-    * @description Sets the zoom mode of the webview.
-    * @param {any} ZoomMode Defines how zooming is handled in the webview.
-    * @param {any} [object Object]
+    * @description Allow the permission request.
      */
-    export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
+    allow(): void;
 
     /**
-    * @description Stops loading the current webview navigation if in progress.
+    * @description Deny the permission request. This is the default behavior if allow is not called.
      */
-    export function stop(): void;
+    deny(): void;
+
+  }
+  export interface GeolocationPermissionRequest {
 
     /**
-    * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
-    * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
+    * @description Allow the permission request.
      */
-    export function stopFinding(action?: string): void;
+    allow(): void;
 
     /**
-    * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
-    * @param {string} dataUrl The data URL to load.
-    * @param {string} baseUrl The base URL that will be used for relative links.
-    * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
+    * @description Deny the permission request. This is the default behavior if allow is not called.
      */
-    export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
+    deny(): void;
+
+  }
+  export interface PointerLockPermissionRequest {
 
     /**
-    * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
+    * @description Allow the permission request.
      */
-    export function terminate(): void;
+    allow(): void;
 
     /**
-    * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
-      webview.src = 'about:blank';
-    });</pre>
+    * @description Deny the permission request. This is the default behavior if allow is not called.
      */
+    deny(): void;
 
-    export function close(event: chrome.events.Event<GenericEvent>): void;
+  }
+  export interface DownloadPermissionRequest {
 
     /**
-    * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
-      console.log('Guest page logged a message: ', e.message);
-    });</pre>
-    * @param {any} [object Object]
+    * @description Allow the permission request.
      */
-
-    export var consolemessage: chrome.events.Event<IConsolemessage>;
+    allow(): void;
 
     /**
-    * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
-      webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
-    });</pre>
+    * @description Deny the permission request. This is the default behavior if allow is not called.
      */
+    deny(): void;
 
-    export var contentload: (event: chrome.events.Event<GenericEvent>) => void;
+  }
+  export interface FileSystemPermissionRequest {
 
     /**
-    * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
-    * @param {any} [object Object]
+    * @description Allow the permission request.
      */
-
-    export var dialog: chrome.events.Event<IDialog>;
+    allow(): void;
 
     /**
-    * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
-      if (e.reason === 'crash') {
-        webview.src = 'data:text/plain,Goodbye, world!';
-      }
-    });</pre>
-    * @param {any} [object Object]
+    * @description Deny the permission request.
      */
+    deny(): void;
 
-    export var exit: chrome.events.Event<IExit>;
+  }
+  export interface FullscreenPermissionRequest {
 
     /**
-    * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
-    * @param {any} [object Object]
+    * @description Allow the permission request.
      */
-
-    export var findupdate: chrome.events.Event<IFindupdate>;
+    allow(): void;
 
     /**
-    * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
-    * @param {any} [object Object]
+    * @description Deny the permission request.
      */
+    deny(): void;
 
-    export var loadabort: chrome.events.Event<ILoadabort>;
+  }
+  export interface LoadPluginPermissionRequest {
 
     /**
-    * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
-    * @param {any} [object Object]
+    * @description Allow the permission request. This is the default behavior if deny is not called..
      */
-
-    export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
+    allow(): void;
 
     /**
-    * @description Fired when a top-level load request has redirected to a different URL.
-    * @param {any} [object Object]
+    * @description Deny the permission request.
      */
+    deny(): void;
 
-    export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
+  }
+  /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
+  export interface SelectionRect {
 
     /**
-    * @description Fired when a load has begun.
-    * @param {any} [object Object]
+    * @description Distance from the left edge of the screen to the left edge of the rectangle.
      */
-
-    export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
+    left: number
 
     /**
-    * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
+    * @description Distance from the top edge of the screen to the top edge of the rectangle.
      */
-
-    export function loadstop(event: chrome.events.Event<GenericEvent>): void;
+    top: number
 
     /**
-    * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
-      var newWebview = document.createElement('webview');
-      document.body.appendChild(newWebview);
-      e.window.attach(newWebview);
-    });</pre>
-    * @param {any} [object Object]
+    * @description Width of the rectangle.
      */
-
-    export var newwindow: chrome.events.Event<INewwindow>;
+    width: number
 
     /**
-    * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
-      if (e.permission === 'media') {
-        e.request.allow();
-      }
-    });</pre>
-    * @param {any} [object Object]
+    * @description Height of the rectangle.
      */
+    height: number
+  }
+  /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
+    function(details) { return {cancel: true}; },
+    {urls: ["*://www.evil.com/*"]},
+    ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
+    conditions: [
+      new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
+    ],
+    actions: [ new chrome.webViewRequest.CancelRequest() ]
+  };
+  myWebview.request.onRequest.addRules([rule]);</pre> */
+  export interface WebRequestEventInterface {
+  }
+  /**
+  * Defines the how zooming is handled in the webview.
+  * Enum values:
+  * "per-origin"
+  * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor.
+  * "per-view"
+  * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
+  * "disabled"
+  * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
+  export type ZoomMode = "per-origin" | "per-view" | "disabled";
 
-    export var permissionrequest: chrome.events.Event<IPermissionrequest>;
+  /**
+  * @description Queries audio state.
+  * @param {any} [object Object]
+   */
+  export function getAudioState(callback: (audible: boolean) => void): void;
 
-    /**
-    * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
-    webview.addEventListener('unresponsive', function() {
-      webview.style.opacity = '0.5';
-    });
-    webview.addEventListener('responsive', function() {
-      webview.style.opacity = '1';
-    });</pre>
-    * @param {any} [object Object]
-     */
+  /**
+  * @description Sets audio mute state of the webview.
+  * @param {boolean} mute Mute audio value
+   */
+  export function setAudioMuted(mute: boolean): void;
 
-    export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
+  /**
+  * @description Queries whether audio is muted.
+  * @param {any} [object Object]
+   */
+  export function isAudioMuted(callback: (muted: boolean) => void): void;
 
-    /**
-    * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
-    * @param {any} [object Object]
-     */
+  /**
+   * @description Captures the visible region of the webview.
+   * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+   */
+  export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
+  /**
+   * @description Captures the visible region of the webview.
+   * @param {*} options
+   * @param {(dataUrl: string) => void} callback
+   */
+  export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
 
-    export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
+  /**
+  * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
+    {
+      name: 'myRule',
+      matches: ['http://www.foo.com/*'],
+      css: { files: ['mystyles.css'] },
+      js: { files: ['jquery.js', 'myscript.js'] },
+      run_at: 'document_start'
+    },
+    {
+      name: 'anotherRule',
+      matches: ['http://www.bar.com/*'],
+      js: { code: "document.body.style.backgroundColor = 'red';" },
+      run_at: 'document_end'
+    }]);
+   ...
 
-    /**
-    * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
-    * @param {any} [object Object]
-     */
+  // Navigates webview.
+  webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
+      name: 'rule',
+      matches: ['http://www.foo.com/*'],
+      js: { files: ['scriptA.js'] },
+      run_at: 'document_start'}]);
 
-    export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
+  // Do something.
+  webview.src = 'http://www.foo.com/*';
+   ...
+  // Overwrite 'rule' defined before.
+  webview.addContentScripts([{
+      name: 'rule',
+      matches: ['http://www.bar.com/*'],
+      js: { files: ['scriptB.js'] },
+      run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
+  * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
+   */
+  export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
 
-    /**
-    * @description Fired when the page's zoom changes.
-    * @param {any} [object Object]
-     */
+  /**
+  * @description Navigates backward one history entry if possible. Equivalent to go(-1).
+  * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
+   */
+  export function back(callback?: (success: boolean) => void): void;
 
-    export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
-    /**IConsolemessage (Auto generated interface) */
-    export interface IConsolemessage {
+  /**
+  * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
+   */
+  export function canGoBack(): void;
 
-        /**
-        * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
-         */
-        level: number
+  /**
+  * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
+   */
+  export function canGoForward(): void;
 
-        /**
-        * @description The logged message contents.
-         */
-        message: string
+  /**
+  * @description <p>Clears browsing data for the webview partition.</p>
+  * @param {any} options Options determining which data to clear.
+  * @param {any} types The types of data to be cleared.
+  * @param {any} [object Object]
+   */
+  export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
 
-        /**
-        * @description The line number of the message source.
-         */
-        line: number
+  /**
+  * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
+  * @param {any} details Details of the script to run.
+  * @param {any} [object Object]
+   */
+  export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
 
-        /**
-        * @description A string identifying the resource which logged the message.
-         */
-        sourceId: string
+  /**
+  * @description Initiates a find-in-page request.
+  * @param {string} searchText The string to find in the page.
+  * @param {any} options Options for the find request.
+  * @param {any} [object Object]
+   */
+  export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
+
+  /**
+  * @description Navigates forward one history entry if possible. Equivalent to go(1).
+  * @param {any} [object Object]
+   */
+  export function forward(callback?: (success: boolean) => void): void;
+
+  /**
+  * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
+   */
+  export function getProcessId(): void;
+
+  /**
+  * @description Returns the user agent string used by the webview for guest page requests.
+   */
+  export function getUserAgent(): void;
+
+  /**
+  * @description Gets the current zoom factor.
+  * @param {any} [object Object]
+   */
+  export function getZoom(callback: (zoomFactor: number) => void): void;
+
+  /**
+  * @description Gets the current zoom mode.
+  * @param {any} [object Object]
+   */
+  export function getZoomMode(callback: (ZoomMode: any) => void): void;
+
+  /**
+  * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
+  * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
+  * @param {any} [object Object]
+   */
+  export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
+
+  /**
+  * @description Injects CSS into the guest page.
+  * @param {any} details Details of the CSS to insert.
+  * @param {any} [object Object]
+   */
+  export function insertCSS(details: InjectDetails, callback?: () => void): void;
+
+  /**
+  * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
+   */
+  export function isUserAgentOverridden(): void;
+
+  /**
+  * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
+   */
+  export function print(): void;
+
+  /**
+  * @description Reloads the current top-level page.
+   */
+  export function reload(): void;
+
+  /**
+  * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
+  * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
+   */
+  export function removeContentScripts(scriptNameList?: any[]): void;
+
+  /**
+  * @description Override the user agent string used by the webview for guest page requests.
+  * @param {string} userAgent The user agent string to use.
+   */
+  export function setUserAgentOverride(userAgent: string): void;
+
+  /**
+  * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
+  * @param {number} zoomFactor The new zoom factor.
+  * @param {any} [object Object]
+   */
+  export function setZoom(zoomFactor: number, callback?: () => void): void;
+
+  /**
+  * @description Sets the zoom mode of the webview.
+  * @param {any} ZoomMode Defines how zooming is handled in the webview.
+  * @param {any} [object Object]
+   */
+  export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
+
+  /**
+  * @description Stops loading the current webview navigation if in progress.
+   */
+  export function stop(): void;
+
+  /**
+  * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
+  * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
+   */
+  export function stopFinding(action?: string): void;
+
+  /**
+  * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
+  * @param {string} dataUrl The data URL to load.
+  * @param {string} baseUrl The base URL that will be used for relative links.
+  * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
+   */
+  export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
+
+  /**
+  * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
+   */
+  export function terminate(): void;
+
+  /**
+  * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
+    webview.src = 'about:blank';
+  });</pre>
+   */
+
+  export function close(event: chrome.events.Event<GenericEvent>): void;
+
+  /**
+  * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
+    console.log('Guest page logged a message: ', e.message);
+  });</pre>
+  * @param {any} [object Object]
+   */
+
+  export var consolemessage: chrome.events.Event<IConsolemessage>;
+
+  /**
+  * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
+    webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
+  });</pre>
+   */
+
+  export var contentload: (event: chrome.events.Event<GenericEvent>) => void;
+
+  /**
+  * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
+  * @param {any} [object Object]
+   */
+
+  export var dialog: chrome.events.Event<IDialog>;
+
+  /**
+  * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
+    if (e.reason === 'crash') {
+      webview.src = 'data:text/plain,Goodbye, world!';
     }
-    /**IDialog (Auto generated interface) */
-    export interface IDialog {
+  });</pre>
+  * @param {any} [object Object]
+   */
 
-        /**
-        * @description The type of modal dialog requested by the guest.
-         */
-        messageType: 'alert' | 'confirm' | 'prompt'
+  export var exit: chrome.events.Event<IExit>;
 
-        /**
-        * @description The text the guest attempted to display in the modal dialog.
-         */
-        messageText: string
+  /**
+  * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
+  * @param {any} [object Object]
+   */
 
-        /**
-        * @description An interface that can be used to respond to the guest's modal request.
-         */
-        dialog: DialogController
+  export var findupdate: chrome.events.Event<IFindupdate>;
+
+  /**
+  * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
+  * @param {any} [object Object]
+   */
+
+  export var loadabort: chrome.events.Event<ILoadabort>;
+
+  /**
+  * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
+  * @param {any} [object Object]
+   */
+
+  export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
+
+  /**
+  * @description Fired when a top-level load request has redirected to a different URL.
+  * @param {any} [object Object]
+   */
+
+  export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
+
+  /**
+  * @description Fired when a load has begun.
+  * @param {any} [object Object]
+   */
+
+  export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
+
+  /**
+  * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
+   */
+
+  export function loadstop(event: chrome.events.Event<GenericEvent>): void;
+
+  /**
+  * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
+    var newWebview = document.createElement('webview');
+    document.body.appendChild(newWebview);
+    e.window.attach(newWebview);
+  });</pre>
+  * @param {any} [object Object]
+   */
+
+  export var newwindow: chrome.events.Event<INewwindow>;
+
+  /**
+  * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
+    if (e.permission === 'media') {
+      e.request.allow();
     }
-    /**IExit (Auto generated interface) */
-    export interface IExit {
+  });</pre>
+  * @param {any} [object Object]
+   */
 
-        /**
-        * @description Chrome's internal ID of the process that exited.
-         */
-        processID: number
+  export var permissionrequest: chrome.events.Event<IPermissionrequest>;
 
-        /**
-        * @description String indicating the reason for the exit.
-         */
-        reason: 'normal' | 'abnormal' | 'crash' | 'kill'
-    }
-    /**IFindupdate (Auto generated interface) */
-    export interface IFindupdate {
+  /**
+  * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
+  webview.addEventListener('unresponsive', function() {
+    webview.style.opacity = '0.5';
+  });
+  webview.addEventListener('responsive', function() {
+    webview.style.opacity = '1';
+  });</pre>
+  * @param {any} [object Object]
+   */
 
-        /**
-        * @description The string that is being searched for in the page.
-         */
-        searchText: string
+  export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
 
-        /**
-        * @description The number of matches found for searchText on the page so far.
-         */
-        numberOfMatches: number
+  /**
+  * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
+  * @param {any} [object Object]
+   */
 
-        /**
-        * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
-         */
-        activeMatchOrdinal: number
+  export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
 
-        /**
-        * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
-         */
-        selectionRect: SelectionRect
+  /**
+  * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
+  * @param {any} [object Object]
+   */
 
-        /**
-        * @description Indicates whether the find request was canceled.
-         */
-        canceled: boolean
+  export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
 
-        /**
-        * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
-         */
-        finalUpdate: string
-    }
-    /**ILoadabort (Auto generated interface) */
-    export interface ILoadabort {
+  /**
+  * @description Fired when the page's zoom changes.
+  * @param {any} [object Object]
+   */
 
-        /**
-        * @description Requested URL.
-         */
-        url: string
+  export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
+  /**IConsolemessage (Auto generated interface) */
+  export interface IConsolemessage {
 
-        /**
-        * @description Whether the load was top-level or in a subframe.
-         */
-        isTopLevel: boolean
+    /**
+    * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
+     */
+    level: number
 
-        /**
-        * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
-         */
-        code: number
+    /**
+    * @description The logged message contents.
+     */
+    message: string
 
-        /**
-        * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
-         */
-        reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
-    }
-    /**ILoadcommit (Auto generated interface) */
-    export interface ILoadcommit {
+    /**
+    * @description The line number of the message source.
+     */
+    line: number
 
-        /**
-        * @description The URL that committed.
-         */
-        url: string
+    /**
+    * @description A string identifying the resource which logged the message.
+     */
+    sourceId: string
+  }
+  /**IDialog (Auto generated interface) */
+  export interface IDialog {
 
-        /**
-        * @description Whether the load is top-level or in a subframe.
-         */
-        isTopLevel: boolean
-    }
-    /**ILoadredirect (Auto generated interface) */
-    export interface ILoadredirect {
+    /**
+    * @description The type of modal dialog requested by the guest.
+     */
+    messageType: 'alert' | 'confirm' | 'prompt'
 
-        /**
-        * @description The requested URL before the redirect.
-         */
-        oldUrl: string
+    /**
+    * @description The text the guest attempted to display in the modal dialog.
+     */
+    messageText: string
 
-        /**
-        * @description The new URL after the redirect.
-         */
-        newUrl: string
+    /**
+    * @description An interface that can be used to respond to the guest's modal request.
+     */
+    dialog: DialogController
+  }
+  /**IExit (Auto generated interface) */
+  export interface IExit {
 
-        /**
-        * @description Whether or not the redirect happened at top-level or in a subframe.
-         */
-        isTopLevel: boolean
-    }
-    /**ILoadstart (Auto generated interface) */
-    export interface ILoadstart {
+    /**
+    * @description Chrome's internal ID of the process that exited.
+     */
+    processID: number
 
-        /**
-        * @description Requested URL.
-         */
-        url: string
+    /**
+    * @description String indicating the reason for the exit.
+     */
+    reason: 'normal' | 'abnormal' | 'crash' | 'kill'
+  }
+  /**IFindupdate (Auto generated interface) */
+  export interface IFindupdate {
 
-        /**
-        * @description Whether the load is top-level or in a subframe.
-         */
-        isTopLevel: boolean
-    }
-    /**INewwindow (Auto generated interface) */
-    export interface INewwindow {
+    /**
+    * @description The string that is being searched for in the page.
+     */
+    searchText: string
 
-        /**
-        * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
-         */
-        window: NewWindow
+    /**
+    * @description The number of matches found for searchText on the page so far.
+     */
+    numberOfMatches: number
 
-        /**
-        * @description The target URL requested for the new window.
-         */
-        targetUrl: string
+    /**
+    * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
+     */
+    activeMatchOrdinal: number
 
-        /**
-        * @description The initial width requested for the new window.
-         */
-        initialWidth: number
+    /**
+    * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
+     */
+    selectionRect: SelectionRect
 
-        /**
-        * @description The initial height requested for the new window.
-         */
-        initialHeight: number
+    /**
+    * @description Indicates whether the find request was canceled.
+     */
+    canceled: boolean
 
-        /**
-        * @description The requested name of the new window.
-         */
-        name: string
+    /**
+    * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
+     */
+    finalUpdate: string
+  }
+  /**ILoadabort (Auto generated interface) */
+  export interface ILoadabort {
 
-        /**
-        * @description The requested disposition of the new window.
-         */
-        windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
-    }
-    /**IPermissionrequest (Auto generated interface) */
-    export interface IPermissionrequest {
+    /**
+    * @description Requested URL.
+     */
+    url: string
 
-        /**
-        * @description The type of permission being requested.
-         */
-        permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
+    /**
+    * @description Whether the load was top-level or in a subframe.
+     */
+    isTopLevel: boolean
 
-        /**
-        * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
-         */
-        request: object
-    }
-    /**IResponsive (Auto generated interface) */
-    export interface IResponsive {
+    /**
+    * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
+     */
+    code: number
 
-        /**
-        * @description Chrome's internal ID of the process that became responsive.
-         */
-        processID: number
-    }
-    /**ISizechanged (Auto generated interface) */
-    export interface ISizechanged {
+    /**
+    * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
+     */
+    reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
+  }
+  /**ILoadcommit (Auto generated interface) */
+  export interface ILoadcommit {
 
-        /**
-        * @description Old width of embedded web content.
-         */
-        oldWidth: number
+    /**
+    * @description The URL that committed.
+     */
+    url: string
 
-        /**
-        * @description Old height of embedded web content.
-         */
-        oldHeight: number
+    /**
+    * @description Whether the load is top-level or in a subframe.
+     */
+    isTopLevel: boolean
+  }
+  /**ILoadredirect (Auto generated interface) */
+  export interface ILoadredirect {
 
-        /**
-        * @description New width of embedded web content.
-         */
-        newWidth: number
+    /**
+    * @description The requested URL before the redirect.
+     */
+    oldUrl: string
 
-        /**
-        * @description New height of embedded web content.
-         */
-        newHeight: number
-    }
-    /**IUnresponsive (Auto generated interface) */
-    export interface IUnresponsive {
+    /**
+    * @description The new URL after the redirect.
+     */
+    newUrl: string
 
-        /**
-        * @description Chrome's internal ID of the process that has become unresponsive.
-         */
-        processID: number
-    }
-    /**IZoomchange (Auto generated interface) */
-    export interface IZoomchange {
+    /**
+    * @description Whether or not the redirect happened at top-level or in a subframe.
+     */
+    isTopLevel: boolean
+  }
+  /**ILoadstart (Auto generated interface) */
+  export interface ILoadstart {
 
-        /**
-        * @description The page's previous zoom factor.
-         */
-        oldZoomFactor: number
+    /**
+    * @description Requested URL.
+     */
+    url: string
 
-        /**
-        * @description The new zoom factor that the page was zoomed to.
-         */
-        newZoomFactor: number
-    }
+    /**
+    * @description Whether the load is top-level or in a subframe.
+     */
+    isTopLevel: boolean
+  }
+  /**INewwindow (Auto generated interface) */
+  export interface INewwindow {
+
+    /**
+    * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
+     */
+    window: NewWindow
+
+    /**
+    * @description The target URL requested for the new window.
+     */
+    targetUrl: string
+
+    /**
+    * @description The initial width requested for the new window.
+     */
+    initialWidth: number
+
+    /**
+    * @description The initial height requested for the new window.
+     */
+    initialHeight: number
+
+    /**
+    * @description The requested name of the new window.
+     */
+    name: string
+
+    /**
+    * @description The requested disposition of the new window.
+     */
+    windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
+  }
+  /**IPermissionrequest (Auto generated interface) */
+  export interface IPermissionrequest {
+
+    /**
+    * @description The type of permission being requested.
+     */
+    permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
+
+    /**
+    * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
+     */
+    request: object
+  }
+  /**IResponsive (Auto generated interface) */
+  export interface IResponsive {
+
+    /**
+    * @description Chrome's internal ID of the process that became responsive.
+     */
+    processID: number
+  }
+  /**ISizechanged (Auto generated interface) */
+  export interface ISizechanged {
+
+    /**
+    * @description Old width of embedded web content.
+     */
+    oldWidth: number
+
+    /**
+    * @description Old height of embedded web content.
+     */
+    oldHeight: number
+
+    /**
+    * @description New width of embedded web content.
+     */
+    newWidth: number
+
+    /**
+    * @description New height of embedded web content.
+     */
+    newHeight: number
+  }
+  /**IUnresponsive (Auto generated interface) */
+  export interface IUnresponsive {
+
+    /**
+    * @description Chrome's internal ID of the process that has become unresponsive.
+     */
+    processID: number
+  }
+  /**IZoomchange (Auto generated interface) */
+  export interface IZoomchange {
+
+    /**
+    * @description The page's previous zoom factor.
+     */
+    oldZoomFactor: number
+
+    /**
+    * @description The new zoom factor that the page was zoomed to.
+     */
+    newZoomFactor: number
+  }
 
 }

From 5e81190e4dbb2a2d61abd4959b9897478d47e199 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 23 May 2018 14:46:09 +0200
Subject: [PATCH 0613/1124] Updates to typings

---
 types/chrome-apps/index.d.ts | 9673 +++++++++++++++++-----------------
 1 file changed, 4844 insertions(+), 4829 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index 065771379a..f4bca3ae3a 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -11,7 +11,7 @@
 // Global object
 ////////////////////
 
-declare namespace chrome {}
+declare namespace chrome { }
 ////////////////////
 // Accessibility Features
 ////////////////////
@@ -22,89 +22,89 @@ declare namespace chrome {}
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.accessibilityFeatures {
-  export interface AccessibilityFeaturesGetArg {
-    /** Optional. Whether to return the value that applies to the incognito session (default false).  */
-    incognito?: boolean;
-  }
+    export interface AccessibilityFeaturesGetArg {
+        /** Optional. Whether to return the value that applies to the incognito session (default false).  */
+        incognito?: boolean;
+    }
 
-  export interface AccessibilityFeaturesCallbackArg {
-    /** The value of the setting. */
-    value: any;
-    /**
-     * One of
-     * • not_controllable: cannot be controlled by any extension
-     * • controlled_by_other_extensions: controlled by extensions with higher precedence
-     * • controllable_by_this_extension: can be controlled by this extension
-     * • controlled_by_this_extension: controlled by this extension
-     */
-    levelOfControl: string;
-    /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
-    incognitoSpecific?: boolean;
-  }
+    export interface AccessibilityFeaturesCallbackArg {
+        /** The value of the setting. */
+        value: any;
+        /**
+         * One of
+         * • not_controllable: cannot be controlled by any extension
+         * • controlled_by_other_extensions: controlled by extensions with higher precedence
+         * • controllable_by_this_extension: can be controlled by this extension
+         * • controlled_by_this_extension: controlled by this extension
+         */
+        levelOfControl: string;
+        /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
+        incognitoSpecific?: boolean;
+    }
 
-  export interface AccessibilityFeaturesSetArg {
-    /**
-     * The value of the setting.
-     * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-     */
-    value: any;
-    /**
-     * Optional.
-      * The scope of the ChromeSetting. One of
-     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-     */
-    scope?: string;
-  }
+    export interface AccessibilityFeaturesSetArg {
+        /**
+         * The value of the setting.
+         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+         */
+        value: any;
+        /**
+         * Optional.
+          * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
 
-  export interface AccessibilityFeaturesClearArg {
-    /**
-     * Optional.
-      * The scope of the ChromeSetting. One of
-     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-     */
-    scope?: string;
-  }
+    export interface AccessibilityFeaturesClearArg {
+        /**
+         * Optional.
+          * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
 
-  export interface AccessibilityFeaturesSetting {
-    /**
-     * Gets the value of a setting.
-     * @param details Which setting to consider.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function(object details) {...};
-     */
-    get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
-    /**
-     * Sets the value of a setting.
-     * @param details Which setting to change.
-     * @param callback Called at the completion of the set operation.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
-    /**
-     * Clears the setting, restoring any default value.
-     * @param details Which setting to clear.
-     * @param callback Called at the completion of the clear operation.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
-  }
+    export interface AccessibilityFeaturesSetting {
+        /**
+         * Gets the value of a setting.
+         * @param details Which setting to consider.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function(object details) {...};
+         */
+        get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
+        /**
+         * Sets the value of a setting.
+         * @param details Which setting to change.
+         * @param callback Called at the completion of the set operation.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
+        /**
+         * Clears the setting, restoring any default value.
+         * @param details Which setting to clear.
+         * @param callback Called at the completion of the clear operation.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
+    }
 
-  export var spokenFeedback: AccessibilityFeaturesSetting;
-  export var largeCursor: AccessibilityFeaturesSetting;
-  export var stickyKeys: AccessibilityFeaturesSetting;
-  export var highContrast: AccessibilityFeaturesSetting;
-  export var screenMagnifier: AccessibilityFeaturesSetting;
-  export var autoclick: AccessibilityFeaturesSetting;
-  export var virtualKeyboard: AccessibilityFeaturesSetting;
-  export var animationPolicy: AccessibilityFeaturesSetting;
+    export var spokenFeedback: AccessibilityFeaturesSetting;
+    export var largeCursor: AccessibilityFeaturesSetting;
+    export var stickyKeys: AccessibilityFeaturesSetting;
+    export var highContrast: AccessibilityFeaturesSetting;
+    export var screenMagnifier: AccessibilityFeaturesSetting;
+    export var autoclick: AccessibilityFeaturesSetting;
+    export var virtualKeyboard: AccessibilityFeaturesSetting;
+    export var animationPolicy: AccessibilityFeaturesSetting;
 }
 
 ////////////////////
@@ -116,82 +116,82 @@ declare namespace chrome.accessibilityFeatures {
  * Permissions:  "alarms"
  */
 declare namespace chrome.alarms {
-  export interface AlarmCreateInfo {
-    /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
-    delayInMinutes?: number;
-    /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
-    periodInMinutes?: number;
-    /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
-    when?: number;
-  }
+    export interface AlarmCreateInfo {
+        /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
+        delayInMinutes?: number;
+        /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
+        periodInMinutes?: number;
+        /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
+        when?: number;
+    }
 
-  export interface Alarm {
-    /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
-    periodInMinutes?: number;
-    /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
-    scheduledTime: number;
-    /** Name of this alarm. */
-    name: string;
-  }
+    export interface Alarm {
+        /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
+        periodInMinutes?: number;
+        /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
+        scheduledTime: number;
+        /** Name of this alarm. */
+        name: string;
+    }
 
-  export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
+    export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
 
-  /**
-   * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-   * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-   * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-   * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-   */
-  export function create(alarmInfo: AlarmCreateInfo): void;
-  /**
-   * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-   * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-   * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-   * @param name Optional name to identify this alarm. Defaults to the empty string.
-   * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-   */
-  export function create(name: string, alarmInfo: AlarmCreateInfo): void;
-  /**
-   * Gets an array of all the alarms.
-   * @param callback The callback parameter should be a function that looks like this:
-   * function(array of Alarm alarms) {...};
-   */
-  export function getAll(callback: (alarms: Alarm[]) => void): void;
-  /**
-   * Clears all alarms.
-   * @param callback If you specify the callback parameter, it should be a function that looks like this:
-   * function(boolean wasCleared) {...};
-   */
-  export function clearAll(callback?: (wasCleared: boolean) => void): void;
-  /**
-   * Clears the alarm with the given name.
-   * @param name The name of the alarm to clear. Defaults to the empty string.
-   * @param callback If you specify the callback parameter, it should be a function that looks like this:
-   * function(boolean wasCleared) {...};
-   */
-  export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
-  /**
-   * Clears the alarm without a name.
-   * @param callback If you specify the callback parameter, it should be a function that looks like this:
-   * function(boolean wasCleared) {...};
-   */
-  export function clear(callback: (wasCleared: boolean) => void): void;
-  /**
-   * Retrieves details about the specified alarm.
-   * @param callback The callback parameter should be a function that looks like this:
-   * function( Alarm alarm) {...};
-   */
-  export function get(callback: (alarm: Alarm) => void): void;
-  /**
-   * Retrieves details about the specified alarm.
-   * @param name The name of the alarm to get. Defaults to the empty string.
-   * @param callback The callback parameter should be a function that looks like this:
-   * function( Alarm alarm) {...};
-   */
-  export function get(name: string, callback: (alarm: Alarm) => void): void;
+    /**
+     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+     */
+    export function create(alarmInfo: AlarmCreateInfo): void;
+    /**
+     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+     * @param name Optional name to identify this alarm. Defaults to the empty string.
+     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
+     */
+    export function create(name: string, alarmInfo: AlarmCreateInfo): void;
+    /**
+     * Gets an array of all the alarms.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function(array of Alarm alarms) {...};
+     */
+    export function getAll(callback: (alarms: Alarm[]) => void): void;
+    /**
+     * Clears all alarms.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clearAll(callback?: (wasCleared: boolean) => void): void;
+    /**
+     * Clears the alarm with the given name.
+     * @param name The name of the alarm to clear. Defaults to the empty string.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
+    /**
+     * Clears the alarm without a name.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clear(callback: (wasCleared: boolean) => void): void;
+    /**
+     * Retrieves details about the specified alarm.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( Alarm alarm) {...};
+     */
+    export function get(callback: (alarm: Alarm) => void): void;
+    /**
+     * Retrieves details about the specified alarm.
+     * @param name The name of the alarm to get. Defaults to the empty string.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( Alarm alarm) {...};
+     */
+    export function get(name: string, callback: (alarm: Alarm) => void): void;
 
-  /** Fired when an alarm has elapsed. Useful for event pages. */
-  export var onAlarm: AlarmEvent;
+    /** Fired when an alarm has elapsed. Useful for event pages. */
+    export var onAlarm: AlarmEvent;
 }
 
 
@@ -199,11 +199,11 @@ declare namespace chrome.alarms {
 // App
 ////////////////////
 declare namespace chrome.app {
-  export interface AppDetails extends chrome.runtime.Manifest {
-    id: string;
-  }
+    export interface AppDetails extends chrome.runtime.Manifest {
+        id: string;
+    }
 
-  export function getDetails(): AppDetails;
+    export function getDetails(): AppDetails;
 }
 
 export type GenericEvent = Event;
@@ -212,155 +212,155 @@ export type GenericEvent = Event;
 // App Runtime
 ////////////////////
 declare namespace chrome.app.runtime {
-  type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
-    'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
-    'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
-    'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
+    type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
+        'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
+        'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
+        'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
 
-  interface LaunchData {
-    id?: string;
-    items?: LaunchDataItem[];
-    url?: string;
-    referrerUrl?: string;
-    isKioskSession?: boolean;
-    isPublicSession?: boolean;
-    source?: LaunchSource;
-    actionData?: {};
-  }
+    interface LaunchData {
+        id?: string;
+        items?: LaunchDataItem[];
+        url?: string;
+        referrerUrl?: string;
+        isKioskSession?: boolean;
+        isPublicSession?: boolean;
+        source?: LaunchSource;
+        actionData?: {};
+    }
 
-  export interface LaunchDataItem {
-    entry: FileEntry;
-    type: string;
-  }
+    export interface LaunchDataItem {
+        entry: FileEntry;
+        type: string;
+    }
 
-  export interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
+    export interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
 
-  export interface RestartedEvent extends chrome.events.Event<() => void> { }
+    export interface RestartedEvent extends chrome.events.Event<() => void> { }
 
-  export var onLaunched: LaunchedEvent;
-  export var onRestarted: RestartedEvent;
+    export var onLaunched: LaunchedEvent;
+    export var onRestarted: RestartedEvent;
 }
 
 ////////////////////
 // App Window
 ////////////////////
 declare namespace chrome.app.window {
-  export interface ContentBounds {
-    left?: number;
-    top?: number;
-    width?: number;
-    height?: number;
-  }
+    export interface ContentBounds {
+        left?: number;
+        top?: number;
+        width?: number;
+        height?: number;
+    }
 
-  export interface BoundsSpecification {
-    left?: number;
-    top?: number;
-    width?: number;
-    height?: number;
-    minWidth?: number;
-    minHeight?: number;
-    maxWidth?: number;
-    maxHeight?: number;
-  }
+    export interface BoundsSpecification {
+        left?: number;
+        top?: number;
+        width?: number;
+        height?: number;
+        minWidth?: number;
+        minHeight?: number;
+        maxWidth?: number;
+        maxHeight?: number;
+    }
 
-  export interface Bounds {
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    minWidth?: number;
-    minHeight?: number;
-    maxWidth?: number;
-    maxHeight?: number;
-    setPosition(left: number, top: number): void;
-    setSize(width: number, height: number): void;
-    setMinimumSize(minWidth: number, minHeight: number): void;
-    setMaximumSize(maxWidth: number, maxHeight: number): void;
-  }
-  export interface FrameOptions {
-    type?: string;
-    color?: string;
-    activeColor?: string;
-    inactiveColor?: string;
-  }
+    export interface Bounds {
+        left: number;
+        top: number;
+        width: number;
+        height: number;
+        minWidth?: number;
+        minHeight?: number;
+        maxWidth?: number;
+        maxHeight?: number;
+        setPosition(left: number, top: number): void;
+        setSize(width: number, height: number): void;
+        setMinimumSize(minWidth: number, minHeight: number): void;
+        setMaximumSize(maxWidth: number, maxHeight: number): void;
+    }
+    export interface FrameOptions {
+        type?: string;
+        color?: string;
+        activeColor?: string;
+        inactiveColor?: string;
+    }
 
-  export interface CreateWindowOptions {
-    id?: string;
-    innerBounds?: BoundsSpecification;
-    outerBounds?: BoundsSpecification;
-    minWidth?: number;
-    minHeight?: number;
-    maxWidth?: number;
-    maxHeight?: number;
-    /**
-     * @description
-     * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
-     * @memberof CreateWindowOptions
-     */
-    frame?: string | FrameOptions;
-    bounds?: ContentBounds;
-    alphaEnabled?: boolean;
-    /**
-     * @description
-     * @type {string} "normal", "fullscreen", "maximized", "minimized"
-     * @memberof CreateWindowOptions
-     */
-    state?: string;
-    hidden?: boolean;
-    resizable?: boolean;
-    singleton?: boolean;
-    alwaysOnTop?: boolean;
-    focused?: boolean;
-    visibleOnAllWorkspaces?: boolean;
-  }
+    export interface CreateWindowOptions {
+        id?: string;
+        innerBounds?: BoundsSpecification;
+        outerBounds?: BoundsSpecification;
+        minWidth?: number;
+        minHeight?: number;
+        maxWidth?: number;
+        maxHeight?: number;
+        /**
+         * @description
+         * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
+         * @memberof CreateWindowOptions
+         */
+        frame?: string | FrameOptions;
+        bounds?: ContentBounds;
+        alphaEnabled?: boolean;
+        /**
+         * @description
+         * @type {string} "normal", "fullscreen", "maximized", "minimized"
+         * @memberof CreateWindowOptions
+         */
+        state?: string;
+        hidden?: boolean;
+        resizable?: boolean;
+        singleton?: boolean;
+        alwaysOnTop?: boolean;
+        focused?: boolean;
+        visibleOnAllWorkspaces?: boolean;
+    }
 
-  export interface AppWindow {
-    focus: () => void;
-    fullscreen: () => void;
-    isFullscreen: () => boolean;
-    minimize: () => void;
-    isMinimized: () => boolean;
-    maximize: () => void;
-    isMaximized: () => boolean;
-    restore: () => void;
-    moveTo: (left: number, top: number) => void;
-    resizeTo: (width: number, height: number) => void;
-    drawAttention: () => void;
-    clearAttention: () => void;
-    close: () => void;
-    show: () => void;
-    hide: () => void;
-    getBounds: () => ContentBounds;
-    setBounds: (bounds: ContentBounds) => void;
-    isAlwaysOnTop: () => boolean;
-    setAlwaysOnTop: (alwaysOnTop: boolean) => void;
-    setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
-    contentWindow: Window;
-    id: string;
-    innerBounds: Bounds;
-    outerBounds: Bounds;
-    onBoundsChanged: WindowEvent;
-    onClosed: WindowEvent;
-    onFullscreened: WindowEvent;
-    onMaximized: WindowEvent;
-    onMinimized: WindowEvent;
-    onRestored: WindowEvent;
-  }
+    export interface AppWindow {
+        focus: () => void;
+        fullscreen: () => void;
+        isFullscreen: () => boolean;
+        minimize: () => void;
+        isMinimized: () => boolean;
+        maximize: () => void;
+        isMaximized: () => boolean;
+        restore: () => void;
+        moveTo: (left: number, top: number) => void;
+        resizeTo: (width: number, height: number) => void;
+        drawAttention: () => void;
+        clearAttention: () => void;
+        close: () => void;
+        show: () => void;
+        hide: () => void;
+        getBounds: () => ContentBounds;
+        setBounds: (bounds: ContentBounds) => void;
+        isAlwaysOnTop: () => boolean;
+        setAlwaysOnTop: (alwaysOnTop: boolean) => void;
+        setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
+        contentWindow: Window;
+        id: string;
+        innerBounds: Bounds;
+        outerBounds: Bounds;
+        onBoundsChanged: WindowEvent;
+        onClosed: WindowEvent;
+        onFullscreened: WindowEvent;
+        onMaximized: WindowEvent;
+        onMinimized: WindowEvent;
+        onRestored: WindowEvent;
+    }
 
-  export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
-  export function current(): AppWindow;
-  export function get(id: string): AppWindow;
-  export function getAll(): AppWindow[];
-  export function canSetVisibleOnAllWorkspaces(): boolean;
+    export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
+    export function current(): AppWindow;
+    export function get(id: string): AppWindow;
+    export function getAll(): AppWindow[];
+    export function canSetVisibleOnAllWorkspaces(): boolean;
 
-  export interface WindowEvent extends chrome.events.Event<() => void> { }
+    export interface WindowEvent extends chrome.events.Event<() => void> { }
 
-  export var onBoundsChanged: WindowEvent;
-  export var onClosed: WindowEvent;
-  export var onFullscreened: WindowEvent;
-  export var onMaximized: WindowEvent;
-  export var onMinimized: WindowEvent;
-  export var onRestored: WindowEvent;
+    export var onBoundsChanged: WindowEvent;
+    export var onClosed: WindowEvent;
+    export var onFullscreened: WindowEvent;
+    export var onMaximized: WindowEvent;
+    export var onMinimized: WindowEvent;
+    export var onRestored: WindowEvent;
 }
 
 
@@ -372,120 +372,120 @@ declare namespace chrome.app.window {
  * @since Chrome 59
  */
 declare namespace chrome.audio {
-  export type StreamType = 'INPUT' | 'OUTPUT';
-  export interface AudioDeviceInfo {
-    /** The unique identifier of the audio device. */
-    id: string;
-    /** Stream type associated with this device. */
-    streamType: StreamType;
-    /** Type of the device. */
-    deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
-    /** The user-friendly name (e.g. "USB Microphone"). */
-    displayName: string;
-    /** Device name. */
-    deviceName: string;
-    /** True if this is the current active device. */
-    isActive: boolean;
-    /** The sound level of the device, volume for output, gain for input. */
-    level: number;
-    /** The stable/persisted device id string when available. */
-    stableDeviceId?: string;
-  }
-  export interface DeviceIdLists {
+    export type StreamType = 'INPUT' | 'OUTPUT';
+    export interface AudioDeviceInfo {
+        /** The unique identifier of the audio device. */
+        id: string;
+        /** Stream type associated with this device. */
+        streamType: StreamType;
+        /** Type of the device. */
+        deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
+        /** The user-friendly name (e.g. "USB Microphone"). */
+        displayName: string;
+        /** Device name. */
+        deviceName: string;
+        /** True if this is the current active device. */
+        isActive: boolean;
+        /** The sound level of the device, volume for output, gain for input. */
+        level: number;
+        /** The stable/persisted device id string when available. */
+        stableDeviceId?: string;
+    }
+    export interface DeviceIdLists {
+        /**
+         * List of input devices specified by their ID.
+         * To indicate input devices should be unaffected, leave this property unset.
+         */
+        input?: string[];
+        /**
+         * List of output devices specified by their ID.
+         * To indicate output devices should be unaffected, leave this property unset.
+         */
+        output?: string[];
+    }
+    export interface SetDeviceProperties {
+        /**
+         * The audio device's desired sound level. Defaults to the device's current sound level.
+         * If used with audio input device, represents audio device gain.
+         * If used with audio output device, represents audio device volume.
+         *
+         * Type: integer
+         */
+        level?: number;
+    }
+    export interface OnLevelChangedEvent {
+        /**
+         * The callback parameter should be a function that looks like this:
+         *   function(object event) {...};
+         * @param {(event: {
+         *             deviceId: string,
+         *             level: number
+         *         }) => void} callback
+         */
+        addListener(callback: (event: {
+            deviceId: string,
+            level: number
+        }) => void): void;
+    }
+    export interface OnMuteChangedEvent {
+        /**
+         * The callback parameter should be a function that looks like this:
+         * function(object event) {...};
+         */
+        addListener(callback: (event: {
+            streamType: StreamType[],
+            isMuted: boolean
+        }) => void): void;
+    }
+    export interface OnDeviceListChangedEvent {
+        /**
+         * The callback parameter should be a function that looks like this:
+         *   function(array of AudioDeviceInfo devices) {...};
+         * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
+         */
+        addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
+    }
     /**
-     * List of input devices specified by their ID.
-     * To indicate input devices should be unaffected, leave this property unset.
+     * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
      */
-    input?: string[];
+    export interface Filter {
+        /**
+         * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
+         */
+        streamTypes?: StreamType[];
+        /**
+         * @description If set, only audio devices whose active state matches this value will satisfy the filter.
+         */
+        isActive?: boolean;
+    }
     /**
-     * List of output devices specified by their ID.
-     * To indicate output devices should be unaffected, leave this property unset.
+     * @description Gets a list of audio devices filtered based on |filter|.
      */
-    output?: string[];
-  }
-  export interface SetDeviceProperties {
+    export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => {});
+    export function getDevices(callback: (devices: AudioDeviceInfo[]) => {});
+    /** Sets lists of active input and/or output devices. */
+    export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void);
+    /** Sets the properties for the input or output device. */
+    export function setProperties(id: string, properties: SetDeviceProperties, callback: () => {});
     /**
-     * The audio device's desired sound level. Defaults to the device's current sound level.
-     * If used with audio input device, represents audio device gain.
-     * If used with audio output device, represents audio device volume.
-     *
-     * Type: integer
+     * @description Gets the system-wide mute state for the specified stream type.
+     * @param {StreamType} streamType Stream type for which mute state should be fetched.
+     * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
      */
-    level?: number;
-  }
-  export interface OnLevelChangedEvent {
+    export function getMute(streamType: StreamType, callback: (value: boolean) => {});
     /**
-     * The callback parameter should be a function that looks like this:
-     *   function(object event) {...};
-     * @param {(event: {
-     *             deviceId: string,
-     *             level: number
-     *         }) => void} callback
+     * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
+     * @param {StreamType} streamType Stream type for which mute state should be set.
+     * @param {boolean} isMuted New mute value.
+     * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
      */
-    addListener(callback: (event: {
-      deviceId: string,
-      level: number
-    }) => void): void;
-  }
-  export interface OnMuteChangedEvent {
-    /**
-     * The callback parameter should be a function that looks like this:
-     * function(object event) {...};
-     */
-    addListener(callback: (event: {
-      streamType: StreamType[],
-      isMuted: boolean
-    }) => void): void;
-  }
-  export interface OnDeviceListChangedEvent {
-    /**
-     * The callback parameter should be a function that looks like this:
-     *   function(array of AudioDeviceInfo devices) {...};
-     * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
-     */
-    addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
-  }
-  /**
-   * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
-   */
-  export interface Filter {
-    /**
-     * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
-     */
-    streamTypes?: StreamType[];
-    /**
-     * @description If set, only audio devices whose active state matches this value will satisfy the filter.
-     */
-    isActive?: boolean;
-  }
-  /**
-   * @description Gets a list of audio devices filtered based on |filter|.
-   */
-  export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => {});
-  export function getDevices(callback: (devices: AudioDeviceInfo[]) => {});
-  /** Sets lists of active input and/or output devices. */
-  export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void);
-  /** Sets the properties for the input or output device. */
-  export function setProperties(id: string, properties: SetDeviceProperties, callback: () => {});
-  /**
-   * @description Gets the system-wide mute state for the specified stream type.
-   * @param {StreamType} streamType Stream type for which mute state should be fetched.
-   * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
-   */
-  export function getMute(streamType: StreamType, callback: (value: boolean) => {});
-  /**
-   * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
-   * @param {StreamType} streamType Stream type for which mute state should be set.
-   * @param {boolean} isMuted New mute value.
-   * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
-   */
-  export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => {});
-  /** Fired when sound level changes for an active audio device. */
-  export var onLevelChanged: OnLevelChangedEvent;
-  /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
-  export var onMuteChanged: OnMuteChangedEvent;
-  /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
-  export var onDeviceListChanged: OnDeviceListChangedEvent;
+    export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => {});
+    /** Fired when sound level changes for an active audio device. */
+    export var onLevelChanged: OnLevelChangedEvent;
+    /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
+    export var onMuteChanged: OnMuteChangedEvent;
+    /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
+    export var onDeviceListChanged: OnDeviceListChangedEvent;
 }
 
 ////////////////////
@@ -497,81 +497,81 @@ declare namespace chrome.audio {
  * @since Chrome 37
  */
 declare namespace chrome.bluetooth {
-  export interface AdapterState {
-    address: string;
-    name: string;
-    powered: boolean;
-    available: boolean;
-    discovering: boolean;
-  }
-  export interface Device {
-    address: string;
-    name?: string;
-    deviceClass?: number;
-    vendorIdSource?: 'bluetooth' | 'usb';
-    vendorId?: number;
-    productId?: number;
-    deviceId?: number;
-    type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
-    paired?: boolean;
-    connected?: boolean;
-    /**
-     * @since Chrome 48
-     */
-    connecting?: boolean;
-    /**
-     * @since Chrome 48
-     */
-    connectable?: boolean;
-    uuids?: string[];
-    /**
-     * @since Chrome 44
-     */
-    inquiryRssi: number;
-    /**
-     * @since Chrome 44
-     */
-    inquiryTxPower: number;
-  }
+    export interface AdapterState {
+        address: string;
+        name: string;
+        powered: boolean;
+        available: boolean;
+        discovering: boolean;
+    }
+    export interface Device {
+        address: string;
+        name?: string;
+        deviceClass?: number;
+        vendorIdSource?: 'bluetooth' | 'usb';
+        vendorId?: number;
+        productId?: number;
+        deviceId?: number;
+        type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
+        paired?: boolean;
+        connected?: boolean;
+        /**
+         * @since Chrome 48
+         */
+        connecting?: boolean;
+        /**
+         * @since Chrome 48
+         */
+        connectable?: boolean;
+        uuids?: string[];
+        /**
+         * @since Chrome 44
+         */
+        inquiryRssi: number;
+        /**
+         * @since Chrome 44
+         */
+        inquiryTxPower: number;
+    }
 
-  export interface BluetoothEvent<T> {
-    addListener(callback: (event: T) => void);
-  }
+    export interface BluetoothEvent<T> {
+        addListener(callback: (event: T) => void);
+    }
 
-  /**
-   * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
-   */
-  export interface DeviceFilter {
-    /** Type of filter to apply to the device list. Default is all. */
-    filterType?: 'all' | 'known';
-    /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
-    limit?: number;
-  }
-  /** Get information about the Bluetooth adapter. */
-  export function getAdapterState(callback: (adapterInfo: AdapterState) => void);
-  /** Get information about a Bluetooth device known to the system. */
-  export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void);
-  /**
-   * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
-   * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
-   * @param callback Called when the search is completed.
-   */
-  export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void);
-  /**
-   * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
-   * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
-   */
-  export function startDiscovery(callback: () => void);
-  /** Stop discovery. */
-  export function stopDiscovery(callback: () => void);
-  /** Fired when the state of the Bluetooth adapter changes. */
-  export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
-  /** Fired when information about a new Bluetooth device is available. */
-  export var onDeviceAdded: BluetoothEvent<Device>;
-  /** Fired when information about a known Bluetooth device has changed. */
-  export var onDeviceChanged: BluetoothEvent<Device>;
-  /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
-  export var onDeviceRemoved: BluetoothEvent<Device>;
+    /**
+     * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+     */
+    export interface DeviceFilter {
+        /** Type of filter to apply to the device list. Default is all. */
+        filterType?: 'all' | 'known';
+        /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
+        limit?: number;
+    }
+    /** Get information about the Bluetooth adapter. */
+    export function getAdapterState(callback: (adapterInfo: AdapterState) => void);
+    /** Get information about a Bluetooth device known to the system. */
+    export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void);
+    /**
+     * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
+     * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+     * @param callback Called when the search is completed.
+     */
+    export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void);
+    /**
+     * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
+     * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
+     */
+    export function startDiscovery(callback: () => void);
+    /** Stop discovery. */
+    export function stopDiscovery(callback: () => void);
+    /** Fired when the state of the Bluetooth adapter changes. */
+    export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
+    /** Fired when information about a new Bluetooth device is available. */
+    export var onDeviceAdded: BluetoothEvent<Device>;
+    /** Fired when information about a known Bluetooth device has changed. */
+    export var onDeviceChanged: BluetoothEvent<Device>;
+    /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
+    export var onDeviceRemoved: BluetoothEvent<Device>;
 }
 /**
  * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
@@ -581,10 +581,10 @@ declare namespace chrome.bluetooth {
  * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
  */
 declare namespace chrome.bluetoothLowEnergy {
-  /**
-   * NOT IMPLEMENTED YET
-   * @see https://developer.chrome.com/apps/bluetoothLowEnergy
-   * */
+    /**
+     * NOT IMPLEMENTED YET
+     * @see https://developer.chrome.com/apps/bluetoothLowEnergy
+     * */
 }
 /**
  * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
@@ -593,7 +593,7 @@ declare namespace chrome.bluetoothLowEnergy {
  * Important: This API works only on OS X, Windows and Chrome OS.
  */
 declare namespace chrome.bluetoothSocket {
-  /** NOT IMPLEMENTED YET */
+    /** NOT IMPLEMENTED YET */
 }
 
 ////////////////////
@@ -604,28 +604,28 @@ declare namespace chrome.bluetoothSocket {
  * the current application and Chrome profile.
  */
 declare namespace chrome.browser {
-  export interface Options {
-    /** The URL to navigate to when the new tab is initially opened. */
-    url: string;
-  }
+    export interface Options {
+        /** The URL to navigate to when the new tab is initially opened. */
+        url: string;
+    }
 
-  /**
-   * Opens a new tab in a browser window associated with the current application
-   * and Chrome profile. If no browser window for the Chrome profile is opened,
-   * a new one is opened prior to creating the new tab.
-   * @param options Configures how the tab should be opened.
-   * @param callback Called when the tab was successfully
-   * created, or failed to be created. If failed, runtime.lastError will be set.
-   */
-  export function openTab(options: Options, callback: () => void): void;
+    /**
+     * Opens a new tab in a browser window associated with the current application
+     * and Chrome profile. If no browser window for the Chrome profile is opened,
+     * a new one is opened prior to creating the new tab.
+     * @param options Configures how the tab should be opened.
+     * @param callback Called when the tab was successfully
+     * created, or failed to be created. If failed, runtime.lastError will be set.
+     */
+    export function openTab(options: Options, callback: () => void): void;
 
-  /**
-  * Opens a new tab in a browser window associated with the current application
-  * and Chrome profile. If no browser window for the Chrome profile is opened,
-  * a new one is opened prior to creating the new tab. Since Chrome 42 only.
-  * @param options Configures how the tab should be opened.
-  */
-  export function openTab(options: Options): void;
+    /**
+    * Opens a new tab in a browser window associated with the current application
+    * and Chrome profile. If no browser window for the Chrome profile is opened,
+    * a new one is opened prior to creating the new tab. Since Chrome 42 only.
+    * @param options Configures how the tab should be opened.
+    */
+    export function openTab(options: Options): void;
 }
 
 ////////////////////
@@ -637,27 +637,27 @@ declare namespace chrome.browser {
  * Manifest:  "commands": {...}
  */
 declare namespace chrome.commands {
-  export interface Command {
-    /** Optional. The name of the Extension Command  */
-    name?: string;
-    /** Optional. The Extension Command description  */
-    description?: string;
-    /** Optional. The shortcut active for this command, or blank if not active.  */
-    shortcut?: string;
-  }
+    export interface Command {
+        /** Optional. The name of the Extension Command  */
+        name?: string;
+        /** Optional. The Extension Command description  */
+        description?: string;
+        /** Optional. The shortcut active for this command, or blank if not active.  */
+        shortcut?: string;
+    }
 
-  export interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
+    export interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
 
-  /**
-   * Returns all the registered extension commands for this extension and their shortcut (if active).
-   * @param callback Called to return the registered commands.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function(array of Command commands) {...};
-   */
-  export function getAll(callback: (commands: Command[]) => void): void;
+    /**
+     * Returns all the registered extension commands for this extension and their shortcut (if active).
+     * @param callback Called to return the registered commands.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(array of Command commands) {...};
+     */
+    export function getAll(callback: (commands: Command[]) => void): void;
 
-  /** Fired when a registered command is activated using a keyboard shortcut. */
-  export var onCommand: CommandEvent;
+    /** Fired when a registered command is activated using a keyboard shortcut. */
+    export var onCommand: CommandEvent;
 }
 
 ////////////////////
@@ -669,204 +669,204 @@ declare namespace chrome.commands {
  * Permissions:  "contextMenus"
  */
 declare namespace chrome.contextMenus {
-  /**
-  * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
-  **/
-  export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
-  /**
-  * The type of menu item.
-  **/
-  export type ItemType = "normal" | "checkbox" | "radio" | "separator";
+    /**
+    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
+    **/
+    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
+    /**
+    * The type of menu item.
+    **/
+    export type ItemType = "normal" | "checkbox" | "radio" | "separator";
 
-  export interface OnClickData {
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * The text for the context selection, if any.
-     */
-    selectionText?: string;
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * A flag indicating the state of a checkbox or radio item after it is clicked.
-     */
-    checked?: boolean;
-    /**
-     * @since Since Chrome 35.
-     * The ID of the menu item that was clicked.
-     */
-    menuItemId: any;
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
-     */
-    frameUrl?: string;
-    /**
-     * @since Since Chrome 35.
-     * A flag indicating whether the element is editable (text input, textarea, etc.).
-     */
-    editable: boolean;
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
-     */
-    mediaType?: string;
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * A flag indicating the state of a checkbox or radio item before it was clicked.
-     */
-    wasChecked?: boolean;
-    /**
-     * @since Since Chrome 35.
-     * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
-     */
-    pageUrl: string;
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * If the element is a link, the URL it points to.
-     */
-    linkUrl?: string;
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * The parent ID, if any, for the item clicked.
-     */
-    parentMenuItemId?: any;
-    /**
-     * Optional.
-     * @since Since Chrome 35.
-     * Will be present for elements with a 'src' URL.
-     */
-    srcUrl?: string;
-  }
+    export interface OnClickData {
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * The text for the context selection, if any.
+         */
+        selectionText?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * A flag indicating the state of a checkbox or radio item after it is clicked.
+         */
+        checked?: boolean;
+        /**
+         * @since Since Chrome 35.
+         * The ID of the menu item that was clicked.
+         */
+        menuItemId: any;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
+         */
+        frameUrl?: string;
+        /**
+         * @since Since Chrome 35.
+         * A flag indicating whether the element is editable (text input, textarea, etc.).
+         */
+        editable: boolean;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+         */
+        mediaType?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * A flag indicating the state of a checkbox or radio item before it was clicked.
+         */
+        wasChecked?: boolean;
+        /**
+         * @since Since Chrome 35.
+         * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
+         */
+        pageUrl: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * If the element is a link, the URL it points to.
+         */
+        linkUrl?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * The parent ID, if any, for the item clicked.
+         */
+        parentMenuItemId?: any;
+        /**
+         * Optional.
+         * @since Since Chrome 35.
+         * Will be present for elements with a 'src' URL.
+         */
+        srcUrl?: string;
+    }
 
-  export interface CreateProperties {
-    /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
-    documentUrlPatterns?: string[];
-    /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
-    checked?: boolean;
-    /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
-    title?: string;
-    /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
-    contexts?: string[];
-    /**
-     * Optional.
-     * Whether this context menu item is enabled or disabled. Defaults to true.
-     * @since Since Chrome 20.
-     */
-    enabled?: boolean;
-    /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
-    targetUrlPatterns?: string[];
-    /**
-     * Optional.
-     * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
-     * @param info Information sent when a context menu item is clicked.
-     */
-    onclick?: (info: OnClickData) => void;
-    /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
-    parentId?: any;
-    /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
-    type?: string;
-    /**
-     * Optional.
-     * @since Since Chrome 21.
-     * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-     */
-    id?: string;
-    /**
-     * @description Whether the item is visible in the menu.
-     * @since Since Chrome 62
-     */
-    visible?: boolean;
-  }
+    export interface CreateProperties {
+        /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
+        documentUrlPatterns?: string[];
+        /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
+        checked?: boolean;
+        /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
+        title?: string;
+        /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
+        contexts?: string[];
+        /**
+         * Optional.
+         * Whether this context menu item is enabled or disabled. Defaults to true.
+         * @since Since Chrome 20.
+         */
+        enabled?: boolean;
+        /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
+        targetUrlPatterns?: string[];
+        /**
+         * Optional.
+         * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+         * @param info Information sent when a context menu item is clicked.
+         */
+        onclick?: (info: OnClickData) => void;
+        /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
+        parentId?: any;
+        /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
+        type?: string;
+        /**
+         * Optional.
+         * @since Since Chrome 21.
+         * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+         */
+        id?: string;
+        /**
+         * @description Whether the item is visible in the menu.
+         * @since Since Chrome 62
+         */
+        visible?: boolean;
+    }
+
+    export interface UpdateProperties {
+        documentUrlPatterns?: string[];
+        checked?: boolean;
+        title?: string;
+        contexts?: string[];
+        /**
+         * @since Chrome 20
+         **/
+        enabled?: boolean;
+        targetUrlPatterns?: string[];
+        onclick?: Function;
+        /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
+        parentId?: any;
+        type?: string;
+        /**
+         * @description Whether the item is visible or not.
+         * @since Since Chrome 62
+         */
+        visible?: boolean;
+    }
+
+    export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
 
-  export interface UpdateProperties {
-    documentUrlPatterns?: string[];
-    checked?: boolean;
-    title?: string;
-    contexts?: string[];
     /**
-     * @since Chrome 20
-     **/
-    enabled?: boolean;
-    targetUrlPatterns?: string[];
-    onclick?: Function;
-    /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
-    parentId?: any;
-    type?: string;
-    /**
-     * @description Whether the item is visible or not.
-     * @since Since Chrome 62
+     * Since Chrome 38.
+     * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
      */
-    visible?: boolean;
-  }
+    export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
 
-  export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
+    /**
+     * Removes all context menu items added by this extension.
+     * @param callback Called when removal is complete.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function removeAll(callback?: () => void): void;
+    /**
+     * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+     * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function create(createProperties: CreateProperties, callback?: () => void): void;
+    /**
+     * Updates a previously created context menu item.
+     * @param id The ID of the item to update.
+     * @param updateProperties The properties to update. Accepts the same values as the create function.
+     * @param callback Called when the context menu has been updated.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
+    /**
+     * Updates a previously created context menu item.
+     * @param id The ID of the item to update.
+     * @param updateProperties The properties to update. Accepts the same values as the create function.
+     * @param callback Called when the context menu has been updated.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
+    /**
+     * Removes a context menu item.
+     * @param menuItemId The ID of the context menu item to remove.
+     * @param callback Called when the context menu has been removed.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function remove(menuItemId: string, callback?: () => void): void;
+    /**
+     * Removes a context menu item.
+     * @param menuItemId The ID of the context menu item to remove.
+     * @param callback Called when the context menu has been removed.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function remove(menuItemId: number, callback?: () => void): void;
 
-  /**
-   * Since Chrome 38.
-   * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
-   */
-  export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
-
-  /**
-   * Removes all context menu items added by this extension.
-   * @param callback Called when removal is complete.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function removeAll(callback?: () => void): void;
-  /**
-   * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-   * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function create(createProperties: CreateProperties, callback?: () => void): void;
-  /**
-   * Updates a previously created context menu item.
-   * @param id The ID of the item to update.
-   * @param updateProperties The properties to update. Accepts the same values as the create function.
-   * @param callback Called when the context menu has been updated.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
-  /**
-   * Updates a previously created context menu item.
-   * @param id The ID of the item to update.
-   * @param updateProperties The properties to update. Accepts the same values as the create function.
-   * @param callback Called when the context menu has been updated.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
-  /**
-   * Removes a context menu item.
-   * @param menuItemId The ID of the context menu item to remove.
-   * @param callback Called when the context menu has been removed.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function remove(menuItemId: string, callback?: () => void): void;
-  /**
-   * Removes a context menu item.
-   * @param menuItemId The ID of the context menu item to remove.
-   * @param callback Called when the context menu has been removed.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function remove(menuItemId: number, callback?: () => void): void;
-
-  /**
-   * Since Chrome 21.
-   * Fired when a context menu item is clicked.
-   */
-  export var onClicked: MenuClickedEvent;
+    /**
+     * Since Chrome 21.
+     * Fired when a context menu item is clicked.
+     */
+    export var onClicked: MenuClickedEvent;
 
 }
 
@@ -880,28 +880,28 @@ declare namespace chrome.contextMenus {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.documentScan {
-  export interface DocumentScanOptions {
-    /** Optional. The MIME types that are accepted by the caller.  */
-    mimeTypes?: string[];
-    /** Optional. The number of scanned images allowed (defaults to 1).  */
-    maxImages?: number;
-  }
+    export interface DocumentScanOptions {
+        /** Optional. The MIME types that are accepted by the caller.  */
+        mimeTypes?: string[];
+        /** Optional. The number of scanned images allowed (defaults to 1).  */
+        maxImages?: number;
+    }
 
-  export interface DocumentScanCallbackArg {
-    /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
-    dataUrls: string[];
-    /** The MIME type of dataUrls. */
-    mimeType: string;
-  }
+    export interface DocumentScanCallbackArg {
+        /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
+        dataUrls: string[];
+        /** The MIME type of dataUrls. */
+        mimeType: string;
+    }
 
-  /**
-   * Performs a document scan. On success, the PNG data will be sent to the callback.
-   * @param options Object containing scan parameters.
-   * @param callback Called with the result and data from the scan.
-   * The callback parameter should be a function that looks like this:
-   * function(object result) {...};
-   */
-  export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
+    /**
+     * Performs a document scan. On success, the PNG data will be sent to the callback.
+     * @param options Object containing scan parameters.
+     * @param callback Called with the result and data from the scan.
+     * The callback parameter should be a function that looks like this:
+     * function(object result) {...};
+     */
+    export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
 }
 
 ////////////////////
@@ -912,139 +912,139 @@ declare namespace chrome.documentScan {
  * Availability: Since Chrome 21.
  */
 declare namespace chrome.events {
-  /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
-  export interface UrlFilter {
-    /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-    schemes?: string[];
-    /**
-     * Optional.
-      * Since Chrome 23.
-     * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-     */
-    urlMatches?: string;
-    /** Optional. Matches if the path segment of the URL contains a specified string.  */
-    pathContains?: string;
-    /** Optional. Matches if the host name of the URL ends with a specified string.  */
-    hostSuffix?: string;
-    /** Optional. Matches if the host name of the URL starts with a specified string.  */
-    hostPrefix?: string;
-    /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
-    hostContains?: string;
-    /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-    urlContains?: string;
-    /** Optional. Matches if the query segment of the URL ends with a specified string.  */
-    querySuffix?: string;
-    /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-    urlPrefix?: string;
-    /** Optional. Matches if the host name of the URL is equal to a specified string.  */
-    hostEquals?: string;
-    /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-    urlEquals?: string;
-    /** Optional. Matches if the query segment of the URL contains a specified string.  */
-    queryContains?: string;
-    /** Optional. Matches if the path segment of the URL starts with a specified string.  */
-    pathPrefix?: string;
-    /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-    pathEquals?: string;
-    /** Optional. Matches if the path segment of the URL ends with a specified string.  */
-    pathSuffix?: string;
-    /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-    queryEquals?: string;
-    /** Optional. Matches if the query segment of the URL starts with a specified string.  */
-    queryPrefix?: string;
-    /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-    urlSuffix?: string;
-    /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-    ports?: any[];
-    /**
-     * Optional.
-      * Since Chrome 28.
-     * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-     */
-    originAndPathMatches?: string;
-  }
+    /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
+    export interface UrlFilter {
+        /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
+        schemes?: string[];
+        /**
+         * Optional.
+          * Since Chrome 23.
+         * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+         */
+        urlMatches?: string;
+        /** Optional. Matches if the path segment of the URL contains a specified string.  */
+        pathContains?: string;
+        /** Optional. Matches if the host name of the URL ends with a specified string.  */
+        hostSuffix?: string;
+        /** Optional. Matches if the host name of the URL starts with a specified string.  */
+        hostPrefix?: string;
+        /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
+        hostContains?: string;
+        /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlContains?: string;
+        /** Optional. Matches if the query segment of the URL ends with a specified string.  */
+        querySuffix?: string;
+        /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlPrefix?: string;
+        /** Optional. Matches if the host name of the URL is equal to a specified string.  */
+        hostEquals?: string;
+        /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlEquals?: string;
+        /** Optional. Matches if the query segment of the URL contains a specified string.  */
+        queryContains?: string;
+        /** Optional. Matches if the path segment of the URL starts with a specified string.  */
+        pathPrefix?: string;
+        /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
+        pathEquals?: string;
+        /** Optional. Matches if the path segment of the URL ends with a specified string.  */
+        pathSuffix?: string;
+        /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
+        queryEquals?: string;
+        /** Optional. Matches if the query segment of the URL starts with a specified string.  */
+        queryPrefix?: string;
+        /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+        urlSuffix?: string;
+        /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
+        ports?: any[];
+        /**
+         * Optional.
+          * Since Chrome 28.
+         * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+         */
+        originAndPathMatches?: string;
+    }
 
-  /** An object which allows the addition and removal of listeners for a Chrome event. */
-  export interface Event<T> {
-    /**
-     * Registers an event listener callback to an event.
-     * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
-     * The callback parameter should be a function that looks like this:
-     * function() {...};
-     */
-    addListener(callback: T): void;
-    /**
-     * Returns currently registered rules.
-     * @param callback Called with registered rules.
-     * The callback parameter should be a function that looks like this:
-     * function(array of Rule rules) {...};
-     * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-     */
-    getRules(callback: (rules: Rule[]) => void): void;
-    /**
-     * Returns currently registered rules.
-     * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
-     * @param callback Called with registered rules.
-     * The callback parameter should be a function that looks like this:
-     * function(array of Rule rules) {...};
-     * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-     */
-    getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
-    /**
-     * @param callback Listener whose registration status shall be tested.
-     */
-    hasListener(callback: T): boolean;
-    /**
-     * Unregisters currently registered rules.
-     * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
-     * @param callback Called when rules were unregistered.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
-    /**
-     * Unregisters currently registered rules.
-     * @param callback Called when rules were unregistered.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    removeRules(callback?: () => void): void;
-    /**
-     * Registers rules to handle events.
-     * @param rules Rules to be registered. These do not replace previously registered rules.
-     * @param callback Called with registered rules.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(array of Rule rules) {...};
-     * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-     */
-    addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
-    /**
-     * Deregisters an event listener callback from an event.
-     * @param callback Listener that shall be unregistered.
-     * The callback parameter should be a function that looks like this:
-     * function() {...};
-     */
-    removeListener(callback: T): void;
-    hasListeners(): boolean;
-  }
+    /** An object which allows the addition and removal of listeners for a Chrome event. */
+    export interface Event<T> {
+        /**
+         * Registers an event listener callback to an event.
+         * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
+         * The callback parameter should be a function that looks like this:
+         * function() {...};
+         */
+        addListener(callback: T): void;
+        /**
+         * Returns currently registered rules.
+         * @param callback Called with registered rules.
+         * The callback parameter should be a function that looks like this:
+         * function(array of Rule rules) {...};
+         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+         */
+        getRules(callback: (rules: Rule[]) => void): void;
+        /**
+         * Returns currently registered rules.
+         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+         * @param callback Called with registered rules.
+         * The callback parameter should be a function that looks like this:
+         * function(array of Rule rules) {...};
+         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+         */
+        getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
+        /**
+         * @param callback Listener whose registration status shall be tested.
+         */
+        hasListener(callback: T): boolean;
+        /**
+         * Unregisters currently registered rules.
+         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+         * @param callback Called when rules were unregistered.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
+        /**
+         * Unregisters currently registered rules.
+         * @param callback Called when rules were unregistered.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        removeRules(callback?: () => void): void;
+        /**
+         * Registers rules to handle events.
+         * @param rules Rules to be registered. These do not replace previously registered rules.
+         * @param callback Called with registered rules.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(array of Rule rules) {...};
+         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+         */
+        addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
+        /**
+         * Deregisters an event listener callback from an event.
+         * @param callback Listener that shall be unregistered.
+         * The callback parameter should be a function that looks like this:
+         * function() {...};
+         */
+        removeListener(callback: T): void;
+        hasListeners(): boolean;
+    }
 
-  /** Description of a declarative rule for handling events. */
-  export interface Rule {
-    /** Optional. Optional priority of this rule. Defaults to 100.  */
-    priority?: number;
-    /** List of conditions that can trigger the actions. */
-    conditions: any[];
-    /** Optional. Optional identifier that allows referencing this rule.  */
-    id?: string;
-    /** List of actions that are triggered if one of the condtions is fulfilled. */
-    actions: any[];
-    /**
-     * Optional.
-      * Since Chrome 28.
-     * Tags can be used to annotate rules and perform operations on sets of rules.
-     */
-    tags?: string[];
-  }
+    /** Description of a declarative rule for handling events. */
+    export interface Rule {
+        /** Optional. Optional priority of this rule. Defaults to 100.  */
+        priority?: number;
+        /** List of conditions that can trigger the actions. */
+        conditions: any[];
+        /** Optional. Optional identifier that allows referencing this rule.  */
+        id?: string;
+        /** List of actions that are triggered if one of the condtions is fulfilled. */
+        actions: any[];
+        /**
+         * Optional.
+          * Since Chrome 28.
+         * Tags can be used to annotate rules and perform operations on sets of rules.
+         */
+        tags?: string[];
+    }
 }
 
 ////////////////////
@@ -1056,87 +1056,87 @@ declare namespace chrome.events {
  * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
  **/
 declare namespace chrome.extensionTypes {
-  /**
-   * The format of an image.
-   **/
-  export type ImageFormat = 'jpeg' | 'png';
-  /**
-   * Details about the format and quality of an image.
-   */
-  export interface ImageDetails {
     /**
-     * @description The format of the resulting image. Default is "jpeg".
-     * @type {ImageFormat}
-     * @memberof ImageDetails
-     */
-    format?: ImageFormat;
+     * The format of an image.
+     **/
+    export type ImageFormat = 'jpeg' | 'png';
     /**
-     * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
-     * @type {number}
-     * @memberof ImageDetails
+     * Details about the format and quality of an image.
      */
-    quality?: number;
-  }
-  /**
-   * The soonest that the JavaScript or CSS will be injected into the tab.
-   **/
-  export type RunAt = 'document_start' | 'document_end' | 'document_idle';
-  /**
-   * The origin of injected CSS.
-   **/
-  export type CSSOrigin = 'author' | 'user';
-  /**
-   * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-   * @interface InjectDetails
-   */
-  export interface InjectDetails {
+    export interface ImageDetails {
+        /**
+         * @description The format of the resulting image. Default is "jpeg".
+         * @type {ImageFormat}
+         * @memberof ImageDetails
+         */
+        format?: ImageFormat;
+        /**
+         * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
+         * @type {number}
+         * @memberof ImageDetails
+         */
+        quality?: number;
+    }
     /**
-     * JavaScript or CSS code to inject.
-     * Warning:
-     * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
-     * @type {string}
-     * @memberof InjectDetails
-     */
-    code?: string;
+     * The soonest that the JavaScript or CSS will be injected into the tab.
+     **/
+    export type RunAt = 'document_start' | 'document_end' | 'document_idle';
     /**
-     * @description JavaScript or CSS file to inject.
-     * @type {string}
-     * @memberof InjectDetails
-     */
-    file?: string;
+     * The origin of injected CSS.
+     **/
+    export type CSSOrigin = 'author' | 'user';
     /**
-     * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
-     * @type {boolean}
-     * @memberof InjectDetails
+     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+     * @interface InjectDetails
      */
-    allFrames?: boolean;
-    /**
-     * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
-     * @since Since Chrome 50.
-     * @type {number}
-     * @memberof InjectDetails
-     */
-    frameId?: number;
-    /**
-     * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
-     * @type {boolean}
-     * @memberof InjectDetails
-     */
-    matchAboutBlank?: boolean;
-    /**
-     * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-     * @type {RunAt}
-     * @memberof InjectDetails
-     */
-    runAt: RunAt;
-    /**
-     * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
-     * @since Since Chrome 66.
-     * @type {CSSOrigin}
-     * @memberof InjectDetails
-     */
-    cssOrigin: CSSOrigin;
-  }
+    export interface InjectDetails {
+        /**
+         * JavaScript or CSS code to inject.
+         * Warning:
+         * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        code?: string;
+        /**
+         * @description JavaScript or CSS file to inject.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        file?: string;
+        /**
+         * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
+         * @type {boolean}
+         * @memberof InjectDetails
+         */
+        allFrames?: boolean;
+        /**
+         * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
+         * @since Since Chrome 50.
+         * @type {number}
+         * @memberof InjectDetails
+         */
+        frameId?: number;
+        /**
+         * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
+         * @type {boolean}
+         * @memberof InjectDetails
+         */
+        matchAboutBlank?: boolean;
+        /**
+         * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+         * @type {RunAt}
+         * @memberof InjectDetails
+         */
+        runAt: RunAt;
+        /**
+         * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
+         * @since Since Chrome 66.
+         * @type {CSSOrigin}
+         * @memberof InjectDetails
+         */
+        cssOrigin: CSSOrigin;
+    }
 }
 
 ////////////////////
@@ -1144,30 +1144,30 @@ declare namespace chrome.extensionTypes {
 ////////////////////
 declare namespace chrome.fileSystem {
 
-  export interface AcceptOptions {
-    description?: string;
-    mimeTypes?: string[];
-    extensions?: string[];
-  }
+    export interface AcceptOptions {
+        description?: string;
+        mimeTypes?: string[];
+        extensions?: string[];
+    }
 
-  export interface ChooseEntryOptions {
-    type?: string;
-    suggestedName?: string;
-    accepts?: AcceptOptions[];
-    acceptsAllTypes?: boolean;
-    acceptsMultiple?: boolean;
-  }
+    export interface ChooseEntryOptions {
+        type?: string;
+        suggestedName?: string;
+        accepts?: AcceptOptions[];
+        acceptsAllTypes?: boolean;
+        acceptsMultiple?: boolean;
+    }
 
-  export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
-  export function getWritableEntry(entry: Entry, callback: (entry: Entry) => void): void;
-  export function isWritableEntry(entry: Entry, callback: (isWritable: boolean) => void): void;
-  export function chooseEntry(callback: (entry: Entry) => void): void;
-  export function chooseEntry(callback: (fileEntries: FileEntry[]) => void): void;
-  export function chooseEntry(options: ChooseEntryOptions, callback: (entry: Entry) => void): void;
-  export function chooseEntry(options: ChooseEntryOptions, callback: (fileEntries: FileEntry[]) => void): void;
-  export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
-  export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
-  export function retainEntry(entry: Entry): string;
+    export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
+    export function getWritableEntry(entry: Entry, callback: (entry: Entry) => void): void;
+    export function isWritableEntry(entry: Entry, callback: (isWritable: boolean) => void): void;
+    export function chooseEntry(callback: (entry: Entry) => void): void;
+    export function chooseEntry(callback: (fileEntries: FileEntry[]) => void): void;
+    export function chooseEntry(options: ChooseEntryOptions, callback: (entry: Entry) => void): void;
+    export function chooseEntry(options: ChooseEntryOptions, callback: (fileEntries: FileEntry[]) => void): void;
+    export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
+    export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
+    export function retainEntry(entry: Entry): string;
 }
 
 
@@ -1181,346 +1181,346 @@ declare namespace chrome.fileSystem {
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome.fileSystemProvider {
-  export interface OpenedFileInfo {
-    /** A request ID to be be used by consecutive read/write and close requests. */
-    openRequestId: number;
-    /** The path of the opened file. */
-    filePath: string;
-    /** Whether the file was opened for reading or writing. */
-    mode: string;
-  }
+    export interface OpenedFileInfo {
+        /** A request ID to be be used by consecutive read/write and close requests. */
+        openRequestId: number;
+        /** The path of the opened file. */
+        filePath: string;
+        /** Whether the file was opened for reading or writing. */
+        mode: string;
+    }
 
-  export interface FileWatchersInfo {
-    /** The path of the entry being observed. */
-    entryPath: string;
-    /** Whether watching should include all child entries recursively. It can be true for directories only. */
-    recursive: boolean;
-    /** Optional. Tag used by the last notification for the watcher.  */
-    lastTag?: string;
-  }
+    export interface FileWatchersInfo {
+        /** The path of the entry being observed. */
+        entryPath: string;
+        /** Whether watching should include all child entries recursively. It can be true for directories only. */
+        recursive: boolean;
+        /** Optional. Tag used by the last notification for the watcher.  */
+        lastTag?: string;
+    }
 
-  export interface EntryMetadata {
-    /** True if it is a directory. */
-    isDirectory: boolean;
-    /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
-    name: string;
-    /** File size in bytes. */
-    size: number;
-    /** The last modified time of this entry. */
-    modificationTime: Date;
-    /** Optional. Mime type for the entry.  */
-    mimeType?: string;
-    /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
-    thumbnail?: string;
-  }
+    export interface EntryMetadata {
+        /** True if it is a directory. */
+        isDirectory: boolean;
+        /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
+        name: string;
+        /** File size in bytes. */
+        size: number;
+        /** The last modified time of this entry. */
+        modificationTime: Date;
+        /** Optional. Mime type for the entry.  */
+        mimeType?: string;
+        /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
+        thumbnail?: string;
+    }
+
+    export interface FileSystemInfo {
+        /** The identifier of the file system. */
+        fileSystemId: string;
+        /** A human-readable name for the file system. */
+        displayName: string;
+        /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
+        writable: boolean;
+        /**
+         * The maximum number of files that can be opened at once. If 0, then not limited.
+         * @since Since Chrome 42.
+         */
+        openedFilesLimit: number;
+        /**
+         * List of currently opened files.
+         * @since Since Chrome 42.
+         */
+        openedFiles: OpenedFileInfo[];
+        /**
+         * Optional.
+          * Whether the file system supports the tag field for observing directories.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        supportsNotifyTag?: boolean;
+        /**
+         * List of watchers.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        watchers: FileWatchersInfo[];
+    }
+
+    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+    export interface GetActionsRequestedOptions {
+        /** The identifier of the file system related to this operation. */
+        fileSystemId: string;
+        /** The unique identifier of this request. */
+        requestId: number;
+        /** The path of the entry to return the list of actions for. */
+        entryPath: string;
+    }
+
+    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+    export interface Action {
+        /** The identifier of the action. Any string or CommonActionId for common actions. */
+        id: string;
+        /** Optional. The title of the action. It may be ignored for common actions.  */
+        title?: string;
+    }
+
+    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+    export interface ExecuteActionRequestedOptions {
+        /** The identifier of the file system related to this operation. */
+        fileSystemId: string;
+        /** The unique identifier of this request. */
+        requestId: number;
+        /** The path of the entry to be used for the action. */
+        entryPath: string;
+        /** The identifier of the action to be executed. */
+        actionId: string;
+    }
+
+    export interface MountOptions {
+        /** The string indentifier of the file system. Must be unique per each extension. */
+        fileSystemId: string;
+        /** A human-readable name for the file system. */
+        displayName: string;
+        /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
+        writable?: boolean;
+        /**
+         * Optional.
+          * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
+         * @since Since Chrome 41.
+         */
+        openedFilesLimit?: number;
+        /**
+         * Optional.
+          * Whether the file system supports the tag field for observed directories.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        supportsNotifyTag?: boolean;
+    }
+
+    export interface UnmountOptions {
+        /** The identifier of the file system to be unmounted. */
+        fileSystemId: string;
+    }
+
+    export interface NotificationChange {
+        /** The path of the changed entry. */
+        entryPath: string;
+        /** The type of the change which happened to the entry. */
+        changeType: string;
+    }
+
+    export interface NotificationOptions {
+        /** The identifier of the file system related to this change. */
+        fileSystemId: string;
+        /** The path of the observed entry. */
+        observedPath: string;
+        /** Mode of the observed entry. */
+        recursive: boolean;
+        /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
+        changeType: string;
+        /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
+        changes?: NotificationChange[];
+        /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
+        tag?: string;
+    }
+
+    export interface RequestedEventOptions {
+        /** The identifier of the file system related to this operation. */
+        fileSystemId: string;
+        /** The unique identifier of this request. */
+        requestId: number;
+    }
+
+    export interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+        /** The path of the entry to which this operation is related to. */
+        entryPath: string;
+    }
+
+    export interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
+        /** Set to true if the thumbnail is requested. */
+        thumbnail: boolean;
+    }
+
+    export interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+        /** The path of the directory which is to be operated on. */
+        directoryPath: string;
+    }
+
+    export interface FilePathRequestedEventOptions extends RequestedEventOptions {
+        /** The path of the entry for the operation */
+        filePath: string;
+    }
+
+    export interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
+        /** Whether the file will be used for reading or writing. */
+        mode: string;
+    }
+
+    export interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+        /** A request ID used to open the file. */
+        openRequestId: number;
+    }
+
+    export interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+        /** Position in the file (in bytes) to start reading from. */
+        offset: number;
+        /** Number of bytes to be returned. */
+        length: number;
+    }
+
+    export interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+        /** Whether the operation is recursive (for directories only). */
+        recursive: boolean;
+    }
+
+    export interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+        /** Whether the operation is recursive (for directories only). */
+        recursive: boolean;
+    }
+
+    export interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+        /** The source path for the operation. */
+        sourcePath: string;
+        /** The destination path for the operation. */
+        targetPath: string;
+    }
+
+    export interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
+        /** Number of bytes to be retained after the operation completes. */
+        length: number;
+    }
+
+    export interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+        /** Position in the file (in bytes) to start operating from. */
+        offset: number;
+        /** Buffer of bytes to be operated on the file. */
+        data: ArrayBuffer;
+    }
+
+    export interface OperationRequestedEventOptions extends RequestedEventOptions {
+        /** An ID of the request to which this operation is related. */
+        operationRequestId: number;
+    }
+
+    export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
+
+    export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+    export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+    export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-  export interface FileSystemInfo {
-    /** The identifier of the file system. */
-    fileSystemId: string;
-    /** A human-readable name for the file system. */
-    displayName: string;
-    /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
-    writable: boolean;
     /**
-     * The maximum number of files that can be opened at once. If 0, then not limited.
+     * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
+     * Depending on the type of the file system being mounted, the source option must be set appropriately.
+     * In case of an error, runtime.lastError will be set with a corresponding error code.
+     * @param callback A generic result callback to indicate success or failure.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function mount(options: MountOptions, callback?: () => void): void;
+    /**
+     * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
+     * In case of an error, runtime.lastError will be set with a corresponding error code.
+     * @param callback A generic result callback to indicate success or failure.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
+     */
+    export function unmount(options: UnmountOptions, callback?: () => void): void;
+    /**
+     * Returns all file systems mounted by the extension.
+     * @param callback Callback to receive the result of getAll function.
+     * The callback parameter should be a function that looks like this:
+     * function(array of FileSystemInfo fileSystems) {...};
+     */
+    export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
+    /**
+     * Returns information about a file system with the passed fileSystemId.
      * @since Since Chrome 42.
+     * @param callback Callback to receive the result of get function.
+     * The callback parameter should be a function that looks like this:
+     * function(FileSystemInfo fileSystem) {...};
      */
-    openedFilesLimit: number;
+    export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
     /**
-     * List of currently opened files.
-     * @since Since Chrome 42.
+     * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
+     * To use, the file_system_provider.notify manifest option must be set to true.
+     * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
+     * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
+     * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
+     * In case of an error, runtime.lastError will be set will a corresponding error code.
+     * @param callback A generic result callback to indicate success or failure.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
      */
-    openedFiles: OpenedFileInfo[];
+    export function notify(options: NotificationOptions, callback: () => void): void;
+
+    /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
+    export var onUnmountRequested: RequestedEvent;
+    /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
+    export var onGetMetadataRequested: MetadataRequestedEvent;
+    /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
+    export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
+    /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
+    export var onOpenFileRequested: OpenFileRequestedEvent;
+    /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
+    export var onCloseFileRequested: OpenedFileRequestedEvent;
+    /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
+    export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
+    /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
+    export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
+    /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
+    export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
+    /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
+    export var onCreateFileRequested: FilePathRequestedEvent;
+    /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+    export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
+    /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+    export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
+    /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
+    export var onTruncateRequested: FilePathLengthRequestedEvent;
+    /** Raised when writing contents to a file opened previously with openRequestId is requested. */
+    export var onWriteFileRequested: OpenedFileIoRequestedEvent;
+    /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
+    export var onAbortRequested: OperationRequestedEvent;
     /**
-     * Optional.
-      * Whether the file system supports the tag field for observing directories.
+     * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
+     * @since Since Chrome 44.
+     */
+    export var onConfigureRequested: RequestedEvent;
+    /**
+     * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
+     * @since Since Chrome 44.
+     */
+    export var onMountRequested: OptionlessRequestedEvent;
+    /**
+     * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
      * @since Since Chrome 45. Warning: this is the current Beta channel.
      */
-    supportsNotifyTag?: boolean;
+    export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
     /**
-     * List of watchers.
+     * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
      * @since Since Chrome 45. Warning: this is the current Beta channel.
      */
-    watchers: FileWatchersInfo[];
-  }
-
-  /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-  export interface GetActionsRequestedOptions {
-    /** The identifier of the file system related to this operation. */
-    fileSystemId: string;
-    /** The unique identifier of this request. */
-    requestId: number;
-    /** The path of the entry to return the list of actions for. */
-    entryPath: string;
-  }
-
-  /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-  export interface Action {
-    /** The identifier of the action. Any string or CommonActionId for common actions. */
-    id: string;
-    /** Optional. The title of the action. It may be ignored for common actions.  */
-    title?: string;
-  }
-
-  /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-  export interface ExecuteActionRequestedOptions {
-    /** The identifier of the file system related to this operation. */
-    fileSystemId: string;
-    /** The unique identifier of this request. */
-    requestId: number;
-    /** The path of the entry to be used for the action. */
-    entryPath: string;
-    /** The identifier of the action to be executed. */
-    actionId: string;
-  }
-
-  export interface MountOptions {
-    /** The string indentifier of the file system. Must be unique per each extension. */
-    fileSystemId: string;
-    /** A human-readable name for the file system. */
-    displayName: string;
-    /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
-    writable?: boolean;
-    /**
-     * Optional.
-      * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
-     * @since Since Chrome 41.
-     */
-    openedFilesLimit?: number;
-    /**
-     * Optional.
-      * Whether the file system supports the tag field for observed directories.
-     * @since Since Chrome 45. Warning: this is the current Beta channel.
-     */
-    supportsNotifyTag?: boolean;
-  }
-
-  export interface UnmountOptions {
-    /** The identifier of the file system to be unmounted. */
-    fileSystemId: string;
-  }
-
-  export interface NotificationChange {
-    /** The path of the changed entry. */
-    entryPath: string;
-    /** The type of the change which happened to the entry. */
-    changeType: string;
-  }
-
-  export interface NotificationOptions {
-    /** The identifier of the file system related to this change. */
-    fileSystemId: string;
-    /** The path of the observed entry. */
-    observedPath: string;
-    /** Mode of the observed entry. */
-    recursive: boolean;
-    /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
-    changeType: string;
-    /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
-    changes?: NotificationChange[];
-    /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
-    tag?: string;
-  }
-
-  export interface RequestedEventOptions {
-    /** The identifier of the file system related to this operation. */
-    fileSystemId: string;
-    /** The unique identifier of this request. */
-    requestId: number;
-  }
-
-  export interface EntryPathRequestedEventOptions extends RequestedEventOptions {
-    /** The path of the entry to which this operation is related to. */
-    entryPath: string;
-  }
-
-  export interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
-    /** Set to true if the thumbnail is requested. */
-    thumbnail: boolean;
-  }
-
-  export interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
-    /** The path of the directory which is to be operated on. */
-    directoryPath: string;
-  }
-
-  export interface FilePathRequestedEventOptions extends RequestedEventOptions {
-    /** The path of the entry for the operation */
-    filePath: string;
-  }
-
-  export interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
-    /** Whether the file will be used for reading or writing. */
-    mode: string;
-  }
-
-  export interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
-    /** A request ID used to open the file. */
-    openRequestId: number;
-  }
-
-  export interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
-    /** Position in the file (in bytes) to start reading from. */
-    offset: number;
-    /** Number of bytes to be returned. */
-    length: number;
-  }
-
-  export interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
-    /** Whether the operation is recursive (for directories only). */
-    recursive: boolean;
-  }
-
-  export interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
-    /** Whether the operation is recursive (for directories only). */
-    recursive: boolean;
-  }
-
-  export interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
-    /** The source path for the operation. */
-    sourcePath: string;
-    /** The destination path for the operation. */
-    targetPath: string;
-  }
-
-  export interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
-    /** Number of bytes to be retained after the operation completes. */
-    length: number;
-  }
-
-  export interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
-    /** Position in the file (in bytes) to start operating from. */
-    offset: number;
-    /** Buffer of bytes to be operated on the file. */
-    data: ArrayBuffer;
-  }
-
-  export interface OperationRequestedEventOptions extends RequestedEventOptions {
-    /** An ID of the request to which this operation is related. */
-    operationRequestId: number;
-  }
-
-  export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
-
-  export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
-
-  export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
-
-  export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-  /**
-   * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
-   * Depending on the type of the file system being mounted, the source option must be set appropriately.
-   * In case of an error, runtime.lastError will be set with a corresponding error code.
-   * @param callback A generic result callback to indicate success or failure.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function mount(options: MountOptions, callback?: () => void): void;
-  /**
-   * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
-   * In case of an error, runtime.lastError will be set with a corresponding error code.
-   * @param callback A generic result callback to indicate success or failure.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function unmount(options: UnmountOptions, callback?: () => void): void;
-  /**
-   * Returns all file systems mounted by the extension.
-   * @param callback Callback to receive the result of getAll function.
-   * The callback parameter should be a function that looks like this:
-   * function(array of FileSystemInfo fileSystems) {...};
-   */
-  export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
-  /**
-   * Returns information about a file system with the passed fileSystemId.
-   * @since Since Chrome 42.
-   * @param callback Callback to receive the result of get function.
-   * The callback parameter should be a function that looks like this:
-   * function(FileSystemInfo fileSystem) {...};
-   */
-  export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
-  /**
-   * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
-   * To use, the file_system_provider.notify manifest option must be set to true.
-   * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
-   * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
-   * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
-   * In case of an error, runtime.lastError will be set will a corresponding error code.
-   * @param callback A generic result callback to indicate success or failure.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function notify(options: NotificationOptions, callback: () => void): void;
-
-  /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
-  export var onUnmountRequested: RequestedEvent;
-  /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
-  export var onGetMetadataRequested: MetadataRequestedEvent;
-  /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
-  export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
-  /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
-  export var onOpenFileRequested: OpenFileRequestedEvent;
-  /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
-  export var onCloseFileRequested: OpenedFileRequestedEvent;
-  /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
-  export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
-  /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
-  export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
-  /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
-  export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
-  /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
-  export var onCreateFileRequested: FilePathRequestedEvent;
-  /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-  export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
-  /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-  export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
-  /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
-  export var onTruncateRequested: FilePathLengthRequestedEvent;
-  /** Raised when writing contents to a file opened previously with openRequestId is requested. */
-  export var onWriteFileRequested: OpenedFileIoRequestedEvent;
-  /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
-  export var onAbortRequested: OperationRequestedEvent;
-  /**
-   * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
-   * @since Since Chrome 44.
-   */
-  export var onConfigureRequested: RequestedEvent;
-  /**
-   * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
-   * @since Since Chrome 44.
-   */
-  export var onMountRequested: OptionlessRequestedEvent;
-  /**
-   * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
-   * @since Since Chrome 45. Warning: this is the current Beta channel.
-   */
-  export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
-  /**
-   * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
-   * @since Since Chrome 45. Warning: this is the current Beta channel.
-   */
-  export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
+    export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
 }
 
 ////////////////////
@@ -1532,83 +1532,83 @@ declare namespace chrome.fileSystemProvider {
  * Permissions:  "gcm"
  */
 declare namespace chrome.gcm {
-  export interface OutgoingMessage {
-    /** The ID of the server to send the message to as assigned by Google API Console. */
-    destinationId: string;
-    /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
-    messageId: string;
-    /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
-    timeToLive?: number;
-    /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
-    data: Object;
-  }
+    export interface OutgoingMessage {
+        /** The ID of the server to send the message to as assigned by Google API Console. */
+        destinationId: string;
+        /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
+        messageId: string;
+        /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
+        timeToLive?: number;
+        /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
+        data: Object;
+    }
+
+    export interface IncomingMessage {
+        /** The message data. */
+        data: Object;
+        /**
+         * Optional.
+         * The sender who issued the message.
+         * @since Since Chrome 41.
+         */
+        from?: string;
+        /**
+         * Optional.
+         * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
+         */
+        collapseKey?: string;
+    }
+
+    export interface GcmError {
+        /** The error message describing the problem. */
+        errorMessage: string;
+        /** Optional. The ID of the message with this error, if error is related to a specific message. */
+        messageId?: string;
+        /** Additional details related to the error, when available. */
+        detail: Object;
+    }
+
+    export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
+
+    export interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
+
+    export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
+
+    /** The maximum size (in bytes) of all key/value pairs in a message. */
+    export var MAX_MESSAGE_SIZE: number;
 
-  export interface IncomingMessage {
-    /** The message data. */
-    data: Object;
     /**
-     * Optional.
-     * The sender who issued the message.
-     * @since Since Chrome 41.
+     * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
+     * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
+     * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
+     * The callback parameter should be a function that looks like this:
+     * function(string registrationId) {...};
+     * Parameter registrationId: A registration ID assigned to the application by the GCM.
      */
-    from?: string;
+    export function register(senderIds: string[], callback: (registrationId: string) => void): void;
     /**
-     * Optional.
-     * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
+     * Unregisters the application from GCM.
+     * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
+     * The callback parameter should be a function that looks like this:
+     * function() {...};
      */
-    collapseKey?: string;
-  }
+    export function unregister(callback: () => void): void;
+    /**
+     * Sends a message according to its contents.
+     * @param message A message to send to the other party via GCM.
+     * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
+     * The callback parameter should be a function that looks like this:
+     * function(string messageId) {...};
+     * Parameter messageId: The ID of the message that the callback was issued for.
+     */
+    export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
 
-  export interface GcmError {
-    /** The error message describing the problem. */
-    errorMessage: string;
-    /** Optional. The ID of the message with this error, if error is related to a specific message. */
-    messageId?: string;
-    /** Additional details related to the error, when available. */
-    detail: Object;
-  }
-
-  export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
-
-  export interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
-
-  export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
-
-  /** The maximum size (in bytes) of all key/value pairs in a message. */
-  export var MAX_MESSAGE_SIZE: number;
-
-  /**
-   * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
-   * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
-   * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
-   * The callback parameter should be a function that looks like this:
-   * function(string registrationId) {...};
-   * Parameter registrationId: A registration ID assigned to the application by the GCM.
-   */
-  export function register(senderIds: string[], callback: (registrationId: string) => void): void;
-  /**
-   * Unregisters the application from GCM.
-   * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
-   * The callback parameter should be a function that looks like this:
-   * function() {...};
-   */
-  export function unregister(callback: () => void): void;
-  /**
-   * Sends a message according to its contents.
-   * @param message A message to send to the other party via GCM.
-   * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
-   * The callback parameter should be a function that looks like this:
-   * function(string messageId) {...};
-   * Parameter messageId: The ID of the message that the callback was issued for.
-   */
-  export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
-
-  /** Fired when a message is received through GCM. */
-  export var onMessage: MessageReceptionEvent;
-  /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
-  export var onMessagesDeleted: MessageDeletionEvent;
-  /** Fired when it was not possible to send a message to the GCM server. */
-  export var onSendError: GcmErrorEvent;
+    /** Fired when a message is received through GCM. */
+    export var onMessage: MessageReceptionEvent;
+    /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
+    export var onMessagesDeleted: MessageDeletionEvent;
+    /** Fired when it was not possible to send a message to the GCM server. */
+    export var onSendError: GcmErrorEvent;
 }
 
 ////////////////////
@@ -1619,7 +1619,7 @@ declare namespace chrome.gcm {
  * @since Chrome 38
  */
 declare namespace chrome.hid {
-  /** NOT YET IMPLEMENTED */
+    /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
@@ -1630,50 +1630,50 @@ declare namespace chrome.hid {
  * @since Chrome 5.
  */
 declare namespace chrome.i18n {
-  /** Holds detected ISO language code and its percentage in the input string */
-  export interface DetectedLanguage {
-    /** An ISO language code such as 'en' or 'fr'.
-     * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
-     * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
-    language: string;
+    /** Holds detected ISO language code and its percentage in the input string */
+    export interface DetectedLanguage {
+        /** An ISO language code such as 'en' or 'fr'.
+         * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
+         * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
+        language: string;
 
-    /** The percentage of the detected language */
-    percentage: number;
-  }
+        /** The percentage of the detected language */
+        percentage: number;
+    }
 
-  /** Holds detected language reliability and array of DetectedLanguage */
-  export interface LanguageDetectionResult {
-    /** CLD detected language reliability */
-    isReliable: boolean;
+    /** Holds detected language reliability and array of DetectedLanguage */
+    export interface LanguageDetectionResult {
+        /** CLD detected language reliability */
+        isReliable: boolean;
 
-    /** Array of detectedLanguage */
-    languages: DetectedLanguage[];
-  }
+        /** Array of detectedLanguage */
+        languages: DetectedLanguage[];
+    }
 
-  /**
-   * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
-   * @param callback The callback parameter should be a function that looks like this:
-   * function(array of string languages) {...};
-   * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
-   */
-  export function getAcceptLanguages(callback: (languages: string[]) => void): void;
-  /**
-   * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
-   * @param messageName The name of the message, as specified in the messages.json file.
-   * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
-   */
-  export function getMessage(messageName: string, substitutions?: any): string;
-  /**
-   * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
-   * @since Chrome 35.
-   */
-  export function getUILanguage(): string;
+    /**
+     * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function(array of string languages) {...};
+     * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
+     */
+    export function getAcceptLanguages(callback: (languages: string[]) => void): void;
+    /**
+     * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
+     * @param messageName The name of the message, as specified in the messages.json file.
+     * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
+     */
+    export function getMessage(messageName: string, substitutions?: any): string;
+    /**
+     * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+     * @since Chrome 35.
+     */
+    export function getUILanguage(): string;
 
-  /** Detects the language of the provided text using CLD.
-   * @param text User input string to be translated.
-   * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
-   */
-  export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
+    /** Detects the language of the provided text using CLD.
+     * @param text User input string to be translated.
+     * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
+     */
+    export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
 }
 
 ////////////////////
@@ -1685,114 +1685,114 @@ declare namespace chrome.i18n {
  * @since Chrome 29.
  */
 declare namespace chrome.identity {
-  /** @since Chrome 32. */
-  export interface AccountInfo {
-    /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
-    id: string;
-  }
+    /** @since Chrome 32. */
+    export interface AccountInfo {
+        /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+        id: string;
+    }
+
+    export interface TokenDetails {
+        /**
+         * Optional.
+         * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
+         */
+        interactive?: boolean;
+        /**
+         * Optional.
+         * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
+         * account is only supported when the "enable-new-profile-management" flag is set.
+         * @since Chrome 37.
+         */
+        account?: AccountInfo;
+        /**
+         * Optional.
+         * A list of OAuth2 scopes to request.
+         * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
+         * @since Chrome 37.
+         */
+        scopes?: string[];
+    }
+
+    export interface UserInfo {
+        /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
+        email: string;
+        /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
+        id: string;
+    }
+
+    export interface TokenInformation {
+        /** The specific token that should be removed from the cache. */
+        token: string;
+    }
+
+    export interface WebAuthFlowOptions {
+        /** The URL that initiates the auth flow. */
+        url: string;
+        /**
+         * Optional.
+         * Whether to launch auth flow in interactive mode.
+         * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
+         * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
+         */
+        interactive?: boolean;
+    }
+
+    export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
 
-  export interface TokenDetails {
     /**
-     * Optional.
-     * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
+     * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
+     * getAccounts is only supported on dev channel.
+     * Dev channel only.
      */
-    interactive?: boolean;
+    export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
     /**
-     * Optional.
-     * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
-     * account is only supported when the "enable-new-profile-management" flag is set.
+     * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+     * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
+     * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
+     * @param details Token options.
+     * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(string token) {...};
+     */
+    export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
+    /**
+     * Retrieves email address and obfuscated gaia id of the user signed into a profile.
+     * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
      * @since Chrome 37.
      */
-    account?: AccountInfo;
+    export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
     /**
-     * Optional.
-     * A list of OAuth2 scopes to request.
-     * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
-     * @since Chrome 37.
+     * Removes an OAuth2 access token from the Identity API's token cache.
+     * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
+     * @param details Token information.
+     * @param callback Called when the token has been removed from the cache.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function() {...};
      */
-    scopes?: string[];
-  }
-
-  export interface UserInfo {
-    /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
-    email: string;
-    /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
-    id: string;
-  }
-
-  export interface TokenInformation {
-    /** The specific token that should be removed from the cache. */
-    token: string;
-  }
-
-  export interface WebAuthFlowOptions {
-    /** The URL that initiates the auth flow. */
-    url: string;
+    export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
     /**
-     * Optional.
-     * Whether to launch auth flow in interactive mode.
-     * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
-     * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
+     * Starts an auth flow at the specified URL.
+     * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
+     * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
+     * @param details WebAuth flow options.
+     * @param callback Called with the URL redirected back to your application.
+     * The callback parameter should be a function that looks like this:
+     * function(string responseUrl) {...};
      */
-    interactive?: boolean;
-  }
+    export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
+    /**
+     * Generates a redirect URL to be used in launchWebAuthFlow.
+     * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
+     * @since Chrome 33.
+     * @param path Optional. The path appended to the end of the generated URL.
+     */
+    export function getRedirectURL(path?: string): string;
 
-  export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
-
-  /**
-   * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
-   * getAccounts is only supported on dev channel.
-   * Dev channel only.
-   */
-  export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
-  /**
-   * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
-   * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
-   * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
-   * @param details Token options.
-   * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function(string token) {...};
-   */
-  export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
-  /**
-   * Retrieves email address and obfuscated gaia id of the user signed into a profile.
-   * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
-   * @since Chrome 37.
-   */
-  export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
-  /**
-   * Removes an OAuth2 access token from the Identity API's token cache.
-   * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
-   * @param details Token information.
-   * @param callback Called when the token has been removed from the cache.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function() {...};
-   */
-  export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
-  /**
-   * Starts an auth flow at the specified URL.
-   * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
-   * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
-   * @param details WebAuth flow options.
-   * @param callback Called with the URL redirected back to your application.
-   * The callback parameter should be a function that looks like this:
-   * function(string responseUrl) {...};
-   */
-  export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
-  /**
-   * Generates a redirect URL to be used in launchWebAuthFlow.
-   * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
-   * @since Chrome 33.
-   * @param path Optional. The path appended to the end of the generated URL.
-   */
-  export function getRedirectURL(path?: string): string;
-
-  /**
-   * Fired when signin state changes for an account on the user's profile.
-   * @since Chrome 33.
-   */
-  export var onSignInChanged: SignInChangeEvent;
+    /**
+     * Fired when signin state changes for an account on the user's profile.
+     * @since Chrome 33.
+     */
+    export var onSignInChanged: SignInChangeEvent;
 }
 
 ////////////////////
@@ -1804,25 +1804,25 @@ declare namespace chrome.identity {
  * @since Chrome 6.
  */
 declare namespace chrome.idle {
-  export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
+    export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
 
-  /**
-   * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
-   * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
-   * Since Chrome 25.
-   * @param callback The callback parameter should be a function that looks like this:
-   * function( IdleState newState) {...};
-   */
-  export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
-  /**
-   * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
-   * @since Chrome 25.
-   * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
-   */
-  export function setDetectionInterval(intervalInSeconds: number): void;
+    /**
+     * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+     * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
+     * Since Chrome 25.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function( IdleState newState) {...};
+     */
+    export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
+    /**
+     * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
+     * @since Chrome 25.
+     * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
+     */
+    export function setDetectionInterval(intervalInSeconds: number): void;
 
-  /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
-  export var onStateChanged: IdleStateChangedEvent;
+    /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
+    export var onStateChanged: IdleStateChangedEvent;
 }
 
 ////////////////////
@@ -1833,7 +1833,7 @@ declare namespace chrome.idle {
  * @since Chrome 46
  */
 declare namespace chrome.instanceID {
-  /** NOT YET IMPLEMENTED */
+    /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
@@ -1844,111 +1844,111 @@ declare namespace chrome.instanceID {
  * @since Chrome 31
  */
 declare namespace chrome.mdns {
-  /** NOT YET IMPLEMENTED */
+    /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
 // Media Galleries
 ////////////////////
 declare namespace chrome.mediaGalleries {
-  export interface MediaFileSystemsOptions {
-    interactive?: 'no' | 'yes' | 'if_needed';
-  }
+    export interface MediaFileSystemsOptions {
+        interactive?: 'no' | 'yes' | 'if_needed';
+    }
 
-  export interface MediaFileSystemMetadata {
-    name: string;
-    galleryId: string;
-    deviceId?: string;
-    isRemovable: boolean;
-    isMediaDevice: boolean;
-    isAvailable: boolean;
-  }
+    export interface MediaFileSystemMetadata {
+        name: string;
+        galleryId: string;
+        deviceId?: string;
+        isRemovable: boolean;
+        isMediaDevice: boolean;
+        isAvailable: boolean;
+    }
 
-  export interface MetadataOptions {
-    metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
-  }
+    export interface MetadataOptions {
+        metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
+    }
 
-  export interface RawTag {
-    type: string;
-    tags: { [name: string]: string; };
-  }
+    export interface RawTag {
+        type: string;
+        tags: { [name: string]: string; };
+    }
 
-  export interface Metadata {
-    // The browser sniffed mime type.
-    mimeType: string;
-    // Defined for images and video. In pixels.
-    height?: number;
-    width?: number;
-    // Defined for images only.
-    xResolution?: number;
-    yResolution?: number;
-    // Defined for audio and video. In seconds.
-    duration?: number;
-    // Defined for images and video. In degrees.
-    rotation?: number;
-    // Defined for images only.
-    cameraMake?: string;
-    cameraModel?: string;
-    exposureTimeSeconds?: number;
-    flashFired?: boolean;
-    fNumber?: number;
-    focalLengthMm?: number;
-    isoEquivalent?: number;
-    // Defined for audio and video only.
-    album?: string;
-    artist?: string;
-    comment?: string;
-    copyright?: string;
-    disc?: number;
-    genre?: string;
-    language?: string;
-    title?: string;
-    track?: number;
-    // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
-    rawTags: RawTag[];
-    // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
-    attachedImages: Blob[];
-  }
+    export interface Metadata {
+        // The browser sniffed mime type.
+        mimeType: string;
+        // Defined for images and video. In pixels.
+        height?: number;
+        width?: number;
+        // Defined for images only.
+        xResolution?: number;
+        yResolution?: number;
+        // Defined for audio and video. In seconds.
+        duration?: number;
+        // Defined for images and video. In degrees.
+        rotation?: number;
+        // Defined for images only.
+        cameraMake?: string;
+        cameraModel?: string;
+        exposureTimeSeconds?: number;
+        flashFired?: boolean;
+        fNumber?: number;
+        focalLengthMm?: number;
+        isoEquivalent?: number;
+        // Defined for audio and video only.
+        album?: string;
+        artist?: string;
+        comment?: string;
+        copyright?: string;
+        disc?: number;
+        genre?: string;
+        language?: string;
+        title?: string;
+        track?: number;
+        // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
+        rawTags: RawTag[];
+        // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
+        attachedImages: Blob[];
+    }
 
-  export interface GalleryWatchResult {
-    galleryId: string;
-    success: boolean;
-  }
+    export interface GalleryWatchResult {
+        galleryId: string;
+        success: boolean;
+    }
 
-  export interface GalleryChangedEventArgs {
-    type: 'contents_changed' | 'watch_dropped';
-    galleryId: string;
-  }
+    export interface GalleryChangedEventArgs {
+        type: 'contents_changed' | 'watch_dropped';
+        galleryId: string;
+    }
 
-  export interface ScanProgressEventArgs {
-    // The type of progress event, i.e. start, finish, etc.
-    type: 'start' | 'cancel' | 'finish' | 'error';
-    // The number of Galleries found.
-    galleryCount?: number;
-    // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
-    audioCount?: number;
-    imageCount?: number;
-    videoCount?: number;
-  }
+    export interface ScanProgressEventArgs {
+        // The type of progress event, i.e. start, finish, etc.
+        type: 'start' | 'cancel' | 'finish' | 'error';
+        // The number of Galleries found.
+        galleryCount?: number;
+        // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
+        audioCount?: number;
+        imageCount?: number;
+        videoCount?: number;
+    }
 
-  export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
-  export function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
-  export function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
-  export function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
-  export function startMediaScan(): void;
-  export function cancelMediaScan(): void;
-  export function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
-  export function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
-  export function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
-  export function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
-  export function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
-  export function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
-  export function removeGalleryWatch(galleryId: string): void;
-  export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
-  export function removeAllGalleryWatch(): void;
+    export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
+    export function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
+    export function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
+    export function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
+    export function startMediaScan(): void;
+    export function cancelMediaScan(): void;
+    export function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
+    export function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
+    export function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
+    export function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
+    export function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
+    export function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
+    export function removeGalleryWatch(galleryId: string): void;
+    export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
+    export function removeAllGalleryWatch(): void;
 
-  export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
-  export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
+    export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
+    export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
 }
 
 ////////////////////////////////////
@@ -1960,112 +1960,112 @@ declare namespace chrome.mediaGalleries {
  * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
  */
 declare namespace chrome.networking.onc {
-  export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
-  export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
-  export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
-  export type IPConfigType = 'DHCP' | 'Static';
-  export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
-  export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
-  export interface ManagedBoolean {
-    /**
-     * @description The active value currently used by the network configuration manager (e.g. Shill).
-     * @type {boolean}
-     * @memberof ManagedBoolean
-     */
-    Active?: boolean,
-    /**
-     * @description The source from which the effective property value was determined.
-     * @type {string}
-     * @memberof ManagedBoolean
-     */
-    Effective?: string,
-    /**
-     * @description The property value provided by the user policy.
-     * @type {boolean}
-     * @memberof ManagedBoolean
-     */
-    UserPolicy?: boolean,
-    /**
-     * @description The property value provided by the device policy.
-     * @type {boolean}
-     * @memberof ManagedBoolean
-     */
-    DevicePolicy?: boolean,
-    /**
-     * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-     * @type {boolean}
-     * @memberof ManagedBoolean
-     */
-    UserSettings?: boolean,
-    /**
-     * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-     * @type {boolean}
-     * @memberof ManagedBoolean
-     */
-    SharedSettings?: boolean,
-    /**
-     * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-     * @type {boolean}
-     * @memberof ManagedBoolean
-     */
-    UserEditable?: boolean,
-    /**
-     * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-     * @type {boolean}
-     * @memberof ManagedBoolean
-     */
-    DeviceEditable?: boolean
-  }
-  export interface ManagedLong {
-    /**
-     * @description The active value currently used by the network configuration manager (e.g. Shill).
-     * @type {number}
-     * @memberof ManagedLong
-     */
-    Active?: number,
-    /**
-     * @description The source from which the effective property value was determined.
-     * @type {string}
-     * @memberof ManagedLong
-     */
-    Effective?: string,
-    /**
-     * @description The property value provided by the user policy.
-     * @type {number}
-     * @memberof ManagedLong
-     */
-    UserPolicy?: number,
-    /**
-     * @description The property value provided by the device policy.
-     * @type {number}
-     * @memberof ManagedLong
-     */
-    DevicePolicy?: number,
-    /**
-     * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-     * @type {number}
-     * @memberof ManagedLong
-     */
-    UserSettings?: number,
-    /**
-     * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-     * @type {number}
-     * @memberof ManagedLong
-     */
-    SharedSettings?: number,
-    /**
-     * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-     * @type {boolean}
-     * @memberof ManagedLong
-     */
-    UserEditable?: boolean,
-    /**
-     * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-     * @type {boolean}
-     * @memberof ManagedLong
-     */
-    DeviceEditable?: boolean
-  }
+    export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
+    export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
+    export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
+    export type IPConfigType = 'DHCP' | 'Static';
+    export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
+    export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
+    export interface ManagedBoolean {
+        /**
+         * @description The active value currently used by the network configuration manager (e.g. Shill).
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        Active?: boolean,
+        /**
+         * @description The source from which the effective property value was determined.
+         * @type {string}
+         * @memberof ManagedBoolean
+         */
+        Effective?: string,
+        /**
+         * @description The property value provided by the user policy.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserPolicy?: boolean,
+        /**
+         * @description The property value provided by the device policy.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        DevicePolicy?: boolean,
+        /**
+         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserSettings?: boolean,
+        /**
+         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        SharedSettings?: boolean,
+        /**
+         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        UserEditable?: boolean,
+        /**
+         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedBoolean
+         */
+        DeviceEditable?: boolean
+    }
+    export interface ManagedLong {
+        /**
+         * @description The active value currently used by the network configuration manager (e.g. Shill).
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        Active?: number,
+        /**
+         * @description The source from which the effective property value was determined.
+         * @type {string}
+         * @memberof ManagedLong
+         */
+        Effective?: string,
+        /**
+         * @description The property value provided by the user policy.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        UserPolicy?: number,
+        /**
+         * @description The property value provided by the device policy.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        DevicePolicy?: number,
+        /**
+         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        UserSettings?: number,
+        /**
+         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+         * @type {number}
+         * @memberof ManagedLong
+         */
+        SharedSettings?: number,
+        /**
+         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedLong
+         */
+        UserEditable?: boolean,
+        /**
+         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+         * @type {boolean}
+         * @memberof ManagedLong
+         */
+        DeviceEditable?: boolean
+    }
 }
 
 ////////////////////
@@ -2078,157 +2078,157 @@ declare namespace chrome.networking.onc {
  * @since Chrome 28.
  */
 declare namespace chrome.notifications {
-  export interface ButtonOptions {
-    title: string;
-    iconUrl?: string;
-  }
+    export interface ButtonOptions {
+        title: string;
+        iconUrl?: string;
+    }
 
-  export interface ItemOptions {
-    /** Title of one item of a list notification. */
-    title: string;
-    /** Additional details about this item. */
-    message: string;
-  }
+    export interface ItemOptions {
+        /** Title of one item of a list notification. */
+        title: string;
+        /** Additional details about this item. */
+        message: string;
+    }
 
-  export interface NotificationOptions {
-    /** Optional. Which type of notification to display. Required for notifications.create method. */
-    type?: string;
+    export interface NotificationOptions {
+        /** Optional. Which type of notification to display. Required for notifications.create method. */
+        type?: string;
+        /**
+         * Optional.
+         * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
+         * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
+         */
+        iconUrl?: string;
+        /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
+        title?: string;
+        /** Optional. Main notification content. Required for notifications.create method. */
+        message?: string;
+        /**
+         * Optional.
+         * Alternate notification content with a lower-weight font.
+         * @since Chrome 31.
+         */
+        contextMessage?: string;
+        /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
+        priority?: number;
+        /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
+        eventTime?: number;
+        /** Optional. Text and icons for up to two notification action buttons. */
+        buttons?: ButtonOptions[];
+        /** Optional. Items for multi-item notifications. */
+        items?: ItemOptions[];
+        /**
+         * Optional.
+         * Current progress ranges from 0 to 100.
+         * @since Chrome 30.
+         */
+        progress?: number;
+        /**
+         * Optional.
+         * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+         * @since Chrome 32.
+         */
+        isClickable?: boolean;
+        /**
+         * Optional.
+         * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
+         * @since Chrome 38.
+         */
+        appIconMaskUrl?: string;
+        /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
+        imageUrl?: string;
+        /**
+         * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
+         * This defaults to false.
+         * @since Chrome 50
+         */
+        requireInteraction?: boolean;
+    }
+
+    export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
+
+    export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
+
+    export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
+
+    export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
+
+    export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
+
+    /** The notification closed, either by the system or by user action. */
+    export var onClosed: NotificationClosedEvent;
+    /** The user clicked in a non-button area of the notification. */
+    export var onClicked: NotificationClickedEvent;
+    /** The user pressed a button in the notification. */
+    export var onButtonClicked: NotificationButtonClickedEvent;
     /**
-     * Optional.
-     * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
-     * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
-     */
-    iconUrl?: string;
-    /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
-    title?: string;
-    /** Optional. Main notification content. Required for notifications.create method. */
-    message?: string;
-    /**
-     * Optional.
-     * Alternate notification content with a lower-weight font.
-     * @since Chrome 31.
-     */
-    contextMessage?: string;
-    /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
-    priority?: number;
-    /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
-    eventTime?: number;
-    /** Optional. Text and icons for up to two notification action buttons. */
-    buttons?: ButtonOptions[];
-    /** Optional. Items for multi-item notifications. */
-    items?: ItemOptions[];
-    /**
-     * Optional.
-     * Current progress ranges from 0 to 100.
-     * @since Chrome 30.
-     */
-    progress?: number;
-    /**
-     * Optional.
-     * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+     * The user changes the permission level.
      * @since Chrome 32.
      */
-    isClickable?: boolean;
+    export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
     /**
-     * Optional.
-     * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
-     * @since Chrome 38.
+     * The user clicked on a link for the app's notification settings.
+     * @since Chrome 32.
      */
-    appIconMaskUrl?: string;
-    /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
-    imageUrl?: string;
+    export var onShowSettings: NotificationShowSettingsEvent;
+
     /**
-     * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
-     * This defaults to false.
-     * @since Chrome 50
+     * Creates and displays a notification.
+     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+     * The notificationId parameter is required before Chrome 42.
+     * @param options Contents of the notification.
+     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(string notificationId) {...};
      */
-    requireInteraction?: boolean;
-  }
-
-  export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
-
-  export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
-
-  export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
-
-  export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
-
-  export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
-
-  /** The notification closed, either by the system or by user action. */
-  export var onClosed: NotificationClosedEvent;
-  /** The user clicked in a non-button area of the notification. */
-  export var onClicked: NotificationClickedEvent;
-  /** The user pressed a button in the notification. */
-  export var onButtonClicked: NotificationButtonClickedEvent;
-  /**
-   * The user changes the permission level.
-   * @since Chrome 32.
-   */
-  export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
-  /**
-   * The user clicked on a link for the app's notification settings.
-   * @since Chrome 32.
-   */
-  export var onShowSettings: NotificationShowSettingsEvent;
-
-  /**
-   * Creates and displays a notification.
-   * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-   * The notificationId parameter is required before Chrome 42.
-   * @param options Contents of the notification.
-   * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-   * The callback is required before Chrome 42.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function(string notificationId) {...};
-   */
-  export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
-  /**
-   * Creates and displays a notification.
-   * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-   * The notificationId parameter is required before Chrome 42.
-   * @param options Contents of the notification.
-   * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-   * The callback is required before Chrome 42.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function(string notificationId) {...};
-   */
-  export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
-  /**
-   * Updates an existing notification.
-   * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
-   * @param options Contents of the notification to update to.
-   * @param callback Called to indicate whether a matching notification existed.
-   * The callback is required before Chrome 42.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function(boolean wasUpdated) {...};
-   */
-  export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
-  /**
-   * Clears the specified notification.
-   * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
-   * @param callback Called to indicate whether a matching notification existed.
-   * The callback is required before Chrome 42.
-   * If you specify the callback parameter, it should be a function that looks like this:
-   * function(boolean wasCleared) {...};
-   */
-  export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
-  /**
-   * Retrieves all the notifications.
-   * @since Chrome 29.
-   * @param callback Returns the set of notification_ids currently in the system.
-   * The callback parameter should be a function that looks like this:
-   * function(object notifications) {...};
-   */
-  export function getAll(callback: (notifications: Object) => void): void;
-  /**
-   * Retrieves whether the user has enabled notifications from this app or extension.
-   * @since Chrome 32.
-   * @param callback Returns the current permission level.
-   * The callback parameter should be a function that looks like this:
-   * function( PermissionLevel level) {...};
-   */
-  export function getPermissionLevel(callback: (level: string) => void): void;
+    export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
+    /**
+     * Creates and displays a notification.
+     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+     * The notificationId parameter is required before Chrome 42.
+     * @param options Contents of the notification.
+     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(string notificationId) {...};
+     */
+    export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
+    /**
+     * Updates an existing notification.
+     * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
+     * @param options Contents of the notification to update to.
+     * @param callback Called to indicate whether a matching notification existed.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasUpdated) {...};
+     */
+    export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
+    /**
+     * Clears the specified notification.
+     * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
+     * @param callback Called to indicate whether a matching notification existed.
+     * The callback is required before Chrome 42.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean wasCleared) {...};
+     */
+    export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
+    /**
+     * Retrieves all the notifications.
+     * @since Chrome 29.
+     * @param callback Returns the set of notification_ids currently in the system.
+     * The callback parameter should be a function that looks like this:
+     * function(object notifications) {...};
+     */
+    export function getAll(callback: (notifications: Object) => void): void;
+    /**
+     * Retrieves whether the user has enabled notifications from this app or extension.
+     * @since Chrome 32.
+     * @param callback Returns the current permission level.
+     * The callback parameter should be a function that looks like this:
+     * function( PermissionLevel level) {...};
+     */
+    export function getPermissionLevel(callback: (level: string) => void): void;
 }
 
 ////////////////////
@@ -2239,70 +2239,70 @@ declare namespace chrome.notifications {
  * @since Chrome 16.
  */
 declare namespace chrome.permissions {
-  export interface Permissions {
-    /**
-     * Optional.
-     * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
-     */
-    origins?: string[];
-    /**
-     * Optional.
-     * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
-     */
-    permissions?: string[];
-  }
+    export interface Permissions {
+        /**
+         * Optional.
+         * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
+         */
+        origins?: string[];
+        /**
+         * Optional.
+         * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
+         */
+        permissions?: string[];
+    }
+
+    export interface PermissionsRemovedEvent {
+        /**
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( Permissions permissions) {...};
+         * Parameter permissions: The permissions that have been removed.
+         */
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
+
+    export interface PermissionsAddedEvent {
+        /**
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( Permissions permissions) {...};
+         * Parameter permissions: The newly acquired permissions.
+         */
+        addListener(callback: (permissions: Permissions) => void): void;
+    }
 
-  export interface PermissionsRemovedEvent {
     /**
+     * Checks if the extension has the specified permissions.
+     * @param callback The callback parameter should be a function that looks like this:
+     * function(boolean result) {...};
+     * Parameter result: True if the extension has the specified permissions.
+     */
+    export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+    /**
+     * Gets the extension's current set of permissions.
      * @param callback The callback parameter should be a function that looks like this:
      * function( Permissions permissions) {...};
-     * Parameter permissions: The permissions that have been removed.
+     * Parameter permissions: The extension's active permissions.
      */
-    addListener(callback: (permissions: Permissions) => void): void;
-  }
-
-  export interface PermissionsAddedEvent {
+    export function getAll(callback: (permissions: Permissions) => void): void;
     /**
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( Permissions permissions) {...};
-     * Parameter permissions: The newly acquired permissions.
+     * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean granted) {...};
+     * Parameter granted: True if the user granted the specified permissions.
      */
-    addListener(callback: (permissions: Permissions) => void): void;
-  }
+    export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
+    /**
+     * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
+     * @param callback If you specify the callback parameter, it should be a function that looks like this:
+     * function(boolean removed) {...};
+     * Parameter removed: True if the permissions were removed.
+     */
+    export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
 
-  /**
-   * Checks if the extension has the specified permissions.
-   * @param callback The callback parameter should be a function that looks like this:
-   * function(boolean result) {...};
-   * Parameter result: True if the extension has the specified permissions.
-   */
-  export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
-  /**
-   * Gets the extension's current set of permissions.
-   * @param callback The callback parameter should be a function that looks like this:
-   * function( Permissions permissions) {...};
-   * Parameter permissions: The extension's active permissions.
-   */
-  export function getAll(callback: (permissions: Permissions) => void): void;
-  /**
-   * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
-   * @param callback If you specify the callback parameter, it should be a function that looks like this:
-   * function(boolean granted) {...};
-   * Parameter granted: True if the user granted the specified permissions.
-   */
-  export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
-  /**
-   * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
-   * @param callback If you specify the callback parameter, it should be a function that looks like this:
-   * function(boolean removed) {...};
-   * Parameter removed: True if the permissions were removed.
-   */
-  export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
-
-  /** Fired when access to permissions has been removed from the extension. */
-  export var onRemoved: PermissionsRemovedEvent;
-  /** Fired when the extension acquires new permissions. */
-  export var onAdded: PermissionsAddedEvent;
+    /** Fired when access to permissions has been removed from the extension. */
+    export var onRemoved: PermissionsRemovedEvent;
+    /** Fired when the extension acquires new permissions. */
+    export var onAdded: PermissionsAddedEvent;
 }
 
 ////////////////////
@@ -2314,10 +2314,10 @@ declare namespace chrome.permissions {
  * @since Chrome 27.
  */
 declare namespace chrome.power {
-  /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
-  export function requestKeepAwake(level: string): void;
-  /** Releases a request previously made via requestKeepAwake(). */
-  export function releaseKeepAwake(): void;
+    /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
+    export function requestKeepAwake(level: string): void;
+    /** Releases a request previously made via requestKeepAwake(). */
+    export function releaseKeepAwake(): void;
 }
 
 ////////////////////
@@ -2329,53 +2329,53 @@ declare namespace chrome.power {
  * @since Chrome 44.
  */
 declare namespace chrome.printerProvider {
-  export interface PrinterInfo {
-    /** Unique printer ID. */
-    id: string;
-    /** Printer's human readable name. */
-    name: string;
-    /** Optional. Printer's human readable description. */
-    description?: string;
-  }
+    export interface PrinterInfo {
+        /** Unique printer ID. */
+        id: string;
+        /** Printer's human readable name. */
+        name: string;
+        /** Optional. Printer's human readable description. */
+        description?: string;
+    }
 
-  export interface PrinterCapabilities {
-    /** Device capabilities in CDD format. */
-    capabilities: any;
-  }
+    export interface PrinterCapabilities {
+        /** Device capabilities in CDD format. */
+        capabilities: any;
+    }
 
-  export interface PrintJob {
-    /** ID of the printer which should handle the job. */
-    printerId: string;
-    /** The print job title. */
-    title: string;
-    /** Print ticket in  CJT format. */
-    ticket: Object;
-    /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
-    contentType: string;
-    /** Blob containing the document data to print. Format must match |contentType|. */
-    document: Blob;
-  }
+    export interface PrintJob {
+        /** ID of the printer which should handle the job. */
+        printerId: string;
+        /** The print job title. */
+        title: string;
+        /** Print ticket in  CJT format. */
+        ticket: Object;
+        /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
+        contentType: string;
+        /** Blob containing the document data to print. Format must match |contentType|. */
+        document: Blob;
+    }
 
-  export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
+    export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
 
-  export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
+    export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
 
-  export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
+    export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
 
-  export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
+    export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
 
-  /** Event fired when print manager requests printers provided by extensions. */
-  export var onGetPrintersRequested: PrinterRequestedEvent;
-  /**
-   * Event fired when print manager requests information about a USB device that may be a printer.
-   * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
-   * @since Chrome 45.
-   */
-  export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
-  /** Event fired when print manager requests printer capabilities. */
-  export var onGetCapabilityRequested: CapabilityRequestedEvent;
-  /** Event fired when print manager requests printing. */
-  export var onPrintRequested: PrintRequestedEvent;
+    /** Event fired when print manager requests printers provided by extensions. */
+    export var onGetPrintersRequested: PrinterRequestedEvent;
+    /**
+     * Event fired when print manager requests information about a USB device that may be a printer.
+     * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
+     * @since Chrome 45.
+     */
+    export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
+    /** Event fired when print manager requests printer capabilities. */
+    export var onGetCapabilityRequested: CapabilityRequestedEvent;
+    /** Event fired when print manager requests printing. */
+    export var onPrintRequested: PrintRequestedEvent;
 }
 
 ////////////////////
@@ -2386,487 +2386,487 @@ declare namespace chrome.printerProvider {
  * @since Chrome 22
  */
 declare namespace chrome.runtime {
-  /** This will be defined during an API method callback if there was an error */
-  export var lastError: LastError | undefined;
-  /** The ID of the extension/app. */
-  export var id: string;
+    /** This will be defined during an API method callback if there was an error */
+    export var lastError: LastError | undefined;
+    /** The ID of the extension/app. */
+    export var id: string;
 
-  export interface LastError {
-    /** Optional. Details about the error which occurred.  */
-    message?: string;
-  }
+    export interface LastError {
+        /** Optional. Details about the error which occurred.  */
+        message?: string;
+    }
 
-  export interface ConnectInfo {
-    name?: string;
-  }
+    export interface ConnectInfo {
+        name?: string;
+    }
+
+    export interface InstalledDetails {
+        /**
+         * The reason that this event is being dispatched.
+         * One of: "install", "update", "chrome_update", or "shared_module_update"
+         */
+        reason: string;
+        /**
+         * Optional.
+         * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
+         */
+        previousVersion?: string;
+        /**
+         * Optional.
+         * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
+         * @since Chrome 29.
+         */
+        id?: string;
+    }
+
+    export interface MessageOptions {
+        /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
+        includeTlsChannelId?: boolean;
+    }
 
-  export interface InstalledDetails {
     /**
-     * The reason that this event is being dispatched.
-     * One of: "install", "update", "chrome_update", or "shared_module_update"
+     * An object containing information about the script context that sent a message or request.
+     * @since Chrome 26.
      */
-    reason: string;
+    export interface MessageSender {
+        /** The ID of the extension or app that opened the connection, if any. */
+        id?: string;
+        /**
+         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
+         * @since Chrome 41.
+         */
+        frameId?: number;
+        /**
+         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
+         * @since Chrome 28.
+         */
+        url?: string;
+        /**
+         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
+         * @since Chrome 32.
+         */
+        tlsChannelId?: string;
+    }
+
     /**
-     * Optional.
-     * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
+     * An object containing information about the current platform.
+     * @since Chrome 36.
      */
-    previousVersion?: string;
+    export interface PlatformInfo {
+        /**
+         * The operating system chrome is running on.
+         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
+         */
+        os: string;
+        /**
+         * The machine's processor architecture.
+         * One of: "arm", "x86-32", or "x86-64"
+         */
+        arch: string;
+        /**
+         * The native client architecture. This may be different from arch on some platforms.
+         * One of: "arm", "x86-32", or "x86-64"
+         */
+        nacl_arch: string;
+    }
+
     /**
-     * Optional.
-     * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
+     * An object which allows two way communication with other pages.
+     * @since Chrome 26.
+     */
+    export interface Port {
+        postMessage: (message: Object) => void;
+        disconnect: () => void;
+        /**
+         * Optional.
+         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
+         */
+        sender?: MessageSender;
+        /** An object which allows the addition and removal of listeners for a Chrome event. */
+        onDisconnect: PortDisconnectEvent;
+        /** An object which allows the addition and removal of listeners for a Chrome event. */
+        onMessage: PortMessageEvent;
+        name: string;
+    }
+
+    export interface UpdateAvailableDetails {
+        /** The version number of the available update. */
+        version: string;
+    }
+
+    export interface UpdateCheckDetails {
+        /** The version of the available update. */
+        version: string;
+    }
+
+    export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
+
+    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
+
+    export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+    export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
+
+    export interface RuntimeEvent extends chrome.events.Event<() => void> { }
+
+    export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
+
+    export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
+
+    export interface ManifestIcons {
+        [size: number]: string;
+    }
+
+    export interface ManifestAction {
+        default_icon?: ManifestIcons;
+        default_title?: string;
+        default_popup?: string;
+    }
+
+    export interface SearchProvider {
+        name?: string;
+        keyword?: string;
+        favicon_url?: string;
+        search_url: string;
+        encoding?: string;
+        suggest_url?: string;
+        instant_url?: string;
+        image_url?: string;
+        search_url_post_params?: string;
+        suggest_url_post_params?: string;
+        instant_url_post_params?: string;
+        image_url_post_params?: string;
+        alternate_urls?: string[];
+        prepopulated_id?: number;
+        is_default?: boolean;
+    }
+
+    export interface Manifest {
+        /** Required */
+        app: {
+            background: {
+                scripts?: string[];
+            }
+        }
+        /** Should be set to 2 */
+        manifest_version: number;
+        name: string;
+        version: string;
+
+        // Recommended
+        default_locale?: string;
+        description?: string;
+        icons?: ManifestIcons;
+        // Optional
+        action_handlers?: string[];
+        author?: any;
+        automation?: any;
+        bluetooth?: {
+            uuids?: string[];
+            socket?: boolean;
+            low_energy?: boolean;
+            peripheral?: boolean;
+        };
+        commands?: {
+            [name: string]: {
+                suggested_key?: {
+                    default?: string;
+                    windows?: string;
+                    mac?: string;
+                    chromeos?: string;
+                    linux?: string;
+                };
+                description?: string;
+                global?: boolean
+            }
+        };
+        current_locale?: string;
+        event_rules?: {
+            event?: string;
+            actions?: {
+                type: string;
+            }[];
+            conditions?: {
+                type: string,
+                css?: string[]
+            }[];
+        }[];
+        file_handlers?: {
+            [key: string]: {
+                extensions?: Array<'*' | string | { include_directories: boolean }>;
+                types?: Array<'*' | string | { include_directories: boolean }>;
+            }
+        }[];
+        file_system_provider_capabilities?: {
+            configurable?: boolean;
+            multiple_mounts?: boolean;
+            source?: string;
+        };
+        import?: {
+            id: string;
+        }[];
+        key?: string;
+        kiosk?: {
+            always_update: any;
+            required_platform_version: any;
+        };
+        kiosk_enabled?: boolean,
+        kiosk_only?: boolean,
+        kiosk_secondary_apps: any;
+        minimum_chrome_version?: string;
+        nacl_modules?: {
+            path: string;
+            mime_type: string;
+        }[];
+        oauth2?: {
+            client_id: string;
+            scopes?: string[];
+        };
+        offline_enabled?: boolean;
+        optional_permissions?: string[];
+        permissions?: string[];
+        platforms?: {
+            nacl_arch?: string;
+            sub_package_path: string;
+        }[];
+        /**
+         * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
+         */
+        requirements?: {
+            /**
+             * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
+             * "requirements": {
+             *   "3D": {
+             *     "features": ["webgl"]
+             *   }
+             * }
+             */
+            '3D'?: {
+                features?: Array<string | 'webgl'>;
+            };
+            /**
+             * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
+             * "requirements": {
+             *   "plugins": {
+             *     "npapi": true
+             *   }
+             * }
+             */
+            plugins?: {
+                npapi?: boolean;
+            }
+
+            [key: string]: any;
+        };
+        /**
+         * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
+         */
+        sandbox?: {
+            pages: string[];
+            content_security_policy?: string;
+        };
+        short_name?: string;
+        signature?: any;
+        sockets?: {
+            tcp?: {
+                connect: string | '*';
+            };
+            udp?: {
+                send: string | '*';
+            }
+        };
+        storage?: {
+            managed_schema: string
+        };
+        system_indicator?: any;
+        update_url?: string;
+        url_handlers?: {
+            [name: string]: {
+                matches: string[];
+                title?: string;
+            }
+        };
+        usb_printers?: {
+            filters: {
+                vendorId?: number;
+                productId?: number;
+                interfaceClass?: number;
+                interfaceSubclass?: number;
+                interfaceProtocol?: number;
+            }[]
+        };
+        version_name?: string;
+        webview?: {
+            partitions?: {
+                name: string;
+                accessible_resources: string[];
+            }[]
+        }
+        [key: string]: any;
+    }
+
+    /**
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+     * @since Chrome 26.
+     */
+    export function connect(connectInfo?: ConnectInfo): Port;
+    /**
+     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+     * @since Chrome 26.
+     * @param extensionId Optional.
+     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
+     */
+    export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
+    /**
+     * Connects to a native application in the host machine.
+     * @since Chrome 28.
+     * @param application The name of the registered application to connect to.
+     */
+    export function connectNative(application: string): Port;
+    /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
+    export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
+    /**
+     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
+     * @returns The manifest details.
+     */
+    export function getManifest(): Manifest;
+    /**
+     * Returns a DirectoryEntry for the package directory.
      * @since Chrome 29.
      */
-    id?: string;
-  }
-
-  export interface MessageOptions {
-    /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
-    includeTlsChannelId?: boolean;
-  }
-
-  /**
-   * An object containing information about the script context that sent a message or request.
-   * @since Chrome 26.
-   */
-  export interface MessageSender {
-    /** The ID of the extension or app that opened the connection, if any. */
-    id?: string;
+    export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
     /**
-     * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
-     * @since Chrome 41.
+     * Returns information about the current platform.
+     * @since Chrome 29.
+     * @param callback Called with results
      */
-    frameId?: number;
+    export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
     /**
-     * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
-     * @since Chrome 28.
+     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+     * @param path A path to a resource within an app/extension expressed relative to its install directory.
      */
-    url?: string;
+    export function getURL(path: string): string;
     /**
-     * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
+     * Reloads the app or extension.
+     * @since Chrome 25.
+     */
+    export function reload(): void;
+    /**
+     * Requests an update check for this app/extension.
+     * @since Chrome 25.
+     * @param callback
+     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+     * Optional parameter details: If an update is available, this contains more information about the available update.
+     */
+    export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
+    /**
+     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
      * @since Chrome 32.
      */
-    tlsChannelId?: string;
-  }
-
-  /**
-   * An object containing information about the current platform.
-   * @since Chrome 36.
-   */
-  export interface PlatformInfo {
+    export function restart(): void;
     /**
-     * The operating system chrome is running on.
-     * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 26.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
-    os: string;
+    export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
     /**
-     * The machine's processor architecture.
-     * One of: "arm", "x86-32", or "x86-64"
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 32.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
-    arch: string;
+    export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
     /**
-     * The native client architecture. This may be different from arch on some platforms.
-     * One of: "arm", "x86-32", or "x86-64"
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 26.
+     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
-    nacl_arch: string;
-  }
-
-  /**
-   * An object which allows two way communication with other pages.
-   * @since Chrome 26.
-   */
-  export interface Port {
-    postMessage: (message: Object) => void;
-    disconnect: () => void;
+    export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
     /**
-     * Optional.
-     * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
+     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+     * @since Chrome 32.
+     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+     * @param responseCallback Optional
+     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
-    sender?: MessageSender;
-    /** An object which allows the addition and removal of listeners for a Chrome event. */
-    onDisconnect: PortDisconnectEvent;
-    /** An object which allows the addition and removal of listeners for a Chrome event. */
-    onMessage: PortMessageEvent;
-    name: string;
-  }
-
-  export interface UpdateAvailableDetails {
-    /** The version number of the available update. */
-    version: string;
-  }
-
-  export interface UpdateCheckDetails {
-    /** The version of the available update. */
-    version: string;
-  }
-
-  export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-  export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
-
-  export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
-
-  export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-  export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
-
-  export interface RuntimeEvent extends chrome.events.Event<() => void> { }
-
-  export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
-
-  export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
-
-  export interface ManifestIcons {
-    [size: number]: string;
-  }
-
-  export interface ManifestAction {
-    default_icon?: ManifestIcons;
-    default_title?: string;
-    default_popup?: string;
-  }
-
-  export interface SearchProvider {
-    name?: string;
-    keyword?: string;
-    favicon_url?: string;
-    search_url: string;
-    encoding?: string;
-    suggest_url?: string;
-    instant_url?: string;
-    image_url?: string;
-    search_url_post_params?: string;
-    suggest_url_post_params?: string;
-    instant_url_post_params?: string;
-    image_url_post_params?: string;
-    alternate_urls?: string[];
-    prepopulated_id?: number;
-    is_default?: boolean;
-  }
-
-  export interface Manifest {
-    /** Required */
-    app: {
-      background: {
-        scripts?: string[];
-      }
-    }
-    /** Should be set to 2 */
-    manifest_version: number;
-    name: string;
-    version: string;
-
-    // Recommended
-    default_locale?: string;
-    description?: string;
-    icons?: ManifestIcons;
-    // Optional
-    action_handlers?: string[];
-    author?: any;
-    automation?: any;
-    bluetooth?: {
-      uuids?: string[];
-      socket?: boolean;
-      low_energy?: boolean;
-      peripheral?: boolean;
-    };
-    commands?: {
-      [name: string]: {
-        suggested_key?: {
-          default?: string;
-          windows?: string;
-          mac?: string;
-          chromeos?: string;
-          linux?: string;
-        };
-        description?: string;
-        global?: boolean
-      }
-    };
-    current_locale?: string;
-    event_rules?: {
-      event?: string;
-      actions?: {
-        type: string;
-      }[];
-      conditions?: {
-        type: string,
-        css?: string[]
-      }[];
-    }[];
-    file_handlers?: {
-      [key: string]: {
-        extensions?: Array<'*' | string | { include_directories: boolean }>;
-        types?: Array<'*' | string | { include_directories: boolean }>;
-      }
-    }[];
-    file_system_provider_capabilities?: {
-      configurable?: boolean;
-      multiple_mounts?: boolean;
-      source?: string;
-    };
-    import?: {
-      id: string;
-    }[];
-    key?: string;
-    kiosk?: {
-      always_update: any;
-      required_platform_version: any;
-    };
-    kiosk_enabled?: boolean,
-    kiosk_only?: boolean,
-    kiosk_secondary_apps: any;
-    minimum_chrome_version?: string;
-    nacl_modules?: {
-      path: string;
-      mime_type: string;
-    }[];
-    oauth2?: {
-      client_id: string;
-      scopes?: string[];
-    };
-    offline_enabled?: boolean;
-    optional_permissions?: string[];
-    permissions?: string[];
-    platforms?: {
-      nacl_arch?: string;
-      sub_package_path: string;
-    }[];
+    export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
     /**
-     * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
+     * Send a single message to a native application.
+     * @since Chrome 28.
+     * @param application The of the native messaging host.
+     * @param message The message that will be passed to the native messaging host.
+     * @param responseCallback Optional.
+     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
      */
-    requirements?: {
-      /**
-       * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
-       * "requirements": {
-       *   "3D": {
-       *     "features": ["webgl"]
-       *   }
-       * }
-       */
-      '3D'?: {
-        features?: Array<string | 'webgl'>;
-      };
-      /**
-       * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
-       * "requirements": {
-       *   "plugins": {
-       *     "npapi": true
-       *   }
-       * }
-       */
-      plugins?: {
-        npapi?: boolean;
-      }
-
-      [key: string]: any;
-    };
+    export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
     /**
-     * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
+     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
+     * @since Chrome 41.
+     * @param url Since Chrome 34.
+     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
+     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
      */
-    sandbox?: {
-      pages: string[];
-      content_security_policy?: string;
-    };
-    short_name?: string;
-    signature?: any;
-    sockets?: {
-      tcp?: {
-        connect: string | '*';
-      };
-      udp?: {
-        send: string | '*';
-      }
-    };
-    storage?: {
-      managed_schema: string
-    };
-    system_indicator?: any;
-    update_url?: string;
-    url_handlers?: {
-      [name: string]: {
-        matches: string[];
-        title?: string;
-      }
-    };
-    usb_printers?: {
-      filters: {
-        vendorId?: number;
-        productId?: number;
-        interfaceClass?: number;
-        interfaceSubclass?: number;
-        interfaceProtocol?: number;
-      }[]
-    };
-    version_name?: string;
-    webview?: {
-      partitions?: {
-        name: string;
-        accessible_resources: string[];
-      }[]
-    }
-    [key: string]: any;
-  }
+    export function setUninstallURL(url: string, callback?: () => void): void;
+    /**
+     * Open your Extension's options page, if possible.
+     * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
+     * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
+     * @since Chrome 42.
+     */
+    export function openOptionsPage(callback?: () => void): void;
 
-  /**
-   * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-   * @since Chrome 26.
-   */
-  export function connect(connectInfo?: ConnectInfo): Port;
-  /**
-   * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-   * @since Chrome 26.
-   * @param extensionId Optional.
-   * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
-   */
-  export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
-  /**
-   * Connects to a native application in the host machine.
-   * @since Chrome 28.
-   * @param application The name of the registered application to connect to.
-   */
-  export function connectNative(application: string): Port;
-  /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
-  export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
-  /**
-   * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
-   * @returns The manifest details.
-   */
-  export function getManifest(): Manifest;
-  /**
-   * Returns a DirectoryEntry for the package directory.
-   * @since Chrome 29.
-   */
-  export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
-  /**
-   * Returns information about the current platform.
-   * @since Chrome 29.
-   * @param callback Called with results
-   */
-  export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
-  /**
-   * Converts a relative path within an app/extension install directory to a fully-qualified URL.
-   * @param path A path to a resource within an app/extension expressed relative to its install directory.
-   */
-  export function getURL(path: string): string;
-  /**
-   * Reloads the app or extension.
-   * @since Chrome 25.
-   */
-  export function reload(): void;
-  /**
-   * Requests an update check for this app/extension.
-   * @since Chrome 25.
-   * @param callback
-   * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
-   * Optional parameter details: If an update is available, this contains more information about the available update.
-   */
-  export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
-  /**
-   * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
-   * @since Chrome 32.
-   */
-  export function restart(): void;
-  /**
-   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-   * @since Chrome 26.
-   * @param responseCallback Optional
-   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-   */
-  export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
-  /**
-   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-   * @since Chrome 32.
-   * @param responseCallback Optional
-   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-   */
-  export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-  /**
-   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-   * @since Chrome 26.
-   * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-   * @param responseCallback Optional
-   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-   */
-  export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
-  /**
-   * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-   * @since Chrome 32.
-   * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-   * @param responseCallback Optional
-   * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-   */
-  export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-  /**
-   * Send a single message to a native application.
-   * @since Chrome 28.
-   * @param application The of the native messaging host.
-   * @param message The message that will be passed to the native messaging host.
-   * @param responseCallback Optional.
-   * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-   */
-  export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
-  /**
-   * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
-   * @since Chrome 41.
-   * @param url Since Chrome 34.
-   * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
-   * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
-   */
-  export function setUninstallURL(url: string, callback?: () => void): void;
-  /**
-   * Open your Extension's options page, if possible.
-   * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
-   * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
-   * @since Chrome 42.
-   */
-  export function openOptionsPage(callback?: () => void): void;
-
-  /**
-   * Fired when a connection is made from either an extension process or a content script.
-   * @since Chrome 26.
-   */
-  export var onConnect: ExtensionConnectEvent;
-  /**
-   * Fired when a connection is made from another extension.
-   * @since Chrome 26.
-   */
-  export var onConnectExternal: ExtensionConnectEvent;
-  /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
-  export var onSuspend: RuntimeEvent;
-  /**
-   * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
-   * @since Chrome 23.
-   */
-  export var onStartup: RuntimeEvent;
-  /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
-  export var onInstalled: RuntimeInstalledEvent;
-  /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
-  export var onSuspendCanceled: RuntimeEvent;
-  /**
-   * Fired when a message is sent from either an extension process or a content script.
-   * @since Chrome 26.
-   */
-  export var onMessage: ExtensionMessageEvent;
-  /**
-   * Fired when a message is sent from another extension/app. Cannot be used in a content script.
-   * @since Chrome 26.
-   */
-  export var onMessageExternal: ExtensionMessageEvent;
-  /**
-   * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
-   * @since Chrome 29.
-   */
-  export var onRestartRequired: RuntimeRestartRequiredEvent;
-  /**
-   * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
-   * @since Chrome 25.
-   */
-  export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
-  /**
-   * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
-   * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
-   */
-  export var onBrowserUpdateAvailable: RuntimeEvent;
+    /**
+     * Fired when a connection is made from either an extension process or a content script.
+     * @since Chrome 26.
+     */
+    export var onConnect: ExtensionConnectEvent;
+    /**
+     * Fired when a connection is made from another extension.
+     * @since Chrome 26.
+     */
+    export var onConnectExternal: ExtensionConnectEvent;
+    /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
+    export var onSuspend: RuntimeEvent;
+    /**
+     * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
+     * @since Chrome 23.
+     */
+    export var onStartup: RuntimeEvent;
+    /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
+    export var onInstalled: RuntimeInstalledEvent;
+    /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
+    export var onSuspendCanceled: RuntimeEvent;
+    /**
+     * Fired when a message is sent from either an extension process or a content script.
+     * @since Chrome 26.
+     */
+    export var onMessage: ExtensionMessageEvent;
+    /**
+     * Fired when a message is sent from another extension/app. Cannot be used in a content script.
+     * @since Chrome 26.
+     */
+    export var onMessageExternal: ExtensionMessageEvent;
+    /**
+     * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
+     * @since Chrome 29.
+     */
+    export var onRestartRequired: RuntimeRestartRequiredEvent;
+    /**
+     * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
+     * @since Chrome 25.
+     */
+    export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+    /**
+     * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
+     * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
+     */
+    export var onBrowserUpdateAvailable: RuntimeEvent;
 }
 
 ////////////////////
@@ -2877,130 +2877,130 @@ declare namespace chrome.runtime {
  * @since Chrome 23
  */
 declare namespace chrome.serial {
-  /** NOT YET IMPLEMENTED */
+    /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
 // Socket
 ////////////////////
 declare namespace chrome.socket {
-  export interface CreateInfo {
-    socketId: number;
-  }
+    export interface CreateInfo {
+        socketId: number;
+    }
 
-  export interface AcceptInfo {
-    resultCode: number;
-    socketId?: number;
-  }
+    export interface AcceptInfo {
+        resultCode: number;
+        socketId?: number;
+    }
 
-  export interface ReadInfo {
-    resultCode: number;
-    data: ArrayBuffer;
-  }
+    export interface ReadInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+    }
 
-  export interface WriteInfo {
-    bytesWritten: number;
-  }
+    export interface WriteInfo {
+        bytesWritten: number;
+    }
 
-  export interface RecvFromInfo {
-    resultCode: number;
-    data: ArrayBuffer;
-    port: number;
-    address: string;
-  }
+    export interface RecvFromInfo {
+        resultCode: number;
+        data: ArrayBuffer;
+        port: number;
+        address: string;
+    }
 
-  export interface SocketInfo {
-    socketType: string;
-    localPort?: number;
-    peerAddress?: string;
-    peerPort?: number;
-    localAddress?: string;
-    connected: boolean;
-  }
+    export interface SocketInfo {
+        socketType: string;
+        localPort?: number;
+        peerAddress?: string;
+        peerPort?: number;
+        localAddress?: string;
+        connected: boolean;
+    }
 
-  export interface NetworkInterface {
-    name: string;
-    address: string;
-  }
+    export interface NetworkInterface {
+        name: string;
+        address: string;
+    }
 
-  export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
-  export function destroy(socketId: number): void;
-  export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
-  export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-  export function disconnect(socketId: number): void;
-  export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
-  export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
-  export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
-  export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
-  export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
-  export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
-  export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
-  export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
-  export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
-  export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
+    export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
+    export function destroy(socketId: number): void;
+    export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
+    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+    export function disconnect(socketId: number): void;
+    export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
+    export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
+    export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
+    export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
+    export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
+    export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
+    export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
+    export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
+    export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
+    export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
 }
 
 declare namespace chrome.sockets.tcp {
-  export interface CreateInfo {
-    socketId: number;
-  }
+    export interface CreateInfo {
+        socketId: number;
+    }
 
-  export interface SendInfo {
-    resultCode: number;
-    bytesSent?: number;
-  }
+    export interface SendInfo {
+        resultCode: number;
+        bytesSent?: number;
+    }
 
-  export interface ReceiveEventArgs {
-    socketId: number;
-    data: ArrayBuffer;
-  }
+    export interface ReceiveEventArgs {
+        socketId: number;
+        data: ArrayBuffer;
+    }
 
-  export interface ReceiveErrorEventArgs {
-    socketId: number;
-    resultCode: number;
-  }
+    export interface ReceiveErrorEventArgs {
+        socketId: number;
+        resultCode: number;
+    }
 
-  export interface SocketProperties {
-    persistent?: boolean;
-    name?: string;
-    bufferSize?: number;
-  }
+    export interface SocketProperties {
+        persistent?: boolean;
+        name?: string;
+        bufferSize?: number;
+    }
 
-  export interface SocketInfo {
-    socketId: number;
-    persistent: boolean;
-    name?: string;
-    bufferSize?: number;
-    paused: boolean;
-    connected: boolean;
-    localAddress?: string;
-    localPort?: number;
-    peerAddress?: string;
-    peerPort?: number;
-  }
+    export interface SocketInfo {
+        socketId: number;
+        persistent: boolean;
+        name?: string;
+        bufferSize?: number;
+        paused: boolean;
+        connected: boolean;
+        localAddress?: string;
+        localPort?: number;
+        peerAddress?: string;
+        peerPort?: number;
+    }
 
-  export function create(callback: (createInfo: CreateInfo) => void): void;
-  export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+    export function create(callback: (createInfo: CreateInfo) => void): void;
+    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
-  export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
-  export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
 
-  export function setKeepAlive(socketId: number,
-    enable: boolean, callback: (result: number) => void): void;
-  export function setKeepAlive(socketId: number,
-    enable: boolean, delay: number, callback: (result: number) => void): void;
+    export function setKeepAlive(socketId: number,
+        enable: boolean, callback: (result: number) => void): void;
+    export function setKeepAlive(socketId: number,
+        enable: boolean, delay: number, callback: (result: number) => void): void;
 
-  export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
-  export function connect(socketId: number,
-    peerAddress: string, peerPort: number, callback: (result: number) => void): void;
-  export function disconnect(socketId: number, callback?: () => void): void;
-  export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
-  export function close(socketId: number, callback?: () => void): void;
-  export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-  export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+    export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
+    export function connect(socketId: number,
+        peerAddress: string, peerPort: number, callback: (result: number) => void): void;
+    export function disconnect(socketId: number, callback?: () => void): void;
+    export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
+    export function close(socketId: number, callback?: () => void): void;
+    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
-  export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
-  export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
 /**
@@ -3012,195 +3012,195 @@ declare namespace chrome.sockets.tcp {
  * @see https://developer.chrome.com/apps/sockets_tcpServer
  */
 declare namespace chrome.sockets.tcpServer {
-  export interface CreateInfo {
-    socketId: number;
-  }
+    export interface CreateInfo {
+        socketId: number;
+    }
 
-  export interface AcceptEventArgs {
-    socketId: number;
-    clientSocketId: number;
-  }
+    export interface AcceptEventArgs {
+        socketId: number;
+        clientSocketId: number;
+    }
 
-  export interface AcceptErrorEventArgs {
-    socketId: number;
-    resultCode: number;
-  }
+    export interface AcceptErrorEventArgs {
+        socketId: number;
+        resultCode: number;
+    }
 
-  /**
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
-   */
-  export interface SocketProperties {
     /**
-     * Flag indicating if the socket remains open when the event page of the
-     * application is unloaded. The default value is "false." When the
-     * application is loaded, any sockets previously opened with
-     * persistent=true can be fetched with getSockets.
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
+     */
+    export interface SocketProperties {
+        /**
+         * Flag indicating if the socket remains open when the event page of the
+         * application is unloaded. The default value is "false." When the
+         * application is loaded, any sockets previously opened with
+         * persistent=true can be fetched with getSockets.
+         *
+         * @see http://developer.chrome.com/apps/app_lifecycle.html
+         */
+        persistent?: boolean;
+
+        /** An application-defined string associated with the socket. */
+        name?: string;
+    }
+
+    /**
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
+     */
+    export interface SocketInfo {
+        /** The socket identifier. */
+        socketId: number;
+
+        /**
+         * Flag indicating if the socket remains open when the event page of the
+         * application is unloaded (see SocketProperties.persistent). The
+         * default value is "false".
+         */
+        persistent: boolean;
+
+        /** Application-defined string associated with the socket. */
+        name?: string;
+
+        /**
+         * Flag indicating whether connection requests on a listening socket are
+         * dispatched through the onAccept event or queued up in the listen
+         * queue backlog. See setPaused. The default value is "false"
+         */
+        paused: boolean;
+
+        /** If the socket is listening, contains its local IPv4/6 address. */
+        localAddress?: string;
+
+        /** If the socket is listening, contains its local port. */
+        localPort?: number;
+    }
+
+    /**
+     * Creates a TCP server socket.
      *
-     * @see http://developer.chrome.com/apps/app_lifecycle.html
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+     * @param callback Called when the socket has been created.
      */
-    persistent?: boolean;
-
-    /** An application-defined string associated with the socket. */
-    name?: string;
-  }
-
-  /**
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
-   */
-  export interface SocketInfo {
-    /** The socket identifier. */
-    socketId: number;
+    export function create(callback: (createInfo: CreateInfo) => void): void;
 
     /**
-     * Flag indicating if the socket remains open when the event page of the
-     * application is unloaded (see SocketProperties.persistent). The
-     * default value is "false".
+     * Creates a TCP server socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+     * @param properties The socket properties.
+     * @param callback   Called when the socket has been created.
      */
-    persistent: boolean;
-
-    /** Application-defined string associated with the socket. */
-    name?: string;
+    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
     /**
-     * Flag indicating whether connection requests on a listening socket are
-     * dispatched through the onAccept event or queued up in the listen
-     * queue backlog. See setPaused. The default value is "false"
+     * Updates the socket properties.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
+     * @param socketId   The socket identifier.
+     * @param properties The properties to update.
+     * @param callback   Called when the properties are updated.
      */
-    paused: boolean;
+    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
 
-    /** If the socket is listening, contains its local IPv4/6 address. */
-    localAddress?: string;
+    /**
+     * Enables or disables a listening socket from accepting new connections.
+     * When paused, a listening socket accepts new connections until its backlog
+     * (see listen function) is full then refuses additional connection
+     * requests. onAccept events are raised only when the socket is un-paused.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
+     * @param callback Callback from the setPaused method.
+     */
+    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
 
-    /** If the socket is listening, contains its local port. */
-    localPort?: number;
-  }
+    /**
+     * Listens for connections on the specified port and address. If the
+     * port/address is in use, the callback indicates a failure.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+     * @param socketId The socket identifier.
+     * @param address  The address of the local machine.
+     * @param port     The port of the local machine. When set to 0, a free port
+     *                 is chosen dynamically. The dynamically allocated port can
+     *                 be found by calling getInfo.
+     * @param backlog  Length of the socket's listen queue. The default value
+     *                 depends on the Operating System (SOMAXCONN), which
+     *                 ensures a reasonable queue length for most applications.
+     * @param callback Called when listen operation completes.
+     */
+    export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
 
-  /**
-   * Creates a TCP server socket.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-   * @param callback Called when the socket has been created.
-   */
-  export function create(callback: (createInfo: CreateInfo) => void): void;
+    /**
+     * Listens for connections on the specified port and address. If the
+     * port/address is in use, the callback indicates a failure.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+     * @param socketId The socket identifier.
+     * @param address  The address of the local machine.
+     * @param port     The port of the local machine. When set to 0, a free port
+     *                 is chosen dynamically. The dynamically allocated port can
+     *                 be found by calling getInfo.
+     * @param callback Called when listen operation completes.
+     */
+    export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
 
-  /**
-   * Creates a TCP server socket.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-   * @param properties The socket properties.
-   * @param callback   Called when the socket has been created.
-   */
-  export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+    /**
+     * Disconnects the listening socket, i.e. stops accepting new connections
+     * and releases the address/port the socket is bound to. The socket
+     * identifier remains valid, e.g. it can be used with listen to accept
+     * connections on a new port and address.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
+     * @param socketId The socket identifier.
+     * @param callback Called when the disconnect attempt is complete.
+     */
+    export function disconnect(socketId: number, callback?: () => void): void;
 
-  /**
-   * Updates the socket properties.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
-   * @param socketId   The socket identifier.
-   * @param properties The properties to update.
-   * @param callback   Called when the properties are updated.
-   */
-  export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+    /**
+     * Disconnects and destroys the socket. Each socket created should be closed
+     * after use. The socket id is no longer valid as soon at the function is
+     * called. However, the socket is guaranteed to be closed only when the
+     * callback is invoked.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
+     * @param socketId The socket identifier.
+     * @param callback Called when the close operation completes.
+     */
+    export function close(socketId: number, callback?: () => void): void;
 
-  /**
-   * Enables or disables a listening socket from accepting new connections.
-   * When paused, a listening socket accepts new connections until its backlog
-   * (see listen function) is full then refuses additional connection
-   * requests. onAccept events are raised only when the socket is un-paused.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
-   * @param callback Callback from the setPaused method.
-   */
-  export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+    /**
+     * Retrieves the state of the given socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
+     * @param socketId The socket identifier.
+     * @param callback Called when the socket state is available.
+     */
+    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
 
-  /**
-   * Listens for connections on the specified port and address. If the
-   * port/address is in use, the callback indicates a failure.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-   * @param socketId The socket identifier.
-   * @param address  The address of the local machine.
-   * @param port     The port of the local machine. When set to 0, a free port
-   *                 is chosen dynamically. The dynamically allocated port can
-   *                 be found by calling getInfo.
-   * @param backlog  Length of the socket's listen queue. The default value
-   *                 depends on the Operating System (SOMAXCONN), which
-   *                 ensures a reasonable queue length for most applications.
-   * @param callback Called when listen operation completes.
-   */
-  export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
+    /**
+     * Retrieves the list of currently opened sockets owned by the application.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
+     * @param callback Called when the list of sockets is available.
+     */
+    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
-  /**
-   * Listens for connections on the specified port and address. If the
-   * port/address is in use, the callback indicates a failure.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-   * @param socketId The socket identifier.
-   * @param address  The address of the local machine.
-   * @param port     The port of the local machine. When set to 0, a free port
-   *                 is chosen dynamically. The dynamically allocated port can
-   *                 be found by calling getInfo.
-   * @param callback Called when listen operation completes.
-   */
-  export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+    /**
+     * Event raised when a connection has been made to the server socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
+     */
+    export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
 
-  /**
-   * Disconnects the listening socket, i.e. stops accepting new connections
-   * and releases the address/port the socket is bound to. The socket
-   * identifier remains valid, e.g. it can be used with listen to accept
-   * connections on a new port and address.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
-   * @param socketId The socket identifier.
-   * @param callback Called when the disconnect attempt is complete.
-   */
-  export function disconnect(socketId: number, callback?: () => void): void;
-
-  /**
-   * Disconnects and destroys the socket. Each socket created should be closed
-   * after use. The socket id is no longer valid as soon at the function is
-   * called. However, the socket is guaranteed to be closed only when the
-   * callback is invoked.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
-   * @param socketId The socket identifier.
-   * @param callback Called when the close operation completes.
-   */
-  export function close(socketId: number, callback?: () => void): void;
-
-  /**
-   * Retrieves the state of the given socket.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
-   * @param socketId The socket identifier.
-   * @param callback Called when the socket state is available.
-   */
-  export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-
-  /**
-   * Retrieves the list of currently opened sockets owned by the application.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
-   * @param callback Called when the list of sockets is available.
-   */
-  export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
-
-  /**
-   * Event raised when a connection has been made to the server socket.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
-   */
-  export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
-
-  /**
-   * Event raised when a network error occured while the runtime was waiting
-   * for new connections on the socket address and port. Once this event is
-   * raised, the socket is set to paused and no more onAccept events are
-   * raised for this socket until the socket is resumed.
-   *
-   * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
-   */
-  export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
+    /**
+     * Event raised when a network error occured while the runtime was waiting
+     * for new connections on the socket address and port. Once this event is
+     * raised, the socket is set to paused and no more onAccept events are
+     * raised for this socket until the socket is resumed.
+     *
+     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
+     */
+    export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
 }
 
 /**
@@ -3212,289 +3212,289 @@ declare namespace chrome.sockets.tcpServer {
  * @see https://developer.chrome.com/apps/sockets_udp
  */
 declare namespace chrome.sockets.udp {
-  export interface CreateInfo {
-    socketId: number;
-  }
+    export interface CreateInfo {
+        socketId: number;
+    }
 
-  export interface SendInfo {
-    resultCode: number;
-    bytesSent?: number;
-  }
+    export interface SendInfo {
+        resultCode: number;
+        bytesSent?: number;
+    }
 
-  export interface ReceiveEventArgs {
-    socketId: number;
-    data: ArrayBuffer;
-    remoteAddress: string;
-    remotePort: number;
-  }
+    export interface ReceiveEventArgs {
+        socketId: number;
+        data: ArrayBuffer;
+        remoteAddress: string;
+        remotePort: number;
+    }
 
-  export interface ReceiveErrorEventArgs {
-    socketId: number;
-    resultCode: number;
-  }
-
-  /**
-   * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
-   */
-  export interface SocketProperties {
-    /**
-     * Flag indicating if the socket is left open when the event page of the
-     * application is unloaded. The default value is "false." When the
-     * application is loaded, any sockets previously opened with
-     * persistent=true can be fetched with getSockets.
-     * @see http://developer.chrome.com/apps/app_lifecycle.html
-     */
-    persistent?: boolean;
-
-    /** An application-defined string associated with the socket. */
-    name?: string;
+    export interface ReceiveErrorEventArgs {
+        socketId: number;
+        resultCode: number;
+    }
 
     /**
-     * The size of the buffer used to receive data. If the buffer is too
-     * small to receive the UDP packet, data is lost. The default value is
-     * 4096.
+     * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
      */
-    bufferSize?: number;
-  }
+    export interface SocketProperties {
+        /**
+         * Flag indicating if the socket is left open when the event page of the
+         * application is unloaded. The default value is "false." When the
+         * application is loaded, any sockets previously opened with
+         * persistent=true can be fetched with getSockets.
+         * @see http://developer.chrome.com/apps/app_lifecycle.html
+         */
+        persistent?: boolean;
 
-  /**
-   * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
-   */
-  export interface SocketInfo {
-    /** The socket identifier. */
-    socketId: number;
+        /** An application-defined string associated with the socket. */
+        name?: string;
+
+        /**
+         * The size of the buffer used to receive data. If the buffer is too
+         * small to receive the UDP packet, data is lost. The default value is
+         * 4096.
+         */
+        bufferSize?: number;
+    }
 
     /**
-     * Flag indicating whether the socket is left open when the application
-     * is suspended (see SocketProperties.persistent).
+     * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
      */
-    persistent: boolean;
+    export interface SocketInfo {
+        /** The socket identifier. */
+        socketId: number;
 
-    /** Application-defined string associated with the socket. */
-    name?: string;
+        /**
+         * Flag indicating whether the socket is left open when the application
+         * is suspended (see SocketProperties.persistent).
+         */
+        persistent: boolean;
+
+        /** Application-defined string associated with the socket. */
+        name?: string;
+
+        /**
+         * The size of the buffer used to receive data. If no buffer size ha
+         * been specified explictly, the value is not provided.
+         */
+        bufferSize?: number;
+
+        /**
+         * Flag indicating whether the socket is blocked from firing onReceive
+         * events.
+         */
+        paused: boolean;
+
+        /**
+         * If the underlying socket is bound, contains its local IPv4/6 address.
+         */
+        localAddress?: string;
+
+        /**
+         * If the underlying socket is bound, contains its local port.
+         */
+        localPort?: number;
+    }
 
     /**
-     * The size of the buffer used to receive data. If no buffer size ha
-     * been specified explictly, the value is not provided.
+     * Creates a UDP socket with default properties.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-create
+     * @param createInfo.socketId The ID of the newly created socket.
      */
-    bufferSize?: number;
+    export function create(callback: (createInfo: CreateInfo) => void): void;
 
     /**
-     * Flag indicating whether the socket is blocked from firing onReceive
-     * events.
+     * Creates a UDP socket with the given properties.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-create
+     * @param properties          The socket properties.
+     * @param createInfo.socketId The ID of the newly created socket.
      */
-    paused: boolean;
+    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
     /**
-     * If the underlying socket is bound, contains its local IPv4/6 address.
+     * Updates the socket properties.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-update
+     * @param socketId   The socket ID.
+     * @param properties The properties to update.
+     * @param callback   Called when the properties are updated.
      */
-    localAddress?: string;
+    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
 
     /**
-     * If the underlying socket is bound, contains its local port.
+     * Pauses or unpauses a socket. A paused socket is blocked from firing
+     * onReceive events.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-setPaused
+     * @param socketId The socket ID.
+     * @param paused   Flag to indicate whether to pause or unpause.
+     * @param callback Called when the socket has been successfully paused or
+     *                 unpaused.
      */
-    localPort?: number;
-  }
+    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
 
-  /**
-   * Creates a UDP socket with default properties.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-create
-   * @param createInfo.socketId The ID of the newly created socket.
-   */
-  export function create(callback: (createInfo: CreateInfo) => void): void;
+    /**
+     * Binds the local address and port for the socket. For a client socket, it
+     * is recommended to use port 0 to let the platform pick a free port.
+     *
+     * Once the bind operation completes successfully, onReceive events are
+     * raised when UDP packets arrive on the address/port specified -- unless
+     * the socket is paused.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-bind
+     * @param socketId The socket ID.
+     * @param address  The address of the local machine. DNS name, IPv4 and IPv6
+     *                 formats are supported. Use "0.0.0.0" to accept packets
+     *                 from all local available network interfaces.
+     * @param port     The port of the local machine. Use "0" to bind to a free
+     *                 port.
+     * @param callback Called when the bind operation completes.
+     */
+    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
 
-  /**
-   * Creates a UDP socket with the given properties.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-create
-   * @param properties          The socket properties.
-   * @param createInfo.socketId The ID of the newly created socket.
-   */
-  export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+    /**
+     * Sends data on the given socket to the given address and port. The socket
+     * must be bound to a local port before calling this method.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-send
+     * @param socketId The socket ID.
+     * @param data     The data to send.
+     * @param address  The address of the remote machine.
+     * @param port     The port of the remote machine.
+     * @param callback Called when the send operation completes.
+     */
+    export function send(socketId: number, data: ArrayBuffer, address: string, port: number, callback: (sendInfo: SendInfo) => void): void;
 
-  /**
-   * Updates the socket properties.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-update
-   * @param socketId   The socket ID.
-   * @param properties The properties to update.
-   * @param callback   Called when the properties are updated.
-   */
-  export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+    /**
+     * Closes the socket and releases the address/port the socket is bound to.
+     * Each socket created should be closed after use. The socket id is no
+     * longer valid as soon at the function is called. However, the socket is
+     * guaranteed to be closed only when the callback is invoked.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-close
+     * @param socketId The socket ID.
+     * @param callback Called when the close operation completes.
+     */
+    export function close(socketId: number, callback?: () => void): void;
 
-  /**
-   * Pauses or unpauses a socket. A paused socket is blocked from firing
-   * onReceive events.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-setPaused
-   * @param socketId The socket ID.
-   * @param paused   Flag to indicate whether to pause or unpause.
-   * @param callback Called when the socket has been successfully paused or
-   *                 unpaused.
-   */
-  export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+    /**
+     * Retrieves the state of the given socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-getInfo
+     * @param socketId The socket ID.
+     * @param callback Called when the socket state is available.
+     */
+    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
 
-  /**
-   * Binds the local address and port for the socket. For a client socket, it
-   * is recommended to use port 0 to let the platform pick a free port.
-   *
-   * Once the bind operation completes successfully, onReceive events are
-   * raised when UDP packets arrive on the address/port specified -- unless
-   * the socket is paused.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-bind
-   * @param socketId The socket ID.
-   * @param address  The address of the local machine. DNS name, IPv4 and IPv6
-   *                 formats are supported. Use "0.0.0.0" to accept packets
-   *                 from all local available network interfaces.
-   * @param port     The port of the local machine. Use "0" to bind to a free
-   *                 port.
-   * @param callback Called when the bind operation completes.
-   */
-  export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+    /**
+     * Retrieves the list of currently opened sockets owned by the application.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-getSockets
+     * @param callback Called when the list of sockets is available.
+     */
+    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
-  /**
-   * Sends data on the given socket to the given address and port. The socket
-   * must be bound to a local port before calling this method.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-send
-   * @param socketId The socket ID.
-   * @param data     The data to send.
-   * @param address  The address of the remote machine.
-   * @param port     The port of the remote machine.
-   * @param callback Called when the send operation completes.
-   */
-  export function send(socketId: number, data: ArrayBuffer, address: string, port: number, callback: (sendInfo: SendInfo) => void): void;
+    /**
+     * Joins the multicast group and starts to receive packets from that group.
+     * The socket must be bound to a local port before calling this method.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-joinGroup
+     * @param socketId The socket ID.
+     * @param address  The group address to join. Domain names are not supported.
+     * @param callback Called when the joinGroup operation completes.
+     */
+    export function joinGroup(socketId: number, address: string, callback: (result: number) => void): void;
 
-  /**
-   * Closes the socket and releases the address/port the socket is bound to.
-   * Each socket created should be closed after use. The socket id is no
-   * longer valid as soon at the function is called. However, the socket is
-   * guaranteed to be closed only when the callback is invoked.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-close
-   * @param socketId The socket ID.
-   * @param callback Called when the close operation completes.
-   */
-  export function close(socketId: number, callback?: () => void): void;
+    /**
+     * Leaves the multicast group previously joined using joinGroup. This is
+     * only necessary to call if you plan to keep using the socket afterwards,
+     * since it will be done automatically by the OS when the socket is closed.
+     *
+     * Leaving the group will prevent the router from sending multicast
+     * datagrams to the local host, presuming no other process on the host is
+     * still joined to the group.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-leaveGroup
+     * @param socketId The socket ID.
+     * @param address  The group address to leave. Domain names are not
+     *                 supported.
+     * @param callback Called when the leaveGroup operation completes.
+     */
+    export function leaveGroup(socketId: number, address: string, callback: (result: number) => void): void;
 
-  /**
-   * Retrieves the state of the given socket.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-getInfo
-   * @param socketId The socket ID.
-   * @param callback Called when the socket state is available.
-   */
-  export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+    /**
+     * Sets the time-to-live of multicast packets sent to the multicast group.
+     *
+     * Calling this method does not require multicast permissions.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastTimeToLive
+     * @param socketId The socket ID.
+     * @param ttl      The time-to-live value.
+     * @param callback Called when the configuration operation completes.
+     */
+    export function setMulticastTimeToLive(socketId: number, ttl: number, callback: (result: number) => void): void;
 
-  /**
-   * Retrieves the list of currently opened sockets owned by the application.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-getSockets
-   * @param callback Called when the list of sockets is available.
-   */
-  export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+    /**
+     * Sets whether multicast packets sent from the host to the multicast group
+     * will be looped back to the host.
+     *
+     * Note: the behavior of setMulticastLoopbackMode is slightly different
+     * between Windows and Unix-like systems. The inconsistency happens only
+     * when there is more than one application on the same host joined to the
+     * same multicast group while having different settings on multicast
+     * loopback mode. On Windows, the applications with loopback off will not
+     * RECEIVE the loopback packets; while on Unix-like systems, the
+     * applications with loopback off will not SEND the loopback packets to
+     * other applications on the same host.
+     * @see MSDN: http://goo.gl/6vqbj
+     *
+     * Calling this method does not require multicast permissions.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastLoopbackMode
+     * @param socketId The socket ID.
+     * @param enabled  Indicate whether to enable loopback mode.
+     * @param callback Called when the configuration operation completes.
+     */
+    export function setMulticastLoopbackMode(socketId: number, enabled: boolean, callback: (result: number) => void): void;
 
-  /**
-   * Joins the multicast group and starts to receive packets from that group.
-   * The socket must be bound to a local port before calling this method.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-joinGroup
-   * @param socketId The socket ID.
-   * @param address  The group address to join. Domain names are not supported.
-   * @param callback Called when the joinGroup operation completes.
-   */
-  export function joinGroup(socketId: number, address: string, callback: (result: number) => void): void;
+    /**
+     * Gets the multicast group addresses the socket is currently joined to.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#method-getJoinedGroups
+     * @param socketId The socket ID.
+     * @param callback Called with an array of strings of the result.
+     */
+    export function getJoinedGroups(socketId: number, callback: (groups: string[]) => void): void;
 
-  /**
-   * Leaves the multicast group previously joined using joinGroup. This is
-   * only necessary to call if you plan to keep using the socket afterwards,
-   * since it will be done automatically by the OS when the socket is closed.
-   *
-   * Leaving the group will prevent the router from sending multicast
-   * datagrams to the local host, presuming no other process on the host is
-   * still joined to the group.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-leaveGroup
-   * @param socketId The socket ID.
-   * @param address  The group address to leave. Domain names are not
-   *                 supported.
-   * @param callback Called when the leaveGroup operation completes.
-   */
-  export function leaveGroup(socketId: number, address: string, callback: (result: number) => void): void;
+    /**
+     * Enables or disables broadcast packets on this socket.
+     *
+     * @since Chrome 44
+     * @see https://developer.chrome.com/apps/sockets_udp#method-setBroadcast
+     * @param socketId The socket ID.
+     * @param enabled  true to enable broadcast packets, false to disable them.
+     * @param callback Callback from the setBroadcast method.
+     */
+    export function setBroadcast(socketId: number, enabled: boolean, callback?: (result: number) => void): void;
 
-  /**
-   * Sets the time-to-live of multicast packets sent to the multicast group.
-   *
-   * Calling this method does not require multicast permissions.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastTimeToLive
-   * @param socketId The socket ID.
-   * @param ttl      The time-to-live value.
-   * @param callback Called when the configuration operation completes.
-   */
-  export function setMulticastTimeToLive(socketId: number, ttl: number, callback: (result: number) => void): void;
+    /**
+     * Event raised when a UDP packet has been received for the given socket.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
+     */
+    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
 
-  /**
-   * Sets whether multicast packets sent from the host to the multicast group
-   * will be looped back to the host.
-   *
-   * Note: the behavior of setMulticastLoopbackMode is slightly different
-   * between Windows and Unix-like systems. The inconsistency happens only
-   * when there is more than one application on the same host joined to the
-   * same multicast group while having different settings on multicast
-   * loopback mode. On Windows, the applications with loopback off will not
-   * RECEIVE the loopback packets; while on Unix-like systems, the
-   * applications with loopback off will not SEND the loopback packets to
-   * other applications on the same host.
-   * @see MSDN: http://goo.gl/6vqbj
-   *
-   * Calling this method does not require multicast permissions.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastLoopbackMode
-   * @param socketId The socket ID.
-   * @param enabled  Indicate whether to enable loopback mode.
-   * @param callback Called when the configuration operation completes.
-   */
-  export function setMulticastLoopbackMode(socketId: number, enabled: boolean, callback: (result: number) => void): void;
-
-  /**
-   * Gets the multicast group addresses the socket is currently joined to.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#method-getJoinedGroups
-   * @param socketId The socket ID.
-   * @param callback Called with an array of strings of the result.
-   */
-  export function getJoinedGroups(socketId: number, callback: (groups: string[]) => void): void;
-
-  /**
-   * Enables or disables broadcast packets on this socket.
-   *
-   * @since Chrome 44
-   * @see https://developer.chrome.com/apps/sockets_udp#method-setBroadcast
-   * @param socketId The socket ID.
-   * @param enabled  true to enable broadcast packets, false to disable them.
-   * @param callback Callback from the setBroadcast method.
-   */
-  export function setBroadcast(socketId: number, enabled: boolean, callback?: (result: number) => void): void;
-
-  /**
-   * Event raised when a UDP packet has been received for the given socket.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
-   */
-  export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
-
-  /**
-   * Event raised when a network error occured while the runtime was waiting
-   * for data on the socket address and port. Once this event is raised, the
-   * socket is paused and no more onReceive events will be raised for this
-   * socket until the socket is resumed.
-   *
-   * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
-   */
-  export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+    /**
+     * Event raised when a network error occured while the runtime was waiting
+     * for data on the socket address and port. Once this event is raised, the
+     * socket is paused and no more onReceive events will be raised for this
+     * socket until the socket is resumed.
+     *
+     * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
+     */
+    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
 }
 
 ////////////////////
@@ -3506,106 +3506,106 @@ declare namespace chrome.sockets.udp {
  * @since Chrome 20.
  */
 declare namespace chrome.storage {
-  export interface StorageArea {
-    /**
-     * Gets the amount of space (in bytes) being used by one or more items.
-     * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-     * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-     */
-    getBytesInUse(callback: (bytesInUse: number) => void): void;
-    /**
-     * Gets the amount of space (in bytes) being used by one or more items.
-     * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
-     * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-     * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-     */
-    getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
-    /**
-     * Removes all items from storage.
-     * @param callback Optional.
-     * Callback on success, or on failure (in which case runtime.lastError will be set).
-     */
-    clear(callback?: () => void): void;
-    /**
-     * Sets multiple items.
-     * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
-     * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
-     * @param callback Optional.
-     * Callback on success, or on failure (in which case runtime.lastError will be set).
-     */
-    set(items: Object, callback?: () => void): void;
-    /**
-     * Removes one or more items from storage.
-     * @param A single key or a list of keys for items to remove.
-     * @param callback Optional.
-     * Callback on success, or on failure (in which case runtime.lastError will be set).
-     */
-    remove(keys: string | string[], callback?: () => void): void;
-    /**
-     * Gets one or more items from storage.
-     * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-     * Parameter items: Object with items in their key-value mappings.
-     */
-    get(callback: (items: { [key: string]: any }) => void): void;
-    /**
-     * Gets one or more items from storage.
-     * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
-     * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
-     * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-     * Parameter items: Object with items in their key-value mappings.
-     */
-    get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
-  }
+    export interface StorageArea {
+        /**
+         * Gets the amount of space (in bytes) being used by one or more items.
+         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+         */
+        getBytesInUse(callback: (bytesInUse: number) => void): void;
+        /**
+         * Gets the amount of space (in bytes) being used by one or more items.
+         * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+         */
+        getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
+        /**
+         * Removes all items from storage.
+         * @param callback Optional.
+         * Callback on success, or on failure (in which case runtime.lastError will be set).
+         */
+        clear(callback?: () => void): void;
+        /**
+         * Sets multiple items.
+         * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
+         * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
+         * @param callback Optional.
+         * Callback on success, or on failure (in which case runtime.lastError will be set).
+         */
+        set(items: Object, callback?: () => void): void;
+        /**
+         * Removes one or more items from storage.
+         * @param A single key or a list of keys for items to remove.
+         * @param callback Optional.
+         * Callback on success, or on failure (in which case runtime.lastError will be set).
+         */
+        remove(keys: string | string[], callback?: () => void): void;
+        /**
+         * Gets one or more items from storage.
+         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+         * Parameter items: Object with items in their key-value mappings.
+         */
+        get(callback: (items: { [key: string]: any }) => void): void;
+        /**
+         * Gets one or more items from storage.
+         * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
+         * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+         * Parameter items: Object with items in their key-value mappings.
+         */
+        get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
+    }
 
-  export interface StorageChange {
-    /** Optional. The new value of the item, if there is a new value. */
-    newValue?: any;
-    /** Optional. The old value of the item, if there was an old value. */
-    oldValue?: any;
-  }
+    export interface StorageChange {
+        /** Optional. The new value of the item, if there is a new value. */
+        newValue?: any;
+        /** Optional. The old value of the item, if there was an old value. */
+        oldValue?: any;
+    }
 
-  export interface LocalStorageArea extends StorageArea {
-    /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-    QUOTA_BYTES: number;
-  }
+    export interface LocalStorageArea extends StorageArea {
+        /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+        QUOTA_BYTES: number;
+    }
+
+    export interface SyncStorageArea extends StorageArea {
+        /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
+        MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+        /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+        QUOTA_BYTES: number;
+        /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
+        QUOTA_BYTES_PER_ITEM: number;
+        /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
+        MAX_ITEMS: number;
+        /**
+         * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
+         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+         */
+        MAX_WRITE_OPERATIONS_PER_HOUR: number;
+        /**
+         * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
+         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+         * @since Chrome 40.
+         */
+        MAX_WRITE_OPERATIONS_PER_MINUTE: number;
+    }
+
+    export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
+
+    /** Items in the local storage area are local to each machine. */
+    export var local: LocalStorageArea;
+    /** Items in the sync storage area are synced using Chrome Sync. */
+    export var sync: SyncStorageArea;
 
-  export interface SyncStorageArea extends StorageArea {
-    /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
-    MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
-    /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-    QUOTA_BYTES: number;
-    /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
-    QUOTA_BYTES_PER_ITEM: number;
-    /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
-    MAX_ITEMS: number;
     /**
-     * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
-     * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+     * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this declare namespace results in an error.
+     * @since Chrome 33.
      */
-    MAX_WRITE_OPERATIONS_PER_HOUR: number;
-    /**
-     * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
-     * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-     * @since Chrome 40.
-     */
-    MAX_WRITE_OPERATIONS_PER_MINUTE: number;
-  }
+    export var managed: StorageArea;
 
-  export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
-
-  /** Items in the local storage area are local to each machine. */
-  export var local: LocalStorageArea;
-  /** Items in the sync storage area are synced using Chrome Sync. */
-  export var sync: SyncStorageArea;
-
-  /**
-   * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this declare namespace results in an error.
-   * @since Chrome 33.
-   */
-  export var managed: StorageArea;
-
-  /** Fired when one or more items change. */
-  export var onChanged: StorageChangedEvent;
+    /** Fired when one or more items change. */
+    export var onChanged: StorageChangedEvent;
 }
 
 ////////////////////
@@ -3616,7 +3616,7 @@ declare namespace chrome.storage {
  * @since Chrome 27
  */
 declare namespace chrome.syncFileSystem {
-  /** NOT YET IMPLEMENTED */
+    /** NOT YET IMPLEMENTED */
 }
 
 
@@ -3629,40 +3629,40 @@ declare namespace chrome.syncFileSystem {
  * @since Chrome 32.
  */
 declare namespace chrome.system.cpu {
-  export interface ProcessorUsage {
-    /** The cumulative time used by userspace programs on this processor. */
-    user: number;
-    /** The cumulative time used by kernel programs on this processor. */
-    kernel: number;
-    /** The cumulative time spent idle by this processor. */
-    idle: number;
-    /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
-    total: number;
-  }
+    export interface ProcessorUsage {
+        /** The cumulative time used by userspace programs on this processor. */
+        user: number;
+        /** The cumulative time used by kernel programs on this processor. */
+        kernel: number;
+        /** The cumulative time spent idle by this processor. */
+        idle: number;
+        /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
+        total: number;
+    }
 
-  export interface ProcessorInfo {
-    /** Cumulative usage info for this logical processor. */
-    usage: ProcessorUsage;
-  }
+    export interface ProcessorInfo {
+        /** Cumulative usage info for this logical processor. */
+        usage: ProcessorUsage;
+    }
 
-  export interface CpuInfo {
-    /** The number of logical processors. */
-    numOfProcessors: number;
-    /** The architecture name of the processors. */
-    archName: string;
-    /** The model name of the processors. */
-    modelName: string;
-    /**
-     * A set of feature codes indicating some of the processor's capabilities.
-     * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
-     */
-    features: string[];
-    /** Information about each logical processor. */
-    processors: ProcessorInfo[];
-  }
+    export interface CpuInfo {
+        /** The number of logical processors. */
+        numOfProcessors: number;
+        /** The architecture name of the processors. */
+        archName: string;
+        /** The model name of the processors. */
+        modelName: string;
+        /**
+         * A set of feature codes indicating some of the processor's capabilities.
+         * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
+         */
+        features: string[];
+        /** Information about each logical processor. */
+        processors: ProcessorInfo[];
+    }
 
-  /** Queries basic CPU information of the system. */
-  export function getInfo(callback: (info: CpuInfo) => void): void;
+    /** Queries basic CPU information of the system. */
+    export function getInfo(callback: (info: CpuInfo) => void): void;
 }
 
 ////////////////////
@@ -3674,331 +3674,331 @@ declare namespace chrome.system.cpu {
  * @since Chrome 30.
  */
 declare namespace chrome.system.display {
-  export interface Bounds {
-    /**  The x-coordinate of the upper-left corner. */
-    left: number;
-    /**  The y-coordinate of the upper-left corner. */
-    top: number;
-    /** The width of the display in pixels. */
-    width: number;
-    /** The height of the display in pixels. */
-    height: number;
-  }
+    export interface Bounds {
+        /**  The x-coordinate of the upper-left corner. */
+        left: number;
+        /**  The y-coordinate of the upper-left corner. */
+        top: number;
+        /** The width of the display in pixels. */
+        width: number;
+        /** The height of the display in pixels. */
+        height: number;
+    }
 
-  export interface Insets {
-    /** The x-axis distance from the left bound. */
-    left: number;
-    /** The y-axis distance from the top bound. */
-    top: number;
-    /** The x-axis distance from the right bound. */
-    right: number;
-    /** The y-axis distance from the bottom bound. */
-    bottom: number;
-  }
-
-  /**
-   * @since Chrome 57
-   */
-  export interface Point {
-    /** The x-coordinate of the point. */
-    x: number;
-    /** The y-coordinate of the point. */
-    y: number;
-  }
-
-  /**
-   * @since Chrome 57
-   */
-  export interface TouchCalibrationPair {
-    /**	The coordinates of the display point. */
-    displayPoint: Point;
-    /** The coordinates of the touch point corresponding to the display point. */
-    touchPoint: Point;
-  }
-
-  /**
-   * @since Chrome 52
-   */
-  export interface DisplayMode {
-    /** The display mode width in device independent (user visible) pixels. */
-    width: number;
-
-    /** The display mode height in device independent (user visible) pixels. */
-    height: number;
-
-    /** The display mode width in native pixels. */
-    widthInNativePixels: number;
-
-    /** The display mode height in native pixels. */
-    heightInNativePixels: number;
-
-    /** The display mode UI scale factor. */
-    uiScale: number;
-
-    /** The display mode device scale factor. */
-    deviceScaleFactor: number;
-
-    /** True if the mode is the display's native mode. */
-    isNative: boolean;
-
-    /** True if the display mode is currently selected. */
-    isSelected: boolean;
-  }
-
-  /**
-   * @since Chrome 53
-   */
-  export interface DisplayLayout {
-    /** The unique identifier of the display. */
-    id: string;
-    /** The unique identifier of the parent display. Empty if this is the root. */
-    parentId: string;
-    /** The layout position of this display relative to the parent. This will be ignored for the root. */
-    position: 'top' | 'right' | 'bottom' | 'left';
-    /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
-    offset: number;
-  }
-
-  /**
-   * @description The pairs of point used to calibrate the display.
-   * @export
-   * @interface TouchCalibrationPairs
-   */
-  export interface TouchCalibrationPairs {
-    /** First pair of touch and display point required for touch calibration. */
-    pair1: TouchCalibrationPair,
-    /** Second pair of touch and display point required for touch calibration. */
-    pair2: TouchCalibrationPair,
-    /** Third pair of touch and display point required for touch calibration. */
-    pair3: TouchCalibrationPair,
-    /** Fourth pair of touch and display point required for touch calibration. */
-    pair4: TouchCalibrationPair
-  }
-
-  /**
-   * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
-   * @export
-   * @interface DisplayPropertiesInfo
-   */
-  export interface DisplayPropertiesInfo {
-    /**
-     * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
-     * @since Chrome 59
-     * */
-    isUnified?: boolean;
+    export interface Insets {
+        /** The x-axis distance from the left bound. */
+        left: number;
+        /** The y-axis distance from the top bound. */
+        top: number;
+        /** The x-axis distance from the right bound. */
+        right: number;
+        /** The y-axis distance from the bottom bound. */
+        bottom: number;
+    }
 
     /**
-     * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
+     * @since Chrome 57
      */
-    mirroringSourceId?: string;
+    export interface Point {
+        /** The x-coordinate of the point. */
+        x: number;
+        /** The y-coordinate of the point. */
+        y: number;
+    }
 
-    /** If set to true, makes the display primary. No-op if set to false. */
-    isPrimary?: boolean;
-
-    /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-    overscan?: Insets;
-
-    /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-    rotation?: 0 | 90 | 180 | 270;
-
-    /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-    boundsOriginX?: number;
-
-    /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-    boundsOriginY: number;
+    /**
+     * @since Chrome 57
+     */
+    export interface TouchCalibrationPair {
+        /**	The coordinates of the display point. */
+        displayPoint: Point;
+        /** The coordinates of the touch point corresponding to the display point. */
+        touchPoint: Point;
+    }
 
     /**
      * @since Chrome 52
-     * @description If set, updates the display mode to the mode matching this value.
      */
-    displayMode?: DisplayMode;
-  }
+    export interface DisplayMode {
+        /** The display mode width in device independent (user visible) pixels. */
+        width: number;
+
+        /** The display mode height in device independent (user visible) pixels. */
+        height: number;
+
+        /** The display mode width in native pixels. */
+        widthInNativePixels: number;
+
+        /** The display mode height in native pixels. */
+        heightInNativePixels: number;
+
+        /** The display mode UI scale factor. */
+        uiScale: number;
+
+        /** The display mode device scale factor. */
+        deviceScaleFactor: number;
+
+        /** True if the mode is the display's native mode. */
+        isNative: boolean;
+
+        /** True if the display mode is currently selected. */
+        isSelected: boolean;
+    }
 
-  /**
-   * @description Options affecting how the information is returned.
-   * @since Chrome 59
-   * @export
-   * @interface DisplayInfoFlags
-   */
-  export interface DisplayInfoFlags {
     /**
-     * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
-     * @type {boolean}
-     * @memberof DisplayInfoFlags
+     * @since Chrome 53
      */
-    singleUnified?: boolean;
-  }
+    export interface DisplayLayout {
+        /** The unique identifier of the display. */
+        id: string;
+        /** The unique identifier of the parent display. Empty if this is the root. */
+        parentId: string;
+        /** The layout position of this display relative to the parent. This will be ignored for the root. */
+        position: 'top' | 'right' | 'bottom' | 'left';
+        /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
+        offset: number;
+    }
 
-  /** Information about display properties. */
-  export interface DisplayInfo {
-    /** The unique identifier of the display. */
-    id: string;
-    /** The user-friendly name (e.g. "HP LCD monitor"). */
-    name: string;
-    /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
-    mirroringSourceId: string;
-    /** True if this is the primary display. */
-    isPrimary: boolean;
-    /** True if this is an internal display. */
-    isInternal: boolean;
-    /** True if this display is enabled. */
-    isEnabled: boolean;
-    /** The number of pixels per inch along the x-axis. */
-    dpiX: number;
-    /** The number of pixels per inch along the y-axis. */
-    dpiY: number;
-    /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
-    rotation: number;
-    /** The display's logical bounds. */
-    bounds: Bounds;
-    /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
-    overscan: Insets;
-    /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
-    workArea: Bounds;
-  }
+    /**
+     * @description The pairs of point used to calibrate the display.
+     * @export
+     * @interface TouchCalibrationPairs
+     */
+    export interface TouchCalibrationPairs {
+        /** First pair of touch and display point required for touch calibration. */
+        pair1: TouchCalibrationPair,
+        /** Second pair of touch and display point required for touch calibration. */
+        pair2: TouchCalibrationPair,
+        /** Third pair of touch and display point required for touch calibration. */
+        pair3: TouchCalibrationPair,
+        /** Fourth pair of touch and display point required for touch calibration. */
+        pair4: TouchCalibrationPair
+    }
 
-  /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
-  export interface DisplayProps {
-    /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
-    mirroringSourceId?: string;
-    /** If set to true, makes the display primary. No-op if set to false. */
-    isPrimary?: boolean;
-    /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-    overscan?: Insets;
-    /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-    rotation?: number;
-    /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-    boundsOriginX?: number;
-    /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-    boundsOriginY?: number;
-  }
+    /**
+     * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
+     * @export
+     * @interface DisplayPropertiesInfo
+     */
+    export interface DisplayPropertiesInfo {
+        /**
+         * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
+         * @since Chrome 59
+         * */
+        isUnified?: boolean;
 
-  /**
-   * @description Fired when anything changes to the display configuration.
-   * @export
-   * @interface DisplayChangedEvent
-   * @extends {chrome.events.Event<() => void>}
-   */
-  export interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
+        /**
+         * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
+         */
+        mirroringSourceId?: string;
 
-  /**
-   * @description Requests the information for all attached display devices.
-   * @export
-   * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
-   */
-  export function getInfo(callback: (info: DisplayInfo[]) => void): void;
-  /**
-   * @description Requests the information for all attached display devices.
-   * @export
-   * @since Chrome 59
-   * @param {DisplayInfoFlags} [flags] Options affecting how the information is returned.
-   * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
-   */
-  export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
+        /** If set to true, makes the display primary. No-op if set to false. */
+        isPrimary?: boolean;
 
-  /**
-   * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-   * @since Chrome 53
-   * @export
-   * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
-   */
-  export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
+        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+        overscan?: Insets;
 
-  /**
-   * @description Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-   * @export
-   * @param {string} id The display's unique identifier.
-   * @param {DisplayPropertiesInfo} info The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|.
-   * @param {() => void} [callback] Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
-   */
-  export function setDisplayProperties(id: string, info: DisplayPropertiesInfo, callback?: () => void): void;
+        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+        rotation?: 0 | 90 | 180 | 270;
 
-  /**
-   * @description Set the layout for all displays. Any display not included will use the default layout. If a layout would overlap or be otherwise invalid it will be adjusted to a valid layout. After layout is resolved, an onDisplayChanged event will be triggered. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-   * @since Chrome 53
-   * @export
-   * @param {DisplayLayout[]} layouts The layout information, required for all displays except the primary display.
-   * @param {() => void} callback Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
-   */
-  export function setDisplayLayout(layouts: DisplayLayout[], callback?: () => void): void;
+        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+        boundsOriginX?: number;
 
-  /**
-   * @description Enables/disables the unified desktop feature. Note that this simply enables the feature, but will not change the actual desktop mode. (That is, if the desktop is in mirror mode, it will stay in mirror mode) NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-   * @since Chrome 46
-   * @export
-   * @param {boolean} enabled True if unified desktop should be enabled.
-   */
-  export function enableUnifiedDesktop(enabled: boolean): void;
-  /**
-   * @description Starts overscan calibration for a display. This will show an overlay on the screen indicating the current overscan insets. If overscan calibration for display |id| is in progress this will reset calibration.
-   * @since Chrome 53
-   * @export
-   * @param {string} id The display's unique identifier.
-   */
-  export function overscanCalibrationStart(id: string): void;
-  /**
-   * @description Adjusts the current overscan insets for a display. Typically this should etiher move the display along an axis (e.g. left+right have the same value) or scale it along an axis (e.g. top+bottom have opposite values). Each Adjust call is cumulative with previous calls since Start.
-   * @since Chrome 53
-   * @export
-   * @param {string} id The display's unique identifier.
-   * @param {Insets} delta The amount to change the overscan insets.
-   */
-  export function overscanCalibrationAdjust(id: string, delta: Insets): void;
+        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+        boundsOriginY: number;
 
-  /**
-   * @description Resets the overscan insets for a display to the last saved value (i.e before Start was called).
-   * @since Chrome 53
-   * @export
-   * @param {string} id The display's unique identifier.
-   */
-  export function overscanCalibrationReset(id: string): void;
+        /**
+         * @since Chrome 52
+         * @description If set, updates the display mode to the mode matching this value.
+         */
+        displayMode?: DisplayMode;
+    }
 
-  /**
-   * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
-   * @since Chrome 53
-   * @export
-   * @param {string} id The display's unique identifier.
-   */
-  export function overscanCalibrationComplete(id: string): void;
+    /**
+     * @description Options affecting how the information is returned.
+     * @since Chrome 59
+     * @export
+     * @interface DisplayInfoFlags
+     */
+    export interface DisplayInfoFlags {
+        /**
+         * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
+         * @type {boolean}
+         * @memberof DisplayInfoFlags
+         */
+        singleUnified?: boolean;
+    }
 
-  /**
-   * @description Displays the native touch calibration UX for the display with |id| as display id. This will show an overlay on the screen with required instructions on how to proceed. The callback will be invoked in case of successful calibraion only. If the calibration fails, this will throw an error.
-   * @since Chrome 57
-   * @export
-   * @param {string} id The display's unique identifier.
-   * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
-   */
-  export function showNativeTouchCalibration(id: string, callback: (success: boolean) => void): void;
+    /** Information about display properties. */
+    export interface DisplayInfo {
+        /** The unique identifier of the display. */
+        id: string;
+        /** The user-friendly name (e.g. "HP LCD monitor"). */
+        name: string;
+        /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
+        mirroringSourceId: string;
+        /** True if this is the primary display. */
+        isPrimary: boolean;
+        /** True if this is an internal display. */
+        isInternal: boolean;
+        /** True if this display is enabled. */
+        isEnabled: boolean;
+        /** The number of pixels per inch along the x-axis. */
+        dpiX: number;
+        /** The number of pixels per inch along the y-axis. */
+        dpiY: number;
+        /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
+        rotation: number;
+        /** The display's logical bounds. */
+        bounds: Bounds;
+        /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
+        overscan: Insets;
+        /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
+        workArea: Bounds;
+    }
 
-  /**
-   * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.
-   * @since Chrome 57
-   * @export
-   * @param {string} id The display's unique identifier.
-   */
-  export function startCustomTouchCalibration(id: string): void;
+    /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
+    export interface DisplayProps {
+        /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
+        mirroringSourceId?: string;
+        /** If set to true, makes the display primary. No-op if set to false. */
+        isPrimary?: boolean;
+        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+        overscan?: Insets;
+        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+        rotation?: number;
+        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+        boundsOriginX?: number;
+        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+        boundsOriginY?: number;
+    }
 
-  /**
-   * @description Sets the touch calibration pairs for a display. These |pairs| would be used to calibrate the touch screen for display with |id| called in startCustomTouchCalibration(). Always call |startCustomTouchCalibration| before calling this method. If another touch calibration is already in progress this will throw an error.
-   * @since Chrome 57
-   * @export
-   * @param {TouchCalibrationPairs} pairs The pairs of point used to calibrate the display.
-   * @param {Bounds} bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
-   */
-  export function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
-  /**
-   * @description Resets the touch calibration for the display and brings it back to its default state by clearing any touch calibration data associated with the display.
-   * @since Chrome 57
-   * @export
-   * @param {string} id The display's unique identifier.
-   */
-  export function clearTouchCalibration(id: string): void;
+    /**
+     * @description Fired when anything changes to the display configuration.
+     * @export
+     * @interface DisplayChangedEvent
+     * @extends {chrome.events.Event<() => void>}
+     */
+    export interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
 
-  /**
-   * @description Fired when anything changes to the display configuration.
-   * @export
-   */
-  export var onDisplayChanged: DisplayChangedEvent;
+    /**
+     * @description Requests the information for all attached display devices.
+     * @export
+     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+     */
+    export function getInfo(callback: (info: DisplayInfo[]) => void): void;
+    /**
+     * @description Requests the information for all attached display devices.
+     * @export
+     * @since Chrome 59
+     * @param {DisplayInfoFlags} [flags] Options affecting how the information is returned.
+     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+     */
+    export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
+
+    /**
+     * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @since Chrome 53
+     * @export
+     * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
+     */
+    export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
+
+    /**
+     * @description Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @export
+     * @param {string} id The display's unique identifier.
+     * @param {DisplayPropertiesInfo} info The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|.
+     * @param {() => void} [callback] Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+     */
+    export function setDisplayProperties(id: string, info: DisplayPropertiesInfo, callback?: () => void): void;
+
+    /**
+     * @description Set the layout for all displays. Any display not included will use the default layout. If a layout would overlap or be otherwise invalid it will be adjusted to a valid layout. After layout is resolved, an onDisplayChanged event will be triggered. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @since Chrome 53
+     * @export
+     * @param {DisplayLayout[]} layouts The layout information, required for all displays except the primary display.
+     * @param {() => void} callback Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+     */
+    export function setDisplayLayout(layouts: DisplayLayout[], callback?: () => void): void;
+
+    /**
+     * @description Enables/disables the unified desktop feature. Note that this simply enables the feature, but will not change the actual desktop mode. (That is, if the desktop is in mirror mode, it will stay in mirror mode) NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * @since Chrome 46
+     * @export
+     * @param {boolean} enabled True if unified desktop should be enabled.
+     */
+    export function enableUnifiedDesktop(enabled: boolean): void;
+    /**
+     * @description Starts overscan calibration for a display. This will show an overlay on the screen indicating the current overscan insets. If overscan calibration for display |id| is in progress this will reset calibration.
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function overscanCalibrationStart(id: string): void;
+    /**
+     * @description Adjusts the current overscan insets for a display. Typically this should etiher move the display along an axis (e.g. left+right have the same value) or scale it along an axis (e.g. top+bottom have opposite values). Each Adjust call is cumulative with previous calls since Start.
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     * @param {Insets} delta The amount to change the overscan insets.
+     */
+    export function overscanCalibrationAdjust(id: string, delta: Insets): void;
+
+    /**
+     * @description Resets the overscan insets for a display to the last saved value (i.e before Start was called).
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function overscanCalibrationReset(id: string): void;
+
+    /**
+     * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
+     * @since Chrome 53
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function overscanCalibrationComplete(id: string): void;
+
+    /**
+     * @description Displays the native touch calibration UX for the display with |id| as display id. This will show an overlay on the screen with required instructions on how to proceed. The callback will be invoked in case of successful calibraion only. If the calibration fails, this will throw an error.
+     * @since Chrome 57
+     * @export
+     * @param {string} id The display's unique identifier.
+     * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
+     */
+    export function showNativeTouchCalibration(id: string, callback: (success: boolean) => void): void;
+
+    /**
+     * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.
+     * @since Chrome 57
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function startCustomTouchCalibration(id: string): void;
+
+    /**
+     * @description Sets the touch calibration pairs for a display. These |pairs| would be used to calibrate the touch screen for display with |id| called in startCustomTouchCalibration(). Always call |startCustomTouchCalibration| before calling this method. If another touch calibration is already in progress this will throw an error.
+     * @since Chrome 57
+     * @export
+     * @param {TouchCalibrationPairs} pairs The pairs of point used to calibrate the display.
+     * @param {Bounds} bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
+     */
+    export function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
+    /**
+     * @description Resets the touch calibration for the display and brings it back to its default state by clearing any touch calibration data associated with the display.
+     * @since Chrome 57
+     * @export
+     * @param {string} id The display's unique identifier.
+     */
+    export function clearTouchCalibration(id: string): void;
+
+    /**
+     * @description Fired when anything changes to the display configuration.
+     * @export
+     */
+    export var onDisplayChanged: DisplayChangedEvent;
 }
 
 ////////////////////
@@ -4010,28 +4010,28 @@ declare namespace chrome.system.display {
  * @since Chrome 32.
  */
 declare namespace chrome.system.memory {
-  export interface MemoryInfo {
-    /** The total amount of physical memory capacity, in bytes. */
-    capacity: number;
-    /** The amount of available capacity, in bytes. */
-    availableCapacity: number;
-  }
+    export interface MemoryInfo {
+        /** The total amount of physical memory capacity, in bytes. */
+        capacity: number;
+        /** The amount of available capacity, in bytes. */
+        availableCapacity: number;
+    }
 
-  /** Get physical memory information. */
-  export function getInfo(callback: (info: MemoryInfo) => void): void;
+    /** Get physical memory information. */
+    export function getInfo(callback: (info: MemoryInfo) => void): void;
 }
 
 ////////////////////
 // System - Network
 ////////////////////
 declare namespace chrome.system.network {
-  export interface NetworkInterface {
-    name: string;
-    address: string;
-    prefixLength: number;
-  }
+    export interface NetworkInterface {
+        name: string;
+        address: string;
+        prefixLength: number;
+    }
 
-  export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
+    export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
 }
 
 ////////////////////
@@ -4043,51 +4043,51 @@ declare namespace chrome.system.network {
  * @since Chrome 30.
  */
 declare namespace chrome.system.storage {
-  export interface StorageUnitInfo {
-    /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
-    id: string;
-    /** The name of the storage unit. */
-    name: string;
+    export interface StorageUnitInfo {
+        /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
+        id: string;
+        /** The name of the storage unit. */
+        name: string;
+        /**
+         * The media type of the storage unit.
+         * fixed: The storage has fixed media, e.g. hard disk or SSD.
+         * removable: The storage is removable, e.g. USB flash drive.
+         * unknown: The storage type is unknown.
+         */
+        type: string;
+        /** The total amount of the storage space, in bytes. */
+        capacity: number;
+    }
+
+    export interface StorageCapacityInfo {
+        /** A copied |id| of getAvailableCapacity function parameter |id|. */
+        id: string;
+        /** The available capacity of the storage device, in bytes. */
+        availableCapacity: number;
+    }
+
+    export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
+
+    export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
+
+    /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
+    export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
     /**
-     * The media type of the storage unit.
-     * fixed: The storage has fixed media, e.g. hard disk or SSD.
-     * removable: The storage is removable, e.g. USB flash drive.
-     * unknown: The storage type is unknown.
+     * Ejects a removable storage device.
+     * @param callback
+     * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
      */
-    type: string;
-    /** The total amount of the storage space, in bytes. */
-    capacity: number;
-  }
+    export function ejectDevice(id: string, callback: (result: string) => void): void;
+    /**
+     * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
+     * @since Dev channel only.
+     */
+    export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
 
-  export interface StorageCapacityInfo {
-    /** A copied |id| of getAvailableCapacity function parameter |id|. */
-    id: string;
-    /** The available capacity of the storage device, in bytes. */
-    availableCapacity: number;
-  }
-
-  export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
-
-  export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
-
-  /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
-  export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
-  /**
-   * Ejects a removable storage device.
-   * @param callback
-   * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
-   */
-  export function ejectDevice(id: string, callback: (result: string) => void): void;
-  /**
-   * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
-   * @since Dev channel only.
-   */
-  export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
-
-  /** Fired when a new removable storage is attached to the system. */
-  export var onAttached: SystemStorageAttachedEvent;
-  /** Fired when a removable storage is detached from the system. */
-  export var onDetached: SystemStorageDetachedEvent;
+    /** Fired when a new removable storage is attached to the system. */
+    export var onAttached: SystemStorageAttachedEvent;
+    /** Fired when a removable storage is detached from the system. */
+    export var onDetached: SystemStorageDetachedEvent;
 }
 
 ////////////////////
@@ -4099,110 +4099,110 @@ declare namespace chrome.system.storage {
  * @since Chrome 14.
  */
 declare namespace chrome.tts {
-  /** An event from the TTS engine to communicate the status of an utterance. */
-  export interface TtsEvent {
-    /** Optional. The index of the current character in the utterance. */
-    charIndex?: number;
-    /** Optional. The error description, if the event type is 'error'. */
-    errorMessage?: string;
-    /**
-     * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
-     * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
-     */
-    type: string;
-  }
+    /** An event from the TTS engine to communicate the status of an utterance. */
+    export interface TtsEvent {
+        /** Optional. The index of the current character in the utterance. */
+        charIndex?: number;
+        /** Optional. The error description, if the event type is 'error'. */
+        errorMessage?: string;
+        /**
+         * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
+         * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
+         */
+        type: string;
+    }
 
-  /** A description of a voice available for speech synthesis. */
-  export interface TtsVoice {
-    /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-    lang?: string;
-    /**
-     * Optional. This voice's gender.
-     * One of: "male", or "female"
-     */
-    gender?: string;
-    /** Optional. The name of the voice. */
-    voiceName?: string;
-    /** The ID of the extension providing this voice. */
-    extensionsId?: string;
-    /** All of the callback event types that this voice is capable of sending. */
-    eventTypes?: string[];
-    /**
-     * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
-     * @since Chrome 33.
-     */
-    remote?: boolean;
-  }
+    /** A description of a voice available for speech synthesis. */
+    export interface TtsVoice {
+        /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+        lang?: string;
+        /**
+         * Optional. This voice's gender.
+         * One of: "male", or "female"
+         */
+        gender?: string;
+        /** Optional. The name of the voice. */
+        voiceName?: string;
+        /** The ID of the extension providing this voice. */
+        extensionsId?: string;
+        /** All of the callback event types that this voice is capable of sending. */
+        eventTypes?: string[];
+        /**
+         * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
+         * @since Chrome 33.
+         */
+        remote?: boolean;
+    }
 
-  export interface SpeakOptions {
-    /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-    volume?: number;
-    /**
-     * Optional.
-     * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
-     */
-    enqueue?: boolean;
-    /**
-     * Optional.
-     * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
-     */
-    rate?: number;
-    /**
-     * Optional. This function is called with events that occur in the process of speaking the utterance.
-     * @param event The update event from the text-to-speech engine indicating the status of this utterance.
-     */
-    onEvent?: (event: TtsEvent) => void;
-    /**
-     * Optional.
-     * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
-     */
-    pitch?: number;
-    /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-    lang?: string;
-    /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
-    voiceName?: string;
-    /** Optional. The extension ID of the speech engine to use, if known. */
-    extensionId?: string;
-    /**
-     * Optional. Gender of voice for synthesized speech.
-     * One of: "male", or "female"
-     */
-    gender?: string;
-    /** Optional. The TTS event types the voice must support. */
-    requiredEventTypes?: string[];
-    /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
-    desiredEventTypes?: string[];
-  }
+    export interface SpeakOptions {
+        /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+        volume?: number;
+        /**
+         * Optional.
+         * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
+         */
+        enqueue?: boolean;
+        /**
+         * Optional.
+         * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
+         */
+        rate?: number;
+        /**
+         * Optional. This function is called with events that occur in the process of speaking the utterance.
+         * @param event The update event from the text-to-speech engine indicating the status of this utterance.
+         */
+        onEvent?: (event: TtsEvent) => void;
+        /**
+         * Optional.
+         * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
+         */
+        pitch?: number;
+        /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+        lang?: string;
+        /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
+        voiceName?: string;
+        /** Optional. The extension ID of the speech engine to use, if known. */
+        extensionId?: string;
+        /**
+         * Optional. Gender of voice for synthesized speech.
+         * One of: "male", or "female"
+         */
+        gender?: string;
+        /** Optional. The TTS event types the voice must support. */
+        requiredEventTypes?: string[];
+        /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
+        desiredEventTypes?: string[];
+    }
 
-  /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
-  export function isSpeaking(callback?: (speaking: boolean) => void): void;
-  /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
-  export function stop(): void;
-  /** Gets an array of all available voices. */
-  export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
-  /**
-   * Speaks text using a text-to-speech engine.
-   * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-   * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-   */
-  export function speak(utterance: string, callback?: Function): void;
-  /**
-   * Speaks text using a text-to-speech engine.
-   * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-   * @param options Optional. The speech options.
-   * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-   */
-  export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
-  /**
-   * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
-   * @since Chrome 29.
-   */
-  export function pause(): void;
-  /**
-   * If speech was paused, resumes speaking where it left off.
-   * @since Chrome 29.
-   */
-  export function resume(): void;
+    /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
+    export function isSpeaking(callback?: (speaking: boolean) => void): void;
+    /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
+    export function stop(): void;
+    /** Gets an array of all available voices. */
+    export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
+    /**
+     * Speaks text using a text-to-speech engine.
+     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+     */
+    export function speak(utterance: string, callback?: Function): void;
+    /**
+     * Speaks text using a text-to-speech engine.
+     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+     * @param options Optional. The speech options.
+     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+     */
+    export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
+    /**
+     * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
+     * @since Chrome 29.
+     */
+    export function pause(): void;
+    /**
+     * If speech was paused, resumes speaking where it left off.
+     * @since Chrome 29.
+     */
+    export function resume(): void;
 }
 
 ////////////////////
@@ -4213,200 +4213,200 @@ declare namespace chrome.tts {
  * @since Chrome 13.
  */
 declare namespace chrome.types {
-  export interface ChromeSettingClearDetails {
-    /**
-     * Optional.
-     * The scope of the ChromeSetting. One of
-     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-     */
-    scope?: string;
-  }
+    export interface ChromeSettingClearDetails {
+        /**
+         * Optional.
+         * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
 
-  export interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
-    /**
-     * The value of the setting.
-     * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-     */
-    value: any;
-    /**
-     * Optional.
-     * The scope of the ChromeSetting. One of
-     * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-     * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-     * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-     * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-     */
-    scope?: string;
-  }
+    export interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+        /**
+         * The value of the setting.
+         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+         */
+        value: any;
+        /**
+         * Optional.
+         * The scope of the ChromeSetting. One of
+         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+         */
+        scope?: string;
+    }
 
-  export interface ChromeSettingGetDetails {
-    /** Optional. Whether to return the value that applies to the incognito session (default false). */
-    incognito?: boolean;
-  }
+    export interface ChromeSettingGetDetails {
+        /** Optional. Whether to return the value that applies to the incognito session (default false). */
+        incognito?: boolean;
+    }
 
-  /**
-   * @param details Details of the currently effective value.
-   */
-  export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+    /**
+     * @param details Details of the currently effective value.
+     */
+    export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
-  export interface ChromeSettingGetResultDetails {
-    /**
-     * One of
-     * • not_controllable: cannot be controlled by any extension
-     * • controlled_by_other_extensions: controlled by extensions with higher precedence
-     * • controllable_by_this_extension: can be controlled by this extension
-     * • controlled_by_this_extension: controlled by this extension
-     */
-    levelOfControl: string;
-    /** The value of the setting. */
-    value: any;
-    /**
-     * Optional.
-     * Whether the effective value is specific to the incognito session.
-     * This property will only be present if the incognito property in the details parameter of get() was true.
-     */
-    incognitoSpecific?: boolean;
-  }
+    export interface ChromeSettingGetResultDetails {
+        /**
+         * One of
+         * • not_controllable: cannot be controlled by any extension
+         * • controlled_by_other_extensions: controlled by extensions with higher precedence
+         * • controllable_by_this_extension: can be controlled by this extension
+         * • controlled_by_this_extension: controlled by this extension
+         */
+        levelOfControl: string;
+        /** The value of the setting. */
+        value: any;
+        /**
+         * Optional.
+         * Whether the effective value is specific to the incognito session.
+         * This property will only be present if the incognito property in the details parameter of get() was true.
+         */
+        incognitoSpecific?: boolean;
+    }
 
-  export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
+    export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
 
-  /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
-  export interface ChromeSetting {
-    /**
-     * Sets the value of a setting.
-     * @param details Which setting to change.
-     * @param callback Optional. Called at the completion of the set operation.
-     */
-    set(details: ChromeSettingSetDetails, callback?: Function): void;
-    /**
-     * Gets the value of a setting.
-     * @param details Which setting to consider.
-     */
-    get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
-    /**
-     * Clears the setting, restoring any default value.
-     * @param details Which setting to clear.
-     * @param callback Optional. Called at the completion of the clear operation.
-     */
-    clear(details: ChromeSettingClearDetails, callback?: Function): void;
-    /** Fired after the setting changes. */
-    onChange: ChromeSettingChangedEvent;
-  }
+    /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
+    export interface ChromeSetting {
+        /**
+         * Sets the value of a setting.
+         * @param details Which setting to change.
+         * @param callback Optional. Called at the completion of the set operation.
+         */
+        set(details: ChromeSettingSetDetails, callback?: Function): void;
+        /**
+         * Gets the value of a setting.
+         * @param details Which setting to consider.
+         */
+        get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
+        /**
+         * Clears the setting, restoring any default value.
+         * @param details Which setting to clear.
+         * @param callback Optional. Called at the completion of the clear operation.
+         */
+        clear(details: ChromeSettingClearDetails, callback?: Function): void;
+        /** Fired after the setting changes. */
+        onChange: ChromeSettingChangedEvent;
+    }
 }
 
 ////////////////////
 // USB
 ////////////////////
 declare namespace chrome.usb {
-  type Direction = 'in' | 'out';
+    type Direction = 'in' | 'out';
 
-  export interface Device {
-    device: number,
-    vendorId: number,
-    productId: number,
-    productName: string,
-    manufacturerName: string,
-    serialNumber: string
-  }
+    export interface Device {
+        device: number,
+        vendorId: number,
+        productId: number,
+        productName: string,
+        manufacturerName: string,
+        serialNumber: string
+    }
 
-  export interface ConnectionHandle {
-    handle: number,
-    vendorId: number,
-    productId: number
-  }
+    export interface ConnectionHandle {
+        handle: number,
+        vendorId: number,
+        productId: number
+    }
 
-  export interface EndpointDescriptor {
-    address: number,
-    type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
-    direction: Direction,
-    maximumPacketSize: number,
-    synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
-    usage?: 'data' | 'feedback' | 'explicitFeedback',
-    pollingInterval?: number,
-    extra_data: ArrayBuffer
-  }
+    export interface EndpointDescriptor {
+        address: number,
+        type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
+        direction: Direction,
+        maximumPacketSize: number,
+        synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
+        usage?: 'data' | 'feedback' | 'explicitFeedback',
+        pollingInterval?: number,
+        extra_data: ArrayBuffer
+    }
 
-  export interface InterfaceDescriptor {
-    interfaceNumber: number,
-    alternateSetting: number,
-    interfaceClass: number,
-    interfaceSubclass: number,
-    interfaceProtocol: number,
-    description?: string,
-    endpoints: EndpointDescriptor[],
-    extra_data: ArrayBuffer
-  }
+    export interface InterfaceDescriptor {
+        interfaceNumber: number,
+        alternateSetting: number,
+        interfaceClass: number,
+        interfaceSubclass: number,
+        interfaceProtocol: number,
+        description?: string,
+        endpoints: EndpointDescriptor[],
+        extra_data: ArrayBuffer
+    }
 
-  export interface ConfigDescriptor {
-    active: boolean,
-    configurationValue: number,
-    description?: string,
-    selfPowered: boolean,
-    remoteWakeup: boolean,
-    maxPower: number,
-    interfaces: InterfaceDescriptor[],
-    extra_data: ArrayBuffer
-  }
+    export interface ConfigDescriptor {
+        active: boolean,
+        configurationValue: number,
+        description?: string,
+        selfPowered: boolean,
+        remoteWakeup: boolean,
+        maxPower: number,
+        interfaces: InterfaceDescriptor[],
+        extra_data: ArrayBuffer
+    }
 
-  export interface GenericTransferInfo {
-    direction: Direction,
-    endpoint: number,
-    length?: number,
-    data?: ArrayBuffer,
-    timeout?: number
-  }
+    export interface GenericTransferInfo {
+        direction: Direction,
+        endpoint: number,
+        length?: number,
+        data?: ArrayBuffer,
+        timeout?: number
+    }
 
-  export interface TransferResultInfo {
-    resultCode: number,
-    data?: ArrayBuffer
-  }
+    export interface TransferResultInfo {
+        resultCode: number,
+        data?: ArrayBuffer
+    }
 
-  export interface DeviceFilter {
-    vendorId?: number,
-    productId?: number,
-    interfaceClass?: number,
-    interfaceSubclass?: number,
-    interfaceProtocol?: number
-  }
+    export interface DeviceFilter {
+        vendorId?: number,
+        productId?: number,
+        interfaceClass?: number,
+        interfaceSubclass?: number,
+        interfaceProtocol?: number
+    }
 
-  export interface TransferInfo {
-    direction: Direction;
-    recipient: 'device' | 'interface' | 'endpoint' | 'other';
-    requestType: 'standard' | 'class' | 'vendor' | 'reserved';
-    request: number;
-    value: number;
-    index: number;
-    length?: number;
-    data?: ArrayBuffer;
-    timeout?: number;
-  }
+    export interface TransferInfo {
+        direction: Direction;
+        recipient: 'device' | 'interface' | 'endpoint' | 'other';
+        requestType: 'standard' | 'class' | 'vendor' | 'reserved';
+        request: number;
+        value: number;
+        index: number;
+        length?: number;
+        data?: ArrayBuffer;
+        timeout?: number;
+    }
 
-  export interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
+    export interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
 
-  export var onDeviceAdded: DeviceEvent;
-  export var onDeviceRemoved: DeviceEvent;
+    export var onDeviceAdded: DeviceEvent;
+    export var onDeviceRemoved: DeviceEvent;
 
-  export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-  export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-  export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
-  export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
-  export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
-  export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
-  export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
-  export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
-  export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
-  export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
-  export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-  export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-  export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
-  export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
-  export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-  export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-  export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
-  export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
+    export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+    export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+    export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
+    export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
+    export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
+    export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
+    export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
+    export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
+    export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
+    export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
+    export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+    export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+    export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
+    export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
+    export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+    export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+    export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
+    export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
 }
 
 
@@ -4420,81 +4420,81 @@ declare namespace chrome.usb {
  * @since Chrome 43.
  */
 declare namespace chrome.vpnProvider {
-  export interface VpnSessionParameters {
-    /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
-    address: string;
-    /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
-    broadcastAddress?: string;
-    /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
-    mtu?: string;
+    export interface VpnSessionParameters {
+        /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
+        address: string;
+        /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
+        broadcastAddress?: string;
+        /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
+        mtu?: string;
+        /**
+         * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+         */
+        exclusionList: string[];
+        /**
+         * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+         */
+        inclusionList: string[];
+        /** Optional. A list of search domains. (default: no search domain) */
+        domainSearch?: string[];
+        /** A list of IPs for the DNS servers. */
+        dnsServer: string[];
+    }
+
+    export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
+
+    export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
+
+    export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
+
+    export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
+
+    export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
+
     /**
-     * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+     * Creates a new VPN configuration that persists across multiple login sessions of the user.
+     * @param name The name of the VPN configuration.
+     * @param callback Called when the configuration is created or if there is an error.
+     * Parameter id: A unique ID for the created configuration, empty string on failure.
      */
-    exclusionList: string[];
+    export function createConfig(name: string, callback: (id: string) => void): void;
     /**
-     * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+     * Destroys a VPN configuration created by the extension.
+     * @param id ID of the VPN configuration to destroy.
+     * @param callback Optional. Called when the configuration is destroyed or if there is an error.
      */
-    inclusionList: string[];
-    /** Optional. A list of search domains. (default: no search domain) */
-    domainSearch?: string[];
-    /** A list of IPs for the DNS servers. */
-    dnsServer: string[];
-  }
+    export function destroyConfig(id: string, callback?: Function): void;
+    /**
+     * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+     * @param parameters The parameters for the VPN session.
+     * @param callback Called when the parameters are set or if there is an error.
+     */
+    export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
+    /**
+     * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
+     * @param data The IP packet to be sent to the platform.
+     * @param callback Optional. Called when the packet is sent or if there is an error.
+     */
+    export function sendPacket(data: ArrayBuffer, callback?: Function): void;
+    /**
+     * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
+     * @param state The VPN session state of the VPN client.
+     * connected: VPN connection was successful.
+     * failure: VPN connection failed.
+     * @param callback Optional. Called when the notification is complete or if there is an error.
+     */
+    export function notifyConnectionStateChanged(state: string, callback?: Function): void;
 
-  export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
-
-  export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
-
-  export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
-
-  export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
-
-  export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
-
-  /**
-   * Creates a new VPN configuration that persists across multiple login sessions of the user.
-   * @param name The name of the VPN configuration.
-   * @param callback Called when the configuration is created or if there is an error.
-   * Parameter id: A unique ID for the created configuration, empty string on failure.
-   */
-  export function createConfig(name: string, callback: (id: string) => void): void;
-  /**
-   * Destroys a VPN configuration created by the extension.
-   * @param id ID of the VPN configuration to destroy.
-   * @param callback Optional. Called when the configuration is destroyed or if there is an error.
-   */
-  export function destroyConfig(id: string, callback?: Function): void;
-  /**
-   * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
-   * @param parameters The parameters for the VPN session.
-   * @param callback Called when the parameters are set or if there is an error.
-   */
-  export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
-  /**
-   * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
-   * @param data The IP packet to be sent to the platform.
-   * @param callback Optional. Called when the packet is sent or if there is an error.
-   */
-  export function sendPacket(data: ArrayBuffer, callback?: Function): void;
-  /**
-   * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
-   * @param state The VPN session state of the VPN client.
-   * connected: VPN connection was successful.
-   * failure: VPN connection failed.
-   * @param callback Optional. Called when the notification is complete or if there is an error.
-   */
-  export function notifyConnectionStateChanged(state: string, callback?: Function): void;
-
-  /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
-  export var onPlatformMessage: VpnPlatformMessageEvent;
-  /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
-  export var onPacketReceived: VpnPacketReceptionEvent;
-  /** Triggered when a configuration created by the extension is removed by the platform. */
-  export var onConfigRemoved: VpnConfigRemovalEvent;
-  /** Triggered when a configuration is created by the platform for the extension. */
-  export var onConfigCreated: VpnConfigCreationEvent;
-  /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
-  export var onUIEvent: VpnUiEvent;
+    /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
+    export var onPlatformMessage: VpnPlatformMessageEvent;
+    /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
+    export var onPacketReceived: VpnPacketReceptionEvent;
+    /** Triggered when a configuration created by the extension is removed by the platform. */
+    export var onConfigRemoved: VpnConfigRemovalEvent;
+    /** Triggered when a configuration is created by the platform for the extension. */
+    export var onConfigCreated: VpnConfigCreationEvent;
+    /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
+    export var onUIEvent: VpnUiEvent;
 }
 
 ////////////////////
@@ -4507,28 +4507,28 @@ declare namespace chrome.vpnProvider {
  * @since Chrome 43.
  */
 declare namespace chrome.wallpaper {
-  export interface WallpaperDetails {
-    /** Optional. The jpeg or png encoded wallpaper image. */
-    data?: any;
-    /** Optional. The URL of the wallpaper to be set. */
-    url?: string;
-    /**
-     * The supported wallpaper layouts.
-     * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
-     */
-    layout: string;
-    /** The file name of the saved wallpaper. */
-    filename: string;
-    /** Optional. True if a 128x60 thumbnail should be generated. */
-    thumbnail?: boolean;
-  }
+    export interface WallpaperDetails {
+        /** Optional. The jpeg or png encoded wallpaper image. */
+        data?: any;
+        /** Optional. The URL of the wallpaper to be set. */
+        url?: string;
+        /**
+         * The supported wallpaper layouts.
+         * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
+         */
+        layout: string;
+        /** The file name of the saved wallpaper. */
+        filename: string;
+        /** Optional. True if a 128x60 thumbnail should be generated. */
+        thumbnail?: boolean;
+    }
 
-  /**
-   * Sets wallpaper to the image at url or wallpaperData with the specified layout
-   * @param callback
-   * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
-   */
-  export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
+    /**
+     * Sets wallpaper to the image at url or wallpaperData with the specified layout
+     * @param callback
+     * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
+     */
+    export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
 }
 
 
@@ -4539,1222 +4539,1237 @@ declare namespace chrome.wallpaper {
  * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
  */
 declare namespace chrome.webview {
-  /** Options that determine what data should be cleared by `clearData`. */
-  export interface ClearDataOptions {
-    /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
-    since?: number;
-  }
-  export interface WindowEvent extends chrome.events.Event<() => void> { }
-
-  export interface ConsoleEvent extends Event {
-    /**
-     * @description The severity level of the log message. Ranges from 0 to 4.
-     * @type {number}
-     * @memberof ConsoleEvent
-     */
-    level: number;
-    /**
-     * @description The logged message contents.
-     * @type {string}
-     * @memberof ConsoleEvent
-     */
-    message: string;
-    /**
-     * @description The line number of the message source.
-     * @type {number}
-     * @memberof ConsoleEvent
-     */
-    line: number;
-    /**
-     * @description A string identifying the resource which logged the message.
-     * @type {string}
-     * @memberof ConsoleEvent
-     */
-    sourceId: string;
-  }
-
-  export interface ExitEvent extends Event {
-    /**
-     * @description Chrome's internal ID of the process that exited.
-     * @type {number}
-     * @memberof ExitEvent
-     */
-    processID: number;
-    /**
-     * @description String indicating the reason for the exit.
-     * @type {string}
-     * @memberof ExitEvent
-     */
-    reason: 'normal' | 'abnormal' | 'crash' | 'kill';
-  }
-
-  /** Description of a declarative rule for handling events. */
-  export interface Rule {
-    /** Optional priority of this rule. Defaults to 100.  */
-    priority?: number;
-    /** List of conditions that can trigger the actions. */
-    conditions: any[];
-    /** Optional. Optional identifier that allows referencing this rule.  */
-    id?: string;
-    /** List of actions that are triggered if one of the condtions is fulfilled. */
-    actions: any[];
-    /**
-     * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
-     * @since Chrome 28
-     * @type {string[]}
-     * @memberof Rule
-     */
-    tags?: string[];
-  }
-
-  /**
-   * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-   * @export
-   * @interface InjectDetails
-   */
-  export interface InjectDetails {
-    /**
-     * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
-     * @type {string}
-     * @memberof InjectDetails
-     */
-    code?: string,
-    /**
-     * @description JavaScript or CSS file to inject.
-     * @type {string}
-     * @memberof InjectDetails
-     */
-    file?: string
-  }
-
-  export interface WebViewElementEventMap extends ElementEventMap {
-    'message': ConsoleEvent,
-    'exit': ExitEvent
-  }
-
-  /**
-   * @description
-   * @export
-   * @interface HTMLWebViewElement
-   * @extends {Element}
-   */
-  export interface HTMLWebViewElement extends Element {
-    executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
-    src: string;
-    contentWindow: Window;
-    addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
-  }
-
-  /**Options that determine what data should be cleared by clearData. */
-  export interface ClearDataOptions {
-
-    /**
-    * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
-     */
-    since?: number;
-  }
-  /**A set of data types. Missing properties are interpreted as false. */
-  export interface ClearDataTypeSet {
-
-    /**
-    * @description Websites' appcaches.
-     */
-    appcache?: boolean
-
-    /**
-    * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
-     */
-    cache?: boolean
-
-    /**
-    * @description The partition's cookies.
-     */
-    cookies?: boolean
-
-    /**
-    * @description The partition's session cookies.
-     */
-    sessionCookies?: boolean
-
-    /**
-    * @description The partition's persistent cookies.
-     */
-    persistentCookies?: boolean
-
-    /**
-    * @description Websites' filesystems.
-     */
-    fileSystems?: boolean
-
-    /**
-    * @description Websites' IndexedDB data.
-     */
-    indexedDB?: boolean
-
-    /**
-    * @description Websites' local storage data.
-     */
-    localStorage?: boolean
-
-    /**
-    * @description Websites' WebSQL data.
-     */
-    webSQL?: boolean
-  }
-  /**
-  * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
-  * Enum values:
-  * "all"
-  * "page"
-  * "frame"
-  * "selection"
-  * "link"
-  * "editable"
-  * "image"
-  * "video"
-  * "audio" */
-  export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
-  /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
-  export interface InjectDetails {
-
-    /**
-    * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
-     */
-    code?: string
-
-    /**
-    * @description JavaScript or CSS file to inject.
-     */
-    file?: string
-  }
-  /**The type of injection item: code or a set of files. */
-  export interface InjectionItems {
-
-    /**
-    * @description JavaScript code or CSS to be injected into matching pages.
-     */
-    code?: string
-
-    /**
-    * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
-     */
-    files?: any[]
-  }
-  /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
-  export interface ContentScriptDetails {
-
-    /**
-    * @description The name of the content script to inject.
-     */
-    name: string
-
-    /**
-    * @description Specifies which pages this content script will be injected into.
-     */
-    matches: any[]
-
-    /**
-    * @description Excludes pages that this content script would otherwise be injected into.
-     */
-    exclude_matches?: any[]
-
-    /**
-    * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
-     */
-    match_about_blank?: boolean
-
-    /**
-    * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
-     */
-    css?: InjectionItems
-
-    /**
-    * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
-     */
-    js?: InjectionItems
-
-    /**
-    * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-     */
-    run_at?: chrome.extensionTypes.RunAt;
-
-    /**
-    * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
-     */
-    all_frames?: boolean;
-
-    /**
-    * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
-     */
-    include_globs?: string[];
-
-    /**
-    * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
-     */
-    exclude_globs?: string[];
-  }
-  /**@todo Add documentation */
-  export interface ContextMenuCreateProperties {
-
-    /**
-    * @description The type of menu item. Defaults to 'normal' if not specified.
-     */
-    type?: chrome.contextMenus.ItemType
-
-    /**
-    * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-     */
-    id?: string
-
-    /**
-    * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
-     */
-    title?: string
-
-    /**
-    * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-     */
-    checked?: boolean
-
-    /**
-    * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
-     */
-    contexts?: any[]
-
-    /**
-    * @description A function that will be called back when the menu item is clicked.
-    * @param {any} [object Object]
-     */
-    onclick?: (info: any) => void
-
-    /**
-    * @description The ID of a parent menu item; this makes the item a child of a previously added item.
-     */
-    parentId?: number | string
-
-    /**
-    * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-     */
-    documentUrlPatterns?: any[]
-
-    /**
-    * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-     */
-    targetUrlPatterns?: any[]
-
-    /**
-    * @description Whether this context menu item is enabled or disabled. Defaults to true.
-     */
-    enabled?: boolean
-  }
-  /**@todo Add documentation */
-  export interface ContextMenuUpdateProperties {
-
-    /**
-    * @description The type of menu item.
-     */
-    type?: chrome.webview.ContextType;
-
-    /**
-    * @description The text to be displayed in the item
-     */
-    title?: string
-
-    /**
-    * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-     */
-    checked?: boolean
-
-    /**
-    * @description List of contexts this menu item will appear in.
-     */
-    contexts?: any[]
-
-    /**
-    * @description A function that will be called back when the menu item is clicked.
-    * @param {any} [object Object]
-     */
-    onclick?: (info: any) => void
-
-    /**
-    * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
-     */
-    parentId?: number | string
-
-    /**
-    * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-     */
-    documentUrlPatterns?: any[]
-
-    /**
-    * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-     */
-    targetUrlPatterns?: any[]
-
-    /**
-    * @description Whether this context menu item is enabled or disabled.
-     */
-    enabled?: boolean
-  }
-  export interface ContextMenus {
-
-    /**
-    * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-    * @param {object} createProperties The properties used to create the item
-    * @param {any} [object Object]
-     */
-    create(createProperties: object, callback?: () => void): void;
-
-    /**
-    * @description Updates a previously created context menu item.
-    * @param {any} id The ID of the item to update.
-    * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
-    * @param {any} [object Object]
-     */
-    update(id: number | string, updateProperties: object, callback?: () => void): void;
-
-    /**
-    * @description Removes a context menu item.
-    * @param {any} menuItemId The ID of the context menu item to remove.
-    * @param {any} [object Object]
-     */
-    remove(menuItemId: number | string, callback?: () => void): void;
-
-    /**
-    * @description Removes all context menu items added to this webview.
-    * @param {any} [object Object]
-     */
-    removeAll(callback?: () => void): void;
-
-
-    /**
-    * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
-     */
-    onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
-
-  }
-  export interface IOnShowEvent {
-    /**
-     * @description Call this to prevent showing the context menu.
-     * @memberof IOnShowEvent
-     */
-    preventDefault: () => void;
-  }
-  export interface ContentWindow {
-
-    /**
-    * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
-    * @param {any} message Message object to send to the guest.
-    * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
-     */
-    postMessage(message: any, targetOrigin: string): void;
-
-  }
-  export interface DialogController {
-
-    /**
-    * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
-    * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
-     */
-    ok(response?: string): void;
-
-    /**
-    * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
-     */
-    cancel(): void;
-
-  }
-  /**Contains all of the results of the find request. */
-  export interface FindCallbackResults {
-
-    /**
-    * @description The number of times searchText was matched on the page.
-     */
-    numberOfMatches: number
-
-    /**
-    * @description The ordinal number of the current match.
-     */
-    activeMatchOrdinal: number
-
-    /**
-    * @description Describes a rectangle around the active match in screen coordinates.
-     */
-    selectionRect: SelectionRect
-
-    /**
-    * @description Indicates whether this find request was canceled.
-     */
-    canceled: boolean
-  }
-  /**Options for the find request. */
-  export interface FindOptions {
-
-    /**
-    * @description Flag to find matches in reverse order. The default value is false.
-     */
-    backward?: boolean
-
-    /**
-    * @description Flag to match with case-sensitivity. The default value is false.
-     */
-    matchCase?: boolean
-  }
-  export interface NewWindow {
-
-    /**
-    * @description Attach the requested target page to an existing webview element.
-    * @param {object} webview The webview element to which the target page should be attached.
-     */
-    attach(webview: object): void;
-
-    /**
-    * @description Cancel the new window request.
-     */
-    discard(): void;
-
-  }
-  export interface MediaPermissionRequest {
-
-    /**
-    * @description Allow the permission request.
-     */
-    allow(): void;
-
-    /**
-    * @description Deny the permission request. This is the default behavior if allow is not called.
-     */
-    deny(): void;
-
-  }
-  export interface GeolocationPermissionRequest {
-
-    /**
-    * @description Allow the permission request.
-     */
-    allow(): void;
-
-    /**
-    * @description Deny the permission request. This is the default behavior if allow is not called.
-     */
-    deny(): void;
-
-  }
-  export interface PointerLockPermissionRequest {
-
-    /**
-    * @description Allow the permission request.
-     */
-    allow(): void;
-
-    /**
-    * @description Deny the permission request. This is the default behavior if allow is not called.
-     */
-    deny(): void;
-
-  }
-  export interface DownloadPermissionRequest {
-
-    /**
-    * @description Allow the permission request.
-     */
-    allow(): void;
-
-    /**
-    * @description Deny the permission request. This is the default behavior if allow is not called.
-     */
-    deny(): void;
-
-  }
-  export interface FileSystemPermissionRequest {
-
-    /**
-    * @description Allow the permission request.
-     */
-    allow(): void;
-
-    /**
-    * @description Deny the permission request.
-     */
-    deny(): void;
-
-  }
-  export interface FullscreenPermissionRequest {
-
-    /**
-    * @description Allow the permission request.
-     */
-    allow(): void;
-
-    /**
-    * @description Deny the permission request.
-     */
-    deny(): void;
-
-  }
-  export interface LoadPluginPermissionRequest {
-
-    /**
-    * @description Allow the permission request. This is the default behavior if deny is not called..
-     */
-    allow(): void;
-
-    /**
-    * @description Deny the permission request.
-     */
-    deny(): void;
-
-  }
-  /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
-  export interface SelectionRect {
-
-    /**
-    * @description Distance from the left edge of the screen to the left edge of the rectangle.
-     */
-    left: number
-
-    /**
-    * @description Distance from the top edge of the screen to the top edge of the rectangle.
-     */
-    top: number
-
-    /**
-    * @description Width of the rectangle.
-     */
-    width: number
-
-    /**
-    * @description Height of the rectangle.
-     */
-    height: number
-  }
-  /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
-    function(details) { return {cancel: true}; },
-    {urls: ["*://www.evil.com/*"]},
-    ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
-    conditions: [
-      new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
-    ],
-    actions: [ new chrome.webViewRequest.CancelRequest() ]
-  };
-  myWebview.request.onRequest.addRules([rule]);</pre> */
-  export interface WebRequestEventInterface {
-  }
-  /**
-  * Defines the how zooming is handled in the webview.
-  * Enum values:
-  * "per-origin"
-  * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor.
-  * "per-view"
-  * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
-  * "disabled"
-  * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
-  export type ZoomMode = "per-origin" | "per-view" | "disabled";
-
-  /**
-  * @description Queries audio state.
-  * @param {any} [object Object]
-   */
-  export function getAudioState(callback: (audible: boolean) => void): void;
-
-  /**
-  * @description Sets audio mute state of the webview.
-  * @param {boolean} mute Mute audio value
-   */
-  export function setAudioMuted(mute: boolean): void;
-
-  /**
-  * @description Queries whether audio is muted.
-  * @param {any} [object Object]
-   */
-  export function isAudioMuted(callback: (muted: boolean) => void): void;
-
-  /**
-   * @description Captures the visible region of the webview.
-   * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
-   */
-  export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
-  /**
-   * @description Captures the visible region of the webview.
-   * @param {*} options
-   * @param {(dataUrl: string) => void} callback
-   */
-  export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
-
-  /**
-  * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
-    {
-      name: 'myRule',
-      matches: ['http://www.foo.com/*'],
-      css: { files: ['mystyles.css'] },
-      js: { files: ['jquery.js', 'myscript.js'] },
-      run_at: 'document_start'
-    },
-    {
-      name: 'anotherRule',
-      matches: ['http://www.bar.com/*'],
-      js: { code: "document.body.style.backgroundColor = 'red';" },
-      run_at: 'document_end'
-    }]);
-   ...
-
-  // Navigates webview.
-  webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
-      name: 'rule',
-      matches: ['http://www.foo.com/*'],
-      js: { files: ['scriptA.js'] },
-      run_at: 'document_start'}]);
-
-  // Do something.
-  webview.src = 'http://www.foo.com/*';
-   ...
-  // Overwrite 'rule' defined before.
-  webview.addContentScripts([{
-      name: 'rule',
-      matches: ['http://www.bar.com/*'],
-      js: { files: ['scriptB.js'] },
-      run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
-  * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
-   */
-  export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
-
-  /**
-  * @description Navigates backward one history entry if possible. Equivalent to go(-1).
-  * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
-   */
-  export function back(callback?: (success: boolean) => void): void;
-
-  /**
-  * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-   */
-  export function canGoBack(): void;
-
-  /**
-  * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-   */
-  export function canGoForward(): void;
-
-  /**
-  * @description <p>Clears browsing data for the webview partition.</p>
-  * @param {any} options Options determining which data to clear.
-  * @param {any} types The types of data to be cleared.
-  * @param {any} [object Object]
-   */
-  export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
-
-  /**
-  * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
-  * @param {any} details Details of the script to run.
-  * @param {any} [object Object]
-   */
-  export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
-
-  /**
-  * @description Initiates a find-in-page request.
-  * @param {string} searchText The string to find in the page.
-  * @param {any} options Options for the find request.
-  * @param {any} [object Object]
-   */
-  export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
-
-  /**
-  * @description Navigates forward one history entry if possible. Equivalent to go(1).
-  * @param {any} [object Object]
-   */
-  export function forward(callback?: (success: boolean) => void): void;
-
-  /**
-  * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
-   */
-  export function getProcessId(): void;
-
-  /**
-  * @description Returns the user agent string used by the webview for guest page requests.
-   */
-  export function getUserAgent(): void;
-
-  /**
-  * @description Gets the current zoom factor.
-  * @param {any} [object Object]
-   */
-  export function getZoom(callback: (zoomFactor: number) => void): void;
-
-  /**
-  * @description Gets the current zoom mode.
-  * @param {any} [object Object]
-   */
-  export function getZoomMode(callback: (ZoomMode: any) => void): void;
-
-  /**
-  * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
-  * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
-  * @param {any} [object Object]
-   */
-  export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
-
-  /**
-  * @description Injects CSS into the guest page.
-  * @param {any} details Details of the CSS to insert.
-  * @param {any} [object Object]
-   */
-  export function insertCSS(details: InjectDetails, callback?: () => void): void;
-
-  /**
-  * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
-   */
-  export function isUserAgentOverridden(): void;
-
-  /**
-  * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
-   */
-  export function print(): void;
-
-  /**
-  * @description Reloads the current top-level page.
-   */
-  export function reload(): void;
-
-  /**
-  * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
-  * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
-   */
-  export function removeContentScripts(scriptNameList?: any[]): void;
-
-  /**
-  * @description Override the user agent string used by the webview for guest page requests.
-  * @param {string} userAgent The user agent string to use.
-   */
-  export function setUserAgentOverride(userAgent: string): void;
-
-  /**
-  * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
-  * @param {number} zoomFactor The new zoom factor.
-  * @param {any} [object Object]
-   */
-  export function setZoom(zoomFactor: number, callback?: () => void): void;
-
-  /**
-  * @description Sets the zoom mode of the webview.
-  * @param {any} ZoomMode Defines how zooming is handled in the webview.
-  * @param {any} [object Object]
-   */
-  export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
-
-  /**
-  * @description Stops loading the current webview navigation if in progress.
-   */
-  export function stop(): void;
-
-  /**
-  * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
-  * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
-   */
-  export function stopFinding(action?: string): void;
-
-  /**
-  * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
-  * @param {string} dataUrl The data URL to load.
-  * @param {string} baseUrl The base URL that will be used for relative links.
-  * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
-   */
-  export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
-
-  /**
-  * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
-   */
-  export function terminate(): void;
-
-  /**
-  * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
-    webview.src = 'about:blank';
-  });</pre>
-   */
-
-  export function close(event: chrome.events.Event<GenericEvent>): void;
-
-  /**
-  * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
-    console.log('Guest page logged a message: ', e.message);
-  });</pre>
-  * @param {any} [object Object]
-   */
-
-  export var consolemessage: chrome.events.Event<IConsolemessage>;
-
-  /**
-  * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
-    webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
-  });</pre>
-   */
-
-  export var contentload: (event: chrome.events.Event<GenericEvent>) => void;
-
-  /**
-  * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
-  * @param {any} [object Object]
-   */
-
-  export var dialog: chrome.events.Event<IDialog>;
-
-  /**
-  * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
-    if (e.reason === 'crash') {
-      webview.src = 'data:text/plain,Goodbye, world!';
+    /** Options that determine what data should be cleared by `clearData`. */
+    export interface ClearDataOptions {
+        /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
+        since?: number;
     }
-  });</pre>
-  * @param {any} [object Object]
-   */
+    export interface WindowEvent extends chrome.events.Event<() => void> { }
 
-  export var exit: chrome.events.Event<IExit>;
-
-  /**
-  * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
-  * @param {any} [object Object]
-   */
-
-  export var findupdate: chrome.events.Event<IFindupdate>;
-
-  /**
-  * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
-  * @param {any} [object Object]
-   */
-
-  export var loadabort: chrome.events.Event<ILoadabort>;
-
-  /**
-  * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
-  * @param {any} [object Object]
-   */
-
-  export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
-
-  /**
-  * @description Fired when a top-level load request has redirected to a different URL.
-  * @param {any} [object Object]
-   */
-
-  export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
-
-  /**
-  * @description Fired when a load has begun.
-  * @param {any} [object Object]
-   */
-
-  export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
-
-  /**
-  * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
-   */
-
-  export function loadstop(event: chrome.events.Event<GenericEvent>): void;
-
-  /**
-  * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
-    var newWebview = document.createElement('webview');
-    document.body.appendChild(newWebview);
-    e.window.attach(newWebview);
-  });</pre>
-  * @param {any} [object Object]
-   */
-
-  export var newwindow: chrome.events.Event<INewwindow>;
-
-  /**
-  * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
-    if (e.permission === 'media') {
-      e.request.allow();
+    export interface ConsoleEvent extends Event {
+        /**
+         * @description The severity level of the log message. Ranges from 0 to 4.
+         * @type {number}
+         * @memberof ConsoleEvent
+         */
+        level: number;
+        /**
+         * @description The logged message contents.
+         * @type {string}
+         * @memberof ConsoleEvent
+         */
+        message: string;
+        /**
+         * @description The line number of the message source.
+         * @type {number}
+         * @memberof ConsoleEvent
+         */
+        line: number;
+        /**
+         * @description A string identifying the resource which logged the message.
+         * @type {string}
+         * @memberof ConsoleEvent
+         */
+        sourceId: string;
     }
-  });</pre>
-  * @param {any} [object Object]
-   */
 
-  export var permissionrequest: chrome.events.Event<IPermissionrequest>;
+    export interface ExitEvent extends Event {
+        /**
+         * @description Chrome's internal ID of the process that exited.
+         * @type {number}
+         * @memberof ExitEvent
+         */
+        processID: number;
+        /**
+         * @description String indicating the reason for the exit.
+         * @type {string}
+         * @memberof ExitEvent
+         */
+        reason: 'normal' | 'abnormal' | 'crash' | 'kill';
+    }
 
-  /**
-  * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
-  webview.addEventListener('unresponsive', function() {
-    webview.style.opacity = '0.5';
-  });
-  webview.addEventListener('responsive', function() {
-    webview.style.opacity = '1';
-  });</pre>
-  * @param {any} [object Object]
-   */
-
-  export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
-
-  /**
-  * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
-  * @param {any} [object Object]
-   */
-
-  export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
-
-  /**
-  * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
-  * @param {any} [object Object]
-   */
-
-  export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
-
-  /**
-  * @description Fired when the page's zoom changes.
-  * @param {any} [object Object]
-   */
-
-  export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
-  /**IConsolemessage (Auto generated interface) */
-  export interface IConsolemessage {
+    /** Description of a declarative rule for handling events. */
+    export interface Rule {
+        /** Optional priority of this rule. Defaults to 100.  */
+        priority?: number;
+        /** List of conditions that can trigger the actions. */
+        conditions: any[];
+        /** Optional. Optional identifier that allows referencing this rule.  */
+        id?: string;
+        /** List of actions that are triggered if one of the condtions is fulfilled. */
+        actions: any[];
+        /**
+         * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
+         * @since Chrome 28
+         * @type {string[]}
+         * @memberof Rule
+         */
+        tags?: string[];
+    }
 
     /**
-    * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
+     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+     * @export
+     * @interface InjectDetails
      */
-    level: number
+    export interface InjectDetails {
+        /**
+         * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        code?: string,
+        /**
+         * @description JavaScript or CSS file to inject.
+         * @type {string}
+         * @memberof InjectDetails
+         */
+        file?: string
+    }
+
+    export interface WebViewElementEventMap {
+        'close': GenericEvent,
+        'consolemessage': IConsolemessage,
+        'contentload': GenericEvent,
+        'dialog': IDialog,
+        'exit': IExit,
+        'findupdate': IFindupdate,
+        'loadabort': ILoadabort,
+        'loadcommit': ILoadcommit,
+        'loadredirect': ILoadredirect,
+        'loadstart': ILoadstart,
+        'loadstop': GenericEvent,
+        'newwindow': INewwindow,
+        'permissionrequest': IPermissionrequest,
+        'responsive': IResponsive,
+        'sizechanged': ISizechanged,
+        'unresponsive': IUnresponsive,
+        'zoomchange': IZoomchange,
+    }
+
 
     /**
-    * @description The logged message contents.
+     * @description
+     * @export
+     * @interface HTMLWebViewElement
+     * @extends {Element}
      */
-    message: string
+    export interface HTMLWebViewElement extends Element {
+        executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
+        src: string;
+        contentWindow: Window;
+        addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
+    }
+
+    /**Options that determine what data should be cleared by clearData. */
+    export interface ClearDataOptions {
+
+        /**
+        * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
+         */
+        since?: number;
+    }
+    /**A set of data types. Missing properties are interpreted as false. */
+    export interface ClearDataTypeSet {
+
+        /**
+        * @description Websites' appcaches.
+         */
+        appcache?: boolean
+
+        /**
+        * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
+         */
+        cache?: boolean
+
+        /**
+        * @description The partition's cookies.
+         */
+        cookies?: boolean
+
+        /**
+        * @description The partition's session cookies.
+         */
+        sessionCookies?: boolean
+
+        /**
+        * @description The partition's persistent cookies.
+         */
+        persistentCookies?: boolean
+
+        /**
+        * @description Websites' filesystems.
+         */
+        fileSystems?: boolean
+
+        /**
+        * @description Websites' IndexedDB data.
+         */
+        indexedDB?: boolean
+
+        /**
+        * @description Websites' local storage data.
+         */
+        localStorage?: boolean
+
+        /**
+        * @description Websites' WebSQL data.
+         */
+        webSQL?: boolean
+    }
+    /**
+    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
+    * Enum values:
+    * "all"
+    * "page"
+    * "frame"
+    * "selection"
+    * "link"
+    * "editable"
+    * "image"
+    * "video"
+    * "audio" */
+    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
+    /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
+    export interface InjectDetails {
+
+        /**
+        * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
+         */
+        code?: string
+
+        /**
+        * @description JavaScript or CSS file to inject.
+         */
+        file?: string
+    }
+    /**The type of injection item: code or a set of files. */
+    export interface InjectionItems {
+
+        /**
+        * @description JavaScript code or CSS to be injected into matching pages.
+         */
+        code?: string
+
+        /**
+        * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
+         */
+        files?: any[]
+    }
+    /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
+    export interface ContentScriptDetails {
+
+        /**
+        * @description The name of the content script to inject.
+         */
+        name: string
+
+        /**
+        * @description Specifies which pages this content script will be injected into.
+         */
+        matches: any[]
+
+        /**
+        * @description Excludes pages that this content script would otherwise be injected into.
+         */
+        exclude_matches?: any[]
+
+        /**
+        * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
+         */
+        match_about_blank?: boolean
+
+        /**
+        * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
+         */
+        css?: InjectionItems
+
+        /**
+        * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
+         */
+        js?: InjectionItems
+
+        /**
+        * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+         */
+        run_at?: chrome.extensionTypes.RunAt;
+
+        /**
+        * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
+         */
+        all_frames?: boolean;
+
+        /**
+        * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
+         */
+        include_globs?: string[];
+
+        /**
+        * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
+         */
+        exclude_globs?: string[];
+    }
+    /**@todo Add documentation */
+    export interface ContextMenuCreateProperties {
+
+        /**
+        * @description The type of menu item. Defaults to 'normal' if not specified.
+         */
+        type?: chrome.contextMenus.ItemType
+
+        /**
+        * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+         */
+        id?: string
+
+        /**
+        * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
+         */
+        title?: string
+
+        /**
+        * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+         */
+        checked?: boolean
+
+        /**
+        * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
+         */
+        contexts?: any[]
+
+        /**
+        * @description A function that will be called back when the menu item is clicked.
+        * @param {any} [object Object]
+         */
+        onclick?: (info: any) => void
+
+        /**
+        * @description The ID of a parent menu item; this makes the item a child of a previously added item.
+         */
+        parentId?: number | string
+
+        /**
+        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+         */
+        documentUrlPatterns?: any[]
+
+        /**
+        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+         */
+        targetUrlPatterns?: any[]
+
+        /**
+        * @description Whether this context menu item is enabled or disabled. Defaults to true.
+         */
+        enabled?: boolean
+    }
+    /**@todo Add documentation */
+    export interface ContextMenuUpdateProperties {
+
+        /**
+        * @description The type of menu item.
+         */
+        type?: chrome.webview.ContextType;
+
+        /**
+        * @description The text to be displayed in the item
+         */
+        title?: string
+
+        /**
+        * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+         */
+        checked?: boolean
+
+        /**
+        * @description List of contexts this menu item will appear in.
+         */
+        contexts?: any[]
+
+        /**
+        * @description A function that will be called back when the menu item is clicked.
+        * @param {any} [object Object]
+         */
+        onclick?: (info: any) => void
+
+        /**
+        * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
+         */
+        parentId?: number | string
+
+        /**
+        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+         */
+        documentUrlPatterns?: any[]
+
+        /**
+        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+         */
+        targetUrlPatterns?: any[]
+
+        /**
+        * @description Whether this context menu item is enabled or disabled.
+         */
+        enabled?: boolean
+    }
+    export interface ContextMenus {
+
+        /**
+        * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+        * @param {object} createProperties The properties used to create the item
+        * @param {any} [object Object]
+         */
+        create(createProperties: object, callback?: () => void): void;
+
+        /**
+        * @description Updates a previously created context menu item.
+        * @param {any} id The ID of the item to update.
+        * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
+        * @param {any} [object Object]
+         */
+        update(id: number | string, updateProperties: object, callback?: () => void): void;
+
+        /**
+        * @description Removes a context menu item.
+        * @param {any} menuItemId The ID of the context menu item to remove.
+        * @param {any} [object Object]
+         */
+        remove(menuItemId: number | string, callback?: () => void): void;
+
+        /**
+        * @description Removes all context menu items added to this webview.
+        * @param {any} [object Object]
+         */
+        removeAll(callback?: () => void): void;
+
+
+        /**
+        * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
+         */
+        onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
+
+    }
+    export interface IOnShowEvent {
+        /**
+         * @description Call this to prevent showing the context menu.
+         * @memberof IOnShowEvent
+         */
+        preventDefault: () => void;
+    }
+    export interface ContentWindow {
+
+        /**
+        * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
+        * @param {any} message Message object to send to the guest.
+        * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
+         */
+        postMessage(message: any, targetOrigin: string): void;
+
+    }
+    export interface DialogController {
+
+        /**
+        * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
+        * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
+         */
+        ok(response?: string): void;
+
+        /**
+        * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
+         */
+        cancel(): void;
+
+    }
+    /**Contains all of the results of the find request. */
+    export interface FindCallbackResults {
+
+        /**
+        * @description The number of times searchText was matched on the page.
+         */
+        numberOfMatches: number
+
+        /**
+        * @description The ordinal number of the current match.
+         */
+        activeMatchOrdinal: number
+
+        /**
+        * @description Describes a rectangle around the active match in screen coordinates.
+         */
+        selectionRect: SelectionRect
+
+        /**
+        * @description Indicates whether this find request was canceled.
+         */
+        canceled: boolean
+    }
+    /**Options for the find request. */
+    export interface FindOptions {
+
+        /**
+        * @description Flag to find matches in reverse order. The default value is false.
+         */
+        backward?: boolean
+
+        /**
+        * @description Flag to match with case-sensitivity. The default value is false.
+         */
+        matchCase?: boolean
+    }
+    export interface NewWindow {
+
+        /**
+        * @description Attach the requested target page to an existing webview element.
+        * @param {object} webview The webview element to which the target page should be attached.
+         */
+        attach(webview: object): void;
+
+        /**
+        * @description Cancel the new window request.
+         */
+        discard(): void;
+
+    }
+    export interface MediaPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface GeolocationPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface PointerLockPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface DownloadPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request. This is the default behavior if allow is not called.
+         */
+        deny(): void;
+
+    }
+    export interface FileSystemPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request.
+         */
+        deny(): void;
+
+    }
+    export interface FullscreenPermissionRequest {
+
+        /**
+        * @description Allow the permission request.
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request.
+         */
+        deny(): void;
+
+    }
+    export interface LoadPluginPermissionRequest {
+
+        /**
+        * @description Allow the permission request. This is the default behavior if deny is not called..
+         */
+        allow(): void;
+
+        /**
+        * @description Deny the permission request.
+         */
+        deny(): void;
+
+    }
+    /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
+    export interface SelectionRect {
+
+        /**
+        * @description Distance from the left edge of the screen to the left edge of the rectangle.
+         */
+        left: number
+
+        /**
+        * @description Distance from the top edge of the screen to the top edge of the rectangle.
+         */
+        top: number
+
+        /**
+        * @description Width of the rectangle.
+         */
+        width: number
+
+        /**
+        * @description Height of the rectangle.
+         */
+        height: number
+    }
+    /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
+      function(details) { return {cancel: true}; },
+      {urls: ["*://www.evil.com/*"]},
+      ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
+      conditions: [
+        new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
+      ],
+      actions: [ new chrome.webViewRequest.CancelRequest() ]
+    };
+    myWebview.request.onRequest.addRules([rule]);</pre> */
+    export interface WebRequestEventInterface {
+    }
+    /**
+    * Defines the how zooming is handled in the webview.
+    * Enum values:
+    * "per-origin"
+    * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor.
+    * "per-view"
+    * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
+    * "disabled"
+    * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
+    export type ZoomMode = "per-origin" | "per-view" | "disabled";
 
     /**
-    * @description The line number of the message source.
+    * @description Queries audio state.
+    * @param {any} [object Object]
      */
-    line: number
+    export function getAudioState(callback: (audible: boolean) => void): void;
 
     /**
-    * @description A string identifying the resource which logged the message.
+    * @description Sets audio mute state of the webview.
+    * @param {boolean} mute Mute audio value
      */
-    sourceId: string
-  }
-  /**IDialog (Auto generated interface) */
-  export interface IDialog {
+    export function setAudioMuted(mute: boolean): void;
 
     /**
-    * @description The type of modal dialog requested by the guest.
+    * @description Queries whether audio is muted.
+    * @param {any} [object Object]
      */
-    messageType: 'alert' | 'confirm' | 'prompt'
+    export function isAudioMuted(callback: (muted: boolean) => void): void;
 
     /**
-    * @description The text the guest attempted to display in the modal dialog.
+     * @description Captures the visible region of the webview.
+     * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
      */
-    messageText: string
+    export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
+    /**
+     * @description Captures the visible region of the webview.
+     * @param {*} options
+     * @param {(dataUrl: string) => void} callback
+     */
+    export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
 
     /**
-    * @description An interface that can be used to respond to the guest's modal request.
+    * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
+      {
+        name: 'myRule',
+        matches: ['http://www.foo.com/*'],
+        css: { files: ['mystyles.css'] },
+        js: { files: ['jquery.js', 'myscript.js'] },
+        run_at: 'document_start'
+      },
+      {
+        name: 'anotherRule',
+        matches: ['http://www.bar.com/*'],
+        js: { code: "document.body.style.backgroundColor = 'red';" },
+        run_at: 'document_end'
+      }]);
+     ...
+
+    // Navigates webview.
+    webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
+        name: 'rule',
+        matches: ['http://www.foo.com/*'],
+        js: { files: ['scriptA.js'] },
+        run_at: 'document_start'}]);
+
+    // Do something.
+    webview.src = 'http://www.foo.com/*';
+     ...
+    // Overwrite 'rule' defined before.
+    webview.addContentScripts([{
+        name: 'rule',
+        matches: ['http://www.bar.com/*'],
+        js: { files: ['scriptB.js'] },
+        run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
+    * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
      */
-    dialog: DialogController
-  }
-  /**IExit (Auto generated interface) */
-  export interface IExit {
+    export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
 
     /**
-    * @description Chrome's internal ID of the process that exited.
+    * @description Navigates backward one history entry if possible. Equivalent to go(-1).
+    * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
      */
-    processID: number
+    export function back(callback?: (success: boolean) => void): void;
 
     /**
-    * @description String indicating the reason for the exit.
+    * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
      */
-    reason: 'normal' | 'abnormal' | 'crash' | 'kill'
-  }
-  /**IFindupdate (Auto generated interface) */
-  export interface IFindupdate {
+    export function canGoBack(): void;
 
     /**
-    * @description The string that is being searched for in the page.
+    * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
      */
-    searchText: string
+    export function canGoForward(): void;
 
     /**
-    * @description The number of matches found for searchText on the page so far.
+    * @description <p>Clears browsing data for the webview partition.</p>
+    * @param {any} options Options determining which data to clear.
+    * @param {any} types The types of data to be cleared.
+    * @param {any} [object Object]
      */
-    numberOfMatches: number
+    export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
 
     /**
-    * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
+    * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
+    * @param {any} details Details of the script to run.
+    * @param {any} [object Object]
      */
-    activeMatchOrdinal: number
+    export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
 
     /**
-    * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
+    * @description Initiates a find-in-page request.
+    * @param {string} searchText The string to find in the page.
+    * @param {any} options Options for the find request.
+    * @param {any} [object Object]
      */
-    selectionRect: SelectionRect
+    export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
 
     /**
-    * @description Indicates whether the find request was canceled.
+    * @description Navigates forward one history entry if possible. Equivalent to go(1).
+    * @param {any} [object Object]
      */
-    canceled: boolean
+    export function forward(callback?: (success: boolean) => void): void;
 
     /**
-    * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
+    * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
      */
-    finalUpdate: string
-  }
-  /**ILoadabort (Auto generated interface) */
-  export interface ILoadabort {
+    export function getProcessId(): void;
 
     /**
-    * @description Requested URL.
+    * @description Returns the user agent string used by the webview for guest page requests.
      */
-    url: string
+    export function getUserAgent(): void;
 
     /**
-    * @description Whether the load was top-level or in a subframe.
+    * @description Gets the current zoom factor.
+    * @param {any} [object Object]
      */
-    isTopLevel: boolean
+    export function getZoom(callback: (zoomFactor: number) => void): void;
 
     /**
-    * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
+    * @description Gets the current zoom mode.
+    * @param {any} [object Object]
      */
-    code: number
+    export function getZoomMode(callback: (ZoomMode: any) => void): void;
 
     /**
-    * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
+    * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
+    * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
+    * @param {any} [object Object]
      */
-    reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
-  }
-  /**ILoadcommit (Auto generated interface) */
-  export interface ILoadcommit {
+    export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
 
     /**
-    * @description The URL that committed.
+    * @description Injects CSS into the guest page.
+    * @param {any} details Details of the CSS to insert.
+    * @param {any} [object Object]
      */
-    url: string
+    export function insertCSS(details: InjectDetails, callback?: () => void): void;
 
     /**
-    * @description Whether the load is top-level or in a subframe.
+    * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
      */
-    isTopLevel: boolean
-  }
-  /**ILoadredirect (Auto generated interface) */
-  export interface ILoadredirect {
+    export function isUserAgentOverridden(): void;
 
     /**
-    * @description The requested URL before the redirect.
+    * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
      */
-    oldUrl: string
+    export function print(): void;
 
     /**
-    * @description The new URL after the redirect.
+    * @description Reloads the current top-level page.
      */
-    newUrl: string
+    export function reload(): void;
 
     /**
-    * @description Whether or not the redirect happened at top-level or in a subframe.
+    * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
+    * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
      */
-    isTopLevel: boolean
-  }
-  /**ILoadstart (Auto generated interface) */
-  export interface ILoadstart {
+    export function removeContentScripts(scriptNameList?: any[]): void;
 
     /**
-    * @description Requested URL.
+    * @description Override the user agent string used by the webview for guest page requests.
+    * @param {string} userAgent The user agent string to use.
      */
-    url: string
+    export function setUserAgentOverride(userAgent: string): void;
 
     /**
-    * @description Whether the load is top-level or in a subframe.
+    * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
+    * @param {number} zoomFactor The new zoom factor.
+    * @param {any} [object Object]
      */
-    isTopLevel: boolean
-  }
-  /**INewwindow (Auto generated interface) */
-  export interface INewwindow {
+    export function setZoom(zoomFactor: number, callback?: () => void): void;
 
     /**
-    * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
+    * @description Sets the zoom mode of the webview.
+    * @param {any} ZoomMode Defines how zooming is handled in the webview.
+    * @param {any} [object Object]
      */
-    window: NewWindow
+    export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
 
     /**
-    * @description The target URL requested for the new window.
+    * @description Stops loading the current webview navigation if in progress.
      */
-    targetUrl: string
+    export function stop(): void;
 
     /**
-    * @description The initial width requested for the new window.
+    * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
+    * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
      */
-    initialWidth: number
+    export function stopFinding(action?: string): void;
 
     /**
-    * @description The initial height requested for the new window.
+    * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
+    * @param {string} dataUrl The data URL to load.
+    * @param {string} baseUrl The base URL that will be used for relative links.
+    * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
      */
-    initialHeight: number
+    export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
 
     /**
-    * @description The requested name of the new window.
+    * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
      */
-    name: string
+    export function terminate(): void;
 
     /**
-    * @description The requested disposition of the new window.
+    * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
+      webview.src = 'about:blank';
+    });</pre>
      */
-    windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
-  }
-  /**IPermissionrequest (Auto generated interface) */
-  export interface IPermissionrequest {
+
+    export function close(event: chrome.events.Event<GenericEvent>): void;
 
     /**
-    * @description The type of permission being requested.
+    * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
+      console.log('Guest page logged a message: ', e.message);
+    });</pre>
+    * @param {any} [object Object]
      */
-    permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
+
+    export var consolemessage: chrome.events.Event<IConsolemessage>;
 
     /**
-    * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
+    * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
+      webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
+    });</pre>
      */
-    request: object
-  }
-  /**IResponsive (Auto generated interface) */
-  export interface IResponsive {
+
+    export var contentload: (event: chrome.events.Event<GenericEvent>) => void;
 
     /**
-    * @description Chrome's internal ID of the process that became responsive.
+    * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
+    * @param {any} [object Object]
      */
-    processID: number
-  }
-  /**ISizechanged (Auto generated interface) */
-  export interface ISizechanged {
+
+    export var dialog: chrome.events.Event<IDialog>;
 
     /**
-    * @description Old width of embedded web content.
+    * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
+      if (e.reason === 'crash') {
+        webview.src = 'data:text/plain,Goodbye, world!';
+      }
+    });</pre>
+    * @param {any} [object Object]
      */
-    oldWidth: number
+
+    export var exit: chrome.events.Event<IExit>;
 
     /**
-    * @description Old height of embedded web content.
+    * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
+    * @param {any} [object Object]
      */
-    oldHeight: number
+
+    export var findupdate: chrome.events.Event<IFindupdate>;
 
     /**
-    * @description New width of embedded web content.
+    * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
+    * @param {any} [object Object]
      */
-    newWidth: number
+
+    export var loadabort: chrome.events.Event<ILoadabort>;
 
     /**
-    * @description New height of embedded web content.
+    * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
+    * @param {any} [object Object]
      */
-    newHeight: number
-  }
-  /**IUnresponsive (Auto generated interface) */
-  export interface IUnresponsive {
+
+    export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
 
     /**
-    * @description Chrome's internal ID of the process that has become unresponsive.
+    * @description Fired when a top-level load request has redirected to a different URL.
+    * @param {any} [object Object]
      */
-    processID: number
-  }
-  /**IZoomchange (Auto generated interface) */
-  export interface IZoomchange {
+
+    export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
 
     /**
-    * @description The page's previous zoom factor.
+    * @description Fired when a load has begun.
+    * @param {any} [object Object]
      */
-    oldZoomFactor: number
+
+    export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
 
     /**
-    * @description The new zoom factor that the page was zoomed to.
+    * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
      */
-    newZoomFactor: number
-  }
+
+    export function loadstop(event: chrome.events.Event<GenericEvent>): void;
+
+    /**
+    * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
+      var newWebview = document.createElement('webview');
+      document.body.appendChild(newWebview);
+      e.window.attach(newWebview);
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var newwindow: chrome.events.Event<INewwindow>;
+
+    /**
+    * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
+      if (e.permission === 'media') {
+        e.request.allow();
+      }
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var permissionrequest: chrome.events.Event<IPermissionrequest>;
+
+    /**
+    * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
+    webview.addEventListener('unresponsive', function() {
+      webview.style.opacity = '0.5';
+    });
+    webview.addEventListener('responsive', function() {
+      webview.style.opacity = '1';
+    });</pre>
+    * @param {any} [object Object]
+     */
+
+    export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
+
+    /**
+    * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
+    * @param {any} [object Object]
+     */
+
+    export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
+
+    /**
+    * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
+    * @param {any} [object Object]
+     */
+
+    export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
+
+    /**
+    * @description Fired when the page's zoom changes.
+    * @param {any} [object Object]
+     */
+
+    export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
+    /**IConsolemessage (Auto generated interface) */
+    export interface IConsolemessage {
+
+        /**
+        * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
+         */
+        level: number
+
+        /**
+        * @description The logged message contents.
+         */
+        message: string
+
+        /**
+        * @description The line number of the message source.
+         */
+        line: number
+
+        /**
+        * @description A string identifying the resource which logged the message.
+         */
+        sourceId: string
+    }
+    /**IDialog (Auto generated interface) */
+    export interface IDialog {
+
+        /**
+        * @description The type of modal dialog requested by the guest.
+         */
+        messageType: 'alert' | 'confirm' | 'prompt'
+
+        /**
+        * @description The text the guest attempted to display in the modal dialog.
+         */
+        messageText: string
+
+        /**
+        * @description An interface that can be used to respond to the guest's modal request.
+         */
+        dialog: DialogController
+    }
+    /**IExit (Auto generated interface) */
+    export interface IExit {
+
+        /**
+        * @description Chrome's internal ID of the process that exited.
+         */
+        processID: number
+
+        /**
+        * @description String indicating the reason for the exit.
+         */
+        reason: 'normal' | 'abnormal' | 'crash' | 'kill'
+    }
+    /**IFindupdate (Auto generated interface) */
+    export interface IFindupdate {
+
+        /**
+        * @description The string that is being searched for in the page.
+         */
+        searchText: string
+
+        /**
+        * @description The number of matches found for searchText on the page so far.
+         */
+        numberOfMatches: number
+
+        /**
+        * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
+         */
+        activeMatchOrdinal: number
+
+        /**
+        * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
+         */
+        selectionRect: SelectionRect
+
+        /**
+        * @description Indicates whether the find request was canceled.
+         */
+        canceled: boolean
+
+        /**
+        * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
+         */
+        finalUpdate: string
+    }
+    /**ILoadabort (Auto generated interface) */
+    export interface ILoadabort {
+
+        /**
+        * @description Requested URL.
+         */
+        url: string
+
+        /**
+        * @description Whether the load was top-level or in a subframe.
+         */
+        isTopLevel: boolean
+
+        /**
+        * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
+         */
+        code: number
+
+        /**
+        * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
+         */
+        reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
+    }
+    /**ILoadcommit (Auto generated interface) */
+    export interface ILoadcommit {
+
+        /**
+        * @description The URL that committed.
+         */
+        url: string
+
+        /**
+        * @description Whether the load is top-level or in a subframe.
+         */
+        isTopLevel: boolean
+    }
+    /**ILoadredirect (Auto generated interface) */
+    export interface ILoadredirect {
+
+        /**
+        * @description The requested URL before the redirect.
+         */
+        oldUrl: string
+
+        /**
+        * @description The new URL after the redirect.
+         */
+        newUrl: string
+
+        /**
+        * @description Whether or not the redirect happened at top-level or in a subframe.
+         */
+        isTopLevel: boolean
+    }
+    /**ILoadstart (Auto generated interface) */
+    export interface ILoadstart {
+
+        /**
+        * @description Requested URL.
+         */
+        url: string
+
+        /**
+        * @description Whether the load is top-level or in a subframe.
+         */
+        isTopLevel: boolean
+    }
+    /**INewwindow (Auto generated interface) */
+    export interface INewwindow {
+
+        /**
+        * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
+         */
+        window: NewWindow
+
+        /**
+        * @description The target URL requested for the new window.
+         */
+        targetUrl: string
+
+        /**
+        * @description The initial width requested for the new window.
+         */
+        initialWidth: number
+
+        /**
+        * @description The initial height requested for the new window.
+         */
+        initialHeight: number
+
+        /**
+        * @description The requested name of the new window.
+         */
+        name: string
+
+        /**
+        * @description The requested disposition of the new window.
+         */
+        windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
+    }
+    /**IPermissionrequest (Auto generated interface) */
+    export interface IPermissionrequest {
+
+        /**
+        * @description The type of permission being requested.
+         */
+        permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
+
+        /**
+        * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
+         */
+        request: object
+    }
+    /**IResponsive (Auto generated interface) */
+    export interface IResponsive {
+
+        /**
+        * @description Chrome's internal ID of the process that became responsive.
+         */
+        processID: number
+    }
+    /**ISizechanged (Auto generated interface) */
+    export interface ISizechanged {
+
+        /**
+        * @description Old width of embedded web content.
+         */
+        oldWidth: number
+
+        /**
+        * @description Old height of embedded web content.
+         */
+        oldHeight: number
+
+        /**
+        * @description New width of embedded web content.
+         */
+        newWidth: number
+
+        /**
+        * @description New height of embedded web content.
+         */
+        newHeight: number
+    }
+    /**IUnresponsive (Auto generated interface) */
+    export interface IUnresponsive {
+
+        /**
+        * @description Chrome's internal ID of the process that has become unresponsive.
+         */
+        processID: number
+    }
+    /**IZoomchange (Auto generated interface) */
+    export interface IZoomchange {
+
+        /**
+        * @description The page's previous zoom factor.
+         */
+        oldZoomFactor: number
+
+        /**
+        * @description The new zoom factor that the page was zoomed to.
+         */
+        newZoomFactor: number
+    }
 
 }

From dd5fb06f5ad73a8ffdecd7bb6c442fcb6c4e349d Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Wed, 23 May 2018 08:45:12 -0400
Subject: [PATCH 0614/1124] [cesium] add module support

---
 types/cesium/index.d.ts                 |  3 ++
 types/cesium/test/cesium-module.test.ts | 50 +++++++++++++++++++++++++
 types/cesium/tsconfig.json              |  3 +-
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 types/cesium/test/cesium-module.test.ts

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 08bc2706d7..8e2f929c83 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -6,6 +6,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+export = Cesium;
+export as namespace Cesium;
+
 declare namespace Cesium {
     type RenderState = any;
 
diff --git a/types/cesium/test/cesium-module.test.ts b/types/cesium/test/cesium-module.test.ts
new file mode 100644
index 0000000000..726daf7df2
--- /dev/null
+++ b/types/cesium/test/cesium-module.test.ts
@@ -0,0 +1,50 @@
+import * as Cesium from 'cesium';
+
+Cesium.buildModuleUrl.setBaseUrl('/assets/cesium/');
+
+const viewer = new Cesium.Viewer('#cesium', {
+    sceneMode: Cesium.SceneMode.COLUMBUS_VIEW,
+    imageryProvider: new Cesium.IonImageryProvider({ assetId: 3845 }),
+    baseLayerPicker: false,
+    geocoder: false,
+});
+
+const midnight = Cesium.JulianDate.fromDate(new Date(2018, 5, 14));
+const prop = new Cesium.SampledPositionProperty();
+
+const pos = Cesium.Cartesian3.fromDegrees(1, 2, 3);
+const time = Cesium.JulianDate.addSeconds(midnight, 12345, new Cesium.JulianDate());
+prop.addSample(time, pos);
+viewer.entities.add(new Cesium.Entity({
+    position: pos,
+    point: new Cesium.PointGraphics({
+        color: Cesium.Color.fromCssColorString('#123123'),
+        pixelSize: 2
+    })
+}));
+
+const objStart = Cesium.JulianDate.addSeconds(midnight, 12340, new Cesium.JulianDate());
+const objStop = Cesium.JulianDate.addSeconds(midnight, 12350, new Cesium.JulianDate());
+
+const entity = new Cesium.Entity({
+    name: 'TEST',
+    availability: new Cesium.TimeIntervalCollection([
+        new Cesium.TimeInterval({
+            start: objStart,
+            stop: objStop
+        })
+    ]),
+    position: prop,
+    orientation: new Cesium.VelocityOrientationProperty(prop),
+    path: new Cesium.PathGraphics({
+        resolution: 5,
+        width: 3,
+        material: new Cesium.ColorMaterialProperty(Cesium.Color.fromCssColorString('#223344')),
+        leadTime: 0
+    }),
+    model: new Cesium.ModelGraphics({
+        uri: 'http://assets.agi.com/models/rv1.gltf',
+        minimumPixelSize: 48
+    })
+});
+viewer.entities.add(entity);
diff --git a/types/cesium/tsconfig.json b/types/cesium/tsconfig.json
index e8c231d442..e82d8ca16a 100644
--- a/types/cesium/tsconfig.json
+++ b/types/cesium/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
-        "test/cesium-global.test.ts"
+        "test/cesium-global.test.ts",
+        "test/cesium-module.test.ts"
     ]
 }

From bbc83a9f551bbca411f81da8104f96318770e896 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 23 May 2018 15:43:54 +0200
Subject: [PATCH 0615/1124] Typings work properly when used as types

---
 types/chrome-apps/index.d.ts | 668 ++++++++++++++++++-----------------
 1 file changed, 338 insertions(+), 330 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index f4bca3ae3a..70446acbd0 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -11,7 +11,7 @@
 // Global object
 ////////////////////
 
-declare namespace chrome { }
+
 ////////////////////
 // Accessibility Features
 ////////////////////
@@ -21,13 +21,14 @@ declare namespace chrome { }
  * Permissions: "accessibilityFeatures.read"
  * Important: This API works only on Chrome OS.
  */
-declare namespace chrome.accessibilityFeatures {
-    export interface AccessibilityFeaturesGetArg {
+declare namespace  chrome {
+namespace  accessibilityFeatures {
+    interface AccessibilityFeaturesGetArg {
         /** Optional. Whether to return the value that applies to the incognito session (default false).  */
         incognito?: boolean;
     }
 
-    export interface AccessibilityFeaturesCallbackArg {
+    interface AccessibilityFeaturesCallbackArg {
         /** The value of the setting. */
         value: any;
         /**
@@ -42,7 +43,7 @@ declare namespace chrome.accessibilityFeatures {
         incognitoSpecific?: boolean;
     }
 
-    export interface AccessibilityFeaturesSetArg {
+    interface AccessibilityFeaturesSetArg {
         /**
          * The value of the setting.
          * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
@@ -59,7 +60,7 @@ declare namespace chrome.accessibilityFeatures {
         scope?: string;
     }
 
-    export interface AccessibilityFeaturesClearArg {
+    interface AccessibilityFeaturesClearArg {
         /**
          * Optional.
           * The scope of the ChromeSetting. One of
@@ -71,7 +72,7 @@ declare namespace chrome.accessibilityFeatures {
         scope?: string;
     }
 
-    export interface AccessibilityFeaturesSetting {
+    interface AccessibilityFeaturesSetting {
         /**
          * Gets the value of a setting.
          * @param details Which setting to consider.
@@ -115,8 +116,8 @@ declare namespace chrome.accessibilityFeatures {
  * Availability: Since Chrome 22.
  * Permissions:  "alarms"
  */
-declare namespace chrome.alarms {
-    export interface AlarmCreateInfo {
+namespace  alarms {
+    interface AlarmCreateInfo {
         /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
         delayInMinutes?: number;
         /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
@@ -125,7 +126,7 @@ declare namespace chrome.alarms {
         when?: number;
     }
 
-    export interface Alarm {
+    interface Alarm {
         /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
         periodInMinutes?: number;
         /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
@@ -134,7 +135,7 @@ declare namespace chrome.alarms {
         name: string;
     }
 
-    export interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
+    interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
 
     /**
      * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
@@ -198,20 +199,18 @@ declare namespace chrome.alarms {
 ////////////////////
 // App
 ////////////////////
-declare namespace chrome.app {
-    export interface AppDetails extends chrome.runtime.Manifest {
+namespace  app {
+    interface AppDetails extends chrome.runtime.Manifest {
         id: string;
     }
 
     export function getDetails(): AppDetails;
 }
 
-export type GenericEvent = Event;
-
 ////////////////////
 // App Runtime
 ////////////////////
-declare namespace chrome.app.runtime {
+namespace  app.runtime {
     type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
         'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
         'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
@@ -228,14 +227,14 @@ declare namespace chrome.app.runtime {
         actionData?: {};
     }
 
-    export interface LaunchDataItem {
+    interface LaunchDataItem {
         entry: FileEntry;
         type: string;
     }
 
-    export interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
+    interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
 
-    export interface RestartedEvent extends chrome.events.Event<() => void> { }
+    interface RestartedEvent extends chrome.events.Event<() => void> { }
 
     export var onLaunched: LaunchedEvent;
     export var onRestarted: RestartedEvent;
@@ -244,15 +243,15 @@ declare namespace chrome.app.runtime {
 ////////////////////
 // App Window
 ////////////////////
-declare namespace chrome.app.window {
-    export interface ContentBounds {
+namespace  app.window {
+    interface ContentBounds {
         left?: number;
         top?: number;
         width?: number;
         height?: number;
     }
 
-    export interface BoundsSpecification {
+    interface BoundsSpecification {
         left?: number;
         top?: number;
         width?: number;
@@ -263,7 +262,7 @@ declare namespace chrome.app.window {
         maxHeight?: number;
     }
 
-    export interface Bounds {
+    interface Bounds {
         left: number;
         top: number;
         width: number;
@@ -277,14 +276,14 @@ declare namespace chrome.app.window {
         setMinimumSize(minWidth: number, minHeight: number): void;
         setMaximumSize(maxWidth: number, maxHeight: number): void;
     }
-    export interface FrameOptions {
+    interface FrameOptions {
         type?: string;
         color?: string;
         activeColor?: string;
         inactiveColor?: string;
     }
 
-    export interface CreateWindowOptions {
+    interface CreateWindowOptions {
         id?: string;
         innerBounds?: BoundsSpecification;
         outerBounds?: BoundsSpecification;
@@ -314,7 +313,7 @@ declare namespace chrome.app.window {
         visibleOnAllWorkspaces?: boolean;
     }
 
-    export interface AppWindow {
+    interface AppWindow {
         focus: () => void;
         fullscreen: () => void;
         isFullscreen: () => boolean;
@@ -353,7 +352,7 @@ declare namespace chrome.app.window {
     export function getAll(): AppWindow[];
     export function canSetVisibleOnAllWorkspaces(): boolean;
 
-    export interface WindowEvent extends chrome.events.Event<() => void> { }
+    interface WindowEvent extends chrome.events.Event<() => void> { }
 
     export var onBoundsChanged: WindowEvent;
     export var onClosed: WindowEvent;
@@ -371,9 +370,9 @@ declare namespace chrome.app.window {
  * The chrome.audio API is provided to allow users to get information about and control the audio devices attached to the system. This API is currently only implemented for ChromeOS.
  * @since Chrome 59
  */
-declare namespace chrome.audio {
+namespace  audio {
     export type StreamType = 'INPUT' | 'OUTPUT';
-    export interface AudioDeviceInfo {
+    interface AudioDeviceInfo {
         /** The unique identifier of the audio device. */
         id: string;
         /** Stream type associated with this device. */
@@ -391,7 +390,7 @@ declare namespace chrome.audio {
         /** The stable/persisted device id string when available. */
         stableDeviceId?: string;
     }
-    export interface DeviceIdLists {
+    interface DeviceIdLists {
         /**
          * List of input devices specified by their ID.
          * To indicate input devices should be unaffected, leave this property unset.
@@ -403,7 +402,7 @@ declare namespace chrome.audio {
          */
         output?: string[];
     }
-    export interface SetDeviceProperties {
+    interface SetDeviceProperties {
         /**
          * The audio device's desired sound level. Defaults to the device's current sound level.
          * If used with audio input device, represents audio device gain.
@@ -413,7 +412,7 @@ declare namespace chrome.audio {
          */
         level?: number;
     }
-    export interface OnLevelChangedEvent {
+    interface OnLevelChangedEvent {
         /**
          * The callback parameter should be a function that looks like this:
          *   function(object event) {...};
@@ -427,7 +426,7 @@ declare namespace chrome.audio {
             level: number
         }) => void): void;
     }
-    export interface OnMuteChangedEvent {
+    interface OnMuteChangedEvent {
         /**
          * The callback parameter should be a function that looks like this:
          * function(object event) {...};
@@ -437,7 +436,7 @@ declare namespace chrome.audio {
             isMuted: boolean
         }) => void): void;
     }
-    export interface OnDeviceListChangedEvent {
+    interface OnDeviceListChangedEvent {
         /**
          * The callback parameter should be a function that looks like this:
          *   function(array of AudioDeviceInfo devices) {...};
@@ -448,7 +447,7 @@ declare namespace chrome.audio {
     /**
      * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
      */
-    export interface Filter {
+    interface Filter {
         /**
          * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
          */
@@ -496,15 +495,15 @@ declare namespace chrome.audio {
  * Manifest: "bluetooth": {...}
  * @since Chrome 37
  */
-declare namespace chrome.bluetooth {
-    export interface AdapterState {
+namespace  bluetooth {
+    interface AdapterState {
         address: string;
         name: string;
         powered: boolean;
         available: boolean;
         discovering: boolean;
     }
-    export interface Device {
+    interface Device {
         address: string;
         name?: string;
         deviceClass?: number;
@@ -534,14 +533,14 @@ declare namespace chrome.bluetooth {
         inquiryTxPower: number;
     }
 
-    export interface BluetoothEvent<T> {
+    interface BluetoothEvent<T> {
         addListener(callback: (event: T) => void);
     }
 
     /**
      * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
      */
-    export interface DeviceFilter {
+    interface DeviceFilter {
         /** Type of filter to apply to the device list. Default is all. */
         filterType?: 'all' | 'known';
         /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
@@ -580,7 +579,7 @@ declare namespace chrome.bluetooth {
  * Important: This API works only on Chrome OS.
  * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
  */
-declare namespace chrome.bluetoothLowEnergy {
+namespace  bluetoothLowEnergy {
     /**
      * NOT IMPLEMENTED YET
      * @see https://developer.chrome.com/apps/bluetoothLowEnergy
@@ -592,7 +591,7 @@ declare namespace chrome.bluetoothLowEnergy {
  * Manifest: "bluetooth": {...}
  * Important: This API works only on OS X, Windows and Chrome OS.
  */
-declare namespace chrome.bluetoothSocket {
+namespace  bluetoothSocket {
     /** NOT IMPLEMENTED YET */
 }
 
@@ -603,8 +602,8 @@ declare namespace chrome.bluetoothSocket {
  * Use the chrome.browser API to interact with the Chrome browser associated with
  * the current application and Chrome profile.
  */
-declare namespace chrome.browser {
-    export interface Options {
+namespace  browser {
+    interface Options {
         /** The URL to navigate to when the new tab is initially opened. */
         url: string;
     }
@@ -636,8 +635,8 @@ declare namespace chrome.browser {
  * Availability: Since Chrome 25.
  * Manifest:  "commands": {...}
  */
-declare namespace chrome.commands {
-    export interface Command {
+namespace  commands {
+    interface Command {
         /** Optional. The name of the Extension Command  */
         name?: string;
         /** Optional. The Extension Command description  */
@@ -646,7 +645,7 @@ declare namespace chrome.commands {
         shortcut?: string;
     }
 
-    export interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
+    interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
 
     /**
      * Returns all the registered extension commands for this extension and their shortcut (if active).
@@ -668,7 +667,7 @@ declare namespace chrome.commands {
  * Availability: Since Chrome 6.
  * Permissions:  "contextMenus"
  */
-declare namespace chrome.contextMenus {
+namespace  contextMenus {
     /**
     * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
     **/
@@ -678,7 +677,7 @@ declare namespace chrome.contextMenus {
     **/
     export type ItemType = "normal" | "checkbox" | "radio" | "separator";
 
-    export interface OnClickData {
+    interface OnClickData {
         /**
          * Optional.
          * @since Since Chrome 35.
@@ -744,7 +743,7 @@ declare namespace chrome.contextMenus {
         srcUrl?: string;
     }
 
-    export interface CreateProperties {
+    interface CreateProperties {
         /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
         documentUrlPatterns?: string[];
         /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
@@ -784,7 +783,7 @@ declare namespace chrome.contextMenus {
         visible?: boolean;
     }
 
-    export interface UpdateProperties {
+    interface UpdateProperties {
         documentUrlPatterns?: string[];
         checked?: boolean;
         title?: string;
@@ -805,7 +804,7 @@ declare namespace chrome.contextMenus {
         visible?: boolean;
     }
 
-    export interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
+    interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
 
     /**
      * Since Chrome 38.
@@ -879,15 +878,15 @@ declare namespace chrome.contextMenus {
  * Permissions:  "documentScan"
  * Important: This API works only on Chrome OS.
  */
-declare namespace chrome.documentScan {
-    export interface DocumentScanOptions {
+namespace  documentScan {
+    interface DocumentScanOptions {
         /** Optional. The MIME types that are accepted by the caller.  */
         mimeTypes?: string[];
         /** Optional. The number of scanned images allowed (defaults to 1).  */
         maxImages?: number;
     }
 
-    export interface DocumentScanCallbackArg {
+    interface DocumentScanCallbackArg {
         /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
         dataUrls: string[];
         /** The MIME type of dataUrls. */
@@ -908,12 +907,12 @@ declare namespace chrome.documentScan {
 // Events
 ////////////////////
 /**
- * The chrome.events declare namespace contains common types used by APIs dispatching events to notify you when something interesting happens.
+ * The chrome.events namespace  contains common types used by APIs dispatching events to notify you when something interesting happens.
  * Availability: Since Chrome 21.
  */
-declare namespace chrome.events {
+namespace  events {
     /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
-    export interface UrlFilter {
+    interface UrlFilter {
         /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
         schemes?: string[];
         /**
@@ -965,7 +964,7 @@ declare namespace chrome.events {
     }
 
     /** An object which allows the addition and removal of listeners for a Chrome event. */
-    export interface Event<T> {
+    interface Event<T> {
         /**
          * Registers an event listener callback to an event.
          * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
@@ -1029,7 +1028,7 @@ declare namespace chrome.events {
     }
 
     /** Description of a declarative rule for handling events. */
-    export interface Rule {
+    interface Rule {
         /** Optional. Optional priority of this rule. Defaults to 100.  */
         priority?: number;
         /** List of conditions that can trigger the actions. */
@@ -1055,7 +1054,7 @@ declare namespace chrome.events {
  * Primary for extensions, but also used in apps.
  * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
  **/
-declare namespace chrome.extensionTypes {
+namespace  extensionTypes {
     /**
      * The format of an image.
      **/
@@ -1063,7 +1062,7 @@ declare namespace chrome.extensionTypes {
     /**
      * Details about the format and quality of an image.
      */
-    export interface ImageDetails {
+    interface ImageDetails {
         /**
          * @description The format of the resulting image. Default is "jpeg".
          * @type {ImageFormat}
@@ -1089,7 +1088,7 @@ declare namespace chrome.extensionTypes {
      * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
      * @interface InjectDetails
      */
-    export interface InjectDetails {
+    interface InjectDetails {
         /**
          * JavaScript or CSS code to inject.
          * Warning:
@@ -1142,15 +1141,15 @@ declare namespace chrome.extensionTypes {
 ////////////////////
 // FileSystem
 ////////////////////
-declare namespace chrome.fileSystem {
+namespace  fileSystem {
 
-    export interface AcceptOptions {
+    interface AcceptOptions {
         description?: string;
         mimeTypes?: string[];
         extensions?: string[];
     }
 
-    export interface ChooseEntryOptions {
+    interface ChooseEntryOptions {
         type?: string;
         suggestedName?: string;
         accepts?: AcceptOptions[];
@@ -1180,8 +1179,8 @@ declare namespace chrome.fileSystem {
  * Permissions:  "fileSystemProvider"
  * Important: This API works only on Chrome OS.
  */
-declare namespace chrome.fileSystemProvider {
-    export interface OpenedFileInfo {
+namespace  fileSystemProvider {
+    interface OpenedFileInfo {
         /** A request ID to be be used by consecutive read/write and close requests. */
         openRequestId: number;
         /** The path of the opened file. */
@@ -1190,7 +1189,7 @@ declare namespace chrome.fileSystemProvider {
         mode: string;
     }
 
-    export interface FileWatchersInfo {
+    interface FileWatchersInfo {
         /** The path of the entry being observed. */
         entryPath: string;
         /** Whether watching should include all child entries recursively. It can be true for directories only. */
@@ -1199,7 +1198,7 @@ declare namespace chrome.fileSystemProvider {
         lastTag?: string;
     }
 
-    export interface EntryMetadata {
+    interface EntryMetadata {
         /** True if it is a directory. */
         isDirectory: boolean;
         /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
@@ -1214,7 +1213,7 @@ declare namespace chrome.fileSystemProvider {
         thumbnail?: string;
     }
 
-    export interface FileSystemInfo {
+    interface FileSystemInfo {
         /** The identifier of the file system. */
         fileSystemId: string;
         /** A human-readable name for the file system. */
@@ -1245,7 +1244,7 @@ declare namespace chrome.fileSystemProvider {
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    export interface GetActionsRequestedOptions {
+    interface GetActionsRequestedOptions {
         /** The identifier of the file system related to this operation. */
         fileSystemId: string;
         /** The unique identifier of this request. */
@@ -1255,7 +1254,7 @@ declare namespace chrome.fileSystemProvider {
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    export interface Action {
+    interface Action {
         /** The identifier of the action. Any string or CommonActionId for common actions. */
         id: string;
         /** Optional. The title of the action. It may be ignored for common actions.  */
@@ -1263,7 +1262,7 @@ declare namespace chrome.fileSystemProvider {
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    export interface ExecuteActionRequestedOptions {
+    interface ExecuteActionRequestedOptions {
         /** The identifier of the file system related to this operation. */
         fileSystemId: string;
         /** The unique identifier of this request. */
@@ -1274,7 +1273,7 @@ declare namespace chrome.fileSystemProvider {
         actionId: string;
     }
 
-    export interface MountOptions {
+    interface MountOptions {
         /** The string indentifier of the file system. Must be unique per each extension. */
         fileSystemId: string;
         /** A human-readable name for the file system. */
@@ -1295,19 +1294,19 @@ declare namespace chrome.fileSystemProvider {
         supportsNotifyTag?: boolean;
     }
 
-    export interface UnmountOptions {
+    interface UnmountOptions {
         /** The identifier of the file system to be unmounted. */
         fileSystemId: string;
     }
 
-    export interface NotificationChange {
+    interface NotificationChange {
         /** The path of the changed entry. */
         entryPath: string;
         /** The type of the change which happened to the entry. */
         changeType: string;
     }
 
-    export interface NotificationOptions {
+    interface NotificationOptions {
         /** The identifier of the file system related to this change. */
         fileSystemId: string;
         /** The path of the observed entry. */
@@ -1322,111 +1321,111 @@ declare namespace chrome.fileSystemProvider {
         tag?: string;
     }
 
-    export interface RequestedEventOptions {
+    interface RequestedEventOptions {
         /** The identifier of the file system related to this operation. */
         fileSystemId: string;
         /** The unique identifier of this request. */
         requestId: number;
     }
 
-    export interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+    interface EntryPathRequestedEventOptions extends RequestedEventOptions {
         /** The path of the entry to which this operation is related to. */
         entryPath: string;
     }
 
-    export interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
+    interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
         /** Set to true if the thumbnail is requested. */
         thumbnail: boolean;
     }
 
-    export interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+    interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
         /** The path of the directory which is to be operated on. */
         directoryPath: string;
     }
 
-    export interface FilePathRequestedEventOptions extends RequestedEventOptions {
+    interface FilePathRequestedEventOptions extends RequestedEventOptions {
         /** The path of the entry for the operation */
         filePath: string;
     }
 
-    export interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
+    interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
         /** Whether the file will be used for reading or writing. */
         mode: string;
     }
 
-    export interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+    interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
         /** A request ID used to open the file. */
         openRequestId: number;
     }
 
-    export interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+    interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
         /** Position in the file (in bytes) to start reading from. */
         offset: number;
         /** Number of bytes to be returned. */
         length: number;
     }
 
-    export interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+    interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
         /** Whether the operation is recursive (for directories only). */
         recursive: boolean;
     }
 
-    export interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+    interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
         /** Whether the operation is recursive (for directories only). */
         recursive: boolean;
     }
 
-    export interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+    interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
         /** The source path for the operation. */
         sourcePath: string;
         /** The destination path for the operation. */
         targetPath: string;
     }
 
-    export interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
+    interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
         /** Number of bytes to be retained after the operation completes. */
         length: number;
     }
 
-    export interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+    interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
         /** Position in the file (in bytes) to start operating from. */
         offset: number;
         /** Buffer of bytes to be operated on the file. */
         data: ArrayBuffer;
     }
 
-    export interface OperationRequestedEventOptions extends RequestedEventOptions {
+    interface OperationRequestedEventOptions extends RequestedEventOptions {
         /** An ID of the request to which this operation is related. */
         operationRequestId: number;
     }
 
-    export interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
+    interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
 
-    export interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+    interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+    interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
 
-    export interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
-    export interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
+    interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
 
     /**
      * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
@@ -1531,8 +1530,8 @@ declare namespace chrome.fileSystemProvider {
  * Availability: Since Chrome 35.
  * Permissions:  "gcm"
  */
-declare namespace chrome.gcm {
-    export interface OutgoingMessage {
+namespace  gcm {
+    interface OutgoingMessage {
         /** The ID of the server to send the message to as assigned by Google API Console. */
         destinationId: string;
         /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
@@ -1543,7 +1542,7 @@ declare namespace chrome.gcm {
         data: Object;
     }
 
-    export interface IncomingMessage {
+    interface IncomingMessage {
         /** The message data. */
         data: Object;
         /**
@@ -1559,7 +1558,7 @@ declare namespace chrome.gcm {
         collapseKey?: string;
     }
 
-    export interface GcmError {
+    interface GcmError {
         /** The error message describing the problem. */
         errorMessage: string;
         /** Optional. The ID of the message with this error, if error is related to a specific message. */
@@ -1568,11 +1567,11 @@ declare namespace chrome.gcm {
         detail: Object;
     }
 
-    export interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
+    interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
 
-    export interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
+    interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
 
-    export interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
+    interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
 
     /** The maximum size (in bytes) of all key/value pairs in a message. */
     export var MAX_MESSAGE_SIZE: number;
@@ -1618,7 +1617,7 @@ declare namespace chrome.gcm {
  * Use the chrome.hid API to interact with connected HID devices. This API provides access to HID operations from within the context of an app. Using this API, apps can function as drivers for hardware devices. Errors generated by this API are reported by setting runtime.lastError and executing the function's regular callback. The callback's regular parameters will be undefined in this case.
  * @since Chrome 38
  */
-declare namespace chrome.hid {
+namespace  hid {
     /** NOT YET IMPLEMENTED */
 }
 
@@ -1629,9 +1628,9 @@ declare namespace chrome.hid {
  * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
  * @since Chrome 5.
  */
-declare namespace chrome.i18n {
+namespace  i18n {
     /** Holds detected ISO language code and its percentage in the input string */
-    export interface DetectedLanguage {
+    interface DetectedLanguage {
         /** An ISO language code such as 'en' or 'fr'.
          * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
          * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
@@ -1642,7 +1641,7 @@ declare namespace chrome.i18n {
     }
 
     /** Holds detected language reliability and array of DetectedLanguage */
-    export interface LanguageDetectionResult {
+    interface LanguageDetectionResult {
         /** CLD detected language reliability */
         isReliable: boolean;
 
@@ -1684,14 +1683,14 @@ declare namespace chrome.i18n {
  * Permissions:  "identity"
  * @since Chrome 29.
  */
-declare namespace chrome.identity {
+namespace  identity {
     /** @since Chrome 32. */
-    export interface AccountInfo {
+    interface AccountInfo {
         /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
         id: string;
     }
 
-    export interface TokenDetails {
+    interface TokenDetails {
         /**
          * Optional.
          * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
@@ -1713,19 +1712,19 @@ declare namespace chrome.identity {
         scopes?: string[];
     }
 
-    export interface UserInfo {
+    interface UserInfo {
         /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
         email: string;
         /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
         id: string;
     }
 
-    export interface TokenInformation {
+    interface TokenInformation {
         /** The specific token that should be removed from the cache. */
         token: string;
     }
 
-    export interface WebAuthFlowOptions {
+    interface WebAuthFlowOptions {
         /** The URL that initiates the auth flow. */
         url: string;
         /**
@@ -1737,7 +1736,7 @@ declare namespace chrome.identity {
         interactive?: boolean;
     }
 
-    export interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
+    interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
 
     /**
      * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
@@ -1803,8 +1802,8 @@ declare namespace chrome.identity {
  * Permissions:  "idle"
  * @since Chrome 6.
  */
-declare namespace chrome.idle {
-    export interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
+namespace  idle {
+    interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
 
     /**
      * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
@@ -1832,7 +1831,7 @@ declare namespace chrome.idle {
  * Use chrome.instanceID to access the Instance ID service.
  * @since Chrome 46
  */
-declare namespace chrome.instanceID {
+namespace  instanceID {
     /** NOT YET IMPLEMENTED */
 }
 
@@ -1843,19 +1842,19 @@ declare namespace chrome.instanceID {
  * 	Use the chrome.mdns API to discover services over mDNS. This comprises a subset of the features of the NSD spec: http://www.w3.org/TR/discovery-api/
  * @since Chrome 31
  */
-declare namespace chrome.mdns {
+namespace  mdns {
     /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
 // Media Galleries
 ////////////////////
-declare namespace chrome.mediaGalleries {
-    export interface MediaFileSystemsOptions {
+namespace  mediaGalleries {
+    interface MediaFileSystemsOptions {
         interactive?: 'no' | 'yes' | 'if_needed';
     }
 
-    export interface MediaFileSystemMetadata {
+    interface MediaFileSystemMetadata {
         name: string;
         galleryId: string;
         deviceId?: string;
@@ -1864,16 +1863,16 @@ declare namespace chrome.mediaGalleries {
         isAvailable: boolean;
     }
 
-    export interface MetadataOptions {
+    interface MetadataOptions {
         metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
     }
 
-    export interface RawTag {
+    interface RawTag {
         type: string;
         tags: { [name: string]: string; };
     }
 
-    export interface Metadata {
+    interface Metadata {
         // The browser sniffed mime type.
         mimeType: string;
         // Defined for images and video. In pixels.
@@ -1910,17 +1909,17 @@ declare namespace chrome.mediaGalleries {
         attachedImages: Blob[];
     }
 
-    export interface GalleryWatchResult {
+    interface GalleryWatchResult {
         galleryId: string;
         success: boolean;
     }
 
-    export interface GalleryChangedEventArgs {
+    interface GalleryChangedEventArgs {
         type: 'contents_changed' | 'watch_dropped';
         galleryId: string;
     }
 
-    export interface ScanProgressEventArgs {
+    interface ScanProgressEventArgs {
         // The type of progress event, i.e. start, finish, etc.
         type: 'start' | 'cancel' | 'finish' | 'error';
         // The number of Galleries found.
@@ -1959,14 +1958,14 @@ declare namespace chrome.mediaGalleries {
  * Network connection configurations are specified following Open Network Configuration (ONC) specification.
  * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
  */
-declare namespace chrome.networking.onc {
+namespace  networking.onc {
     export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
     export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
     export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
     export type IPConfigType = 'DHCP' | 'Static';
     export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
     export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
-    export interface ManagedBoolean {
+    interface ManagedBoolean {
         /**
          * @description The active value currently used by the network configuration manager (e.g. Shill).
          * @type {boolean}
@@ -2016,7 +2015,7 @@ declare namespace chrome.networking.onc {
          */
         DeviceEditable?: boolean
     }
-    export interface ManagedLong {
+    interface ManagedLong {
         /**
          * @description The active value currently used by the network configuration manager (e.g. Shill).
          * @type {number}
@@ -2077,20 +2076,20 @@ declare namespace chrome.networking.onc {
  * Permissions:  "notifications"
  * @since Chrome 28.
  */
-declare namespace chrome.notifications {
-    export interface ButtonOptions {
+namespace  notifications {
+    interface ButtonOptions {
         title: string;
         iconUrl?: string;
     }
 
-    export interface ItemOptions {
+    interface ItemOptions {
         /** Title of one item of a list notification. */
         title: string;
         /** Additional details about this item. */
         message: string;
     }
 
-    export interface NotificationOptions {
+    interface NotificationOptions {
         /** Optional. Which type of notification to display. Required for notifications.create method. */
         type?: string;
         /**
@@ -2145,15 +2144,15 @@ declare namespace chrome.notifications {
         requireInteraction?: boolean;
     }
 
-    export interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
+    interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
 
-    export interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
+    interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
 
-    export interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
+    interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
 
-    export interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
+    interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
 
-    export interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
+    interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
 
     /** The notification closed, either by the system or by user action. */
     export var onClosed: NotificationClosedEvent;
@@ -2238,8 +2237,8 @@ declare namespace chrome.notifications {
  * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
  * @since Chrome 16.
  */
-declare namespace chrome.permissions {
-    export interface Permissions {
+namespace  permissions {
+    interface Permissions {
         /**
          * Optional.
          * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
@@ -2252,7 +2251,7 @@ declare namespace chrome.permissions {
         permissions?: string[];
     }
 
-    export interface PermissionsRemovedEvent {
+    interface PermissionsRemovedEvent {
         /**
          * @param callback The callback parameter should be a function that looks like this:
          * function( Permissions permissions) {...};
@@ -2261,7 +2260,7 @@ declare namespace chrome.permissions {
         addListener(callback: (permissions: Permissions) => void): void;
     }
 
-    export interface PermissionsAddedEvent {
+    interface PermissionsAddedEvent {
         /**
          * @param callback The callback parameter should be a function that looks like this:
          * function( Permissions permissions) {...};
@@ -2313,7 +2312,7 @@ declare namespace chrome.permissions {
  * Permissions:  "power"
  * @since Chrome 27.
  */
-declare namespace chrome.power {
+namespace  power {
     /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
     export function requestKeepAwake(level: string): void;
     /** Releases a request previously made via requestKeepAwake(). */
@@ -2328,8 +2327,8 @@ declare namespace chrome.power {
  * Permissions:  "printerProvider"
  * @since Chrome 44.
  */
-declare namespace chrome.printerProvider {
-    export interface PrinterInfo {
+namespace  printerProvider {
+    interface PrinterInfo {
         /** Unique printer ID. */
         id: string;
         /** Printer's human readable name. */
@@ -2338,12 +2337,12 @@ declare namespace chrome.printerProvider {
         description?: string;
     }
 
-    export interface PrinterCapabilities {
+    interface PrinterCapabilities {
         /** Device capabilities in CDD format. */
         capabilities: any;
     }
 
-    export interface PrintJob {
+    interface PrintJob {
         /** ID of the printer which should handle the job. */
         printerId: string;
         /** The print job title. */
@@ -2356,13 +2355,13 @@ declare namespace chrome.printerProvider {
         document: Blob;
     }
 
-    export interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
+    interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
 
-    export interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
+    interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
 
-    export interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
+    interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
 
-    export interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
+    interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
 
     /** Event fired when print manager requests printers provided by extensions. */
     export var onGetPrintersRequested: PrinterRequestedEvent;
@@ -2385,22 +2384,22 @@ declare namespace chrome.printerProvider {
  * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
  * @since Chrome 22
  */
-declare namespace chrome.runtime {
+namespace  runtime {
     /** This will be defined during an API method callback if there was an error */
     export var lastError: LastError | undefined;
     /** The ID of the extension/app. */
     export var id: string;
 
-    export interface LastError {
+    interface LastError {
         /** Optional. Details about the error which occurred.  */
         message?: string;
     }
 
-    export interface ConnectInfo {
+    interface ConnectInfo {
         name?: string;
     }
 
-    export interface InstalledDetails {
+    interface InstalledDetails {
         /**
          * The reason that this event is being dispatched.
          * One of: "install", "update", "chrome_update", or "shared_module_update"
@@ -2419,7 +2418,7 @@ declare namespace chrome.runtime {
         id?: string;
     }
 
-    export interface MessageOptions {
+    interface MessageOptions {
         /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
         includeTlsChannelId?: boolean;
     }
@@ -2428,7 +2427,7 @@ declare namespace chrome.runtime {
      * An object containing information about the script context that sent a message or request.
      * @since Chrome 26.
      */
-    export interface MessageSender {
+    interface MessageSender {
         /** The ID of the extension or app that opened the connection, if any. */
         id?: string;
         /**
@@ -2452,7 +2451,7 @@ declare namespace chrome.runtime {
      * An object containing information about the current platform.
      * @since Chrome 36.
      */
-    export interface PlatformInfo {
+    interface PlatformInfo {
         /**
          * The operating system chrome is running on.
          * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
@@ -2474,7 +2473,7 @@ declare namespace chrome.runtime {
      * An object which allows two way communication with other pages.
      * @since Chrome 26.
      */
-    export interface Port {
+    interface Port {
         postMessage: (message: Object) => void;
         disconnect: () => void;
         /**
@@ -2489,43 +2488,43 @@ declare namespace chrome.runtime {
         name: string;
     }
 
-    export interface UpdateAvailableDetails {
+    interface UpdateAvailableDetails {
         /** The version number of the available update. */
         version: string;
     }
 
-    export interface UpdateCheckDetails {
+    interface UpdateCheckDetails {
         /** The version of the available update. */
         version: string;
     }
 
-    export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
+    interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
 
-    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
+    interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
 
-    export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
+    interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
 
-    export interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
+    interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
 
-    export interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
+    interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
 
-    export interface RuntimeEvent extends chrome.events.Event<() => void> { }
+    interface RuntimeEvent extends chrome.events.Event<() => void> { }
 
-    export interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
+    interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
 
-    export interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
+    interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
 
-    export interface ManifestIcons {
+    interface ManifestIcons {
         [size: number]: string;
     }
 
-    export interface ManifestAction {
+    interface ManifestAction {
         default_icon?: ManifestIcons;
         default_title?: string;
         default_popup?: string;
     }
 
-    export interface SearchProvider {
+    interface SearchProvider {
         name?: string;
         keyword?: string;
         favicon_url?: string;
@@ -2543,7 +2542,7 @@ declare namespace chrome.runtime {
         is_default?: boolean;
     }
 
-    export interface Manifest {
+    interface Manifest {
         /** Required */
         app: {
             background: {
@@ -2876,40 +2875,40 @@ declare namespace chrome.runtime {
  * Use the chrome.serial API to read from and write to a device connected to a serial port.
  * @since Chrome 23
  */
-declare namespace chrome.serial {
+namespace  serial {
     /** NOT YET IMPLEMENTED */
 }
 
 ////////////////////
 // Socket
 ////////////////////
-declare namespace chrome.socket {
-    export interface CreateInfo {
+namespace  socket {
+    interface CreateInfo {
         socketId: number;
     }
 
-    export interface AcceptInfo {
+    interface AcceptInfo {
         resultCode: number;
         socketId?: number;
     }
 
-    export interface ReadInfo {
+    interface ReadInfo {
         resultCode: number;
         data: ArrayBuffer;
     }
 
-    export interface WriteInfo {
+    interface WriteInfo {
         bytesWritten: number;
     }
 
-    export interface RecvFromInfo {
+    interface RecvFromInfo {
         resultCode: number;
         data: ArrayBuffer;
         port: number;
         address: string;
     }
 
-    export interface SocketInfo {
+    interface SocketInfo {
         socketType: string;
         localPort?: number;
         peerAddress?: string;
@@ -2918,7 +2917,7 @@ declare namespace chrome.socket {
         connected: boolean;
     }
 
-    export interface NetworkInterface {
+    interface NetworkInterface {
         name: string;
         address: string;
     }
@@ -2940,33 +2939,33 @@ declare namespace chrome.socket {
     export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
 }
 
-declare namespace chrome.sockets.tcp {
-    export interface CreateInfo {
+namespace  sockets.tcp {
+    interface CreateInfo {
         socketId: number;
     }
 
-    export interface SendInfo {
+    interface SendInfo {
         resultCode: number;
         bytesSent?: number;
     }
 
-    export interface ReceiveEventArgs {
+    interface ReceiveEventArgs {
         socketId: number;
         data: ArrayBuffer;
     }
 
-    export interface ReceiveErrorEventArgs {
+    interface ReceiveErrorEventArgs {
         socketId: number;
         resultCode: number;
     }
 
-    export interface SocketProperties {
+    interface SocketProperties {
         persistent?: boolean;
         name?: string;
         bufferSize?: number;
     }
 
-    export interface SocketInfo {
+    interface SocketInfo {
         socketId: number;
         persistent: boolean;
         name?: string;
@@ -3011,17 +3010,17 @@ declare namespace chrome.sockets.tcp {
  * @since Chrome 33
  * @see https://developer.chrome.com/apps/sockets_tcpServer
  */
-declare namespace chrome.sockets.tcpServer {
-    export interface CreateInfo {
+namespace  sockets.tcpServer {
+    interface CreateInfo {
         socketId: number;
     }
 
-    export interface AcceptEventArgs {
+    interface AcceptEventArgs {
         socketId: number;
         clientSocketId: number;
     }
 
-    export interface AcceptErrorEventArgs {
+    interface AcceptErrorEventArgs {
         socketId: number;
         resultCode: number;
     }
@@ -3029,7 +3028,7 @@ declare namespace chrome.sockets.tcpServer {
     /**
      * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
      */
-    export interface SocketProperties {
+    interface SocketProperties {
         /**
          * Flag indicating if the socket remains open when the event page of the
          * application is unloaded. The default value is "false." When the
@@ -3047,7 +3046,7 @@ declare namespace chrome.sockets.tcpServer {
     /**
      * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
      */
-    export interface SocketInfo {
+    interface SocketInfo {
         /** The socket identifier. */
         socketId: number;
 
@@ -3211,24 +3210,24 @@ declare namespace chrome.sockets.tcpServer {
  * @since Chrome 33
  * @see https://developer.chrome.com/apps/sockets_udp
  */
-declare namespace chrome.sockets.udp {
-    export interface CreateInfo {
+namespace  sockets.udp {
+    interface CreateInfo {
         socketId: number;
     }
 
-    export interface SendInfo {
+    interface SendInfo {
         resultCode: number;
         bytesSent?: number;
     }
 
-    export interface ReceiveEventArgs {
+    interface ReceiveEventArgs {
         socketId: number;
         data: ArrayBuffer;
         remoteAddress: string;
         remotePort: number;
     }
 
-    export interface ReceiveErrorEventArgs {
+    interface ReceiveErrorEventArgs {
         socketId: number;
         resultCode: number;
     }
@@ -3236,7 +3235,7 @@ declare namespace chrome.sockets.udp {
     /**
      * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
      */
-    export interface SocketProperties {
+    interface SocketProperties {
         /**
          * Flag indicating if the socket is left open when the event page of the
          * application is unloaded. The default value is "false." When the
@@ -3260,7 +3259,7 @@ declare namespace chrome.sockets.udp {
     /**
      * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
      */
-    export interface SocketInfo {
+    interface SocketInfo {
         /** The socket identifier. */
         socketId: number;
 
@@ -3505,8 +3504,8 @@ declare namespace chrome.sockets.udp {
  * Permissions:  "storage"
  * @since Chrome 20.
  */
-declare namespace chrome.storage {
-    export interface StorageArea {
+namespace  storage {
+    interface StorageArea {
         /**
          * Gets the amount of space (in bytes) being used by one or more items.
          * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
@@ -3557,19 +3556,19 @@ declare namespace chrome.storage {
         get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
     }
 
-    export interface StorageChange {
+    interface StorageChange {
         /** Optional. The new value of the item, if there is a new value. */
         newValue?: any;
         /** Optional. The old value of the item, if there was an old value. */
         oldValue?: any;
     }
 
-    export interface LocalStorageArea extends StorageArea {
+    interface LocalStorageArea extends StorageArea {
         /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
         QUOTA_BYTES: number;
     }
 
-    export interface SyncStorageArea extends StorageArea {
+    interface SyncStorageArea extends StorageArea {
         /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
         MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
         /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
@@ -3591,7 +3590,7 @@ declare namespace chrome.storage {
         MAX_WRITE_OPERATIONS_PER_MINUTE: number;
     }
 
-    export interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
+    interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
 
     /** Items in the local storage area are local to each machine. */
     export var local: LocalStorageArea;
@@ -3599,7 +3598,7 @@ declare namespace chrome.storage {
     export var sync: SyncStorageArea;
 
     /**
-     * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this declare namespace results in an error.
+     * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace  results in an error.
      * @since Chrome 33.
      */
     export var managed: StorageArea;
@@ -3615,7 +3614,7 @@ declare namespace chrome.storage {
  * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive. This API is NOT for accessing arbitrary user docs stored in Google Drive. It provides app-specific syncable storage for offline and caching usage so that the same data can be available across different clients. Read Manage Data for more on using this API.
  * @since Chrome 27
  */
-declare namespace chrome.syncFileSystem {
+namespace  syncFileSystem {
     /** NOT YET IMPLEMENTED */
 }
 
@@ -3628,8 +3627,8 @@ declare namespace chrome.syncFileSystem {
  * Permissions: "system.cpu"
  * @since Chrome 32.
  */
-declare namespace chrome.system.cpu {
-    export interface ProcessorUsage {
+namespace  system.cpu {
+    interface ProcessorUsage {
         /** The cumulative time used by userspace programs on this processor. */
         user: number;
         /** The cumulative time used by kernel programs on this processor. */
@@ -3640,12 +3639,12 @@ declare namespace chrome.system.cpu {
         total: number;
     }
 
-    export interface ProcessorInfo {
+    interface ProcessorInfo {
         /** Cumulative usage info for this logical processor. */
         usage: ProcessorUsage;
     }
 
-    export interface CpuInfo {
+    interface CpuInfo {
         /** The number of logical processors. */
         numOfProcessors: number;
         /** The architecture name of the processors. */
@@ -3673,8 +3672,8 @@ declare namespace chrome.system.cpu {
  * Permissions: "system.display"
  * @since Chrome 30.
  */
-declare namespace chrome.system.display {
-    export interface Bounds {
+namespace  system.display {
+    interface Bounds {
         /**  The x-coordinate of the upper-left corner. */
         left: number;
         /**  The y-coordinate of the upper-left corner. */
@@ -3685,7 +3684,7 @@ declare namespace chrome.system.display {
         height: number;
     }
 
-    export interface Insets {
+    interface Insets {
         /** The x-axis distance from the left bound. */
         left: number;
         /** The y-axis distance from the top bound. */
@@ -3699,7 +3698,7 @@ declare namespace chrome.system.display {
     /**
      * @since Chrome 57
      */
-    export interface Point {
+    interface Point {
         /** The x-coordinate of the point. */
         x: number;
         /** The y-coordinate of the point. */
@@ -3709,7 +3708,7 @@ declare namespace chrome.system.display {
     /**
      * @since Chrome 57
      */
-    export interface TouchCalibrationPair {
+    interface TouchCalibrationPair {
         /**	The coordinates of the display point. */
         displayPoint: Point;
         /** The coordinates of the touch point corresponding to the display point. */
@@ -3719,7 +3718,7 @@ declare namespace chrome.system.display {
     /**
      * @since Chrome 52
      */
-    export interface DisplayMode {
+    interface DisplayMode {
         /** The display mode width in device independent (user visible) pixels. */
         width: number;
 
@@ -3748,7 +3747,7 @@ declare namespace chrome.system.display {
     /**
      * @since Chrome 53
      */
-    export interface DisplayLayout {
+    interface DisplayLayout {
         /** The unique identifier of the display. */
         id: string;
         /** The unique identifier of the parent display. Empty if this is the root. */
@@ -3764,7 +3763,7 @@ declare namespace chrome.system.display {
      * @export
      * @interface TouchCalibrationPairs
      */
-    export interface TouchCalibrationPairs {
+    interface TouchCalibrationPairs {
         /** First pair of touch and display point required for touch calibration. */
         pair1: TouchCalibrationPair,
         /** Second pair of touch and display point required for touch calibration. */
@@ -3780,7 +3779,7 @@ declare namespace chrome.system.display {
      * @export
      * @interface DisplayPropertiesInfo
      */
-    export interface DisplayPropertiesInfo {
+    interface DisplayPropertiesInfo {
         /**
          * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
          * @since Chrome 59
@@ -3820,7 +3819,7 @@ declare namespace chrome.system.display {
      * @export
      * @interface DisplayInfoFlags
      */
-    export interface DisplayInfoFlags {
+    interface DisplayInfoFlags {
         /**
          * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
          * @type {boolean}
@@ -3830,7 +3829,7 @@ declare namespace chrome.system.display {
     }
 
     /** Information about display properties. */
-    export interface DisplayInfo {
+    interface DisplayInfo {
         /** The unique identifier of the display. */
         id: string;
         /** The user-friendly name (e.g. "HP LCD monitor"). */
@@ -3858,7 +3857,7 @@ declare namespace chrome.system.display {
     }
 
     /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
-    export interface DisplayProps {
+    interface DisplayProps {
         /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
         mirroringSourceId?: string;
         /** If set to true, makes the display primary. No-op if set to false. */
@@ -3879,7 +3878,7 @@ declare namespace chrome.system.display {
      * @interface DisplayChangedEvent
      * @extends {chrome.events.Event<() => void>}
      */
-    export interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
+    interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
 
     /**
      * @description Requests the information for all attached display devices.
@@ -4009,8 +4008,8 @@ declare namespace chrome.system.display {
  * Permissions:  "system.memory"
  * @since Chrome 32.
  */
-declare namespace chrome.system.memory {
-    export interface MemoryInfo {
+namespace  system.memory {
+    interface MemoryInfo {
         /** The total amount of physical memory capacity, in bytes. */
         capacity: number;
         /** The amount of available capacity, in bytes. */
@@ -4024,8 +4023,8 @@ declare namespace chrome.system.memory {
 ////////////////////
 // System - Network
 ////////////////////
-declare namespace chrome.system.network {
-    export interface NetworkInterface {
+namespace  system.network {
+    interface NetworkInterface {
         name: string;
         address: string;
         prefixLength: number;
@@ -4042,8 +4041,8 @@ declare namespace chrome.system.network {
  * Permissions:  "system.storage"
  * @since Chrome 30.
  */
-declare namespace chrome.system.storage {
-    export interface StorageUnitInfo {
+namespace  system.storage {
+    interface StorageUnitInfo {
         /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
         id: string;
         /** The name of the storage unit. */
@@ -4059,16 +4058,16 @@ declare namespace chrome.system.storage {
         capacity: number;
     }
 
-    export interface StorageCapacityInfo {
+    interface StorageCapacityInfo {
         /** A copied |id| of getAvailableCapacity function parameter |id|. */
         id: string;
         /** The available capacity of the storage device, in bytes. */
         availableCapacity: number;
     }
 
-    export interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
+    interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
 
-    export interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
+    interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
 
     /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
     export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
@@ -4098,9 +4097,9 @@ declare namespace chrome.system.storage {
  * Permissions:  "tts"
  * @since Chrome 14.
  */
-declare namespace chrome.tts {
+namespace  tts {
     /** An event from the TTS engine to communicate the status of an utterance. */
-    export interface TtsEvent {
+    interface TtsEvent {
         /** Optional. The index of the current character in the utterance. */
         charIndex?: number;
         /** Optional. The error description, if the event type is 'error'. */
@@ -4113,7 +4112,7 @@ declare namespace chrome.tts {
     }
 
     /** A description of a voice available for speech synthesis. */
-    export interface TtsVoice {
+    interface TtsVoice {
         /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
         lang?: string;
         /**
@@ -4134,7 +4133,7 @@ declare namespace chrome.tts {
         remote?: boolean;
     }
 
-    export interface SpeakOptions {
+    interface SpeakOptions {
         /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
         volume?: number;
         /**
@@ -4212,8 +4211,8 @@ declare namespace chrome.tts {
  * The chrome.types API contains type declarations for Chrome.
  * @since Chrome 13.
  */
-declare namespace chrome.types {
-    export interface ChromeSettingClearDetails {
+namespace  types {
+    interface ChromeSettingClearDetails {
         /**
          * Optional.
          * The scope of the ChromeSetting. One of
@@ -4225,7 +4224,7 @@ declare namespace chrome.types {
         scope?: string;
     }
 
-    export interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+    interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
         /**
          * The value of the setting.
          * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
@@ -4242,7 +4241,7 @@ declare namespace chrome.types {
         scope?: string;
     }
 
-    export interface ChromeSettingGetDetails {
+    interface ChromeSettingGetDetails {
         /** Optional. Whether to return the value that applies to the incognito session (default false). */
         incognito?: boolean;
     }
@@ -4252,7 +4251,7 @@ declare namespace chrome.types {
      */
     export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
-    export interface ChromeSettingGetResultDetails {
+    interface ChromeSettingGetResultDetails {
         /**
          * One of
          * • not_controllable: cannot be controlled by any extension
@@ -4271,10 +4270,10 @@ declare namespace chrome.types {
         incognitoSpecific?: boolean;
     }
 
-    export interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
+    interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
 
     /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
-    export interface ChromeSetting {
+    interface ChromeSetting {
         /**
          * Sets the value of a setting.
          * @param details Which setting to change.
@@ -4300,10 +4299,10 @@ declare namespace chrome.types {
 ////////////////////
 // USB
 ////////////////////
-declare namespace chrome.usb {
+namespace  usb {
     type Direction = 'in' | 'out';
 
-    export interface Device {
+    interface Device {
         device: number,
         vendorId: number,
         productId: number,
@@ -4312,13 +4311,13 @@ declare namespace chrome.usb {
         serialNumber: string
     }
 
-    export interface ConnectionHandle {
+    interface ConnectionHandle {
         handle: number,
         vendorId: number,
         productId: number
     }
 
-    export interface EndpointDescriptor {
+    interface EndpointDescriptor {
         address: number,
         type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
         direction: Direction,
@@ -4329,7 +4328,7 @@ declare namespace chrome.usb {
         extra_data: ArrayBuffer
     }
 
-    export interface InterfaceDescriptor {
+    interface InterfaceDescriptor {
         interfaceNumber: number,
         alternateSetting: number,
         interfaceClass: number,
@@ -4340,7 +4339,7 @@ declare namespace chrome.usb {
         extra_data: ArrayBuffer
     }
 
-    export interface ConfigDescriptor {
+    interface ConfigDescriptor {
         active: boolean,
         configurationValue: number,
         description?: string,
@@ -4351,7 +4350,7 @@ declare namespace chrome.usb {
         extra_data: ArrayBuffer
     }
 
-    export interface GenericTransferInfo {
+    interface GenericTransferInfo {
         direction: Direction,
         endpoint: number,
         length?: number,
@@ -4359,12 +4358,12 @@ declare namespace chrome.usb {
         timeout?: number
     }
 
-    export interface TransferResultInfo {
+    interface TransferResultInfo {
         resultCode: number,
         data?: ArrayBuffer
     }
 
-    export interface DeviceFilter {
+    interface DeviceFilter {
         vendorId?: number,
         productId?: number,
         interfaceClass?: number,
@@ -4372,7 +4371,7 @@ declare namespace chrome.usb {
         interfaceProtocol?: number
     }
 
-    export interface TransferInfo {
+    interface TransferInfo {
         direction: Direction;
         recipient: 'device' | 'interface' | 'endpoint' | 'other';
         requestType: 'standard' | 'class' | 'vendor' | 'reserved';
@@ -4384,7 +4383,7 @@ declare namespace chrome.usb {
         timeout?: number;
     }
 
-    export interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
+    interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
 
     export var onDeviceAdded: DeviceEvent;
     export var onDeviceRemoved: DeviceEvent;
@@ -4419,8 +4418,8 @@ declare namespace chrome.usb {
  * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
-declare namespace chrome.vpnProvider {
-    export interface VpnSessionParameters {
+namespace  vpnProvider {
+    interface VpnSessionParameters {
         /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
         address: string;
         /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
@@ -4441,15 +4440,15 @@ declare namespace chrome.vpnProvider {
         dnsServer: string[];
     }
 
-    export interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
+    interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
 
-    export interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
+    interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
 
-    export interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
+    interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
 
-    export interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
+    interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
 
-    export interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
+    interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
 
     /**
      * Creates a new VPN configuration that persists across multiple login sessions of the user.
@@ -4506,8 +4505,8 @@ declare namespace chrome.vpnProvider {
  * Important: This API works only on Chrome OS.
  * @since Chrome 43.
  */
-declare namespace chrome.wallpaper {
-    export interface WallpaperDetails {
+namespace  wallpaper {
+    interface WallpaperDetails {
         /** Optional. The jpeg or png encoded wallpaper image. */
         data?: any;
         /** Optional. The URL of the wallpaper to be set. */
@@ -4538,15 +4537,15 @@ declare namespace chrome.wallpaper {
 /**
  * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
  */
-declare namespace chrome.webview {
+namespace  webview {
     /** Options that determine what data should be cleared by `clearData`. */
-    export interface ClearDataOptions {
+    interface ClearDataOptions {
         /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
         since?: number;
     }
-    export interface WindowEvent extends chrome.events.Event<() => void> { }
+    interface WindowEvent extends chrome.events.Event<() => void> { }
 
-    export interface ConsoleEvent extends Event {
+    interface ConsoleEvent extends Event {
         /**
          * @description The severity level of the log message. Ranges from 0 to 4.
          * @type {number}
@@ -4573,7 +4572,7 @@ declare namespace chrome.webview {
         sourceId: string;
     }
 
-    export interface ExitEvent extends Event {
+    interface ExitEvent extends Event {
         /**
          * @description Chrome's internal ID of the process that exited.
          * @type {number}
@@ -4589,7 +4588,7 @@ declare namespace chrome.webview {
     }
 
     /** Description of a declarative rule for handling events. */
-    export interface Rule {
+    interface Rule {
         /** Optional priority of this rule. Defaults to 100.  */
         priority?: number;
         /** List of conditions that can trigger the actions. */
@@ -4612,7 +4611,7 @@ declare namespace chrome.webview {
      * @export
      * @interface InjectDetails
      */
-    export interface InjectDetails {
+    interface InjectDetails {
         /**
          * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
          * @type {string}
@@ -4627,10 +4626,10 @@ declare namespace chrome.webview {
         file?: string
     }
 
-    export interface WebViewElementEventMap {
-        'close': GenericEvent,
+    interface WebViewElementEventMap {
+        'close': Event,
         'consolemessage': IConsolemessage,
-        'contentload': GenericEvent,
+        'contentload': Event,
         'dialog': IDialog,
         'exit': IExit,
         'findupdate': IFindupdate,
@@ -4638,7 +4637,7 @@ declare namespace chrome.webview {
         'loadcommit': ILoadcommit,
         'loadredirect': ILoadredirect,
         'loadstart': ILoadstart,
-        'loadstop': GenericEvent,
+        'loadstop': Event,
         'newwindow': INewwindow,
         'permissionrequest': IPermissionrequest,
         'responsive': IResponsive,
@@ -4654,7 +4653,7 @@ declare namespace chrome.webview {
      * @interface HTMLWebViewElement
      * @extends {Element}
      */
-    export interface HTMLWebViewElement extends Element {
+    interface HTMLWebViewElement extends Element {
         executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
         src: string;
         contentWindow: Window;
@@ -4662,7 +4661,7 @@ declare namespace chrome.webview {
     }
 
     /**Options that determine what data should be cleared by clearData. */
-    export interface ClearDataOptions {
+    interface ClearDataOptions {
 
         /**
         * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
@@ -4670,7 +4669,7 @@ declare namespace chrome.webview {
         since?: number;
     }
     /**A set of data types. Missing properties are interpreted as false. */
-    export interface ClearDataTypeSet {
+    interface ClearDataTypeSet {
 
         /**
         * @description Websites' appcaches.
@@ -4731,7 +4730,7 @@ declare namespace chrome.webview {
     * "audio" */
     export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
     /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
-    export interface InjectDetails {
+    interface InjectDetails {
 
         /**
         * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
@@ -4744,7 +4743,7 @@ declare namespace chrome.webview {
         file?: string
     }
     /**The type of injection item: code or a set of files. */
-    export interface InjectionItems {
+    interface InjectionItems {
 
         /**
         * @description JavaScript code or CSS to be injected into matching pages.
@@ -4757,7 +4756,7 @@ declare namespace chrome.webview {
         files?: any[]
     }
     /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
-    export interface ContentScriptDetails {
+    interface ContentScriptDetails {
 
         /**
         * @description The name of the content script to inject.
@@ -4810,7 +4809,7 @@ declare namespace chrome.webview {
         exclude_globs?: string[];
     }
     /**@todo Add documentation */
-    export interface ContextMenuCreateProperties {
+    interface ContextMenuCreateProperties {
 
         /**
         * @description The type of menu item. Defaults to 'normal' if not specified.
@@ -4864,7 +4863,7 @@ declare namespace chrome.webview {
         enabled?: boolean
     }
     /**@todo Add documentation */
-    export interface ContextMenuUpdateProperties {
+    interface ContextMenuUpdateProperties {
 
         /**
         * @description The type of menu item.
@@ -4912,7 +4911,7 @@ declare namespace chrome.webview {
          */
         enabled?: boolean
     }
-    export interface ContextMenus {
+    interface ContextMenus {
 
         /**
         * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
@@ -4949,14 +4948,14 @@ declare namespace chrome.webview {
         onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
 
     }
-    export interface IOnShowEvent {
+    interface IOnShowEvent {
         /**
          * @description Call this to prevent showing the context menu.
          * @memberof IOnShowEvent
          */
         preventDefault: () => void;
     }
-    export interface ContentWindow {
+    interface ContentWindow {
 
         /**
         * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
@@ -4966,7 +4965,7 @@ declare namespace chrome.webview {
         postMessage(message: any, targetOrigin: string): void;
 
     }
-    export interface DialogController {
+    interface DialogController {
 
         /**
         * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
@@ -4981,7 +4980,7 @@ declare namespace chrome.webview {
 
     }
     /**Contains all of the results of the find request. */
-    export interface FindCallbackResults {
+    interface FindCallbackResults {
 
         /**
         * @description The number of times searchText was matched on the page.
@@ -5004,7 +5003,7 @@ declare namespace chrome.webview {
         canceled: boolean
     }
     /**Options for the find request. */
-    export interface FindOptions {
+    interface FindOptions {
 
         /**
         * @description Flag to find matches in reverse order. The default value is false.
@@ -5016,7 +5015,7 @@ declare namespace chrome.webview {
          */
         matchCase?: boolean
     }
-    export interface NewWindow {
+    interface NewWindow {
 
         /**
         * @description Attach the requested target page to an existing webview element.
@@ -5030,7 +5029,7 @@ declare namespace chrome.webview {
         discard(): void;
 
     }
-    export interface MediaPermissionRequest {
+    interface MediaPermissionRequest {
 
         /**
         * @description Allow the permission request.
@@ -5043,7 +5042,7 @@ declare namespace chrome.webview {
         deny(): void;
 
     }
-    export interface GeolocationPermissionRequest {
+    interface GeolocationPermissionRequest {
 
         /**
         * @description Allow the permission request.
@@ -5056,7 +5055,7 @@ declare namespace chrome.webview {
         deny(): void;
 
     }
-    export interface PointerLockPermissionRequest {
+    interface PointerLockPermissionRequest {
 
         /**
         * @description Allow the permission request.
@@ -5069,7 +5068,7 @@ declare namespace chrome.webview {
         deny(): void;
 
     }
-    export interface DownloadPermissionRequest {
+    interface DownloadPermissionRequest {
 
         /**
         * @description Allow the permission request.
@@ -5082,7 +5081,7 @@ declare namespace chrome.webview {
         deny(): void;
 
     }
-    export interface FileSystemPermissionRequest {
+    interface FileSystemPermissionRequest {
 
         /**
         * @description Allow the permission request.
@@ -5095,7 +5094,7 @@ declare namespace chrome.webview {
         deny(): void;
 
     }
-    export interface FullscreenPermissionRequest {
+    interface FullscreenPermissionRequest {
 
         /**
         * @description Allow the permission request.
@@ -5108,7 +5107,7 @@ declare namespace chrome.webview {
         deny(): void;
 
     }
-    export interface LoadPluginPermissionRequest {
+    interface LoadPluginPermissionRequest {
 
         /**
         * @description Allow the permission request. This is the default behavior if deny is not called..
@@ -5122,7 +5121,7 @@ declare namespace chrome.webview {
 
     }
     /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
-    export interface SelectionRect {
+    interface SelectionRect {
 
         /**
         * @description Distance from the left edge of the screen to the left edge of the rectangle.
@@ -5154,7 +5153,7 @@ declare namespace chrome.webview {
       actions: [ new chrome.webViewRequest.CancelRequest() ]
     };
     myWebview.request.onRequest.addRules([rule]);</pre> */
-    export interface WebRequestEventInterface {
+    interface WebRequestEventInterface {
     }
     /**
     * Defines the how zooming is handled in the webview.
@@ -5386,7 +5385,7 @@ declare namespace chrome.webview {
     });</pre>
      */
 
-    export function close(event: chrome.events.Event<GenericEvent>): void;
+    export function close(event: chrome.events.Event<Event>): void;
 
     /**
     * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
@@ -5403,7 +5402,7 @@ declare namespace chrome.webview {
     });</pre>
      */
 
-    export var contentload: (event: chrome.events.Event<GenericEvent>) => void;
+    export var contentload: (event: chrome.events.Event<Event>) => void;
 
     /**
     * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
@@ -5462,7 +5461,7 @@ declare namespace chrome.webview {
     * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
      */
 
-    export function loadstop(event: chrome.events.Event<GenericEvent>): void;
+    export function loadstop(event: chrome.events.Event<Event>): void;
 
     /**
     * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
@@ -5520,7 +5519,7 @@ declare namespace chrome.webview {
 
     export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
     /**IConsolemessage (Auto generated interface) */
-    export interface IConsolemessage {
+    interface IConsolemessage {
 
         /**
         * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
@@ -5543,7 +5542,7 @@ declare namespace chrome.webview {
         sourceId: string
     }
     /**IDialog (Auto generated interface) */
-    export interface IDialog {
+    interface IDialog {
 
         /**
         * @description The type of modal dialog requested by the guest.
@@ -5561,7 +5560,7 @@ declare namespace chrome.webview {
         dialog: DialogController
     }
     /**IExit (Auto generated interface) */
-    export interface IExit {
+    interface IExit {
 
         /**
         * @description Chrome's internal ID of the process that exited.
@@ -5574,7 +5573,7 @@ declare namespace chrome.webview {
         reason: 'normal' | 'abnormal' | 'crash' | 'kill'
     }
     /**IFindupdate (Auto generated interface) */
-    export interface IFindupdate {
+    interface IFindupdate {
 
         /**
         * @description The string that is being searched for in the page.
@@ -5607,7 +5606,7 @@ declare namespace chrome.webview {
         finalUpdate: string
     }
     /**ILoadabort (Auto generated interface) */
-    export interface ILoadabort {
+    interface ILoadabort {
 
         /**
         * @description Requested URL.
@@ -5630,7 +5629,7 @@ declare namespace chrome.webview {
         reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
     }
     /**ILoadcommit (Auto generated interface) */
-    export interface ILoadcommit {
+    interface ILoadcommit {
 
         /**
         * @description The URL that committed.
@@ -5643,7 +5642,7 @@ declare namespace chrome.webview {
         isTopLevel: boolean
     }
     /**ILoadredirect (Auto generated interface) */
-    export interface ILoadredirect {
+    interface ILoadredirect {
 
         /**
         * @description The requested URL before the redirect.
@@ -5661,7 +5660,7 @@ declare namespace chrome.webview {
         isTopLevel: boolean
     }
     /**ILoadstart (Auto generated interface) */
-    export interface ILoadstart {
+    interface ILoadstart {
 
         /**
         * @description Requested URL.
@@ -5674,7 +5673,7 @@ declare namespace chrome.webview {
         isTopLevel: boolean
     }
     /**INewwindow (Auto generated interface) */
-    export interface INewwindow {
+    interface INewwindow {
 
         /**
         * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
@@ -5707,7 +5706,7 @@ declare namespace chrome.webview {
         windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
     }
     /**IPermissionrequest (Auto generated interface) */
-    export interface IPermissionrequest {
+    interface IPermissionrequest {
 
         /**
         * @description The type of permission being requested.
@@ -5720,7 +5719,7 @@ declare namespace chrome.webview {
         request: object
     }
     /**IResponsive (Auto generated interface) */
-    export interface IResponsive {
+    interface IResponsive {
 
         /**
         * @description Chrome's internal ID of the process that became responsive.
@@ -5728,7 +5727,7 @@ declare namespace chrome.webview {
         processID: number
     }
     /**ISizechanged (Auto generated interface) */
-    export interface ISizechanged {
+    interface ISizechanged {
 
         /**
         * @description Old width of embedded web content.
@@ -5751,7 +5750,7 @@ declare namespace chrome.webview {
         newHeight: number
     }
     /**IUnresponsive (Auto generated interface) */
-    export interface IUnresponsive {
+    interface IUnresponsive {
 
         /**
         * @description Chrome's internal ID of the process that has become unresponsive.
@@ -5759,7 +5758,7 @@ declare namespace chrome.webview {
         processID: number
     }
     /**IZoomchange (Auto generated interface) */
-    export interface IZoomchange {
+    interface IZoomchange {
 
         /**
         * @description The page's previous zoom factor.
@@ -5773,3 +5772,12 @@ declare namespace chrome.webview {
     }
 
 }
+
+}
+
+/////////////////////
+// EXPORT
+/////////////////////
+interface Window {
+    chrome: typeof chrome;
+}

From 2ad5fa0077d46d0d7148e0434a4502dcc4c72bcc Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Wed, 23 May 2018 09:49:17 -0400
Subject: [PATCH 0616/1124] [cesium] update linting config

---
 types/cesium/index.d.ts  | 1 +
 types/cesium/tslint.json | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 8e2f929c83..21b80f7d05 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -6,6 +6,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+// tslint:disable-next-line:export-just-namespace
 export = Cesium;
 export as namespace Cesium;
 
diff --git a/types/cesium/tslint.json b/types/cesium/tslint.json
index 3db14f85ea..4c4fc86ace 100644
--- a/types/cesium/tslint.json
+++ b/types/cesium/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false
+    }
+}

From 00f20de939ed34c90799a0c946099a70b82775fb Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 23 May 2018 15:50:42 +0200
Subject: [PATCH 0617/1124] Compatible with noImplicitAny: true

---
 types/chrome-apps/index.d.ts | 5790 +++++++++++++++++-----------------
 1 file changed, 2895 insertions(+), 2895 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index 70446acbd0..91c1e766ec 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -21,81 +21,81 @@
  * Permissions: "accessibilityFeatures.read"
  * Important: This API works only on Chrome OS.
  */
-declare namespace  chrome {
-namespace  accessibilityFeatures {
+declare namespace chrome {
+  namespace accessibilityFeatures {
     interface AccessibilityFeaturesGetArg {
-        /** Optional. Whether to return the value that applies to the incognito session (default false).  */
-        incognito?: boolean;
+      /** Optional. Whether to return the value that applies to the incognito session (default false).  */
+      incognito?: boolean;
     }
 
     interface AccessibilityFeaturesCallbackArg {
-        /** The value of the setting. */
-        value: any;
-        /**
-         * One of
-         * • not_controllable: cannot be controlled by any extension
-         * • controlled_by_other_extensions: controlled by extensions with higher precedence
-         * • controllable_by_this_extension: can be controlled by this extension
-         * • controlled_by_this_extension: controlled by this extension
-         */
-        levelOfControl: string;
-        /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
-        incognitoSpecific?: boolean;
+      /** The value of the setting. */
+      value: any;
+      /**
+       * One of
+       * • not_controllable: cannot be controlled by any extension
+       * • controlled_by_other_extensions: controlled by extensions with higher precedence
+       * • controllable_by_this_extension: can be controlled by this extension
+       * • controlled_by_this_extension: controlled by this extension
+       */
+      levelOfControl: string;
+      /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
+      incognitoSpecific?: boolean;
     }
 
     interface AccessibilityFeaturesSetArg {
-        /**
-         * The value of the setting.
-         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-         */
-        value: any;
-        /**
-         * Optional.
-          * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
+      /**
+       * The value of the setting.
+       * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+       */
+      value: any;
+      /**
+       * Optional.
+        * The scope of the ChromeSetting. One of
+       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+       */
+      scope?: string;
     }
 
     interface AccessibilityFeaturesClearArg {
-        /**
-         * Optional.
-          * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
+      /**
+       * Optional.
+        * The scope of the ChromeSetting. One of
+       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+       */
+      scope?: string;
     }
 
     interface AccessibilityFeaturesSetting {
-        /**
-         * Gets the value of a setting.
-         * @param details Which setting to consider.
-         * @param callback The callback parameter should be a function that looks like this:
-         * function(object details) {...};
-         */
-        get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
-        /**
-         * Sets the value of a setting.
-         * @param details Which setting to change.
-         * @param callback Called at the completion of the set operation.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
-        /**
-         * Clears the setting, restoring any default value.
-         * @param details Which setting to clear.
-         * @param callback Called at the completion of the clear operation.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
+      /**
+       * Gets the value of a setting.
+       * @param details Which setting to consider.
+       * @param callback The callback parameter should be a function that looks like this:
+       * function(object details) {...};
+       */
+      get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
+      /**
+       * Sets the value of a setting.
+       * @param details Which setting to change.
+       * @param callback Called at the completion of the set operation.
+       * If you specify the callback parameter, it should be a function that looks like this:
+       * function() {...};
+       */
+      set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
+      /**
+       * Clears the setting, restoring any default value.
+       * @param details Which setting to clear.
+       * @param callback Called at the completion of the clear operation.
+       * If you specify the callback parameter, it should be a function that looks like this:
+       * function() {...};
+       */
+      clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
     }
 
     export var spokenFeedback: AccessibilityFeaturesSetting;
@@ -106,33 +106,33 @@ namespace  accessibilityFeatures {
     export var autoclick: AccessibilityFeaturesSetting;
     export var virtualKeyboard: AccessibilityFeaturesSetting;
     export var animationPolicy: AccessibilityFeaturesSetting;
-}
+  }
 
-////////////////////
-// Alarms
-////////////////////
-/**
- * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
- * Availability: Since Chrome 22.
- * Permissions:  "alarms"
- */
-namespace  alarms {
+  ////////////////////
+  // Alarms
+  ////////////////////
+  /**
+   * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
+   * Availability: Since Chrome 22.
+   * Permissions:  "alarms"
+   */
+  namespace alarms {
     interface AlarmCreateInfo {
-        /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
-        delayInMinutes?: number;
-        /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
-        periodInMinutes?: number;
-        /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
-        when?: number;
+      /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
+      delayInMinutes?: number;
+      /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
+      periodInMinutes?: number;
+      /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
+      when?: number;
     }
 
     interface Alarm {
-        /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
-        periodInMinutes?: number;
-        /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
-        scheduledTime: number;
-        /** Name of this alarm. */
-        name: string;
+      /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
+      periodInMinutes?: number;
+      /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
+      scheduledTime: number;
+      /** Name of this alarm. */
+      name: string;
     }
 
     interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
@@ -193,43 +193,43 @@ namespace  alarms {
 
     /** Fired when an alarm has elapsed. Useful for event pages. */
     export var onAlarm: AlarmEvent;
-}
+  }
 
 
-////////////////////
-// App
-////////////////////
-namespace  app {
+  ////////////////////
+  // App
+  ////////////////////
+  namespace app {
     interface AppDetails extends chrome.runtime.Manifest {
-        id: string;
+      id: string;
     }
 
     export function getDetails(): AppDetails;
-}
+  }
 
-////////////////////
-// App Runtime
-////////////////////
-namespace  app.runtime {
+  ////////////////////
+  // App Runtime
+  ////////////////////
+  namespace app.runtime {
     type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
-        'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
-        'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
-        'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
+      'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
+      'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
+      'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
 
     interface LaunchData {
-        id?: string;
-        items?: LaunchDataItem[];
-        url?: string;
-        referrerUrl?: string;
-        isKioskSession?: boolean;
-        isPublicSession?: boolean;
-        source?: LaunchSource;
-        actionData?: {};
+      id?: string;
+      items?: LaunchDataItem[];
+      url?: string;
+      referrerUrl?: string;
+      isKioskSession?: boolean;
+      isPublicSession?: boolean;
+      source?: LaunchSource;
+      actionData?: {};
     }
 
     interface LaunchDataItem {
-        entry: FileEntry;
-        type: string;
+      entry: FileEntry;
+      type: string;
     }
 
     interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
@@ -238,112 +238,112 @@ namespace  app.runtime {
 
     export var onLaunched: LaunchedEvent;
     export var onRestarted: RestartedEvent;
-}
+  }
 
-////////////////////
-// App Window
-////////////////////
-namespace  app.window {
+  ////////////////////
+  // App Window
+  ////////////////////
+  namespace app.window {
     interface ContentBounds {
-        left?: number;
-        top?: number;
-        width?: number;
-        height?: number;
+      left?: number;
+      top?: number;
+      width?: number;
+      height?: number;
     }
 
     interface BoundsSpecification {
-        left?: number;
-        top?: number;
-        width?: number;
-        height?: number;
-        minWidth?: number;
-        minHeight?: number;
-        maxWidth?: number;
-        maxHeight?: number;
+      left?: number;
+      top?: number;
+      width?: number;
+      height?: number;
+      minWidth?: number;
+      minHeight?: number;
+      maxWidth?: number;
+      maxHeight?: number;
     }
 
     interface Bounds {
-        left: number;
-        top: number;
-        width: number;
-        height: number;
-        minWidth?: number;
-        minHeight?: number;
-        maxWidth?: number;
-        maxHeight?: number;
-        setPosition(left: number, top: number): void;
-        setSize(width: number, height: number): void;
-        setMinimumSize(minWidth: number, minHeight: number): void;
-        setMaximumSize(maxWidth: number, maxHeight: number): void;
+      left: number;
+      top: number;
+      width: number;
+      height: number;
+      minWidth?: number;
+      minHeight?: number;
+      maxWidth?: number;
+      maxHeight?: number;
+      setPosition(left: number, top: number): void;
+      setSize(width: number, height: number): void;
+      setMinimumSize(minWidth: number, minHeight: number): void;
+      setMaximumSize(maxWidth: number, maxHeight: number): void;
     }
     interface FrameOptions {
-        type?: string;
-        color?: string;
-        activeColor?: string;
-        inactiveColor?: string;
+      type?: string;
+      color?: string;
+      activeColor?: string;
+      inactiveColor?: string;
     }
 
     interface CreateWindowOptions {
-        id?: string;
-        innerBounds?: BoundsSpecification;
-        outerBounds?: BoundsSpecification;
-        minWidth?: number;
-        minHeight?: number;
-        maxWidth?: number;
-        maxHeight?: number;
-        /**
-         * @description
-         * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
-         * @memberof CreateWindowOptions
-         */
-        frame?: string | FrameOptions;
-        bounds?: ContentBounds;
-        alphaEnabled?: boolean;
-        /**
-         * @description
-         * @type {string} "normal", "fullscreen", "maximized", "minimized"
-         * @memberof CreateWindowOptions
-         */
-        state?: string;
-        hidden?: boolean;
-        resizable?: boolean;
-        singleton?: boolean;
-        alwaysOnTop?: boolean;
-        focused?: boolean;
-        visibleOnAllWorkspaces?: boolean;
+      id?: string;
+      innerBounds?: BoundsSpecification;
+      outerBounds?: BoundsSpecification;
+      minWidth?: number;
+      minHeight?: number;
+      maxWidth?: number;
+      maxHeight?: number;
+      /**
+       * @description
+       * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
+       * @memberof CreateWindowOptions
+       */
+      frame?: string | FrameOptions;
+      bounds?: ContentBounds;
+      alphaEnabled?: boolean;
+      /**
+       * @description
+       * @type {string} "normal", "fullscreen", "maximized", "minimized"
+       * @memberof CreateWindowOptions
+       */
+      state?: string;
+      hidden?: boolean;
+      resizable?: boolean;
+      singleton?: boolean;
+      alwaysOnTop?: boolean;
+      focused?: boolean;
+      visibleOnAllWorkspaces?: boolean;
     }
 
     interface AppWindow {
-        focus: () => void;
-        fullscreen: () => void;
-        isFullscreen: () => boolean;
-        minimize: () => void;
-        isMinimized: () => boolean;
-        maximize: () => void;
-        isMaximized: () => boolean;
-        restore: () => void;
-        moveTo: (left: number, top: number) => void;
-        resizeTo: (width: number, height: number) => void;
-        drawAttention: () => void;
-        clearAttention: () => void;
-        close: () => void;
-        show: () => void;
-        hide: () => void;
-        getBounds: () => ContentBounds;
-        setBounds: (bounds: ContentBounds) => void;
-        isAlwaysOnTop: () => boolean;
-        setAlwaysOnTop: (alwaysOnTop: boolean) => void;
-        setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
-        contentWindow: Window;
-        id: string;
-        innerBounds: Bounds;
-        outerBounds: Bounds;
-        onBoundsChanged: WindowEvent;
-        onClosed: WindowEvent;
-        onFullscreened: WindowEvent;
-        onMaximized: WindowEvent;
-        onMinimized: WindowEvent;
-        onRestored: WindowEvent;
+      focus: () => void;
+      fullscreen: () => void;
+      isFullscreen: () => boolean;
+      minimize: () => void;
+      isMinimized: () => boolean;
+      maximize: () => void;
+      isMaximized: () => boolean;
+      restore: () => void;
+      moveTo: (left: number, top: number) => void;
+      resizeTo: (width: number, height: number) => void;
+      drawAttention: () => void;
+      clearAttention: () => void;
+      close: () => void;
+      show: () => void;
+      hide: () => void;
+      getBounds: () => ContentBounds;
+      setBounds: (bounds: ContentBounds) => void;
+      isAlwaysOnTop: () => boolean;
+      setAlwaysOnTop: (alwaysOnTop: boolean) => void;
+      setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
+      contentWindow: Window;
+      id: string;
+      innerBounds: Bounds;
+      outerBounds: Bounds;
+      onBoundsChanged: WindowEvent;
+      onClosed: WindowEvent;
+      onFullscreened: WindowEvent;
+      onMaximized: WindowEvent;
+      onMinimized: WindowEvent;
+      onRestored: WindowEvent;
     }
 
     export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
@@ -360,209 +360,209 @@ namespace  app.window {
     export var onMaximized: WindowEvent;
     export var onMinimized: WindowEvent;
     export var onRestored: WindowEvent;
-}
+  }
 
 
-////////////////////
-// Audio
-////////////////////
-/**
- * The chrome.audio API is provided to allow users to get information about and control the audio devices attached to the system. This API is currently only implemented for ChromeOS.
- * @since Chrome 59
- */
-namespace  audio {
+  ////////////////////
+  // Audio
+  ////////////////////
+  /**
+   * The chrome.audio API is provided to allow users to get information about and control the audio devices attached to the system. This API is currently only implemented for ChromeOS.
+   * @since Chrome 59
+   */
+  namespace audio {
     export type StreamType = 'INPUT' | 'OUTPUT';
     interface AudioDeviceInfo {
-        /** The unique identifier of the audio device. */
-        id: string;
-        /** Stream type associated with this device. */
-        streamType: StreamType;
-        /** Type of the device. */
-        deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
-        /** The user-friendly name (e.g. "USB Microphone"). */
-        displayName: string;
-        /** Device name. */
-        deviceName: string;
-        /** True if this is the current active device. */
-        isActive: boolean;
-        /** The sound level of the device, volume for output, gain for input. */
-        level: number;
-        /** The stable/persisted device id string when available. */
-        stableDeviceId?: string;
+      /** The unique identifier of the audio device. */
+      id: string;
+      /** Stream type associated with this device. */
+      streamType: StreamType;
+      /** Type of the device. */
+      deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
+      /** The user-friendly name (e.g. "USB Microphone"). */
+      displayName: string;
+      /** Device name. */
+      deviceName: string;
+      /** True if this is the current active device. */
+      isActive: boolean;
+      /** The sound level of the device, volume for output, gain for input. */
+      level: number;
+      /** The stable/persisted device id string when available. */
+      stableDeviceId?: string;
     }
     interface DeviceIdLists {
-        /**
-         * List of input devices specified by their ID.
-         * To indicate input devices should be unaffected, leave this property unset.
-         */
-        input?: string[];
-        /**
-         * List of output devices specified by their ID.
-         * To indicate output devices should be unaffected, leave this property unset.
-         */
-        output?: string[];
+      /**
+       * List of input devices specified by their ID.
+       * To indicate input devices should be unaffected, leave this property unset.
+       */
+      input?: string[];
+      /**
+       * List of output devices specified by their ID.
+       * To indicate output devices should be unaffected, leave this property unset.
+       */
+      output?: string[];
     }
     interface SetDeviceProperties {
-        /**
-         * The audio device's desired sound level. Defaults to the device's current sound level.
-         * If used with audio input device, represents audio device gain.
-         * If used with audio output device, represents audio device volume.
-         *
-         * Type: integer
-         */
-        level?: number;
+      /**
+       * The audio device's desired sound level. Defaults to the device's current sound level.
+       * If used with audio input device, represents audio device gain.
+       * If used with audio output device, represents audio device volume.
+       *
+       * Type: integer
+       */
+      level?: number;
     }
     interface OnLevelChangedEvent {
-        /**
-         * The callback parameter should be a function that looks like this:
-         *   function(object event) {...};
-         * @param {(event: {
-         *             deviceId: string,
-         *             level: number
-         *         }) => void} callback
-         */
-        addListener(callback: (event: {
-            deviceId: string,
-            level: number
-        }) => void): void;
+      /**
+       * The callback parameter should be a function that looks like this:
+       *   function(object event) {...};
+       * @param {(event: {
+       *             deviceId: string,
+       *             level: number
+       *         }) => void} callback
+       */
+      addListener(callback: (event: {
+        deviceId: string,
+        level: number
+      }) => void): void;
     }
     interface OnMuteChangedEvent {
-        /**
-         * The callback parameter should be a function that looks like this:
-         * function(object event) {...};
-         */
-        addListener(callback: (event: {
-            streamType: StreamType[],
-            isMuted: boolean
-        }) => void): void;
+      /**
+       * The callback parameter should be a function that looks like this:
+       * function(object event) {...};
+       */
+      addListener(callback: (event: {
+        streamType: StreamType[],
+        isMuted: boolean
+      }) => void): void;
     }
     interface OnDeviceListChangedEvent {
-        /**
-         * The callback parameter should be a function that looks like this:
-         *   function(array of AudioDeviceInfo devices) {...};
-         * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
-         */
-        addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
+      /**
+       * The callback parameter should be a function that looks like this:
+       *   function(array of AudioDeviceInfo devices) {...};
+       * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
+       */
+      addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
     }
     /**
      * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
      */
     interface Filter {
-        /**
-         * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
-         */
-        streamTypes?: StreamType[];
-        /**
-         * @description If set, only audio devices whose active state matches this value will satisfy the filter.
-         */
-        isActive?: boolean;
+      /**
+       * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
+       */
+      streamTypes?: StreamType[];
+      /**
+       * @description If set, only audio devices whose active state matches this value will satisfy the filter.
+       */
+      isActive?: boolean;
     }
     /**
      * @description Gets a list of audio devices filtered based on |filter|.
      */
-    export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => {});
-    export function getDevices(callback: (devices: AudioDeviceInfo[]) => {});
+    export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => void): void;
+    export function getDevices(callback: (devices: AudioDeviceInfo[]) => void): void;
     /** Sets lists of active input and/or output devices. */
-    export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void);
+    export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void): void;
     /** Sets the properties for the input or output device. */
-    export function setProperties(id: string, properties: SetDeviceProperties, callback: () => {});
+    export function setProperties(id: string, properties: SetDeviceProperties, callback: () => void): void;
     /**
      * @description Gets the system-wide mute state for the specified stream type.
      * @param {StreamType} streamType Stream type for which mute state should be fetched.
      * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
      */
-    export function getMute(streamType: StreamType, callback: (value: boolean) => {});
+    export function getMute(streamType: StreamType, callback: (value: boolean) => void): void;
     /**
      * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
      * @param {StreamType} streamType Stream type for which mute state should be set.
      * @param {boolean} isMuted New mute value.
      * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
      */
-    export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => {});
+    export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => void): void;
     /** Fired when sound level changes for an active audio device. */
     export var onLevelChanged: OnLevelChangedEvent;
     /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
     export var onMuteChanged: OnMuteChangedEvent;
     /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
     export var onDeviceListChanged: OnDeviceListChangedEvent;
-}
+  }
 
-////////////////////
-// Bluetooth
-////////////////////
-/**
- * Use the chrome.bluetooth API to connect to a Bluetooth device. All functions report failures via chrome.runtime.lastError.
- * Manifest: "bluetooth": {...}
- * @since Chrome 37
- */
-namespace  bluetooth {
+  ////////////////////
+  // Bluetooth
+  ////////////////////
+  /**
+   * Use the chrome.bluetooth API to connect to a Bluetooth device. All functions report failures via chrome.runtime.lastError.
+   * Manifest: "bluetooth": {...}
+   * @since Chrome 37
+   */
+  namespace bluetooth {
     interface AdapterState {
-        address: string;
-        name: string;
-        powered: boolean;
-        available: boolean;
-        discovering: boolean;
+      address: string;
+      name: string;
+      powered: boolean;
+      available: boolean;
+      discovering: boolean;
     }
     interface Device {
-        address: string;
-        name?: string;
-        deviceClass?: number;
-        vendorIdSource?: 'bluetooth' | 'usb';
-        vendorId?: number;
-        productId?: number;
-        deviceId?: number;
-        type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
-        paired?: boolean;
-        connected?: boolean;
-        /**
-         * @since Chrome 48
-         */
-        connecting?: boolean;
-        /**
-         * @since Chrome 48
-         */
-        connectable?: boolean;
-        uuids?: string[];
-        /**
-         * @since Chrome 44
-         */
-        inquiryRssi: number;
-        /**
-         * @since Chrome 44
-         */
-        inquiryTxPower: number;
+      address: string;
+      name?: string;
+      deviceClass?: number;
+      vendorIdSource?: 'bluetooth' | 'usb';
+      vendorId?: number;
+      productId?: number;
+      deviceId?: number;
+      type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
+      paired?: boolean;
+      connected?: boolean;
+      /**
+       * @since Chrome 48
+       */
+      connecting?: boolean;
+      /**
+       * @since Chrome 48
+       */
+      connectable?: boolean;
+      uuids?: string[];
+      /**
+       * @since Chrome 44
+       */
+      inquiryRssi: number;
+      /**
+       * @since Chrome 44
+       */
+      inquiryTxPower: number;
     }
 
     interface BluetoothEvent<T> {
-        addListener(callback: (event: T) => void);
+      addListener(callback: (event: T) => void): void;
     }
 
     /**
      * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
      */
     interface DeviceFilter {
-        /** Type of filter to apply to the device list. Default is all. */
-        filterType?: 'all' | 'known';
-        /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
-        limit?: number;
+      /** Type of filter to apply to the device list. Default is all. */
+      filterType?: 'all' | 'known';
+      /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
+      limit?: number;
     }
     /** Get information about the Bluetooth adapter. */
-    export function getAdapterState(callback: (adapterInfo: AdapterState) => void);
+    export function getAdapterState(callback: (adapterInfo: AdapterState) => void): void;
     /** Get information about a Bluetooth device known to the system. */
-    export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void);
+    export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void): void;
     /**
      * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
      * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
      * @param callback Called when the search is completed.
      */
-    export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void);
+    export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void): void;
     /**
      * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
      * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
      */
-    export function startDiscovery(callback: () => void);
+    export function startDiscovery(callback: () => void): void;
     /** Stop discovery. */
-    export function stopDiscovery(callback: () => void);
+    export function stopDiscovery(callback: () => void): void;
     /** Fired when the state of the Bluetooth adapter changes. */
     export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
     /** Fired when information about a new Bluetooth device is available. */
@@ -571,41 +571,41 @@ namespace  bluetooth {
     export var onDeviceChanged: BluetoothEvent<Device>;
     /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
     export var onDeviceRemoved: BluetoothEvent<Device>;
-}
-/**
- * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
- * Manifest: "bluetooth": {...}
- * @since Chrome 37
- * Important: This API works only on Chrome OS.
- * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
- */
-namespace  bluetoothLowEnergy {
+  }
+  /**
+   * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
+   * Manifest: "bluetooth": {...}
+   * @since Chrome 37
+   * Important: This API works only on Chrome OS.
+   * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
+   */
+  namespace bluetoothLowEnergy {
     /**
      * NOT IMPLEMENTED YET
      * @see https://developer.chrome.com/apps/bluetoothLowEnergy
      * */
-}
-/**
- * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
- * @since Chrome 37
- * Manifest: "bluetooth": {...}
- * Important: This API works only on OS X, Windows and Chrome OS.
- */
-namespace  bluetoothSocket {
+  }
+  /**
+   * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
+   * @since Chrome 37
+   * Manifest: "bluetooth": {...}
+   * Important: This API works only on OS X, Windows and Chrome OS.
+   */
+  namespace bluetoothSocket {
     /** NOT IMPLEMENTED YET */
-}
+  }
 
-////////////////////
-// Browser
-////////////////////
-/**
- * Use the chrome.browser API to interact with the Chrome browser associated with
- * the current application and Chrome profile.
- */
-namespace  browser {
+  ////////////////////
+  // Browser
+  ////////////////////
+  /**
+   * Use the chrome.browser API to interact with the Chrome browser associated with
+   * the current application and Chrome profile.
+   */
+  namespace browser {
     interface Options {
-        /** The URL to navigate to when the new tab is initially opened. */
-        url: string;
+      /** The URL to navigate to when the new tab is initially opened. */
+      url: string;
     }
 
     /**
@@ -625,24 +625,24 @@ namespace  browser {
     * @param options Configures how the tab should be opened.
     */
     export function openTab(options: Options): void;
-}
+  }
 
-////////////////////
-// Commands
-////////////////////
-/**
- * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
- * Availability: Since Chrome 25.
- * Manifest:  "commands": {...}
- */
-namespace  commands {
+  ////////////////////
+  // Commands
+  ////////////////////
+  /**
+   * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
+   * Availability: Since Chrome 25.
+   * Manifest:  "commands": {...}
+   */
+  namespace commands {
     interface Command {
-        /** Optional. The name of the Extension Command  */
-        name?: string;
-        /** Optional. The Extension Command description  */
-        description?: string;
-        /** Optional. The shortcut active for this command, or blank if not active.  */
-        shortcut?: string;
+      /** Optional. The name of the Extension Command  */
+      name?: string;
+      /** Optional. The Extension Command description  */
+      description?: string;
+      /** Optional. The shortcut active for this command, or blank if not active.  */
+      shortcut?: string;
     }
 
     interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
@@ -657,17 +657,17 @@ namespace  commands {
 
     /** Fired when a registered command is activated using a keyboard shortcut. */
     export var onCommand: CommandEvent;
-}
+  }
 
-////////////////////
-// Context Menus
-////////////////////
-/**
- * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
- * Availability: Since Chrome 6.
- * Permissions:  "contextMenus"
- */
-namespace  contextMenus {
+  ////////////////////
+  // Context Menus
+  ////////////////////
+  /**
+   * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
+   * Availability: Since Chrome 6.
+   * Permissions:  "contextMenus"
+   */
+  namespace contextMenus {
     /**
     * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
     **/
@@ -678,130 +678,130 @@ namespace  contextMenus {
     export type ItemType = "normal" | "checkbox" | "radio" | "separator";
 
     interface OnClickData {
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * The text for the context selection, if any.
-         */
-        selectionText?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * A flag indicating the state of a checkbox or radio item after it is clicked.
-         */
-        checked?: boolean;
-        /**
-         * @since Since Chrome 35.
-         * The ID of the menu item that was clicked.
-         */
-        menuItemId: any;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
-         */
-        frameUrl?: string;
-        /**
-         * @since Since Chrome 35.
-         * A flag indicating whether the element is editable (text input, textarea, etc.).
-         */
-        editable: boolean;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
-         */
-        mediaType?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * A flag indicating the state of a checkbox or radio item before it was clicked.
-         */
-        wasChecked?: boolean;
-        /**
-         * @since Since Chrome 35.
-         * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
-         */
-        pageUrl: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * If the element is a link, the URL it points to.
-         */
-        linkUrl?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * The parent ID, if any, for the item clicked.
-         */
-        parentMenuItemId?: any;
-        /**
-         * Optional.
-         * @since Since Chrome 35.
-         * Will be present for elements with a 'src' URL.
-         */
-        srcUrl?: string;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * The text for the context selection, if any.
+       */
+      selectionText?: string;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * A flag indicating the state of a checkbox or radio item after it is clicked.
+       */
+      checked?: boolean;
+      /**
+       * @since Since Chrome 35.
+       * The ID of the menu item that was clicked.
+       */
+      menuItemId: any;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
+       */
+      frameUrl?: string;
+      /**
+       * @since Since Chrome 35.
+       * A flag indicating whether the element is editable (text input, textarea, etc.).
+       */
+      editable: boolean;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+       */
+      mediaType?: string;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * A flag indicating the state of a checkbox or radio item before it was clicked.
+       */
+      wasChecked?: boolean;
+      /**
+       * @since Since Chrome 35.
+       * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
+       */
+      pageUrl: string;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * If the element is a link, the URL it points to.
+       */
+      linkUrl?: string;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * The parent ID, if any, for the item clicked.
+       */
+      parentMenuItemId?: any;
+      /**
+       * Optional.
+       * @since Since Chrome 35.
+       * Will be present for elements with a 'src' URL.
+       */
+      srcUrl?: string;
     }
 
     interface CreateProperties {
-        /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
-        documentUrlPatterns?: string[];
-        /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
-        checked?: boolean;
-        /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
-        title?: string;
-        /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
-        contexts?: string[];
-        /**
-         * Optional.
-         * Whether this context menu item is enabled or disabled. Defaults to true.
-         * @since Since Chrome 20.
-         */
-        enabled?: boolean;
-        /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
-        targetUrlPatterns?: string[];
-        /**
-         * Optional.
-         * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
-         * @param info Information sent when a context menu item is clicked.
-         */
-        onclick?: (info: OnClickData) => void;
-        /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
-        parentId?: any;
-        /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
-        type?: string;
-        /**
-         * Optional.
-         * @since Since Chrome 21.
-         * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-         */
-        id?: string;
-        /**
-         * @description Whether the item is visible in the menu.
-         * @since Since Chrome 62
-         */
-        visible?: boolean;
+      /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
+      documentUrlPatterns?: string[];
+      /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
+      checked?: boolean;
+      /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
+      title?: string;
+      /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
+      contexts?: string[];
+      /**
+       * Optional.
+       * Whether this context menu item is enabled or disabled. Defaults to true.
+       * @since Since Chrome 20.
+       */
+      enabled?: boolean;
+      /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
+      targetUrlPatterns?: string[];
+      /**
+       * Optional.
+       * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+       * @param info Information sent when a context menu item is clicked.
+       */
+      onclick?: (info: OnClickData) => void;
+      /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
+      parentId?: any;
+      /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
+      type?: string;
+      /**
+       * Optional.
+       * @since Since Chrome 21.
+       * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+       */
+      id?: string;
+      /**
+       * @description Whether the item is visible in the menu.
+       * @since Since Chrome 62
+       */
+      visible?: boolean;
     }
 
     interface UpdateProperties {
-        documentUrlPatterns?: string[];
-        checked?: boolean;
-        title?: string;
-        contexts?: string[];
-        /**
-         * @since Chrome 20
-         **/
-        enabled?: boolean;
-        targetUrlPatterns?: string[];
-        onclick?: Function;
-        /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
-        parentId?: any;
-        type?: string;
-        /**
-         * @description Whether the item is visible or not.
-         * @since Since Chrome 62
-         */
-        visible?: boolean;
+      documentUrlPatterns?: string[];
+      checked?: boolean;
+      title?: string;
+      contexts?: string[];
+      /**
+       * @since Chrome 20
+       **/
+      enabled?: boolean;
+      targetUrlPatterns?: string[];
+      onclick?: Function;
+      /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
+      parentId?: any;
+      type?: string;
+      /**
+       * @description Whether the item is visible or not.
+       * @since Since Chrome 62
+       */
+      visible?: boolean;
     }
 
     interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
@@ -867,30 +867,30 @@ namespace  contextMenus {
      */
     export var onClicked: MenuClickedEvent;
 
-}
+  }
 
-////////////////////
-// Document Scan
-////////////////////
-/**
- * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
- * Availability: Since Chrome 44.
- * Permissions:  "documentScan"
- * Important: This API works only on Chrome OS.
- */
-namespace  documentScan {
+  ////////////////////
+  // Document Scan
+  ////////////////////
+  /**
+   * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
+   * Availability: Since Chrome 44.
+   * Permissions:  "documentScan"
+   * Important: This API works only on Chrome OS.
+   */
+  namespace documentScan {
     interface DocumentScanOptions {
-        /** Optional. The MIME types that are accepted by the caller.  */
-        mimeTypes?: string[];
-        /** Optional. The number of scanned images allowed (defaults to 1).  */
-        maxImages?: number;
+      /** Optional. The MIME types that are accepted by the caller.  */
+      mimeTypes?: string[];
+      /** Optional. The number of scanned images allowed (defaults to 1).  */
+      maxImages?: number;
     }
 
     interface DocumentScanCallbackArg {
-        /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
-        dataUrls: string[];
-        /** The MIME type of dataUrls. */
-        mimeType: string;
+      /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
+      dataUrls: string[];
+      /** The MIME type of dataUrls. */
+      mimeType: string;
     }
 
     /**
@@ -901,160 +901,160 @@ namespace  documentScan {
      * function(object result) {...};
      */
     export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
-}
+  }
 
-////////////////////
-// Events
-////////////////////
-/**
- * The chrome.events namespace  contains common types used by APIs dispatching events to notify you when something interesting happens.
- * Availability: Since Chrome 21.
- */
-namespace  events {
+  ////////////////////
+  // Events
+  ////////////////////
+  /**
+   * The chrome.events namespace  contains common types used by APIs dispatching events to notify you when something interesting happens.
+   * Availability: Since Chrome 21.
+   */
+  namespace events {
     /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
     interface UrlFilter {
-        /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-        schemes?: string[];
-        /**
-         * Optional.
-          * Since Chrome 23.
-         * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-         */
-        urlMatches?: string;
-        /** Optional. Matches if the path segment of the URL contains a specified string.  */
-        pathContains?: string;
-        /** Optional. Matches if the host name of the URL ends with a specified string.  */
-        hostSuffix?: string;
-        /** Optional. Matches if the host name of the URL starts with a specified string.  */
-        hostPrefix?: string;
-        /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
-        hostContains?: string;
-        /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlContains?: string;
-        /** Optional. Matches if the query segment of the URL ends with a specified string.  */
-        querySuffix?: string;
-        /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlPrefix?: string;
-        /** Optional. Matches if the host name of the URL is equal to a specified string.  */
-        hostEquals?: string;
-        /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlEquals?: string;
-        /** Optional. Matches if the query segment of the URL contains a specified string.  */
-        queryContains?: string;
-        /** Optional. Matches if the path segment of the URL starts with a specified string.  */
-        pathPrefix?: string;
-        /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-        pathEquals?: string;
-        /** Optional. Matches if the path segment of the URL ends with a specified string.  */
-        pathSuffix?: string;
-        /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-        queryEquals?: string;
-        /** Optional. Matches if the query segment of the URL starts with a specified string.  */
-        queryPrefix?: string;
-        /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-        urlSuffix?: string;
-        /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-        ports?: any[];
-        /**
-         * Optional.
-          * Since Chrome 28.
-         * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-         */
-        originAndPathMatches?: string;
+      /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
+      schemes?: string[];
+      /**
+       * Optional.
+        * Since Chrome 23.
+       * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+       */
+      urlMatches?: string;
+      /** Optional. Matches if the path segment of the URL contains a specified string.  */
+      pathContains?: string;
+      /** Optional. Matches if the host name of the URL ends with a specified string.  */
+      hostSuffix?: string;
+      /** Optional. Matches if the host name of the URL starts with a specified string.  */
+      hostPrefix?: string;
+      /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
+      hostContains?: string;
+      /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+      urlContains?: string;
+      /** Optional. Matches if the query segment of the URL ends with a specified string.  */
+      querySuffix?: string;
+      /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+      urlPrefix?: string;
+      /** Optional. Matches if the host name of the URL is equal to a specified string.  */
+      hostEquals?: string;
+      /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+      urlEquals?: string;
+      /** Optional. Matches if the query segment of the URL contains a specified string.  */
+      queryContains?: string;
+      /** Optional. Matches if the path segment of the URL starts with a specified string.  */
+      pathPrefix?: string;
+      /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
+      pathEquals?: string;
+      /** Optional. Matches if the path segment of the URL ends with a specified string.  */
+      pathSuffix?: string;
+      /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
+      queryEquals?: string;
+      /** Optional. Matches if the query segment of the URL starts with a specified string.  */
+      queryPrefix?: string;
+      /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+      urlSuffix?: string;
+      /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
+      ports?: any[];
+      /**
+       * Optional.
+        * Since Chrome 28.
+       * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+       */
+      originAndPathMatches?: string;
     }
 
     /** An object which allows the addition and removal of listeners for a Chrome event. */
     interface Event<T> {
-        /**
-         * Registers an event listener callback to an event.
-         * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
-         * The callback parameter should be a function that looks like this:
-         * function() {...};
-         */
-        addListener(callback: T): void;
-        /**
-         * Returns currently registered rules.
-         * @param callback Called with registered rules.
-         * The callback parameter should be a function that looks like this:
-         * function(array of Rule rules) {...};
-         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-         */
-        getRules(callback: (rules: Rule[]) => void): void;
-        /**
-         * Returns currently registered rules.
-         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
-         * @param callback Called with registered rules.
-         * The callback parameter should be a function that looks like this:
-         * function(array of Rule rules) {...};
-         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-         */
-        getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
-        /**
-         * @param callback Listener whose registration status shall be tested.
-         */
-        hasListener(callback: T): boolean;
-        /**
-         * Unregisters currently registered rules.
-         * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
-         * @param callback Called when rules were unregistered.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
-        /**
-         * Unregisters currently registered rules.
-         * @param callback Called when rules were unregistered.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        removeRules(callback?: () => void): void;
-        /**
-         * Registers rules to handle events.
-         * @param rules Rules to be registered. These do not replace previously registered rules.
-         * @param callback Called with registered rules.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(array of Rule rules) {...};
-         * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-         */
-        addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
-        /**
-         * Deregisters an event listener callback from an event.
-         * @param callback Listener that shall be unregistered.
-         * The callback parameter should be a function that looks like this:
-         * function() {...};
-         */
-        removeListener(callback: T): void;
-        hasListeners(): boolean;
+      /**
+       * Registers an event listener callback to an event.
+       * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
+       * The callback parameter should be a function that looks like this:
+       * function() {...};
+       */
+      addListener(callback: T): void;
+      /**
+       * Returns currently registered rules.
+       * @param callback Called with registered rules.
+       * The callback parameter should be a function that looks like this:
+       * function(array of Rule rules) {...};
+       * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+       */
+      getRules(callback: (rules: Rule[]) => void): void;
+      /**
+       * Returns currently registered rules.
+       * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+       * @param callback Called with registered rules.
+       * The callback parameter should be a function that looks like this:
+       * function(array of Rule rules) {...};
+       * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+       */
+      getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
+      /**
+       * @param callback Listener whose registration status shall be tested.
+       */
+      hasListener(callback: T): boolean;
+      /**
+       * Unregisters currently registered rules.
+       * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+       * @param callback Called when rules were unregistered.
+       * If you specify the callback parameter, it should be a function that looks like this:
+       * function() {...};
+       */
+      removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
+      /**
+       * Unregisters currently registered rules.
+       * @param callback Called when rules were unregistered.
+       * If you specify the callback parameter, it should be a function that looks like this:
+       * function() {...};
+       */
+      removeRules(callback?: () => void): void;
+      /**
+       * Registers rules to handle events.
+       * @param rules Rules to be registered. These do not replace previously registered rules.
+       * @param callback Called with registered rules.
+       * If you specify the callback parameter, it should be a function that looks like this:
+       * function(array of Rule rules) {...};
+       * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+       */
+      addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
+      /**
+       * Deregisters an event listener callback from an event.
+       * @param callback Listener that shall be unregistered.
+       * The callback parameter should be a function that looks like this:
+       * function() {...};
+       */
+      removeListener(callback: T): void;
+      hasListeners(): boolean;
     }
 
     /** Description of a declarative rule for handling events. */
     interface Rule {
-        /** Optional. Optional priority of this rule. Defaults to 100.  */
-        priority?: number;
-        /** List of conditions that can trigger the actions. */
-        conditions: any[];
-        /** Optional. Optional identifier that allows referencing this rule.  */
-        id?: string;
-        /** List of actions that are triggered if one of the condtions is fulfilled. */
-        actions: any[];
-        /**
-         * Optional.
-          * Since Chrome 28.
-         * Tags can be used to annotate rules and perform operations on sets of rules.
-         */
-        tags?: string[];
+      /** Optional. Optional priority of this rule. Defaults to 100.  */
+      priority?: number;
+      /** List of conditions that can trigger the actions. */
+      conditions: any[];
+      /** Optional. Optional identifier that allows referencing this rule.  */
+      id?: string;
+      /** List of actions that are triggered if one of the condtions is fulfilled. */
+      actions: any[];
+      /**
+       * Optional.
+        * Since Chrome 28.
+       * Tags can be used to annotate rules and perform operations on sets of rules.
+       */
+      tags?: string[];
     }
-}
+  }
 
-////////////////////
-// Extension Types
-////////////////////
+  ////////////////////
+  // Extension Types
+  ////////////////////
 
-/**
- * Primary for extensions, but also used in apps.
- * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
- **/
-namespace  extensionTypes {
+  /**
+   * Primary for extensions, but also used in apps.
+   * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
+   **/
+  namespace extensionTypes {
     /**
      * The format of an image.
      **/
@@ -1063,18 +1063,18 @@ namespace  extensionTypes {
      * Details about the format and quality of an image.
      */
     interface ImageDetails {
-        /**
-         * @description The format of the resulting image. Default is "jpeg".
-         * @type {ImageFormat}
-         * @memberof ImageDetails
-         */
-        format?: ImageFormat;
-        /**
-         * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
-         * @type {number}
-         * @memberof ImageDetails
-         */
-        quality?: number;
+      /**
+       * @description The format of the resulting image. Default is "jpeg".
+       * @type {ImageFormat}
+       * @memberof ImageDetails
+       */
+      format?: ImageFormat;
+      /**
+       * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
+       * @type {number}
+       * @memberof ImageDetails
+       */
+      quality?: number;
     }
     /**
      * The soonest that the JavaScript or CSS will be injected into the tab.
@@ -1089,72 +1089,72 @@ namespace  extensionTypes {
      * @interface InjectDetails
      */
     interface InjectDetails {
-        /**
-         * JavaScript or CSS code to inject.
-         * Warning:
-         * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        code?: string;
-        /**
-         * @description JavaScript or CSS file to inject.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        file?: string;
-        /**
-         * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
-         * @type {boolean}
-         * @memberof InjectDetails
-         */
-        allFrames?: boolean;
-        /**
-         * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
-         * @since Since Chrome 50.
-         * @type {number}
-         * @memberof InjectDetails
-         */
-        frameId?: number;
-        /**
-         * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
-         * @type {boolean}
-         * @memberof InjectDetails
-         */
-        matchAboutBlank?: boolean;
-        /**
-         * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-         * @type {RunAt}
-         * @memberof InjectDetails
-         */
-        runAt: RunAt;
-        /**
-         * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
-         * @since Since Chrome 66.
-         * @type {CSSOrigin}
-         * @memberof InjectDetails
-         */
-        cssOrigin: CSSOrigin;
+      /**
+       * JavaScript or CSS code to inject.
+       * Warning:
+       * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
+       * @type {string}
+       * @memberof InjectDetails
+       */
+      code?: string;
+      /**
+       * @description JavaScript or CSS file to inject.
+       * @type {string}
+       * @memberof InjectDetails
+       */
+      file?: string;
+      /**
+       * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
+       * @type {boolean}
+       * @memberof InjectDetails
+       */
+      allFrames?: boolean;
+      /**
+       * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
+       * @since Since Chrome 50.
+       * @type {number}
+       * @memberof InjectDetails
+       */
+      frameId?: number;
+      /**
+       * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
+       * @type {boolean}
+       * @memberof InjectDetails
+       */
+      matchAboutBlank?: boolean;
+      /**
+       * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+       * @type {RunAt}
+       * @memberof InjectDetails
+       */
+      runAt: RunAt;
+      /**
+       * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
+       * @since Since Chrome 66.
+       * @type {CSSOrigin}
+       * @memberof InjectDetails
+       */
+      cssOrigin: CSSOrigin;
     }
-}
+  }
 
-////////////////////
-// FileSystem
-////////////////////
-namespace  fileSystem {
+  ////////////////////
+  // FileSystem
+  ////////////////////
+  namespace fileSystem {
 
     interface AcceptOptions {
-        description?: string;
-        mimeTypes?: string[];
-        extensions?: string[];
+      description?: string;
+      mimeTypes?: string[];
+      extensions?: string[];
     }
 
     interface ChooseEntryOptions {
-        type?: string;
-        suggestedName?: string;
-        accepts?: AcceptOptions[];
-        acceptsAllTypes?: boolean;
-        acceptsMultiple?: boolean;
+      type?: string;
+      suggestedName?: string;
+      accepts?: AcceptOptions[];
+      acceptsAllTypes?: boolean;
+      acceptsMultiple?: boolean;
     }
 
     export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
@@ -1167,236 +1167,236 @@ namespace  fileSystem {
     export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
     export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
     export function retainEntry(entry: Entry): string;
-}
+  }
 
 
-////////////////////
-// File System Provider
-////////////////////
-/**
- * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
- * Availability: Since Chrome 40.
- * Permissions:  "fileSystemProvider"
- * Important: This API works only on Chrome OS.
- */
-namespace  fileSystemProvider {
+  ////////////////////
+  // File System Provider
+  ////////////////////
+  /**
+   * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
+   * Availability: Since Chrome 40.
+   * Permissions:  "fileSystemProvider"
+   * Important: This API works only on Chrome OS.
+   */
+  namespace fileSystemProvider {
     interface OpenedFileInfo {
-        /** A request ID to be be used by consecutive read/write and close requests. */
-        openRequestId: number;
-        /** The path of the opened file. */
-        filePath: string;
-        /** Whether the file was opened for reading or writing. */
-        mode: string;
+      /** A request ID to be be used by consecutive read/write and close requests. */
+      openRequestId: number;
+      /** The path of the opened file. */
+      filePath: string;
+      /** Whether the file was opened for reading or writing. */
+      mode: string;
     }
 
     interface FileWatchersInfo {
-        /** The path of the entry being observed. */
-        entryPath: string;
-        /** Whether watching should include all child entries recursively. It can be true for directories only. */
-        recursive: boolean;
-        /** Optional. Tag used by the last notification for the watcher.  */
-        lastTag?: string;
+      /** The path of the entry being observed. */
+      entryPath: string;
+      /** Whether watching should include all child entries recursively. It can be true for directories only. */
+      recursive: boolean;
+      /** Optional. Tag used by the last notification for the watcher.  */
+      lastTag?: string;
     }
 
     interface EntryMetadata {
-        /** True if it is a directory. */
-        isDirectory: boolean;
-        /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
-        name: string;
-        /** File size in bytes. */
-        size: number;
-        /** The last modified time of this entry. */
-        modificationTime: Date;
-        /** Optional. Mime type for the entry.  */
-        mimeType?: string;
-        /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
-        thumbnail?: string;
+      /** True if it is a directory. */
+      isDirectory: boolean;
+      /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
+      name: string;
+      /** File size in bytes. */
+      size: number;
+      /** The last modified time of this entry. */
+      modificationTime: Date;
+      /** Optional. Mime type for the entry.  */
+      mimeType?: string;
+      /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
+      thumbnail?: string;
     }
 
     interface FileSystemInfo {
-        /** The identifier of the file system. */
-        fileSystemId: string;
-        /** A human-readable name for the file system. */
-        displayName: string;
-        /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
-        writable: boolean;
-        /**
-         * The maximum number of files that can be opened at once. If 0, then not limited.
-         * @since Since Chrome 42.
-         */
-        openedFilesLimit: number;
-        /**
-         * List of currently opened files.
-         * @since Since Chrome 42.
-         */
-        openedFiles: OpenedFileInfo[];
-        /**
-         * Optional.
-          * Whether the file system supports the tag field for observing directories.
-         * @since Since Chrome 45. Warning: this is the current Beta channel.
-         */
-        supportsNotifyTag?: boolean;
-        /**
-         * List of watchers.
-         * @since Since Chrome 45. Warning: this is the current Beta channel.
-         */
-        watchers: FileWatchersInfo[];
+      /** The identifier of the file system. */
+      fileSystemId: string;
+      /** A human-readable name for the file system. */
+      displayName: string;
+      /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
+      writable: boolean;
+      /**
+       * The maximum number of files that can be opened at once. If 0, then not limited.
+       * @since Since Chrome 42.
+       */
+      openedFilesLimit: number;
+      /**
+       * List of currently opened files.
+       * @since Since Chrome 42.
+       */
+      openedFiles: OpenedFileInfo[];
+      /**
+       * Optional.
+        * Whether the file system supports the tag field for observing directories.
+       * @since Since Chrome 45. Warning: this is the current Beta channel.
+       */
+      supportsNotifyTag?: boolean;
+      /**
+       * List of watchers.
+       * @since Since Chrome 45. Warning: this is the current Beta channel.
+       */
+      watchers: FileWatchersInfo[];
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
     interface GetActionsRequestedOptions {
-        /** The identifier of the file system related to this operation. */
-        fileSystemId: string;
-        /** The unique identifier of this request. */
-        requestId: number;
-        /** The path of the entry to return the list of actions for. */
-        entryPath: string;
+      /** The identifier of the file system related to this operation. */
+      fileSystemId: string;
+      /** The unique identifier of this request. */
+      requestId: number;
+      /** The path of the entry to return the list of actions for. */
+      entryPath: string;
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
     interface Action {
-        /** The identifier of the action. Any string or CommonActionId for common actions. */
-        id: string;
-        /** Optional. The title of the action. It may be ignored for common actions.  */
-        title?: string;
+      /** The identifier of the action. Any string or CommonActionId for common actions. */
+      id: string;
+      /** Optional. The title of the action. It may be ignored for common actions.  */
+      title?: string;
     }
 
     /** @since Since Chrome 45. Warning: this is the current Beta channel. */
     interface ExecuteActionRequestedOptions {
-        /** The identifier of the file system related to this operation. */
-        fileSystemId: string;
-        /** The unique identifier of this request. */
-        requestId: number;
-        /** The path of the entry to be used for the action. */
-        entryPath: string;
-        /** The identifier of the action to be executed. */
-        actionId: string;
+      /** The identifier of the file system related to this operation. */
+      fileSystemId: string;
+      /** The unique identifier of this request. */
+      requestId: number;
+      /** The path of the entry to be used for the action. */
+      entryPath: string;
+      /** The identifier of the action to be executed. */
+      actionId: string;
     }
 
     interface MountOptions {
-        /** The string indentifier of the file system. Must be unique per each extension. */
-        fileSystemId: string;
-        /** A human-readable name for the file system. */
-        displayName: string;
-        /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
-        writable?: boolean;
-        /**
-         * Optional.
-          * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
-         * @since Since Chrome 41.
-         */
-        openedFilesLimit?: number;
-        /**
-         * Optional.
-          * Whether the file system supports the tag field for observed directories.
-         * @since Since Chrome 45. Warning: this is the current Beta channel.
-         */
-        supportsNotifyTag?: boolean;
+      /** The string indentifier of the file system. Must be unique per each extension. */
+      fileSystemId: string;
+      /** A human-readable name for the file system. */
+      displayName: string;
+      /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
+      writable?: boolean;
+      /**
+       * Optional.
+        * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
+       * @since Since Chrome 41.
+       */
+      openedFilesLimit?: number;
+      /**
+       * Optional.
+        * Whether the file system supports the tag field for observed directories.
+       * @since Since Chrome 45. Warning: this is the current Beta channel.
+       */
+      supportsNotifyTag?: boolean;
     }
 
     interface UnmountOptions {
-        /** The identifier of the file system to be unmounted. */
-        fileSystemId: string;
+      /** The identifier of the file system to be unmounted. */
+      fileSystemId: string;
     }
 
     interface NotificationChange {
-        /** The path of the changed entry. */
-        entryPath: string;
-        /** The type of the change which happened to the entry. */
-        changeType: string;
+      /** The path of the changed entry. */
+      entryPath: string;
+      /** The type of the change which happened to the entry. */
+      changeType: string;
     }
 
     interface NotificationOptions {
-        /** The identifier of the file system related to this change. */
-        fileSystemId: string;
-        /** The path of the observed entry. */
-        observedPath: string;
-        /** Mode of the observed entry. */
-        recursive: boolean;
-        /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
-        changeType: string;
-        /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
-        changes?: NotificationChange[];
-        /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
-        tag?: string;
+      /** The identifier of the file system related to this change. */
+      fileSystemId: string;
+      /** The path of the observed entry. */
+      observedPath: string;
+      /** Mode of the observed entry. */
+      recursive: boolean;
+      /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
+      changeType: string;
+      /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
+      changes?: NotificationChange[];
+      /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
+      tag?: string;
     }
 
     interface RequestedEventOptions {
-        /** The identifier of the file system related to this operation. */
-        fileSystemId: string;
-        /** The unique identifier of this request. */
-        requestId: number;
+      /** The identifier of the file system related to this operation. */
+      fileSystemId: string;
+      /** The unique identifier of this request. */
+      requestId: number;
     }
 
     interface EntryPathRequestedEventOptions extends RequestedEventOptions {
-        /** The path of the entry to which this operation is related to. */
-        entryPath: string;
+      /** The path of the entry to which this operation is related to. */
+      entryPath: string;
     }
 
     interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
-        /** Set to true if the thumbnail is requested. */
-        thumbnail: boolean;
+      /** Set to true if the thumbnail is requested. */
+      thumbnail: boolean;
     }
 
     interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
-        /** The path of the directory which is to be operated on. */
-        directoryPath: string;
+      /** The path of the directory which is to be operated on. */
+      directoryPath: string;
     }
 
     interface FilePathRequestedEventOptions extends RequestedEventOptions {
-        /** The path of the entry for the operation */
-        filePath: string;
+      /** The path of the entry for the operation */
+      filePath: string;
     }
 
     interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
-        /** Whether the file will be used for reading or writing. */
-        mode: string;
+      /** Whether the file will be used for reading or writing. */
+      mode: string;
     }
 
     interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
-        /** A request ID used to open the file. */
-        openRequestId: number;
+      /** A request ID used to open the file. */
+      openRequestId: number;
     }
 
     interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
-        /** Position in the file (in bytes) to start reading from. */
-        offset: number;
-        /** Number of bytes to be returned. */
-        length: number;
+      /** Position in the file (in bytes) to start reading from. */
+      offset: number;
+      /** Number of bytes to be returned. */
+      length: number;
     }
 
     interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
-        /** Whether the operation is recursive (for directories only). */
-        recursive: boolean;
+      /** Whether the operation is recursive (for directories only). */
+      recursive: boolean;
     }
 
     interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
-        /** Whether the operation is recursive (for directories only). */
-        recursive: boolean;
+      /** Whether the operation is recursive (for directories only). */
+      recursive: boolean;
     }
 
     interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
-        /** The source path for the operation. */
-        sourcePath: string;
-        /** The destination path for the operation. */
-        targetPath: string;
+      /** The source path for the operation. */
+      sourcePath: string;
+      /** The destination path for the operation. */
+      targetPath: string;
     }
 
     interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
-        /** Number of bytes to be retained after the operation completes. */
-        length: number;
+      /** Number of bytes to be retained after the operation completes. */
+      length: number;
     }
 
     interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
-        /** Position in the file (in bytes) to start operating from. */
-        offset: number;
-        /** Buffer of bytes to be operated on the file. */
-        data: ArrayBuffer;
+      /** Position in the file (in bytes) to start operating from. */
+      offset: number;
+      /** Buffer of bytes to be operated on the file. */
+      data: ArrayBuffer;
     }
 
     interface OperationRequestedEventOptions extends RequestedEventOptions {
-        /** An ID of the request to which this operation is related. */
-        operationRequestId: number;
+      /** An ID of the request to which this operation is related. */
+      operationRequestId: number;
     }
 
     interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
@@ -1520,51 +1520,51 @@ namespace  fileSystemProvider {
      * @since Since Chrome 45. Warning: this is the current Beta channel.
      */
     export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
-}
+  }
 
-////////////////////
-// Google Cloud Messaging
-////////////////////
-/**
- * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
- * Availability: Since Chrome 35.
- * Permissions:  "gcm"
- */
-namespace  gcm {
+  ////////////////////
+  // Google Cloud Messaging
+  ////////////////////
+  /**
+   * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
+   * Availability: Since Chrome 35.
+   * Permissions:  "gcm"
+   */
+  namespace gcm {
     interface OutgoingMessage {
-        /** The ID of the server to send the message to as assigned by Google API Console. */
-        destinationId: string;
-        /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
-        messageId: string;
-        /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
-        timeToLive?: number;
-        /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
-        data: Object;
+      /** The ID of the server to send the message to as assigned by Google API Console. */
+      destinationId: string;
+      /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
+      messageId: string;
+      /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
+      timeToLive?: number;
+      /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
+      data: Object;
     }
 
     interface IncomingMessage {
-        /** The message data. */
-        data: Object;
-        /**
-         * Optional.
-         * The sender who issued the message.
-         * @since Since Chrome 41.
-         */
-        from?: string;
-        /**
-         * Optional.
-         * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
-         */
-        collapseKey?: string;
+      /** The message data. */
+      data: Object;
+      /**
+       * Optional.
+       * The sender who issued the message.
+       * @since Since Chrome 41.
+       */
+      from?: string;
+      /**
+       * Optional.
+       * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
+       */
+      collapseKey?: string;
     }
 
     interface GcmError {
-        /** The error message describing the problem. */
-        errorMessage: string;
-        /** Optional. The ID of the message with this error, if error is related to a specific message. */
-        messageId?: string;
-        /** Additional details related to the error, when available. */
-        detail: Object;
+      /** The error message describing the problem. */
+      errorMessage: string;
+      /** Optional. The ID of the message with this error, if error is related to a specific message. */
+      messageId?: string;
+      /** Additional details related to the error, when available. */
+      detail: Object;
     }
 
     interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
@@ -1608,45 +1608,45 @@ namespace  gcm {
     export var onMessagesDeleted: MessageDeletionEvent;
     /** Fired when it was not possible to send a message to the GCM server. */
     export var onSendError: GcmErrorEvent;
-}
+  }
 
-////////////////////
-// HID
-////////////////////
-/**
- * Use the chrome.hid API to interact with connected HID devices. This API provides access to HID operations from within the context of an app. Using this API, apps can function as drivers for hardware devices. Errors generated by this API are reported by setting runtime.lastError and executing the function's regular callback. The callback's regular parameters will be undefined in this case.
- * @since Chrome 38
- */
-namespace  hid {
+  ////////////////////
+  // HID
+  ////////////////////
+  /**
+   * Use the chrome.hid API to interact with connected HID devices. This API provides access to HID operations from within the context of an app. Using this API, apps can function as drivers for hardware devices. Errors generated by this API are reported by setting runtime.lastError and executing the function's regular callback. The callback's regular parameters will be undefined in this case.
+   * @since Chrome 38
+   */
+  namespace hid {
     /** NOT YET IMPLEMENTED */
-}
+  }
 
-////////////////////
-// i18n
-////////////////////
-/**
- * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
- * @since Chrome 5.
- */
-namespace  i18n {
+  ////////////////////
+  // i18n
+  ////////////////////
+  /**
+   * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
+   * @since Chrome 5.
+   */
+  namespace i18n {
     /** Holds detected ISO language code and its percentage in the input string */
     interface DetectedLanguage {
-        /** An ISO language code such as 'en' or 'fr'.
-         * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
-         * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
-        language: string;
+      /** An ISO language code such as 'en' or 'fr'.
+       * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
+       * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
+      language: string;
 
-        /** The percentage of the detected language */
-        percentage: number;
+      /** The percentage of the detected language */
+      percentage: number;
     }
 
     /** Holds detected language reliability and array of DetectedLanguage */
     interface LanguageDetectionResult {
-        /** CLD detected language reliability */
-        isReliable: boolean;
+      /** CLD detected language reliability */
+      isReliable: boolean;
 
-        /** Array of detectedLanguage */
-        languages: DetectedLanguage[];
+      /** Array of detectedLanguage */
+      languages: DetectedLanguage[];
     }
 
     /**
@@ -1673,67 +1673,67 @@ namespace  i18n {
      * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
      */
     export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
-}
+  }
 
-////////////////////
-// Identity
-////////////////////
-/**
- * Use the chrome.identity API to get OAuth2 access tokens.
- * Permissions:  "identity"
- * @since Chrome 29.
- */
-namespace  identity {
+  ////////////////////
+  // Identity
+  ////////////////////
+  /**
+   * Use the chrome.identity API to get OAuth2 access tokens.
+   * Permissions:  "identity"
+   * @since Chrome 29.
+   */
+  namespace identity {
     /** @since Chrome 32. */
     interface AccountInfo {
-        /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
-        id: string;
+      /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+      id: string;
     }
 
     interface TokenDetails {
-        /**
-         * Optional.
-         * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
-         */
-        interactive?: boolean;
-        /**
-         * Optional.
-         * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
-         * account is only supported when the "enable-new-profile-management" flag is set.
-         * @since Chrome 37.
-         */
-        account?: AccountInfo;
-        /**
-         * Optional.
-         * A list of OAuth2 scopes to request.
-         * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
-         * @since Chrome 37.
-         */
-        scopes?: string[];
+      /**
+       * Optional.
+       * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
+       */
+      interactive?: boolean;
+      /**
+       * Optional.
+       * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
+       * account is only supported when the "enable-new-profile-management" flag is set.
+       * @since Chrome 37.
+       */
+      account?: AccountInfo;
+      /**
+       * Optional.
+       * A list of OAuth2 scopes to request.
+       * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
+       * @since Chrome 37.
+       */
+      scopes?: string[];
     }
 
     interface UserInfo {
-        /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
-        email: string;
-        /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
-        id: string;
+      /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
+      email: string;
+      /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
+      id: string;
     }
 
     interface TokenInformation {
-        /** The specific token that should be removed from the cache. */
-        token: string;
+      /** The specific token that should be removed from the cache. */
+      token: string;
     }
 
     interface WebAuthFlowOptions {
-        /** The URL that initiates the auth flow. */
-        url: string;
-        /**
-         * Optional.
-         * Whether to launch auth flow in interactive mode.
-         * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
-         * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
-         */
-        interactive?: boolean;
+      /** The URL that initiates the auth flow. */
+      url: string;
+      /**
+       * Optional.
+       * Whether to launch auth flow in interactive mode.
+       * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
+       * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
+       */
+      interactive?: boolean;
     }
 
     interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
@@ -1792,17 +1792,17 @@ namespace  identity {
      * @since Chrome 33.
      */
     export var onSignInChanged: SignInChangeEvent;
-}
+  }
 
-////////////////////
-// Idle
-////////////////////
-/**
- * Use the chrome.idle API to detect when the machine's idle state changes.
- * Permissions:  "idle"
- * @since Chrome 6.
- */
-namespace  idle {
+  ////////////////////
+  // Idle
+  ////////////////////
+  /**
+   * Use the chrome.idle API to detect when the machine's idle state changes.
+   * Permissions:  "idle"
+   * @since Chrome 6.
+   */
+  namespace idle {
     interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
 
     /**
@@ -1822,112 +1822,112 @@ namespace  idle {
 
     /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
     export var onStateChanged: IdleStateChangedEvent;
-}
+  }
 
-////////////////////
-// InstanceID
-////////////////////
-/**
- * Use chrome.instanceID to access the Instance ID service.
- * @since Chrome 46
- */
-namespace  instanceID {
+  ////////////////////
+  // InstanceID
+  ////////////////////
+  /**
+   * Use chrome.instanceID to access the Instance ID service.
+   * @since Chrome 46
+   */
+  namespace instanceID {
     /** NOT YET IMPLEMENTED */
-}
+  }
 
-////////////////////
-// mDNS
-////////////////////
-/**
- * 	Use the chrome.mdns API to discover services over mDNS. This comprises a subset of the features of the NSD spec: http://www.w3.org/TR/discovery-api/
- * @since Chrome 31
- */
-namespace  mdns {
+  ////////////////////
+  // mDNS
+  ////////////////////
+  /**
+   * 	Use the chrome.mdns API to discover services over mDNS. This comprises a subset of the features of the NSD spec: http://www.w3.org/TR/discovery-api/
+   * @since Chrome 31
+   */
+  namespace mdns {
     /** NOT YET IMPLEMENTED */
-}
+  }
 
-////////////////////
-// Media Galleries
-////////////////////
-namespace  mediaGalleries {
+  ////////////////////
+  // Media Galleries
+  ////////////////////
+  namespace mediaGalleries {
     interface MediaFileSystemsOptions {
-        interactive?: 'no' | 'yes' | 'if_needed';
+      interactive?: 'no' | 'yes' | 'if_needed';
     }
 
     interface MediaFileSystemMetadata {
-        name: string;
-        galleryId: string;
-        deviceId?: string;
-        isRemovable: boolean;
-        isMediaDevice: boolean;
-        isAvailable: boolean;
+      name: string;
+      galleryId: string;
+      deviceId?: string;
+      isRemovable: boolean;
+      isMediaDevice: boolean;
+      isAvailable: boolean;
     }
 
     interface MetadataOptions {
-        metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
+      metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
     }
 
     interface RawTag {
-        type: string;
-        tags: { [name: string]: string; };
+      type: string;
+      tags: { [name: string]: string; };
     }
 
     interface Metadata {
-        // The browser sniffed mime type.
-        mimeType: string;
-        // Defined for images and video. In pixels.
-        height?: number;
-        width?: number;
-        // Defined for images only.
-        xResolution?: number;
-        yResolution?: number;
-        // Defined for audio and video. In seconds.
-        duration?: number;
-        // Defined for images and video. In degrees.
-        rotation?: number;
-        // Defined for images only.
-        cameraMake?: string;
-        cameraModel?: string;
-        exposureTimeSeconds?: number;
-        flashFired?: boolean;
-        fNumber?: number;
-        focalLengthMm?: number;
-        isoEquivalent?: number;
-        // Defined for audio and video only.
-        album?: string;
-        artist?: string;
-        comment?: string;
-        copyright?: string;
-        disc?: number;
-        genre?: string;
-        language?: string;
-        title?: string;
-        track?: number;
-        // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
-        rawTags: RawTag[];
-        // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
-        attachedImages: Blob[];
+      // The browser sniffed mime type.
+      mimeType: string;
+      // Defined for images and video. In pixels.
+      height?: number;
+      width?: number;
+      // Defined for images only.
+      xResolution?: number;
+      yResolution?: number;
+      // Defined for audio and video. In seconds.
+      duration?: number;
+      // Defined for images and video. In degrees.
+      rotation?: number;
+      // Defined for images only.
+      cameraMake?: string;
+      cameraModel?: string;
+      exposureTimeSeconds?: number;
+      flashFired?: boolean;
+      fNumber?: number;
+      focalLengthMm?: number;
+      isoEquivalent?: number;
+      // Defined for audio and video only.
+      album?: string;
+      artist?: string;
+      comment?: string;
+      copyright?: string;
+      disc?: number;
+      genre?: string;
+      language?: string;
+      title?: string;
+      track?: number;
+      // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
+      rawTags: RawTag[];
+      // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
+      attachedImages: Blob[];
     }
 
     interface GalleryWatchResult {
-        galleryId: string;
-        success: boolean;
+      galleryId: string;
+      success: boolean;
     }
 
     interface GalleryChangedEventArgs {
-        type: 'contents_changed' | 'watch_dropped';
-        galleryId: string;
+      type: 'contents_changed' | 'watch_dropped';
+      galleryId: string;
     }
 
     interface ScanProgressEventArgs {
-        // The type of progress event, i.e. start, finish, etc.
-        type: 'start' | 'cancel' | 'finish' | 'error';
-        // The number of Galleries found.
-        galleryCount?: number;
-        // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
-        audioCount?: number;
-        imageCount?: number;
-        videoCount?: number;
+      // The type of progress event, i.e. start, finish, etc.
+      type: 'start' | 'cancel' | 'finish' | 'error';
+      // The number of Galleries found.
+      galleryCount?: number;
+      // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
+      audioCount?: number;
+      imageCount?: number;
+      videoCount?: number;
     }
 
     export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
@@ -1948,17 +1948,17 @@ namespace  mediaGalleries {
 
     export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
     export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
-}
+  }
 
-////////////////////////////////////
-// Open Network Configuration (ONC)
-////////////////////////////////////
-/**
- * The chrome.networking.onc API is used for configuring network connections (Cellular, Ethernet, VPN, WiFi or WiMAX). This API is available in Chrome OS kiosk sessions.
- * Network connection configurations are specified following Open Network Configuration (ONC) specification.
- * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
- */
-namespace  networking.onc {
+  ////////////////////////////////////
+  // Open Network Configuration (ONC)
+  ////////////////////////////////////
+  /**
+   * The chrome.networking.onc API is used for configuring network connections (Cellular, Ethernet, VPN, WiFi or WiMAX). This API is available in Chrome OS kiosk sessions.
+   * Network connection configurations are specified following Open Network Configuration (ONC) specification.
+   * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
+   */
+  namespace networking.onc {
     export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
     export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
     export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
@@ -1966,182 +1966,182 @@ namespace  networking.onc {
     export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
     export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
     interface ManagedBoolean {
-        /**
-         * @description The active value currently used by the network configuration manager (e.g. Shill).
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        Active?: boolean,
-        /**
-         * @description The source from which the effective property value was determined.
-         * @type {string}
-         * @memberof ManagedBoolean
-         */
-        Effective?: string,
-        /**
-         * @description The property value provided by the user policy.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserPolicy?: boolean,
-        /**
-         * @description The property value provided by the device policy.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        DevicePolicy?: boolean,
-        /**
-         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserSettings?: boolean,
-        /**
-         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        SharedSettings?: boolean,
-        /**
-         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        UserEditable?: boolean,
-        /**
-         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedBoolean
-         */
-        DeviceEditable?: boolean
+      /**
+       * @description The active value currently used by the network configuration manager (e.g. Shill).
+       * @type {boolean}
+       * @memberof ManagedBoolean
+       */
+      Active?: boolean,
+      /**
+       * @description The source from which the effective property value was determined.
+       * @type {string}
+       * @memberof ManagedBoolean
+       */
+      Effective?: string,
+      /**
+       * @description The property value provided by the user policy.
+       * @type {boolean}
+       * @memberof ManagedBoolean
+       */
+      UserPolicy?: boolean,
+      /**
+       * @description The property value provided by the device policy.
+       * @type {boolean}
+       * @memberof ManagedBoolean
+       */
+      DevicePolicy?: boolean,
+      /**
+       * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+       * @type {boolean}
+       * @memberof ManagedBoolean
+       */
+      UserSettings?: boolean,
+      /**
+       * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+       * @type {boolean}
+       * @memberof ManagedBoolean
+       */
+      SharedSettings?: boolean,
+      /**
+       * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+       * @type {boolean}
+       * @memberof ManagedBoolean
+       */
+      UserEditable?: boolean,
+      /**
+       * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+       * @type {boolean}
+       * @memberof ManagedBoolean
+       */
+      DeviceEditable?: boolean
     }
     interface ManagedLong {
-        /**
-         * @description The active value currently used by the network configuration manager (e.g. Shill).
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        Active?: number,
-        /**
-         * @description The source from which the effective property value was determined.
-         * @type {string}
-         * @memberof ManagedLong
-         */
-        Effective?: string,
-        /**
-         * @description The property value provided by the user policy.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        UserPolicy?: number,
-        /**
-         * @description The property value provided by the device policy.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        DevicePolicy?: number,
-        /**
-         * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        UserSettings?: number,
-        /**
-         * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-         * @type {number}
-         * @memberof ManagedLong
-         */
-        SharedSettings?: number,
-        /**
-         * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedLong
-         */
-        UserEditable?: boolean,
-        /**
-         * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-         * @type {boolean}
-         * @memberof ManagedLong
-         */
-        DeviceEditable?: boolean
+      /**
+       * @description The active value currently used by the network configuration manager (e.g. Shill).
+       * @type {number}
+       * @memberof ManagedLong
+       */
+      Active?: number,
+      /**
+       * @description The source from which the effective property value was determined.
+       * @type {string}
+       * @memberof ManagedLong
+       */
+      Effective?: string,
+      /**
+       * @description The property value provided by the user policy.
+       * @type {number}
+       * @memberof ManagedLong
+       */
+      UserPolicy?: number,
+      /**
+       * @description The property value provided by the device policy.
+       * @type {number}
+       * @memberof ManagedLong
+       */
+      DevicePolicy?: number,
+      /**
+       * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+       * @type {number}
+       * @memberof ManagedLong
+       */
+      UserSettings?: number,
+      /**
+       * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+       * @type {number}
+       * @memberof ManagedLong
+       */
+      SharedSettings?: number,
+      /**
+       * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+       * @type {boolean}
+       * @memberof ManagedLong
+       */
+      UserEditable?: boolean,
+      /**
+       * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+       * @type {boolean}
+       * @memberof ManagedLong
+       */
+      DeviceEditable?: boolean
     }
-}
+  }
 
-////////////////////
-// Notifications
-// https://developer.chrome.com/extensions/notifications
-////////////////////
-/**
- * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
- * Permissions:  "notifications"
- * @since Chrome 28.
- */
-namespace  notifications {
+  ////////////////////
+  // Notifications
+  // https://developer.chrome.com/extensions/notifications
+  ////////////////////
+  /**
+   * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
+   * Permissions:  "notifications"
+   * @since Chrome 28.
+   */
+  namespace notifications {
     interface ButtonOptions {
-        title: string;
-        iconUrl?: string;
+      title: string;
+      iconUrl?: string;
     }
 
     interface ItemOptions {
-        /** Title of one item of a list notification. */
-        title: string;
-        /** Additional details about this item. */
-        message: string;
+      /** Title of one item of a list notification. */
+      title: string;
+      /** Additional details about this item. */
+      message: string;
     }
 
     interface NotificationOptions {
-        /** Optional. Which type of notification to display. Required for notifications.create method. */
-        type?: string;
-        /**
-         * Optional.
-         * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
-         * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
-         */
-        iconUrl?: string;
-        /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
-        title?: string;
-        /** Optional. Main notification content. Required for notifications.create method. */
-        message?: string;
-        /**
-         * Optional.
-         * Alternate notification content with a lower-weight font.
-         * @since Chrome 31.
-         */
-        contextMessage?: string;
-        /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
-        priority?: number;
-        /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
-        eventTime?: number;
-        /** Optional. Text and icons for up to two notification action buttons. */
-        buttons?: ButtonOptions[];
-        /** Optional. Items for multi-item notifications. */
-        items?: ItemOptions[];
-        /**
-         * Optional.
-         * Current progress ranges from 0 to 100.
-         * @since Chrome 30.
-         */
-        progress?: number;
-        /**
-         * Optional.
-         * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
-         * @since Chrome 32.
-         */
-        isClickable?: boolean;
-        /**
-         * Optional.
-         * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
-         * @since Chrome 38.
-         */
-        appIconMaskUrl?: string;
-        /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
-        imageUrl?: string;
-        /**
-         * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
-         * This defaults to false.
-         * @since Chrome 50
-         */
-        requireInteraction?: boolean;
+      /** Optional. Which type of notification to display. Required for notifications.create method. */
+      type?: string;
+      /**
+       * Optional.
+       * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
+       * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
+       */
+      iconUrl?: string;
+      /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
+      title?: string;
+      /** Optional. Main notification content. Required for notifications.create method. */
+      message?: string;
+      /**
+       * Optional.
+       * Alternate notification content with a lower-weight font.
+       * @since Chrome 31.
+       */
+      contextMessage?: string;
+      /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
+      priority?: number;
+      /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
+      eventTime?: number;
+      /** Optional. Text and icons for up to two notification action buttons. */
+      buttons?: ButtonOptions[];
+      /** Optional. Items for multi-item notifications. */
+      items?: ItemOptions[];
+      /**
+       * Optional.
+       * Current progress ranges from 0 to 100.
+       * @since Chrome 30.
+       */
+      progress?: number;
+      /**
+       * Optional.
+       * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+       * @since Chrome 32.
+       */
+      isClickable?: boolean;
+      /**
+       * Optional.
+       * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
+       * @since Chrome 38.
+       */
+      appIconMaskUrl?: string;
+      /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
+      imageUrl?: string;
+      /**
+       * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
+       * This defaults to false.
+       * @since Chrome 50
+       */
+      requireInteraction?: boolean;
     }
 
     interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
@@ -2228,45 +2228,45 @@ namespace  notifications {
      * function( PermissionLevel level) {...};
      */
     export function getPermissionLevel(callback: (level: string) => void): void;
-}
+  }
 
-////////////////////
-// Permissions
-////////////////////
-/**
- * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
- * @since Chrome 16.
- */
-namespace  permissions {
+  ////////////////////
+  // Permissions
+  ////////////////////
+  /**
+   * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
+   * @since Chrome 16.
+   */
+  namespace permissions {
     interface Permissions {
-        /**
-         * Optional.
-         * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
-         */
-        origins?: string[];
-        /**
-         * Optional.
-         * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
-         */
-        permissions?: string[];
+      /**
+       * Optional.
+       * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
+       */
+      origins?: string[];
+      /**
+       * Optional.
+       * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
+       */
+      permissions?: string[];
     }
 
     interface PermissionsRemovedEvent {
-        /**
-         * @param callback The callback parameter should be a function that looks like this:
-         * function( Permissions permissions) {...};
-         * Parameter permissions: The permissions that have been removed.
-         */
-        addListener(callback: (permissions: Permissions) => void): void;
+      /**
+       * @param callback The callback parameter should be a function that looks like this:
+       * function( Permissions permissions) {...};
+       * Parameter permissions: The permissions that have been removed.
+       */
+      addListener(callback: (permissions: Permissions) => void): void;
     }
 
     interface PermissionsAddedEvent {
-        /**
-         * @param callback The callback parameter should be a function that looks like this:
-         * function( Permissions permissions) {...};
-         * Parameter permissions: The newly acquired permissions.
-         */
-        addListener(callback: (permissions: Permissions) => void): void;
+      /**
+       * @param callback The callback parameter should be a function that looks like this:
+       * function( Permissions permissions) {...};
+       * Parameter permissions: The newly acquired permissions.
+       */
+      addListener(callback: (permissions: Permissions) => void): void;
     }
 
     /**
@@ -2302,57 +2302,57 @@ namespace  permissions {
     export var onRemoved: PermissionsRemovedEvent;
     /** Fired when the extension acquires new permissions. */
     export var onAdded: PermissionsAddedEvent;
-}
+  }
 
-////////////////////
-// Power
-////////////////////
-/**
- * Use the chrome.power API to override the system's power management features.
- * Permissions:  "power"
- * @since Chrome 27.
- */
-namespace  power {
+  ////////////////////
+  // Power
+  ////////////////////
+  /**
+   * Use the chrome.power API to override the system's power management features.
+   * Permissions:  "power"
+   * @since Chrome 27.
+   */
+  namespace power {
     /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
     export function requestKeepAwake(level: string): void;
     /** Releases a request previously made via requestKeepAwake(). */
     export function releaseKeepAwake(): void;
-}
+  }
 
-////////////////////
-// Printer Provider
-////////////////////
-/**
- * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
- * Permissions:  "printerProvider"
- * @since Chrome 44.
- */
-namespace  printerProvider {
+  ////////////////////
+  // Printer Provider
+  ////////////////////
+  /**
+   * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
+   * Permissions:  "printerProvider"
+   * @since Chrome 44.
+   */
+  namespace printerProvider {
     interface PrinterInfo {
-        /** Unique printer ID. */
-        id: string;
-        /** Printer's human readable name. */
-        name: string;
-        /** Optional. Printer's human readable description. */
-        description?: string;
+      /** Unique printer ID. */
+      id: string;
+      /** Printer's human readable name. */
+      name: string;
+      /** Optional. Printer's human readable description. */
+      description?: string;
     }
 
     interface PrinterCapabilities {
-        /** Device capabilities in CDD format. */
-        capabilities: any;
+      /** Device capabilities in CDD format. */
+      capabilities: any;
     }
 
     interface PrintJob {
-        /** ID of the printer which should handle the job. */
-        printerId: string;
-        /** The print job title. */
-        title: string;
-        /** Print ticket in  CJT format. */
-        ticket: Object;
-        /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
-        contentType: string;
-        /** Blob containing the document data to print. Format must match |contentType|. */
-        document: Blob;
+      /** ID of the printer which should handle the job. */
+      printerId: string;
+      /** The print job title. */
+      title: string;
+      /** Print ticket in  CJT format. */
+      ticket: Object;
+      /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
+      contentType: string;
+      /** Blob containing the document data to print. Format must match |contentType|. */
+      document: Blob;
     }
 
     interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
@@ -2375,52 +2375,52 @@ namespace  printerProvider {
     export var onGetCapabilityRequested: CapabilityRequestedEvent;
     /** Event fired when print manager requests printing. */
     export var onPrintRequested: PrintRequestedEvent;
-}
+  }
 
-////////////////////
-// Runtime
-////////////////////
-/**
- * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
- * @since Chrome 22
- */
-namespace  runtime {
+  ////////////////////
+  // Runtime
+  ////////////////////
+  /**
+   * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
+   * @since Chrome 22
+   */
+  namespace runtime {
     /** This will be defined during an API method callback if there was an error */
     export var lastError: LastError | undefined;
     /** The ID of the extension/app. */
     export var id: string;
 
     interface LastError {
-        /** Optional. Details about the error which occurred.  */
-        message?: string;
+      /** Optional. Details about the error which occurred.  */
+      message?: string;
     }
 
     interface ConnectInfo {
-        name?: string;
+      name?: string;
     }
 
     interface InstalledDetails {
-        /**
-         * The reason that this event is being dispatched.
-         * One of: "install", "update", "chrome_update", or "shared_module_update"
-         */
-        reason: string;
-        /**
-         * Optional.
-         * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
-         */
-        previousVersion?: string;
-        /**
-         * Optional.
-         * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
-         * @since Chrome 29.
-         */
-        id?: string;
+      /**
+       * The reason that this event is being dispatched.
+       * One of: "install", "update", "chrome_update", or "shared_module_update"
+       */
+      reason: string;
+      /**
+       * Optional.
+       * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
+       */
+      previousVersion?: string;
+      /**
+       * Optional.
+       * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
+       * @since Chrome 29.
+       */
+      id?: string;
     }
 
     interface MessageOptions {
-        /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
-        includeTlsChannelId?: boolean;
+      /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
+      includeTlsChannelId?: boolean;
     }
 
     /**
@@ -2428,23 +2428,23 @@ namespace  runtime {
      * @since Chrome 26.
      */
     interface MessageSender {
-        /** The ID of the extension or app that opened the connection, if any. */
-        id?: string;
-        /**
-         * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
-         * @since Chrome 41.
-         */
-        frameId?: number;
-        /**
-         * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
-         * @since Chrome 28.
-         */
-        url?: string;
-        /**
-         * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
-         * @since Chrome 32.
-         */
-        tlsChannelId?: string;
+      /** The ID of the extension or app that opened the connection, if any. */
+      id?: string;
+      /**
+       * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
+       * @since Chrome 41.
+       */
+      frameId?: number;
+      /**
+       * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
+       * @since Chrome 28.
+       */
+      url?: string;
+      /**
+       * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
+       * @since Chrome 32.
+       */
+      tlsChannelId?: string;
     }
 
     /**
@@ -2452,21 +2452,21 @@ namespace  runtime {
      * @since Chrome 36.
      */
     interface PlatformInfo {
-        /**
-         * The operating system chrome is running on.
-         * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
-         */
-        os: string;
-        /**
-         * The machine's processor architecture.
-         * One of: "arm", "x86-32", or "x86-64"
-         */
-        arch: string;
-        /**
-         * The native client architecture. This may be different from arch on some platforms.
-         * One of: "arm", "x86-32", or "x86-64"
-         */
-        nacl_arch: string;
+      /**
+       * The operating system chrome is running on.
+       * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
+       */
+      os: string;
+      /**
+       * The machine's processor architecture.
+       * One of: "arm", "x86-32", or "x86-64"
+       */
+      arch: string;
+      /**
+       * The native client architecture. This may be different from arch on some platforms.
+       * One of: "arm", "x86-32", or "x86-64"
+       */
+      nacl_arch: string;
     }
 
     /**
@@ -2474,28 +2474,28 @@ namespace  runtime {
      * @since Chrome 26.
      */
     interface Port {
-        postMessage: (message: Object) => void;
-        disconnect: () => void;
-        /**
-         * Optional.
-         * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
-         */
-        sender?: MessageSender;
-        /** An object which allows the addition and removal of listeners for a Chrome event. */
-        onDisconnect: PortDisconnectEvent;
-        /** An object which allows the addition and removal of listeners for a Chrome event. */
-        onMessage: PortMessageEvent;
-        name: string;
+      postMessage: (message: Object) => void;
+      disconnect: () => void;
+      /**
+       * Optional.
+       * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
+       */
+      sender?: MessageSender;
+      /** An object which allows the addition and removal of listeners for a Chrome event. */
+      onDisconnect: PortDisconnectEvent;
+      /** An object which allows the addition and removal of listeners for a Chrome event. */
+      onMessage: PortMessageEvent;
+      name: string;
     }
 
     interface UpdateAvailableDetails {
-        /** The version number of the available update. */
-        version: string;
+      /** The version number of the available update. */
+      version: string;
     }
 
     interface UpdateCheckDetails {
-        /** The version of the available update. */
-        version: string;
+      /** The version of the available update. */
+      version: string;
     }
 
     interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
@@ -2515,195 +2515,195 @@ namespace  runtime {
     interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
 
     interface ManifestIcons {
-        [size: number]: string;
+      [size: number]: string;
     }
 
     interface ManifestAction {
-        default_icon?: ManifestIcons;
-        default_title?: string;
-        default_popup?: string;
+      default_icon?: ManifestIcons;
+      default_title?: string;
+      default_popup?: string;
     }
 
     interface SearchProvider {
-        name?: string;
-        keyword?: string;
-        favicon_url?: string;
-        search_url: string;
-        encoding?: string;
-        suggest_url?: string;
-        instant_url?: string;
-        image_url?: string;
-        search_url_post_params?: string;
-        suggest_url_post_params?: string;
-        instant_url_post_params?: string;
-        image_url_post_params?: string;
-        alternate_urls?: string[];
-        prepopulated_id?: number;
-        is_default?: boolean;
+      name?: string;
+      keyword?: string;
+      favicon_url?: string;
+      search_url: string;
+      encoding?: string;
+      suggest_url?: string;
+      instant_url?: string;
+      image_url?: string;
+      search_url_post_params?: string;
+      suggest_url_post_params?: string;
+      instant_url_post_params?: string;
+      image_url_post_params?: string;
+      alternate_urls?: string[];
+      prepopulated_id?: number;
+      is_default?: boolean;
     }
 
     interface Manifest {
-        /** Required */
-        app: {
-            background: {
-                scripts?: string[];
-            }
+      /** Required */
+      app: {
+        background: {
+          scripts?: string[];
         }
-        /** Should be set to 2 */
-        manifest_version: number;
-        name: string;
-        version: string;
+      }
+      /** Should be set to 2 */
+      manifest_version: number;
+      name: string;
+      version: string;
 
-        // Recommended
-        default_locale?: string;
-        description?: string;
-        icons?: ManifestIcons;
-        // Optional
-        action_handlers?: string[];
-        author?: any;
-        automation?: any;
-        bluetooth?: {
-            uuids?: string[];
-            socket?: boolean;
-            low_energy?: boolean;
-            peripheral?: boolean;
-        };
-        commands?: {
-            [name: string]: {
-                suggested_key?: {
-                    default?: string;
-                    windows?: string;
-                    mac?: string;
-                    chromeos?: string;
-                    linux?: string;
-                };
-                description?: string;
-                global?: boolean
-            }
-        };
-        current_locale?: string;
-        event_rules?: {
-            event?: string;
-            actions?: {
-                type: string;
-            }[];
-            conditions?: {
-                type: string,
-                css?: string[]
-            }[];
+      // Recommended
+      default_locale?: string;
+      description?: string;
+      icons?: ManifestIcons;
+      // Optional
+      action_handlers?: string[];
+      author?: any;
+      automation?: any;
+      bluetooth?: {
+        uuids?: string[];
+        socket?: boolean;
+        low_energy?: boolean;
+        peripheral?: boolean;
+      };
+      commands?: {
+        [name: string]: {
+          suggested_key?: {
+            default?: string;
+            windows?: string;
+            mac?: string;
+            chromeos?: string;
+            linux?: string;
+          };
+          description?: string;
+          global?: boolean
+        }
+      };
+      current_locale?: string;
+      event_rules?: {
+        event?: string;
+        actions?: {
+          type: string;
         }[];
-        file_handlers?: {
-            [key: string]: {
-                extensions?: Array<'*' | string | { include_directories: boolean }>;
-                types?: Array<'*' | string | { include_directories: boolean }>;
-            }
-        }[];
-        file_system_provider_capabilities?: {
-            configurable?: boolean;
-            multiple_mounts?: boolean;
-            source?: string;
-        };
-        import?: {
-            id: string;
-        }[];
-        key?: string;
-        kiosk?: {
-            always_update: any;
-            required_platform_version: any;
-        };
-        kiosk_enabled?: boolean,
-        kiosk_only?: boolean,
-        kiosk_secondary_apps: any;
-        minimum_chrome_version?: string;
-        nacl_modules?: {
-            path: string;
-            mime_type: string;
-        }[];
-        oauth2?: {
-            client_id: string;
-            scopes?: string[];
-        };
-        offline_enabled?: boolean;
-        optional_permissions?: string[];
-        permissions?: string[];
-        platforms?: {
-            nacl_arch?: string;
-            sub_package_path: string;
+        conditions?: {
+          type: string,
+          css?: string[]
         }[];
+      }[];
+      file_handlers?: {
+        [key: string]: {
+          extensions?: Array<'*' | string | { include_directories: boolean }>;
+          types?: Array<'*' | string | { include_directories: boolean }>;
+        }
+      }[];
+      file_system_provider_capabilities?: {
+        configurable?: boolean;
+        multiple_mounts?: boolean;
+        source?: string;
+      };
+      import?: {
+        id: string;
+      }[];
+      key?: string;
+      kiosk?: {
+        always_update: any;
+        required_platform_version: any;
+      };
+      kiosk_enabled?: boolean,
+      kiosk_only?: boolean,
+      kiosk_secondary_apps: any;
+      minimum_chrome_version?: string;
+      nacl_modules?: {
+        path: string;
+        mime_type: string;
+      }[];
+      oauth2?: {
+        client_id: string;
+        scopes?: string[];
+      };
+      offline_enabled?: boolean;
+      optional_permissions?: string[];
+      permissions?: string[];
+      platforms?: {
+        nacl_arch?: string;
+        sub_package_path: string;
+      }[];
+      /**
+       * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
+       */
+      requirements?: {
         /**
-         * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
+         * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
+         * "requirements": {
+         *   "3D": {
+         *     "features": ["webgl"]
+         *   }
+         * }
          */
-        requirements?: {
-            /**
-             * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
-             * "requirements": {
-             *   "3D": {
-             *     "features": ["webgl"]
-             *   }
-             * }
-             */
-            '3D'?: {
-                features?: Array<string | 'webgl'>;
-            };
-            /**
-             * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
-             * "requirements": {
-             *   "plugins": {
-             *     "npapi": true
-             *   }
-             * }
-             */
-            plugins?: {
-                npapi?: boolean;
-            }
-
-            [key: string]: any;
+        '3D'?: {
+          features?: Array<string | 'webgl'>;
         };
         /**
-         * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
+         * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
+         * "requirements": {
+         *   "plugins": {
+         *     "npapi": true
+         *   }
+         * }
          */
-        sandbox?: {
-            pages: string[];
-            content_security_policy?: string;
-        };
-        short_name?: string;
-        signature?: any;
-        sockets?: {
-            tcp?: {
-                connect: string | '*';
-            };
-            udp?: {
-                send: string | '*';
-            }
-        };
-        storage?: {
-            managed_schema: string
-        };
-        system_indicator?: any;
-        update_url?: string;
-        url_handlers?: {
-            [name: string]: {
-                matches: string[];
-                title?: string;
-            }
-        };
-        usb_printers?: {
-            filters: {
-                vendorId?: number;
-                productId?: number;
-                interfaceClass?: number;
-                interfaceSubclass?: number;
-                interfaceProtocol?: number;
-            }[]
-        };
-        version_name?: string;
-        webview?: {
-            partitions?: {
-                name: string;
-                accessible_resources: string[];
-            }[]
+        plugins?: {
+          npapi?: boolean;
         }
+
         [key: string]: any;
+      };
+      /**
+       * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
+       */
+      sandbox?: {
+        pages: string[];
+        content_security_policy?: string;
+      };
+      short_name?: string;
+      signature?: any;
+      sockets?: {
+        tcp?: {
+          connect: string | '*';
+        };
+        udp?: {
+          send: string | '*';
+        }
+      };
+      storage?: {
+        managed_schema: string
+      };
+      system_indicator?: any;
+      update_url?: string;
+      url_handlers?: {
+        [name: string]: {
+          matches: string[];
+          title?: string;
+        }
+      };
+      usb_printers?: {
+        filters: {
+          vendorId?: number;
+          productId?: number;
+          interfaceClass?: number;
+          interfaceSubclass?: number;
+          interfaceProtocol?: number;
+        }[]
+      };
+      version_name?: string;
+      webview?: {
+        partitions?: {
+          name: string;
+          accessible_resources: string[];
+        }[]
+      }
+      [key: string]: any;
     }
 
     /**
@@ -2866,60 +2866,60 @@ namespace  runtime {
      * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
      */
     export var onBrowserUpdateAvailable: RuntimeEvent;
-}
+  }
 
-////////////////////
-// Serial
-////////////////////
-/**
- * Use the chrome.serial API to read from and write to a device connected to a serial port.
- * @since Chrome 23
- */
-namespace  serial {
+  ////////////////////
+  // Serial
+  ////////////////////
+  /**
+   * Use the chrome.serial API to read from and write to a device connected to a serial port.
+   * @since Chrome 23
+   */
+  namespace serial {
     /** NOT YET IMPLEMENTED */
-}
+  }
 
-////////////////////
-// Socket
-////////////////////
-namespace  socket {
+  ////////////////////
+  // Socket
+  ////////////////////
+  namespace socket {
     interface CreateInfo {
-        socketId: number;
+      socketId: number;
     }
 
     interface AcceptInfo {
-        resultCode: number;
-        socketId?: number;
+      resultCode: number;
+      socketId?: number;
     }
 
     interface ReadInfo {
-        resultCode: number;
-        data: ArrayBuffer;
+      resultCode: number;
+      data: ArrayBuffer;
     }
 
     interface WriteInfo {
-        bytesWritten: number;
+      bytesWritten: number;
     }
 
     interface RecvFromInfo {
-        resultCode: number;
-        data: ArrayBuffer;
-        port: number;
-        address: string;
+      resultCode: number;
+      data: ArrayBuffer;
+      port: number;
+      address: string;
     }
 
     interface SocketInfo {
-        socketType: string;
-        localPort?: number;
-        peerAddress?: string;
-        peerPort?: number;
-        localAddress?: string;
-        connected: boolean;
+      socketType: string;
+      localPort?: number;
+      peerAddress?: string;
+      peerPort?: number;
+      localAddress?: string;
+      connected: boolean;
     }
 
     interface NetworkInterface {
-        name: string;
-        address: string;
+      name: string;
+      address: string;
     }
 
     export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
@@ -2937,45 +2937,45 @@ namespace  socket {
     export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
     export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
     export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
-}
+  }
 
-namespace  sockets.tcp {
+  namespace sockets.tcp {
     interface CreateInfo {
-        socketId: number;
+      socketId: number;
     }
 
     interface SendInfo {
-        resultCode: number;
-        bytesSent?: number;
+      resultCode: number;
+      bytesSent?: number;
     }
 
     interface ReceiveEventArgs {
-        socketId: number;
-        data: ArrayBuffer;
+      socketId: number;
+      data: ArrayBuffer;
     }
 
     interface ReceiveErrorEventArgs {
-        socketId: number;
-        resultCode: number;
+      socketId: number;
+      resultCode: number;
     }
 
     interface SocketProperties {
-        persistent?: boolean;
-        name?: string;
-        bufferSize?: number;
+      persistent?: boolean;
+      name?: string;
+      bufferSize?: number;
     }
 
     interface SocketInfo {
-        socketId: number;
-        persistent: boolean;
-        name?: string;
-        bufferSize?: number;
-        paused: boolean;
-        connected: boolean;
-        localAddress?: string;
-        localPort?: number;
-        peerAddress?: string;
-        peerPort?: number;
+      socketId: number;
+      persistent: boolean;
+      name?: string;
+      bufferSize?: number;
+      paused: boolean;
+      connected: boolean;
+      localAddress?: string;
+      localPort?: number;
+      peerAddress?: string;
+      peerPort?: number;
     }
 
     export function create(callback: (createInfo: CreateInfo) => void): void;
@@ -2985,13 +2985,13 @@ namespace  sockets.tcp {
     export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
 
     export function setKeepAlive(socketId: number,
-        enable: boolean, callback: (result: number) => void): void;
+      enable: boolean, callback: (result: number) => void): void;
     export function setKeepAlive(socketId: number,
-        enable: boolean, delay: number, callback: (result: number) => void): void;
+      enable: boolean, delay: number, callback: (result: number) => void): void;
 
     export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
     export function connect(socketId: number,
-        peerAddress: string, peerPort: number, callback: (result: number) => void): void;
+      peerAddress: string, peerPort: number, callback: (result: number) => void): void;
     export function disconnect(socketId: number, callback?: () => void): void;
     export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
     export function close(socketId: number, callback?: () => void): void;
@@ -3000,78 +3000,78 @@ namespace  sockets.tcp {
 
     export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
     export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
-}
+  }
 
-/**
- * Use the chrome.sockets.tcpServer API to create server applications using TCP
- * connections. This API supersedes the TCP functionality previously found in
- * the chrome.socket API.
- *
- * @since Chrome 33
- * @see https://developer.chrome.com/apps/sockets_tcpServer
- */
-namespace  sockets.tcpServer {
+  /**
+   * Use the chrome.sockets.tcpServer API to create server applications using TCP
+   * connections. This API supersedes the TCP functionality previously found in
+   * the chrome.socket API.
+   *
+   * @since Chrome 33
+   * @see https://developer.chrome.com/apps/sockets_tcpServer
+   */
+  namespace sockets.tcpServer {
     interface CreateInfo {
-        socketId: number;
+      socketId: number;
     }
 
     interface AcceptEventArgs {
-        socketId: number;
-        clientSocketId: number;
+      socketId: number;
+      clientSocketId: number;
     }
 
     interface AcceptErrorEventArgs {
-        socketId: number;
-        resultCode: number;
+      socketId: number;
+      resultCode: number;
     }
 
     /**
      * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
      */
     interface SocketProperties {
-        /**
-         * Flag indicating if the socket remains open when the event page of the
-         * application is unloaded. The default value is "false." When the
-         * application is loaded, any sockets previously opened with
-         * persistent=true can be fetched with getSockets.
-         *
-         * @see http://developer.chrome.com/apps/app_lifecycle.html
-         */
-        persistent?: boolean;
+      /**
+       * Flag indicating if the socket remains open when the event page of the
+       * application is unloaded. The default value is "false." When the
+       * application is loaded, any sockets previously opened with
+       * persistent=true can be fetched with getSockets.
+       *
+       * @see http://developer.chrome.com/apps/app_lifecycle.html
+       */
+      persistent?: boolean;
 
-        /** An application-defined string associated with the socket. */
-        name?: string;
+      /** An application-defined string associated with the socket. */
+      name?: string;
     }
 
     /**
      * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
      */
     interface SocketInfo {
-        /** The socket identifier. */
-        socketId: number;
+      /** The socket identifier. */
+      socketId: number;
 
-        /**
-         * Flag indicating if the socket remains open when the event page of the
-         * application is unloaded (see SocketProperties.persistent). The
-         * default value is "false".
-         */
-        persistent: boolean;
+      /**
+       * Flag indicating if the socket remains open when the event page of the
+       * application is unloaded (see SocketProperties.persistent). The
+       * default value is "false".
+       */
+      persistent: boolean;
 
-        /** Application-defined string associated with the socket. */
-        name?: string;
+      /** Application-defined string associated with the socket. */
+      name?: string;
 
-        /**
-         * Flag indicating whether connection requests on a listening socket are
-         * dispatched through the onAccept event or queued up in the listen
-         * queue backlog. See setPaused. The default value is "false"
-         */
-        paused: boolean;
+      /**
+       * Flag indicating whether connection requests on a listening socket are
+       * dispatched through the onAccept event or queued up in the listen
+       * queue backlog. See setPaused. The default value is "false"
+       */
+      paused: boolean;
 
-        /** If the socket is listening, contains its local IPv4/6 address. */
-        localAddress?: string;
+      /** If the socket is listening, contains its local IPv4/6 address. */
+      localAddress?: string;
 
-        /** If the socket is listening, contains its local port. */
-        localPort?: number;
+      /** If the socket is listening, contains its local port. */
+      localPort?: number;
     }
 
     /**
@@ -3200,99 +3200,99 @@ namespace  sockets.tcpServer {
      * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
      */
     export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
-}
+  }
 
-/**
- * Use the chrome.sockets.udp API to send and receive data over the network
- * using UDP connections. This API supersedes the UDP functionality previously
- * found in the "socket" API.
- *
- * @since Chrome 33
- * @see https://developer.chrome.com/apps/sockets_udp
- */
-namespace  sockets.udp {
+  /**
+   * Use the chrome.sockets.udp API to send and receive data over the network
+   * using UDP connections. This API supersedes the UDP functionality previously
+   * found in the "socket" API.
+   *
+   * @since Chrome 33
+   * @see https://developer.chrome.com/apps/sockets_udp
+   */
+  namespace sockets.udp {
     interface CreateInfo {
-        socketId: number;
+      socketId: number;
     }
 
     interface SendInfo {
-        resultCode: number;
-        bytesSent?: number;
+      resultCode: number;
+      bytesSent?: number;
     }
 
     interface ReceiveEventArgs {
-        socketId: number;
-        data: ArrayBuffer;
-        remoteAddress: string;
-        remotePort: number;
+      socketId: number;
+      data: ArrayBuffer;
+      remoteAddress: string;
+      remotePort: number;
     }
 
     interface ReceiveErrorEventArgs {
-        socketId: number;
-        resultCode: number;
+      socketId: number;
+      resultCode: number;
     }
 
     /**
      * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
      */
     interface SocketProperties {
-        /**
-         * Flag indicating if the socket is left open when the event page of the
-         * application is unloaded. The default value is "false." When the
-         * application is loaded, any sockets previously opened with
-         * persistent=true can be fetched with getSockets.
-         * @see http://developer.chrome.com/apps/app_lifecycle.html
-         */
-        persistent?: boolean;
+      /**
+       * Flag indicating if the socket is left open when the event page of the
+       * application is unloaded. The default value is "false." When the
+       * application is loaded, any sockets previously opened with
+       * persistent=true can be fetched with getSockets.
+       * @see http://developer.chrome.com/apps/app_lifecycle.html
+       */
+      persistent?: boolean;
 
-        /** An application-defined string associated with the socket. */
-        name?: string;
+      /** An application-defined string associated with the socket. */
+      name?: string;
 
-        /**
-         * The size of the buffer used to receive data. If the buffer is too
-         * small to receive the UDP packet, data is lost. The default value is
-         * 4096.
-         */
-        bufferSize?: number;
+      /**
+       * The size of the buffer used to receive data. If the buffer is too
+       * small to receive the UDP packet, data is lost. The default value is
+       * 4096.
+       */
+      bufferSize?: number;
     }
 
     /**
      * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
      */
     interface SocketInfo {
-        /** The socket identifier. */
-        socketId: number;
+      /** The socket identifier. */
+      socketId: number;
 
-        /**
-         * Flag indicating whether the socket is left open when the application
-         * is suspended (see SocketProperties.persistent).
-         */
-        persistent: boolean;
+      /**
+       * Flag indicating whether the socket is left open when the application
+       * is suspended (see SocketProperties.persistent).
+       */
+      persistent: boolean;
 
-        /** Application-defined string associated with the socket. */
-        name?: string;
+      /** Application-defined string associated with the socket. */
+      name?: string;
 
-        /**
-         * The size of the buffer used to receive data. If no buffer size ha
-         * been specified explictly, the value is not provided.
-         */
-        bufferSize?: number;
+      /**
+       * The size of the buffer used to receive data. If no buffer size ha
+       * been specified explictly, the value is not provided.
+       */
+      bufferSize?: number;
 
-        /**
-         * Flag indicating whether the socket is blocked from firing onReceive
-         * events.
-         */
-        paused: boolean;
+      /**
+       * Flag indicating whether the socket is blocked from firing onReceive
+       * events.
+       */
+      paused: boolean;
 
-        /**
-         * If the underlying socket is bound, contains its local IPv4/6 address.
-         */
-        localAddress?: string;
+      /**
+       * If the underlying socket is bound, contains its local IPv4/6 address.
+       */
+      localAddress?: string;
 
-        /**
-         * If the underlying socket is bound, contains its local port.
-         */
-        localPort?: number;
+      /**
+       * If the underlying socket is bound, contains its local port.
+       */
+      localPort?: number;
     }
 
     /**
@@ -3494,100 +3494,100 @@ namespace  sockets.udp {
      * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
      */
     export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
-}
+  }
 
-////////////////////
-// Storage
-////////////////////
-/**
- * Use the chrome.storage API to store, retrieve, and track changes to user data.
- * Permissions:  "storage"
- * @since Chrome 20.
- */
-namespace  storage {
+  ////////////////////
+  // Storage
+  ////////////////////
+  /**
+   * Use the chrome.storage API to store, retrieve, and track changes to user data.
+   * Permissions:  "storage"
+   * @since Chrome 20.
+   */
+  namespace storage {
     interface StorageArea {
-        /**
-         * Gets the amount of space (in bytes) being used by one or more items.
-         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-         */
-        getBytesInUse(callback: (bytesInUse: number) => void): void;
-        /**
-         * Gets the amount of space (in bytes) being used by one or more items.
-         * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
-         * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-         * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-         */
-        getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
-        /**
-         * Removes all items from storage.
-         * @param callback Optional.
-         * Callback on success, or on failure (in which case runtime.lastError will be set).
-         */
-        clear(callback?: () => void): void;
-        /**
-         * Sets multiple items.
-         * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
-         * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
-         * @param callback Optional.
-         * Callback on success, or on failure (in which case runtime.lastError will be set).
-         */
-        set(items: Object, callback?: () => void): void;
-        /**
-         * Removes one or more items from storage.
-         * @param A single key or a list of keys for items to remove.
-         * @param callback Optional.
-         * Callback on success, or on failure (in which case runtime.lastError will be set).
-         */
-        remove(keys: string | string[], callback?: () => void): void;
-        /**
-         * Gets one or more items from storage.
-         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-         * Parameter items: Object with items in their key-value mappings.
-         */
-        get(callback: (items: { [key: string]: any }) => void): void;
-        /**
-         * Gets one or more items from storage.
-         * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
-         * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
-         * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-         * Parameter items: Object with items in their key-value mappings.
-         */
-        get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
+      /**
+       * Gets the amount of space (in bytes) being used by one or more items.
+       * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+       * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+       */
+      getBytesInUse(callback: (bytesInUse: number) => void): void;
+      /**
+       * Gets the amount of space (in bytes) being used by one or more items.
+       * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+       * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+       * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+       */
+      getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
+      /**
+       * Removes all items from storage.
+       * @param callback Optional.
+       * Callback on success, or on failure (in which case runtime.lastError will be set).
+       */
+      clear(callback?: () => void): void;
+      /**
+       * Sets multiple items.
+       * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
+       * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
+       * @param callback Optional.
+       * Callback on success, or on failure (in which case runtime.lastError will be set).
+       */
+      set(items: Object, callback?: () => void): void;
+      /**
+       * Removes one or more items from storage.
+       * @param A single key or a list of keys for items to remove.
+       * @param callback Optional.
+       * Callback on success, or on failure (in which case runtime.lastError will be set).
+       */
+      remove(keys: string | string[], callback?: () => void): void;
+      /**
+       * Gets one or more items from storage.
+       * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+       * Parameter items: Object with items in their key-value mappings.
+       */
+      get(callback: (items: { [key: string]: any }) => void): void;
+      /**
+       * Gets one or more items from storage.
+       * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
+       * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+       * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+       * Parameter items: Object with items in their key-value mappings.
+       */
+      get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
     }
 
     interface StorageChange {
-        /** Optional. The new value of the item, if there is a new value. */
-        newValue?: any;
-        /** Optional. The old value of the item, if there was an old value. */
-        oldValue?: any;
+      /** Optional. The new value of the item, if there is a new value. */
+      newValue?: any;
+      /** Optional. The old value of the item, if there was an old value. */
+      oldValue?: any;
     }
 
     interface LocalStorageArea extends StorageArea {
-        /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-        QUOTA_BYTES: number;
+      /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+      QUOTA_BYTES: number;
     }
 
     interface SyncStorageArea extends StorageArea {
-        /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
-        MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
-        /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-        QUOTA_BYTES: number;
-        /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
-        QUOTA_BYTES_PER_ITEM: number;
-        /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
-        MAX_ITEMS: number;
-        /**
-         * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
-         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-         */
-        MAX_WRITE_OPERATIONS_PER_HOUR: number;
-        /**
-         * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
-         * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-         * @since Chrome 40.
-         */
-        MAX_WRITE_OPERATIONS_PER_MINUTE: number;
+      /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
+      MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+      /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+      QUOTA_BYTES: number;
+      /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
+      QUOTA_BYTES_PER_ITEM: number;
+      /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
+      MAX_ITEMS: number;
+      /**
+       * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
+       * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+       */
+      MAX_WRITE_OPERATIONS_PER_HOUR: number;
+      /**
+       * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
+       * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+       * @since Chrome 40.
+       */
+      MAX_WRITE_OPERATIONS_PER_MINUTE: number;
     }
 
     interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
@@ -3605,157 +3605,157 @@ namespace  storage {
 
     /** Fired when one or more items change. */
     export var onChanged: StorageChangedEvent;
-}
+  }
 
-////////////////////
-// SyncFileSystem
-////////////////////
-/**
- * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive. This API is NOT for accessing arbitrary user docs stored in Google Drive. It provides app-specific syncable storage for offline and caching usage so that the same data can be available across different clients. Read Manage Data for more on using this API.
- * @since Chrome 27
- */
-namespace  syncFileSystem {
+  ////////////////////
+  // SyncFileSystem
+  ////////////////////
+  /**
+   * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive. This API is NOT for accessing arbitrary user docs stored in Google Drive. It provides app-specific syncable storage for offline and caching usage so that the same data can be available across different clients. Read Manage Data for more on using this API.
+   * @since Chrome 27
+   */
+  namespace syncFileSystem {
     /** NOT YET IMPLEMENTED */
-}
+  }
 
 
-////////////////////
-// System CPU
-////////////////////
-/**
- * Use the system.cpu API to query CPU metadata.
- * Permissions: "system.cpu"
- * @since Chrome 32.
- */
-namespace  system.cpu {
+  ////////////////////
+  // System CPU
+  ////////////////////
+  /**
+   * Use the system.cpu API to query CPU metadata.
+   * Permissions: "system.cpu"
+   * @since Chrome 32.
+   */
+  namespace system.cpu {
     interface ProcessorUsage {
-        /** The cumulative time used by userspace programs on this processor. */
-        user: number;
-        /** The cumulative time used by kernel programs on this processor. */
-        kernel: number;
-        /** The cumulative time spent idle by this processor. */
-        idle: number;
-        /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
-        total: number;
+      /** The cumulative time used by userspace programs on this processor. */
+      user: number;
+      /** The cumulative time used by kernel programs on this processor. */
+      kernel: number;
+      /** The cumulative time spent idle by this processor. */
+      idle: number;
+      /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
+      total: number;
     }
 
     interface ProcessorInfo {
-        /** Cumulative usage info for this logical processor. */
-        usage: ProcessorUsage;
+      /** Cumulative usage info for this logical processor. */
+      usage: ProcessorUsage;
     }
 
     interface CpuInfo {
-        /** The number of logical processors. */
-        numOfProcessors: number;
-        /** The architecture name of the processors. */
-        archName: string;
-        /** The model name of the processors. */
-        modelName: string;
-        /**
-         * A set of feature codes indicating some of the processor's capabilities.
-         * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
-         */
-        features: string[];
-        /** Information about each logical processor. */
-        processors: ProcessorInfo[];
+      /** The number of logical processors. */
+      numOfProcessors: number;
+      /** The architecture name of the processors. */
+      archName: string;
+      /** The model name of the processors. */
+      modelName: string;
+      /**
+       * A set of feature codes indicating some of the processor's capabilities.
+       * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
+       */
+      features: string[];
+      /** Information about each logical processor. */
+      processors: ProcessorInfo[];
     }
 
     /** Queries basic CPU information of the system. */
     export function getInfo(callback: (info: CpuInfo) => void): void;
-}
+  }
 
-////////////////////
-// System Display
-////////////////////
-/**
- * Use the system.display API to query display metadata.
- * Permissions: "system.display"
- * @since Chrome 30.
- */
-namespace  system.display {
+  ////////////////////
+  // System Display
+  ////////////////////
+  /**
+   * Use the system.display API to query display metadata.
+   * Permissions: "system.display"
+   * @since Chrome 30.
+   */
+  namespace system.display {
     interface Bounds {
-        /**  The x-coordinate of the upper-left corner. */
-        left: number;
-        /**  The y-coordinate of the upper-left corner. */
-        top: number;
-        /** The width of the display in pixels. */
-        width: number;
-        /** The height of the display in pixels. */
-        height: number;
+      /**  The x-coordinate of the upper-left corner. */
+      left: number;
+      /**  The y-coordinate of the upper-left corner. */
+      top: number;
+      /** The width of the display in pixels. */
+      width: number;
+      /** The height of the display in pixels. */
+      height: number;
     }
 
     interface Insets {
-        /** The x-axis distance from the left bound. */
-        left: number;
-        /** The y-axis distance from the top bound. */
-        top: number;
-        /** The x-axis distance from the right bound. */
-        right: number;
-        /** The y-axis distance from the bottom bound. */
-        bottom: number;
+      /** The x-axis distance from the left bound. */
+      left: number;
+      /** The y-axis distance from the top bound. */
+      top: number;
+      /** The x-axis distance from the right bound. */
+      right: number;
+      /** The y-axis distance from the bottom bound. */
+      bottom: number;
     }
 
     /**
      * @since Chrome 57
      */
     interface Point {
-        /** The x-coordinate of the point. */
-        x: number;
-        /** The y-coordinate of the point. */
-        y: number;
+      /** The x-coordinate of the point. */
+      x: number;
+      /** The y-coordinate of the point. */
+      y: number;
     }
 
     /**
      * @since Chrome 57
      */
     interface TouchCalibrationPair {
-        /**	The coordinates of the display point. */
-        displayPoint: Point;
-        /** The coordinates of the touch point corresponding to the display point. */
-        touchPoint: Point;
+      /**	The coordinates of the display point. */
+      displayPoint: Point;
+      /** The coordinates of the touch point corresponding to the display point. */
+      touchPoint: Point;
     }
 
     /**
      * @since Chrome 52
      */
     interface DisplayMode {
-        /** The display mode width in device independent (user visible) pixels. */
-        width: number;
+      /** The display mode width in device independent (user visible) pixels. */
+      width: number;
 
-        /** The display mode height in device independent (user visible) pixels. */
-        height: number;
+      /** The display mode height in device independent (user visible) pixels. */
+      height: number;
 
-        /** The display mode width in native pixels. */
-        widthInNativePixels: number;
+      /** The display mode width in native pixels. */
+      widthInNativePixels: number;
 
-        /** The display mode height in native pixels. */
-        heightInNativePixels: number;
+      /** The display mode height in native pixels. */
+      heightInNativePixels: number;
 
-        /** The display mode UI scale factor. */
-        uiScale: number;
+      /** The display mode UI scale factor. */
+      uiScale: number;
 
-        /** The display mode device scale factor. */
-        deviceScaleFactor: number;
+      /** The display mode device scale factor. */
+      deviceScaleFactor: number;
 
-        /** True if the mode is the display's native mode. */
-        isNative: boolean;
+      /** True if the mode is the display's native mode. */
+      isNative: boolean;
 
-        /** True if the display mode is currently selected. */
-        isSelected: boolean;
+      /** True if the display mode is currently selected. */
+      isSelected: boolean;
     }
 
     /**
      * @since Chrome 53
      */
     interface DisplayLayout {
-        /** The unique identifier of the display. */
-        id: string;
-        /** The unique identifier of the parent display. Empty if this is the root. */
-        parentId: string;
-        /** The layout position of this display relative to the parent. This will be ignored for the root. */
-        position: 'top' | 'right' | 'bottom' | 'left';
-        /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
-        offset: number;
+      /** The unique identifier of the display. */
+      id: string;
+      /** The unique identifier of the parent display. Empty if this is the root. */
+      parentId: string;
+      /** The layout position of this display relative to the parent. This will be ignored for the root. */
+      position: 'top' | 'right' | 'bottom' | 'left';
+      /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
+      offset: number;
     }
 
     /**
@@ -3764,14 +3764,14 @@ namespace  system.display {
      * @interface TouchCalibrationPairs
      */
     interface TouchCalibrationPairs {
-        /** First pair of touch and display point required for touch calibration. */
-        pair1: TouchCalibrationPair,
-        /** Second pair of touch and display point required for touch calibration. */
-        pair2: TouchCalibrationPair,
-        /** Third pair of touch and display point required for touch calibration. */
-        pair3: TouchCalibrationPair,
-        /** Fourth pair of touch and display point required for touch calibration. */
-        pair4: TouchCalibrationPair
+      /** First pair of touch and display point required for touch calibration. */
+      pair1: TouchCalibrationPair,
+      /** Second pair of touch and display point required for touch calibration. */
+      pair2: TouchCalibrationPair,
+      /** Third pair of touch and display point required for touch calibration. */
+      pair3: TouchCalibrationPair,
+      /** Fourth pair of touch and display point required for touch calibration. */
+      pair4: TouchCalibrationPair
     }
 
     /**
@@ -3780,37 +3780,37 @@ namespace  system.display {
      * @interface DisplayPropertiesInfo
      */
     interface DisplayPropertiesInfo {
-        /**
-         * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
-         * @since Chrome 59
-         * */
-        isUnified?: boolean;
+      /**
+       * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
+       * @since Chrome 59
+       * */
+      isUnified?: boolean;
 
-        /**
-         * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
-         */
-        mirroringSourceId?: string;
+      /**
+       * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
+       */
+      mirroringSourceId?: string;
 
-        /** If set to true, makes the display primary. No-op if set to false. */
-        isPrimary?: boolean;
+      /** If set to true, makes the display primary. No-op if set to false. */
+      isPrimary?: boolean;
 
-        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-        overscan?: Insets;
+      /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+      overscan?: Insets;
 
-        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-        rotation?: 0 | 90 | 180 | 270;
+      /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+      rotation?: 0 | 90 | 180 | 270;
 
-        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-        boundsOriginX?: number;
+      /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+      boundsOriginX?: number;
 
-        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-        boundsOriginY: number;
+      /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+      boundsOriginY: number;
 
-        /**
-         * @since Chrome 52
-         * @description If set, updates the display mode to the mode matching this value.
-         */
-        displayMode?: DisplayMode;
+      /**
+       * @since Chrome 52
+       * @description If set, updates the display mode to the mode matching this value.
+       */
+      displayMode?: DisplayMode;
     }
 
     /**
@@ -3820,56 +3820,56 @@ namespace  system.display {
      * @interface DisplayInfoFlags
      */
     interface DisplayInfoFlags {
-        /**
-         * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
-         * @type {boolean}
-         * @memberof DisplayInfoFlags
-         */
-        singleUnified?: boolean;
+      /**
+       * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
+       * @type {boolean}
+       * @memberof DisplayInfoFlags
+       */
+      singleUnified?: boolean;
     }
 
     /** Information about display properties. */
     interface DisplayInfo {
-        /** The unique identifier of the display. */
-        id: string;
-        /** The user-friendly name (e.g. "HP LCD monitor"). */
-        name: string;
-        /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
-        mirroringSourceId: string;
-        /** True if this is the primary display. */
-        isPrimary: boolean;
-        /** True if this is an internal display. */
-        isInternal: boolean;
-        /** True if this display is enabled. */
-        isEnabled: boolean;
-        /** The number of pixels per inch along the x-axis. */
-        dpiX: number;
-        /** The number of pixels per inch along the y-axis. */
-        dpiY: number;
-        /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
-        rotation: number;
-        /** The display's logical bounds. */
-        bounds: Bounds;
-        /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
-        overscan: Insets;
-        /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
-        workArea: Bounds;
+      /** The unique identifier of the display. */
+      id: string;
+      /** The user-friendly name (e.g. "HP LCD monitor"). */
+      name: string;
+      /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
+      mirroringSourceId: string;
+      /** True if this is the primary display. */
+      isPrimary: boolean;
+      /** True if this is an internal display. */
+      isInternal: boolean;
+      /** True if this display is enabled. */
+      isEnabled: boolean;
+      /** The number of pixels per inch along the x-axis. */
+      dpiX: number;
+      /** The number of pixels per inch along the y-axis. */
+      dpiY: number;
+      /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
+      rotation: number;
+      /** The display's logical bounds. */
+      bounds: Bounds;
+      /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
+      overscan: Insets;
+      /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
+      workArea: Bounds;
     }
 
     /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
     interface DisplayProps {
-        /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
-        mirroringSourceId?: string;
-        /** If set to true, makes the display primary. No-op if set to false. */
-        isPrimary?: boolean;
-        /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-        overscan?: Insets;
-        /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-        rotation?: number;
-        /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-        boundsOriginX?: number;
-        /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-        boundsOriginY?: number;
+      /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
+      mirroringSourceId?: string;
+      /** If set to true, makes the display primary. No-op if set to false. */
+      isPrimary?: boolean;
+      /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+      overscan?: Insets;
+      /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+      rotation?: number;
+      /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+      boundsOriginX?: number;
+      /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+      boundsOriginY?: number;
     }
 
     /**
@@ -3998,71 +3998,71 @@ namespace  system.display {
      * @export
      */
     export var onDisplayChanged: DisplayChangedEvent;
-}
+  }
 
-////////////////////
-// System Memory
-////////////////////
-/**
- * The chrome.system.memory API.
- * Permissions:  "system.memory"
- * @since Chrome 32.
- */
-namespace  system.memory {
+  ////////////////////
+  // System Memory
+  ////////////////////
+  /**
+   * The chrome.system.memory API.
+   * Permissions:  "system.memory"
+   * @since Chrome 32.
+   */
+  namespace system.memory {
     interface MemoryInfo {
-        /** The total amount of physical memory capacity, in bytes. */
-        capacity: number;
-        /** The amount of available capacity, in bytes. */
-        availableCapacity: number;
+      /** The total amount of physical memory capacity, in bytes. */
+      capacity: number;
+      /** The amount of available capacity, in bytes. */
+      availableCapacity: number;
     }
 
     /** Get physical memory information. */
     export function getInfo(callback: (info: MemoryInfo) => void): void;
-}
+  }
 
-////////////////////
-// System - Network
-////////////////////
-namespace  system.network {
+  ////////////////////
+  // System - Network
+  ////////////////////
+  namespace system.network {
     interface NetworkInterface {
-        name: string;
-        address: string;
-        prefixLength: number;
+      name: string;
+      address: string;
+      prefixLength: number;
     }
 
     export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
-}
+  }
 
-////////////////////
-// System Storage
-////////////////////
-/**
- * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
- * Permissions:  "system.storage"
- * @since Chrome 30.
- */
-namespace  system.storage {
+  ////////////////////
+  // System Storage
+  ////////////////////
+  /**
+   * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
+   * Permissions:  "system.storage"
+   * @since Chrome 30.
+   */
+  namespace system.storage {
     interface StorageUnitInfo {
-        /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
-        id: string;
-        /** The name of the storage unit. */
-        name: string;
-        /**
-         * The media type of the storage unit.
-         * fixed: The storage has fixed media, e.g. hard disk or SSD.
-         * removable: The storage is removable, e.g. USB flash drive.
-         * unknown: The storage type is unknown.
-         */
-        type: string;
-        /** The total amount of the storage space, in bytes. */
-        capacity: number;
+      /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
+      id: string;
+      /** The name of the storage unit. */
+      name: string;
+      /**
+       * The media type of the storage unit.
+       * fixed: The storage has fixed media, e.g. hard disk or SSD.
+       * removable: The storage is removable, e.g. USB flash drive.
+       * unknown: The storage type is unknown.
+       */
+      type: string;
+      /** The total amount of the storage space, in bytes. */
+      capacity: number;
     }
 
     interface StorageCapacityInfo {
-        /** A copied |id| of getAvailableCapacity function parameter |id|. */
-        id: string;
-        /** The available capacity of the storage device, in bytes. */
-        availableCapacity: number;
+      /** A copied |id| of getAvailableCapacity function parameter |id|. */
+      id: string;
+      /** The available capacity of the storage device, in bytes. */
+      availableCapacity: number;
     }
 
     interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
@@ -4087,90 +4087,90 @@ namespace  system.storage {
     export var onAttached: SystemStorageAttachedEvent;
     /** Fired when a removable storage is detached from the system. */
     export var onDetached: SystemStorageDetachedEvent;
-}
+  }
 
-////////////////////
-// Text to Speech
-////////////////////
-/**
- * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
- * Permissions:  "tts"
- * @since Chrome 14.
- */
-namespace  tts {
+  ////////////////////
+  // Text to Speech
+  ////////////////////
+  /**
+   * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
+   * Permissions:  "tts"
+   * @since Chrome 14.
+   */
+  namespace tts {
     /** An event from the TTS engine to communicate the status of an utterance. */
     interface TtsEvent {
-        /** Optional. The index of the current character in the utterance. */
-        charIndex?: number;
-        /** Optional. The error description, if the event type is 'error'. */
-        errorMessage?: string;
-        /**
-         * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
-         * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
-         */
-        type: string;
+      /** Optional. The index of the current character in the utterance. */
+      charIndex?: number;
+      /** Optional. The error description, if the event type is 'error'. */
+      errorMessage?: string;
+      /**
+       * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
+       * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
+       */
+      type: string;
     }
 
     /** A description of a voice available for speech synthesis. */
     interface TtsVoice {
-        /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-        lang?: string;
-        /**
-         * Optional. This voice's gender.
-         * One of: "male", or "female"
-         */
-        gender?: string;
-        /** Optional. The name of the voice. */
-        voiceName?: string;
-        /** The ID of the extension providing this voice. */
-        extensionsId?: string;
-        /** All of the callback event types that this voice is capable of sending. */
-        eventTypes?: string[];
-        /**
-         * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
-         * @since Chrome 33.
-         */
-        remote?: boolean;
+      /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+      lang?: string;
+      /**
+       * Optional. This voice's gender.
+       * One of: "male", or "female"
+       */
+      gender?: string;
+      /** Optional. The name of the voice. */
+      voiceName?: string;
+      /** The ID of the extension providing this voice. */
+      extensionsId?: string;
+      /** All of the callback event types that this voice is capable of sending. */
+      eventTypes?: string[];
+      /**
+       * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
+       * @since Chrome 33.
+       */
+      remote?: boolean;
     }
 
     interface SpeakOptions {
-        /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-        volume?: number;
-        /**
-         * Optional.
-         * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
-         */
-        enqueue?: boolean;
-        /**
-         * Optional.
-         * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
-         */
-        rate?: number;
-        /**
-         * Optional. This function is called with events that occur in the process of speaking the utterance.
-         * @param event The update event from the text-to-speech engine indicating the status of this utterance.
-         */
-        onEvent?: (event: TtsEvent) => void;
-        /**
-         * Optional.
-         * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
-         */
-        pitch?: number;
-        /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-        lang?: string;
-        /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
-        voiceName?: string;
-        /** Optional. The extension ID of the speech engine to use, if known. */
-        extensionId?: string;
-        /**
-         * Optional. Gender of voice for synthesized speech.
-         * One of: "male", or "female"
-         */
-        gender?: string;
-        /** Optional. The TTS event types the voice must support. */
-        requiredEventTypes?: string[];
-        /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
-        desiredEventTypes?: string[];
+      /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+      volume?: number;
+      /**
+       * Optional.
+       * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
+       */
+      enqueue?: boolean;
+      /**
+       * Optional.
+       * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
+       */
+      rate?: number;
+      /**
+       * Optional. This function is called with events that occur in the process of speaking the utterance.
+       * @param event The update event from the text-to-speech engine indicating the status of this utterance.
+       */
+      onEvent?: (event: TtsEvent) => void;
+      /**
+       * Optional.
+       * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
+       */
+      pitch?: number;
+      /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+      lang?: string;
+      /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
+      voiceName?: string;
+      /** Optional. The extension ID of the speech engine to use, if known. */
+      extensionId?: string;
+      /**
+       * Optional. Gender of voice for synthesized speech.
+       * One of: "male", or "female"
+       */
+      gender?: string;
+      /** Optional. The TTS event types the voice must support. */
+      requiredEventTypes?: string[];
+      /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
+      desiredEventTypes?: string[];
     }
 
     /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
@@ -4202,48 +4202,48 @@ namespace  tts {
      * @since Chrome 29.
      */
     export function resume(): void;
-}
+  }
 
-////////////////////
-// Types
-////////////////////
-/**
- * The chrome.types API contains type declarations for Chrome.
- * @since Chrome 13.
- */
-namespace  types {
+  ////////////////////
+  // Types
+  ////////////////////
+  /**
+   * The chrome.types API contains type declarations for Chrome.
+   * @since Chrome 13.
+   */
+  namespace types {
     interface ChromeSettingClearDetails {
-        /**
-         * Optional.
-         * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
+      /**
+       * Optional.
+       * The scope of the ChromeSetting. One of
+       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+       */
+      scope?: string;
     }
 
     interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
-        /**
-         * The value of the setting.
-         * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-         */
-        value: any;
-        /**
-         * Optional.
-         * The scope of the ChromeSetting. One of
-         * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-         * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-         * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-         * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-         */
-        scope?: string;
+      /**
+       * The value of the setting.
+       * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+       */
+      value: any;
+      /**
+       * Optional.
+       * The scope of the ChromeSetting. One of
+       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+       */
+      scope?: string;
     }
 
     interface ChromeSettingGetDetails {
-        /** Optional. Whether to return the value that applies to the incognito session (default false). */
-        incognito?: boolean;
+      /** Optional. Whether to return the value that applies to the incognito session (default false). */
+      incognito?: boolean;
     }
 
     /**
@@ -4252,135 +4252,135 @@ namespace  types {
     export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
     interface ChromeSettingGetResultDetails {
-        /**
-         * One of
-         * • not_controllable: cannot be controlled by any extension
-         * • controlled_by_other_extensions: controlled by extensions with higher precedence
-         * • controllable_by_this_extension: can be controlled by this extension
-         * • controlled_by_this_extension: controlled by this extension
-         */
-        levelOfControl: string;
-        /** The value of the setting. */
-        value: any;
-        /**
-         * Optional.
-         * Whether the effective value is specific to the incognito session.
-         * This property will only be present if the incognito property in the details parameter of get() was true.
-         */
-        incognitoSpecific?: boolean;
+      /**
+       * One of
+       * • not_controllable: cannot be controlled by any extension
+       * • controlled_by_other_extensions: controlled by extensions with higher precedence
+       * • controllable_by_this_extension: can be controlled by this extension
+       * • controlled_by_this_extension: controlled by this extension
+       */
+      levelOfControl: string;
+      /** The value of the setting. */
+      value: any;
+      /**
+       * Optional.
+       * Whether the effective value is specific to the incognito session.
+       * This property will only be present if the incognito property in the details parameter of get() was true.
+       */
+      incognitoSpecific?: boolean;
     }
 
     interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
 
     /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
     interface ChromeSetting {
-        /**
-         * Sets the value of a setting.
-         * @param details Which setting to change.
-         * @param callback Optional. Called at the completion of the set operation.
-         */
-        set(details: ChromeSettingSetDetails, callback?: Function): void;
-        /**
-         * Gets the value of a setting.
-         * @param details Which setting to consider.
-         */
-        get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
-        /**
-         * Clears the setting, restoring any default value.
-         * @param details Which setting to clear.
-         * @param callback Optional. Called at the completion of the clear operation.
-         */
-        clear(details: ChromeSettingClearDetails, callback?: Function): void;
-        /** Fired after the setting changes. */
-        onChange: ChromeSettingChangedEvent;
+      /**
+       * Sets the value of a setting.
+       * @param details Which setting to change.
+       * @param callback Optional. Called at the completion of the set operation.
+       */
+      set(details: ChromeSettingSetDetails, callback?: Function): void;
+      /**
+       * Gets the value of a setting.
+       * @param details Which setting to consider.
+       */
+      get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
+      /**
+       * Clears the setting, restoring any default value.
+       * @param details Which setting to clear.
+       * @param callback Optional. Called at the completion of the clear operation.
+       */
+      clear(details: ChromeSettingClearDetails, callback?: Function): void;
+      /** Fired after the setting changes. */
+      onChange: ChromeSettingChangedEvent;
     }
-}
+  }
 
-////////////////////
-// USB
-////////////////////
-namespace  usb {
+  ////////////////////
+  // USB
+  ////////////////////
+  namespace usb {
     type Direction = 'in' | 'out';
 
     interface Device {
-        device: number,
-        vendorId: number,
-        productId: number,
-        productName: string,
-        manufacturerName: string,
-        serialNumber: string
+      device: number,
+      vendorId: number,
+      productId: number,
+      productName: string,
+      manufacturerName: string,
+      serialNumber: string
     }
 
     interface ConnectionHandle {
-        handle: number,
-        vendorId: number,
-        productId: number
+      handle: number,
+      vendorId: number,
+      productId: number
     }
 
     interface EndpointDescriptor {
-        address: number,
-        type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
-        direction: Direction,
-        maximumPacketSize: number,
-        synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
-        usage?: 'data' | 'feedback' | 'explicitFeedback',
-        pollingInterval?: number,
-        extra_data: ArrayBuffer
+      address: number,
+      type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
+      direction: Direction,
+      maximumPacketSize: number,
+      synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
+      usage?: 'data' | 'feedback' | 'explicitFeedback',
+      pollingInterval?: number,
+      extra_data: ArrayBuffer
     }
 
     interface InterfaceDescriptor {
-        interfaceNumber: number,
-        alternateSetting: number,
-        interfaceClass: number,
-        interfaceSubclass: number,
-        interfaceProtocol: number,
-        description?: string,
-        endpoints: EndpointDescriptor[],
-        extra_data: ArrayBuffer
+      interfaceNumber: number,
+      alternateSetting: number,
+      interfaceClass: number,
+      interfaceSubclass: number,
+      interfaceProtocol: number,
+      description?: string,
+      endpoints: EndpointDescriptor[],
+      extra_data: ArrayBuffer
     }
 
     interface ConfigDescriptor {
-        active: boolean,
-        configurationValue: number,
-        description?: string,
-        selfPowered: boolean,
-        remoteWakeup: boolean,
-        maxPower: number,
-        interfaces: InterfaceDescriptor[],
-        extra_data: ArrayBuffer
+      active: boolean,
+      configurationValue: number,
+      description?: string,
+      selfPowered: boolean,
+      remoteWakeup: boolean,
+      maxPower: number,
+      interfaces: InterfaceDescriptor[],
+      extra_data: ArrayBuffer
     }
 
     interface GenericTransferInfo {
-        direction: Direction,
-        endpoint: number,
-        length?: number,
-        data?: ArrayBuffer,
-        timeout?: number
+      direction: Direction,
+      endpoint: number,
+      length?: number,
+      data?: ArrayBuffer,
+      timeout?: number
     }
 
     interface TransferResultInfo {
-        resultCode: number,
-        data?: ArrayBuffer
+      resultCode: number,
+      data?: ArrayBuffer
     }
 
     interface DeviceFilter {
-        vendorId?: number,
-        productId?: number,
-        interfaceClass?: number,
-        interfaceSubclass?: number,
-        interfaceProtocol?: number
+      vendorId?: number,
+      productId?: number,
+      interfaceClass?: number,
+      interfaceSubclass?: number,
+      interfaceProtocol?: number
     }
 
     interface TransferInfo {
-        direction: Direction;
-        recipient: 'device' | 'interface' | 'endpoint' | 'other';
-        requestType: 'standard' | 'class' | 'vendor' | 'reserved';
-        request: number;
-        value: number;
-        index: number;
-        length?: number;
-        data?: ArrayBuffer;
-        timeout?: number;
+      direction: Direction;
+      recipient: 'device' | 'interface' | 'endpoint' | 'other';
+      requestType: 'standard' | 'class' | 'vendor' | 'reserved';
+      request: number;
+      value: number;
+      index: number;
+      length?: number;
+      data?: ArrayBuffer;
+      timeout?: number;
     }
 
     interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
@@ -4406,38 +4406,38 @@ namespace  usb {
     export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
     export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
     export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
-}
+  }
 
 
-////////////////////
-// VPN Provider
-////////////////////
-/**
- * Use the chrome.vpnProvider API to implement a VPN client.
- * Permissions:  "vpnProvider"
- * Important: This API works only on Chrome OS.
- * @since Chrome 43.
- */
-namespace  vpnProvider {
+  ////////////////////
+  // VPN Provider
+  ////////////////////
+  /**
+   * Use the chrome.vpnProvider API to implement a VPN client.
+   * Permissions:  "vpnProvider"
+   * Important: This API works only on Chrome OS.
+   * @since Chrome 43.
+   */
+  namespace vpnProvider {
     interface VpnSessionParameters {
-        /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
-        address: string;
-        /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
-        broadcastAddress?: string;
-        /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
-        mtu?: string;
-        /**
-         * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-         */
-        exclusionList: string[];
-        /**
-         * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-         */
-        inclusionList: string[];
-        /** Optional. A list of search domains. (default: no search domain) */
-        domainSearch?: string[];
-        /** A list of IPs for the DNS servers. */
-        dnsServer: string[];
+      /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
+      address: string;
+      /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
+      broadcastAddress?: string;
+      /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
+      mtu?: string;
+      /**
+       * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+       */
+      exclusionList: string[];
+      /**
+       * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+       */
+      inclusionList: string[];
+      /** Optional. A list of search domains. (default: no search domain) */
+      domainSearch?: string[];
+      /** A list of IPs for the DNS servers. */
+      dnsServer: string[];
     }
 
     interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
@@ -4494,32 +4494,32 @@ namespace  vpnProvider {
     export var onConfigCreated: VpnConfigCreationEvent;
     /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
     export var onUIEvent: VpnUiEvent;
-}
+  }
 
-////////////////////
-// Wallpaper
-////////////////////
-/**
- * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
- * Permissions:  "wallpaper"
- * Important: This API works only on Chrome OS.
- * @since Chrome 43.
- */
-namespace  wallpaper {
+  ////////////////////
+  // Wallpaper
+  ////////////////////
+  /**
+   * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
+   * Permissions:  "wallpaper"
+   * Important: This API works only on Chrome OS.
+   * @since Chrome 43.
+   */
+  namespace wallpaper {
     interface WallpaperDetails {
-        /** Optional. The jpeg or png encoded wallpaper image. */
-        data?: any;
-        /** Optional. The URL of the wallpaper to be set. */
-        url?: string;
-        /**
-         * The supported wallpaper layouts.
-         * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
-         */
-        layout: string;
-        /** The file name of the saved wallpaper. */
-        filename: string;
-        /** Optional. True if a 128x60 thumbnail should be generated. */
-        thumbnail?: boolean;
+      /** Optional. The jpeg or png encoded wallpaper image. */
+      data?: any;
+      /** Optional. The URL of the wallpaper to be set. */
+      url?: string;
+      /**
+       * The supported wallpaper layouts.
+       * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
+       */
+      layout: string;
+      /** The file name of the saved wallpaper. */
+      filename: string;
+      /** Optional. True if a 128x60 thumbnail should be generated. */
+      thumbnail?: boolean;
     }
 
     /**
@@ -4528,82 +4528,82 @@ namespace  wallpaper {
      * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
      */
     export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
-}
+  }
 
 
-///////////////////
-// Webview Tag
-///////////////////
-/**
- * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
- */
-namespace  webview {
+  ///////////////////
+  // Webview Tag
+  ///////////////////
+  /**
+   * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
+   */
+  namespace webview {
     /** Options that determine what data should be cleared by `clearData`. */
     interface ClearDataOptions {
-        /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
-        since?: number;
+      /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
+      since?: number;
     }
     interface WindowEvent extends chrome.events.Event<() => void> { }
 
     interface ConsoleEvent extends Event {
-        /**
-         * @description The severity level of the log message. Ranges from 0 to 4.
-         * @type {number}
-         * @memberof ConsoleEvent
-         */
-        level: number;
-        /**
-         * @description The logged message contents.
-         * @type {string}
-         * @memberof ConsoleEvent
-         */
-        message: string;
-        /**
-         * @description The line number of the message source.
-         * @type {number}
-         * @memberof ConsoleEvent
-         */
-        line: number;
-        /**
-         * @description A string identifying the resource which logged the message.
-         * @type {string}
-         * @memberof ConsoleEvent
-         */
-        sourceId: string;
+      /**
+       * @description The severity level of the log message. Ranges from 0 to 4.
+       * @type {number}
+       * @memberof ConsoleEvent
+       */
+      level: number;
+      /**
+       * @description The logged message contents.
+       * @type {string}
+       * @memberof ConsoleEvent
+       */
+      message: string;
+      /**
+       * @description The line number of the message source.
+       * @type {number}
+       * @memberof ConsoleEvent
+       */
+      line: number;
+      /**
+       * @description A string identifying the resource which logged the message.
+       * @type {string}
+       * @memberof ConsoleEvent
+       */
+      sourceId: string;
     }
 
     interface ExitEvent extends Event {
-        /**
-         * @description Chrome's internal ID of the process that exited.
-         * @type {number}
-         * @memberof ExitEvent
-         */
-        processID: number;
-        /**
-         * @description String indicating the reason for the exit.
-         * @type {string}
-         * @memberof ExitEvent
-         */
-        reason: 'normal' | 'abnormal' | 'crash' | 'kill';
+      /**
+       * @description Chrome's internal ID of the process that exited.
+       * @type {number}
+       * @memberof ExitEvent
+       */
+      processID: number;
+      /**
+       * @description String indicating the reason for the exit.
+       * @type {string}
+       * @memberof ExitEvent
+       */
+      reason: 'normal' | 'abnormal' | 'crash' | 'kill';
     }
 
     /** Description of a declarative rule for handling events. */
     interface Rule {
-        /** Optional priority of this rule. Defaults to 100.  */
-        priority?: number;
-        /** List of conditions that can trigger the actions. */
-        conditions: any[];
-        /** Optional. Optional identifier that allows referencing this rule.  */
-        id?: string;
-        /** List of actions that are triggered if one of the condtions is fulfilled. */
-        actions: any[];
-        /**
-         * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
-         * @since Chrome 28
-         * @type {string[]}
-         * @memberof Rule
-         */
-        tags?: string[];
+      /** Optional priority of this rule. Defaults to 100.  */
+      priority?: number;
+      /** List of conditions that can trigger the actions. */
+      conditions: any[];
+      /** Optional. Optional identifier that allows referencing this rule.  */
+      id?: string;
+      /** List of actions that are triggered if one of the condtions is fulfilled. */
+      actions: any[];
+      /**
+       * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
+       * @since Chrome 28
+       * @type {string[]}
+       * @memberof Rule
+       */
+      tags?: string[];
     }
 
     /**
@@ -4612,38 +4612,38 @@ namespace  webview {
      * @interface InjectDetails
      */
     interface InjectDetails {
-        /**
-         * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        code?: string,
-        /**
-         * @description JavaScript or CSS file to inject.
-         * @type {string}
-         * @memberof InjectDetails
-         */
-        file?: string
+      /**
+       * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
+       * @type {string}
+       * @memberof InjectDetails
+       */
+      code?: string,
+      /**
+       * @description JavaScript or CSS file to inject.
+       * @type {string}
+       * @memberof InjectDetails
+       */
+      file?: string
     }
 
     interface WebViewElementEventMap {
-        'close': Event,
-        'consolemessage': IConsolemessage,
-        'contentload': Event,
-        'dialog': IDialog,
-        'exit': IExit,
-        'findupdate': IFindupdate,
-        'loadabort': ILoadabort,
-        'loadcommit': ILoadcommit,
-        'loadredirect': ILoadredirect,
-        'loadstart': ILoadstart,
-        'loadstop': Event,
-        'newwindow': INewwindow,
-        'permissionrequest': IPermissionrequest,
-        'responsive': IResponsive,
-        'sizechanged': ISizechanged,
-        'unresponsive': IUnresponsive,
-        'zoomchange': IZoomchange,
+      'close': Event,
+      'consolemessage': IConsolemessage,
+      'contentload': Event,
+      'dialog': IDialog,
+      'exit': IExit,
+      'findupdate': IFindupdate,
+      'loadabort': ILoadabort,
+      'loadcommit': ILoadcommit,
+      'loadredirect': ILoadredirect,
+      'loadstart': ILoadstart,
+      'loadstop': Event,
+      'newwindow': INewwindow,
+      'permissionrequest': IPermissionrequest,
+      'responsive': IResponsive,
+      'sizechanged': ISizechanged,
+      'unresponsive': IUnresponsive,
+      'zoomchange': IZoomchange,
     }
 
 
@@ -4654,67 +4654,67 @@ namespace  webview {
      * @extends {Element}
      */
     interface HTMLWebViewElement extends Element {
-        executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
-        src: string;
-        contentWindow: Window;
-        addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
+      executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
+      src: string;
+      contentWindow: Window;
+      addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
     }
 
     /**Options that determine what data should be cleared by clearData. */
     interface ClearDataOptions {
 
-        /**
-        * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
-         */
-        since?: number;
+      /**
+      * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
+       */
+      since?: number;
     }
     /**A set of data types. Missing properties are interpreted as false. */
     interface ClearDataTypeSet {
 
-        /**
-        * @description Websites' appcaches.
-         */
-        appcache?: boolean
+      /**
+      * @description Websites' appcaches.
+       */
+      appcache?: boolean
 
-        /**
-        * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
-         */
-        cache?: boolean
+      /**
+      * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
+       */
+      cache?: boolean
 
-        /**
-        * @description The partition's cookies.
-         */
-        cookies?: boolean
+      /**
+      * @description The partition's cookies.
+       */
+      cookies?: boolean
 
-        /**
-        * @description The partition's session cookies.
-         */
-        sessionCookies?: boolean
+      /**
+      * @description The partition's session cookies.
+       */
+      sessionCookies?: boolean
 
-        /**
-        * @description The partition's persistent cookies.
-         */
-        persistentCookies?: boolean
+      /**
+      * @description The partition's persistent cookies.
+       */
+      persistentCookies?: boolean
 
-        /**
-        * @description Websites' filesystems.
-         */
-        fileSystems?: boolean
+      /**
+      * @description Websites' filesystems.
+       */
+      fileSystems?: boolean
 
-        /**
-        * @description Websites' IndexedDB data.
-         */
-        indexedDB?: boolean
+      /**
+      * @description Websites' IndexedDB data.
+       */
+      indexedDB?: boolean
 
-        /**
-        * @description Websites' local storage data.
-         */
-        localStorage?: boolean
+      /**
+      * @description Websites' local storage data.
+       */
+      localStorage?: boolean
 
-        /**
-        * @description Websites' WebSQL data.
-         */
-        webSQL?: boolean
+      /**
+      * @description Websites' WebSQL data.
+       */
+      webSQL?: boolean
     }
     /**
     * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
@@ -4732,416 +4732,416 @@ namespace  webview {
     /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
     interface InjectDetails {
 
-        /**
-        * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
-         */
-        code?: string
+      /**
+      * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
+       */
+      code?: string
 
-        /**
-        * @description JavaScript or CSS file to inject.
-         */
-        file?: string
+      /**
+      * @description JavaScript or CSS file to inject.
+       */
+      file?: string
     }
     /**The type of injection item: code or a set of files. */
     interface InjectionItems {
 
-        /**
-        * @description JavaScript code or CSS to be injected into matching pages.
-         */
-        code?: string
+      /**
+      * @description JavaScript code or CSS to be injected into matching pages.
+       */
+      code?: string
 
-        /**
-        * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
-         */
-        files?: any[]
+      /**
+      * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
+       */
+      files?: any[]
     }
     /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
     interface ContentScriptDetails {
 
-        /**
-        * @description The name of the content script to inject.
-         */
-        name: string
+      /**
+      * @description The name of the content script to inject.
+       */
+      name: string
 
-        /**
-        * @description Specifies which pages this content script will be injected into.
-         */
-        matches: any[]
+      /**
+      * @description Specifies which pages this content script will be injected into.
+       */
+      matches: any[]
 
-        /**
-        * @description Excludes pages that this content script would otherwise be injected into.
-         */
-        exclude_matches?: any[]
+      /**
+      * @description Excludes pages that this content script would otherwise be injected into.
+       */
+      exclude_matches?: any[]
 
-        /**
-        * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
-         */
-        match_about_blank?: boolean
+      /**
+      * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
+       */
+      match_about_blank?: boolean
 
-        /**
-        * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
-         */
-        css?: InjectionItems
+      /**
+      * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
+       */
+      css?: InjectionItems
 
-        /**
-        * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
-         */
-        js?: InjectionItems
+      /**
+      * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
+       */
+      js?: InjectionItems
 
-        /**
-        * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-         */
-        run_at?: chrome.extensionTypes.RunAt;
+      /**
+      * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+       */
+      run_at?: chrome.extensionTypes.RunAt;
 
-        /**
-        * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
-         */
-        all_frames?: boolean;
+      /**
+      * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
+       */
+      all_frames?: boolean;
 
-        /**
-        * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
-         */
-        include_globs?: string[];
+      /**
+      * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
+       */
+      include_globs?: string[];
 
-        /**
-        * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
-         */
-        exclude_globs?: string[];
+      /**
+      * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
+       */
+      exclude_globs?: string[];
     }
     /**@todo Add documentation */
     interface ContextMenuCreateProperties {
 
-        /**
-        * @description The type of menu item. Defaults to 'normal' if not specified.
-         */
-        type?: chrome.contextMenus.ItemType
+      /**
+      * @description The type of menu item. Defaults to 'normal' if not specified.
+       */
+      type?: chrome.contextMenus.ItemType
 
-        /**
-        * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-         */
-        id?: string
+      /**
+      * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+       */
+      id?: string
 
-        /**
-        * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
-         */
-        title?: string
+      /**
+      * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
+       */
+      title?: string
 
-        /**
-        * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-         */
-        checked?: boolean
+      /**
+      * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+       */
+      checked?: boolean
 
-        /**
-        * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
-         */
-        contexts?: any[]
+      /**
+      * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
+       */
+      contexts?: any[]
 
-        /**
-        * @description A function that will be called back when the menu item is clicked.
-        * @param {any} [object Object]
-         */
-        onclick?: (info: any) => void
+      /**
+      * @description A function that will be called back when the menu item is clicked.
+      * @param {any} [object Object]
+       */
+      onclick?: (info: any) => void
 
-        /**
-        * @description The ID of a parent menu item; this makes the item a child of a previously added item.
-         */
-        parentId?: number | string
+      /**
+      * @description The ID of a parent menu item; this makes the item a child of a previously added item.
+       */
+      parentId?: number | string
 
-        /**
-        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-         */
-        documentUrlPatterns?: any[]
+      /**
+      * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+       */
+      documentUrlPatterns?: any[]
 
-        /**
-        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-         */
-        targetUrlPatterns?: any[]
+      /**
+      * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+       */
+      targetUrlPatterns?: any[]
 
-        /**
-        * @description Whether this context menu item is enabled or disabled. Defaults to true.
-         */
-        enabled?: boolean
+      /**
+      * @description Whether this context menu item is enabled or disabled. Defaults to true.
+       */
+      enabled?: boolean
     }
     /**@todo Add documentation */
     interface ContextMenuUpdateProperties {
 
-        /**
-        * @description The type of menu item.
-         */
-        type?: chrome.webview.ContextType;
+      /**
+      * @description The type of menu item.
+       */
+      type?: chrome.webview.ContextType;
 
-        /**
-        * @description The text to be displayed in the item
-         */
-        title?: string
+      /**
+      * @description The text to be displayed in the item
+       */
+      title?: string
 
-        /**
-        * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-         */
-        checked?: boolean
+      /**
+      * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+       */
+      checked?: boolean
 
-        /**
-        * @description List of contexts this menu item will appear in.
-         */
-        contexts?: any[]
+      /**
+      * @description List of contexts this menu item will appear in.
+       */
+      contexts?: any[]
 
-        /**
-        * @description A function that will be called back when the menu item is clicked.
-        * @param {any} [object Object]
-         */
-        onclick?: (info: any) => void
+      /**
+      * @description A function that will be called back when the menu item is clicked.
+      * @param {any} [object Object]
+       */
+      onclick?: (info: any) => void
 
-        /**
-        * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
-         */
-        parentId?: number | string
+      /**
+      * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
+       */
+      parentId?: number | string
 
-        /**
-        * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-         */
-        documentUrlPatterns?: any[]
+      /**
+      * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+       */
+      documentUrlPatterns?: any[]
 
-        /**
-        * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-         */
-        targetUrlPatterns?: any[]
+      /**
+      * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+       */
+      targetUrlPatterns?: any[]
 
-        /**
-        * @description Whether this context menu item is enabled or disabled.
-         */
-        enabled?: boolean
+      /**
+      * @description Whether this context menu item is enabled or disabled.
+       */
+      enabled?: boolean
     }
     interface ContextMenus {
 
-        /**
-        * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-        * @param {object} createProperties The properties used to create the item
-        * @param {any} [object Object]
-         */
-        create(createProperties: object, callback?: () => void): void;
+      /**
+      * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+      * @param {object} createProperties The properties used to create the item
+      * @param {any} [object Object]
+       */
+      create(createProperties: object, callback?: () => void): void;
 
-        /**
-        * @description Updates a previously created context menu item.
-        * @param {any} id The ID of the item to update.
-        * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
-        * @param {any} [object Object]
-         */
-        update(id: number | string, updateProperties: object, callback?: () => void): void;
+      /**
+      * @description Updates a previously created context menu item.
+      * @param {any} id The ID of the item to update.
+      * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
+      * @param {any} [object Object]
+       */
+      update(id: number | string, updateProperties: object, callback?: () => void): void;
 
-        /**
-        * @description Removes a context menu item.
-        * @param {any} menuItemId The ID of the context menu item to remove.
-        * @param {any} [object Object]
-         */
-        remove(menuItemId: number | string, callback?: () => void): void;
+      /**
+      * @description Removes a context menu item.
+      * @param {any} menuItemId The ID of the context menu item to remove.
+      * @param {any} [object Object]
+       */
+      remove(menuItemId: number | string, callback?: () => void): void;
 
-        /**
-        * @description Removes all context menu items added to this webview.
-        * @param {any} [object Object]
-         */
-        removeAll(callback?: () => void): void;
+      /**
+      * @description Removes all context menu items added to this webview.
+      * @param {any} [object Object]
+       */
+      removeAll(callback?: () => void): void;
 
 
-        /**
-        * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
-         */
-        onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
+      /**
+      * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
+       */
+      onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
 
     }
     interface IOnShowEvent {
-        /**
-         * @description Call this to prevent showing the context menu.
-         * @memberof IOnShowEvent
-         */
-        preventDefault: () => void;
+      /**
+       * @description Call this to prevent showing the context menu.
+       * @memberof IOnShowEvent
+       */
+      preventDefault: () => void;
     }
     interface ContentWindow {
 
-        /**
-        * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
-        * @param {any} message Message object to send to the guest.
-        * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
-         */
-        postMessage(message: any, targetOrigin: string): void;
+      /**
+      * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
+      * @param {any} message Message object to send to the guest.
+      * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
+       */
+      postMessage(message: any, targetOrigin: string): void;
 
     }
     interface DialogController {
 
-        /**
-        * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
-        * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
-         */
-        ok(response?: string): void;
+      /**
+      * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
+      * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
+       */
+      ok(response?: string): void;
 
-        /**
-        * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
-         */
-        cancel(): void;
+      /**
+      * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
+       */
+      cancel(): void;
 
     }
     /**Contains all of the results of the find request. */
     interface FindCallbackResults {
 
-        /**
-        * @description The number of times searchText was matched on the page.
-         */
-        numberOfMatches: number
+      /**
+      * @description The number of times searchText was matched on the page.
+       */
+      numberOfMatches: number
 
-        /**
-        * @description The ordinal number of the current match.
-         */
-        activeMatchOrdinal: number
+      /**
+      * @description The ordinal number of the current match.
+       */
+      activeMatchOrdinal: number
 
-        /**
-        * @description Describes a rectangle around the active match in screen coordinates.
-         */
-        selectionRect: SelectionRect
+      /**
+      * @description Describes a rectangle around the active match in screen coordinates.
+       */
+      selectionRect: SelectionRect
 
-        /**
-        * @description Indicates whether this find request was canceled.
-         */
-        canceled: boolean
+      /**
+      * @description Indicates whether this find request was canceled.
+       */
+      canceled: boolean
     }
     /**Options for the find request. */
     interface FindOptions {
 
-        /**
-        * @description Flag to find matches in reverse order. The default value is false.
-         */
-        backward?: boolean
+      /**
+      * @description Flag to find matches in reverse order. The default value is false.
+       */
+      backward?: boolean
 
-        /**
-        * @description Flag to match with case-sensitivity. The default value is false.
-         */
-        matchCase?: boolean
+      /**
+      * @description Flag to match with case-sensitivity. The default value is false.
+       */
+      matchCase?: boolean
     }
     interface NewWindow {
 
-        /**
-        * @description Attach the requested target page to an existing webview element.
-        * @param {object} webview The webview element to which the target page should be attached.
-         */
-        attach(webview: object): void;
+      /**
+      * @description Attach the requested target page to an existing webview element.
+      * @param {object} webview The webview element to which the target page should be attached.
+       */
+      attach(webview: object): void;
 
-        /**
-        * @description Cancel the new window request.
-         */
-        discard(): void;
+      /**
+      * @description Cancel the new window request.
+       */
+      discard(): void;
 
     }
     interface MediaPermissionRequest {
 
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
+      /**
+      * @description Allow the permission request.
+       */
+      allow(): void;
 
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
+      /**
+      * @description Deny the permission request. This is the default behavior if allow is not called.
+       */
+      deny(): void;
 
     }
     interface GeolocationPermissionRequest {
 
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
+      /**
+      * @description Allow the permission request.
+       */
+      allow(): void;
 
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
+      /**
+      * @description Deny the permission request. This is the default behavior if allow is not called.
+       */
+      deny(): void;
 
     }
     interface PointerLockPermissionRequest {
 
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
+      /**
+      * @description Allow the permission request.
+       */
+      allow(): void;
 
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
+      /**
+      * @description Deny the permission request. This is the default behavior if allow is not called.
+       */
+      deny(): void;
 
     }
     interface DownloadPermissionRequest {
 
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
+      /**
+      * @description Allow the permission request.
+       */
+      allow(): void;
 
-        /**
-        * @description Deny the permission request. This is the default behavior if allow is not called.
-         */
-        deny(): void;
+      /**
+      * @description Deny the permission request. This is the default behavior if allow is not called.
+       */
+      deny(): void;
 
     }
     interface FileSystemPermissionRequest {
 
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
+      /**
+      * @description Allow the permission request.
+       */
+      allow(): void;
 
-        /**
-        * @description Deny the permission request.
-         */
-        deny(): void;
+      /**
+      * @description Deny the permission request.
+       */
+      deny(): void;
 
     }
     interface FullscreenPermissionRequest {
 
-        /**
-        * @description Allow the permission request.
-         */
-        allow(): void;
+      /**
+      * @description Allow the permission request.
+       */
+      allow(): void;
 
-        /**
-        * @description Deny the permission request.
-         */
-        deny(): void;
+      /**
+      * @description Deny the permission request.
+       */
+      deny(): void;
 
     }
     interface LoadPluginPermissionRequest {
 
-        /**
-        * @description Allow the permission request. This is the default behavior if deny is not called..
-         */
-        allow(): void;
+      /**
+      * @description Allow the permission request. This is the default behavior if deny is not called..
+       */
+      allow(): void;
 
-        /**
-        * @description Deny the permission request.
-         */
-        deny(): void;
+      /**
+      * @description Deny the permission request.
+       */
+      deny(): void;
 
     }
     /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
     interface SelectionRect {
 
-        /**
-        * @description Distance from the left edge of the screen to the left edge of the rectangle.
-         */
-        left: number
+      /**
+      * @description Distance from the left edge of the screen to the left edge of the rectangle.
+       */
+      left: number
 
-        /**
-        * @description Distance from the top edge of the screen to the top edge of the rectangle.
-         */
-        top: number
+      /**
+      * @description Distance from the top edge of the screen to the top edge of the rectangle.
+       */
+      top: number
 
-        /**
-        * @description Width of the rectangle.
-         */
-        width: number
+      /**
+      * @description Width of the rectangle.
+       */
+      width: number
 
-        /**
-        * @description Height of the rectangle.
-         */
-        height: number
+      /**
+      * @description Height of the rectangle.
+       */
+      height: number
     }
     /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
       function(details) { return {cancel: true}; },
@@ -5521,257 +5521,257 @@ namespace  webview {
     /**IConsolemessage (Auto generated interface) */
     interface IConsolemessage {
 
-        /**
-        * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
-         */
-        level: number
+      /**
+      * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
+       */
+      level: number
 
-        /**
-        * @description The logged message contents.
-         */
-        message: string
+      /**
+      * @description The logged message contents.
+       */
+      message: string
 
-        /**
-        * @description The line number of the message source.
-         */
-        line: number
+      /**
+      * @description The line number of the message source.
+       */
+      line: number
 
-        /**
-        * @description A string identifying the resource which logged the message.
-         */
-        sourceId: string
+      /**
+      * @description A string identifying the resource which logged the message.
+       */
+      sourceId: string
     }
     /**IDialog (Auto generated interface) */
     interface IDialog {
 
-        /**
-        * @description The type of modal dialog requested by the guest.
-         */
-        messageType: 'alert' | 'confirm' | 'prompt'
+      /**
+      * @description The type of modal dialog requested by the guest.
+       */
+      messageType: 'alert' | 'confirm' | 'prompt'
 
-        /**
-        * @description The text the guest attempted to display in the modal dialog.
-         */
-        messageText: string
+      /**
+      * @description The text the guest attempted to display in the modal dialog.
+       */
+      messageText: string
 
-        /**
-        * @description An interface that can be used to respond to the guest's modal request.
-         */
-        dialog: DialogController
+      /**
+      * @description An interface that can be used to respond to the guest's modal request.
+       */
+      dialog: DialogController
     }
     /**IExit (Auto generated interface) */
     interface IExit {
 
-        /**
-        * @description Chrome's internal ID of the process that exited.
-         */
-        processID: number
+      /**
+      * @description Chrome's internal ID of the process that exited.
+       */
+      processID: number
 
-        /**
-        * @description String indicating the reason for the exit.
-         */
-        reason: 'normal' | 'abnormal' | 'crash' | 'kill'
+      /**
+      * @description String indicating the reason for the exit.
+       */
+      reason: 'normal' | 'abnormal' | 'crash' | 'kill'
     }
     /**IFindupdate (Auto generated interface) */
     interface IFindupdate {
 
-        /**
-        * @description The string that is being searched for in the page.
-         */
-        searchText: string
+      /**
+      * @description The string that is being searched for in the page.
+       */
+      searchText: string
 
-        /**
-        * @description The number of matches found for searchText on the page so far.
-         */
-        numberOfMatches: number
+      /**
+      * @description The number of matches found for searchText on the page so far.
+       */
+      numberOfMatches: number
 
-        /**
-        * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
-         */
-        activeMatchOrdinal: number
+      /**
+      * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
+       */
+      activeMatchOrdinal: number
 
-        /**
-        * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
-         */
-        selectionRect: SelectionRect
+      /**
+      * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
+       */
+      selectionRect: SelectionRect
 
-        /**
-        * @description Indicates whether the find request was canceled.
-         */
-        canceled: boolean
+      /**
+      * @description Indicates whether the find request was canceled.
+       */
+      canceled: boolean
 
-        /**
-        * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
-         */
-        finalUpdate: string
+      /**
+      * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
+       */
+      finalUpdate: string
     }
     /**ILoadabort (Auto generated interface) */
     interface ILoadabort {
 
-        /**
-        * @description Requested URL.
-         */
-        url: string
+      /**
+      * @description Requested URL.
+       */
+      url: string
 
-        /**
-        * @description Whether the load was top-level or in a subframe.
-         */
-        isTopLevel: boolean
+      /**
+      * @description Whether the load was top-level or in a subframe.
+       */
+      isTopLevel: boolean
 
-        /**
-        * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
-         */
-        code: number
+      /**
+      * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
+       */
+      code: number
 
-        /**
-        * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
-         */
-        reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
+      /**
+      * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
+       */
+      reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
     }
     /**ILoadcommit (Auto generated interface) */
     interface ILoadcommit {
 
-        /**
-        * @description The URL that committed.
-         */
-        url: string
+      /**
+      * @description The URL that committed.
+       */
+      url: string
 
-        /**
-        * @description Whether the load is top-level or in a subframe.
-         */
-        isTopLevel: boolean
+      /**
+      * @description Whether the load is top-level or in a subframe.
+       */
+      isTopLevel: boolean
     }
     /**ILoadredirect (Auto generated interface) */
     interface ILoadredirect {
 
-        /**
-        * @description The requested URL before the redirect.
-         */
-        oldUrl: string
+      /**
+      * @description The requested URL before the redirect.
+       */
+      oldUrl: string
 
-        /**
-        * @description The new URL after the redirect.
-         */
-        newUrl: string
+      /**
+      * @description The new URL after the redirect.
+       */
+      newUrl: string
 
-        /**
-        * @description Whether or not the redirect happened at top-level or in a subframe.
-         */
-        isTopLevel: boolean
+      /**
+      * @description Whether or not the redirect happened at top-level or in a subframe.
+       */
+      isTopLevel: boolean
     }
     /**ILoadstart (Auto generated interface) */
     interface ILoadstart {
 
-        /**
-        * @description Requested URL.
-         */
-        url: string
+      /**
+      * @description Requested URL.
+       */
+      url: string
 
-        /**
-        * @description Whether the load is top-level or in a subframe.
-         */
-        isTopLevel: boolean
+      /**
+      * @description Whether the load is top-level or in a subframe.
+       */
+      isTopLevel: boolean
     }
     /**INewwindow (Auto generated interface) */
     interface INewwindow {
 
-        /**
-        * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
-         */
-        window: NewWindow
+      /**
+      * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
+       */
+      window: NewWindow
 
-        /**
-        * @description The target URL requested for the new window.
-         */
-        targetUrl: string
+      /**
+      * @description The target URL requested for the new window.
+       */
+      targetUrl: string
 
-        /**
-        * @description The initial width requested for the new window.
-         */
-        initialWidth: number
+      /**
+      * @description The initial width requested for the new window.
+       */
+      initialWidth: number
 
-        /**
-        * @description The initial height requested for the new window.
-         */
-        initialHeight: number
+      /**
+      * @description The initial height requested for the new window.
+       */
+      initialHeight: number
 
-        /**
-        * @description The requested name of the new window.
-         */
-        name: string
+      /**
+      * @description The requested name of the new window.
+       */
+      name: string
 
-        /**
-        * @description The requested disposition of the new window.
-         */
-        windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
+      /**
+      * @description The requested disposition of the new window.
+       */
+      windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
     }
     /**IPermissionrequest (Auto generated interface) */
     interface IPermissionrequest {
 
-        /**
-        * @description The type of permission being requested.
-         */
-        permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
+      /**
+      * @description The type of permission being requested.
+       */
+      permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
 
-        /**
-        * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
-         */
-        request: object
+      /**
+      * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
+       */
+      request: object
     }
     /**IResponsive (Auto generated interface) */
     interface IResponsive {
 
-        /**
-        * @description Chrome's internal ID of the process that became responsive.
-         */
-        processID: number
+      /**
+      * @description Chrome's internal ID of the process that became responsive.
+       */
+      processID: number
     }
     /**ISizechanged (Auto generated interface) */
     interface ISizechanged {
 
-        /**
-        * @description Old width of embedded web content.
-         */
-        oldWidth: number
+      /**
+      * @description Old width of embedded web content.
+       */
+      oldWidth: number
 
-        /**
-        * @description Old height of embedded web content.
-         */
-        oldHeight: number
+      /**
+      * @description Old height of embedded web content.
+       */
+      oldHeight: number
 
-        /**
-        * @description New width of embedded web content.
-         */
-        newWidth: number
+      /**
+      * @description New width of embedded web content.
+       */
+      newWidth: number
 
-        /**
-        * @description New height of embedded web content.
-         */
-        newHeight: number
+      /**
+      * @description New height of embedded web content.
+       */
+      newHeight: number
     }
     /**IUnresponsive (Auto generated interface) */
     interface IUnresponsive {
 
-        /**
-        * @description Chrome's internal ID of the process that has become unresponsive.
-         */
-        processID: number
+      /**
+      * @description Chrome's internal ID of the process that has become unresponsive.
+       */
+      processID: number
     }
     /**IZoomchange (Auto generated interface) */
     interface IZoomchange {
 
-        /**
-        * @description The page's previous zoom factor.
-         */
-        oldZoomFactor: number
+      /**
+      * @description The page's previous zoom factor.
+       */
+      oldZoomFactor: number
 
-        /**
-        * @description The new zoom factor that the page was zoomed to.
-         */
-        newZoomFactor: number
+      /**
+      * @description The new zoom factor that the page was zoomed to.
+       */
+      newZoomFactor: number
     }
 
-}
+  }
 
 }
 
@@ -5779,5 +5779,5 @@ namespace  webview {
 // EXPORT
 /////////////////////
 interface Window {
-    chrome: typeof chrome;
+  chrome: typeof chrome;
 }

From c3d2e58beea4d833693a9f3a33b2c443c4682447 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 23 May 2018 15:52:34 +0200
Subject: [PATCH 0618/1124] Cleanup and lint check

---
 types/chrome-apps/package.json  | 21 ---------------------
 types/chrome-apps/test/index.ts |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 types/chrome-apps/package.json

diff --git a/types/chrome-apps/package.json b/types/chrome-apps/package.json
deleted file mode 100644
index 3798524bb9..0000000000
--- a/types/chrome-apps/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "@types/chrome-apps",
-    "version": "1.0.0",
-    "description": "TypeScript definitions for chrome-apps",
-    "license": "MIT",
-    "contributors": [
-        {
-            "name": "Nikolai Ommundsen",
-            "url": "https://github.com/niikoo",
-            "githubUsername": "niikoo"
-        }
-    ],
-    "main": "",
-    "repository": {
-        "type": "git",
-        "url": "https://www.github.com/DefinitelyTyped/DefinitelyTyped.git"
-    },
-    "scripts": {},
-    "dependencies": {},
-    "typeScriptVersion": "2.4"
-}
\ No newline at end of file
diff --git a/types/chrome-apps/test/index.ts b/types/chrome-apps/test/index.ts
index f4e2fa1cf4..d0a7234553 100644
--- a/types/chrome-apps/test/index.ts
+++ b/types/chrome-apps/test/index.ts
@@ -326,5 +326,4 @@ function testSystemNetwork() {
 }
 
 import webview = chrome.webview;
-import { chrome } from "chrome-apps";
 let element: webview.HTMLWebViewElement;

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 0619/1124] 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 2504955c5da3943cd990f2d96c9c9c50c7dcf736 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Wed, 23 May 2018 16:05:50 +0200
Subject: [PATCH 0620/1124] Replaced some Function types

---
 types/chrome-apps/index.d.ts    | 11418 +++++++++++++++---------------
 types/chrome-apps/tsconfig.json |     8 +-
 2 files changed, 5713 insertions(+), 5713 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index 91c1e766ec..f089c56a7a 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -22,5756 +22,5756 @@
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome {
-  namespace accessibilityFeatures {
-    interface AccessibilityFeaturesGetArg {
-      /** Optional. Whether to return the value that applies to the incognito session (default false).  */
-      incognito?: boolean;
-    }
-
-    interface AccessibilityFeaturesCallbackArg {
-      /** The value of the setting. */
-      value: any;
-      /**
-       * One of
-       * • not_controllable: cannot be controlled by any extension
-       * • controlled_by_other_extensions: controlled by extensions with higher precedence
-       * • controllable_by_this_extension: can be controlled by this extension
-       * • controlled_by_this_extension: controlled by this extension
-       */
-      levelOfControl: string;
-      /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
-      incognitoSpecific?: boolean;
-    }
-
-    interface AccessibilityFeaturesSetArg {
-      /**
-       * The value of the setting.
-       * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-       */
-      value: any;
-      /**
-       * Optional.
-        * The scope of the ChromeSetting. One of
-       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-       */
-      scope?: string;
-    }
-
-    interface AccessibilityFeaturesClearArg {
-      /**
-       * Optional.
-        * The scope of the ChromeSetting. One of
-       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-       */
-      scope?: string;
-    }
-
-    interface AccessibilityFeaturesSetting {
-      /**
-       * Gets the value of a setting.
-       * @param details Which setting to consider.
-       * @param callback The callback parameter should be a function that looks like this:
-       * function(object details) {...};
-       */
-      get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
-      /**
-       * Sets the value of a setting.
-       * @param details Which setting to change.
-       * @param callback Called at the completion of the set operation.
-       * If you specify the callback parameter, it should be a function that looks like this:
-       * function() {...};
-       */
-      set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
-      /**
-       * Clears the setting, restoring any default value.
-       * @param details Which setting to clear.
-       * @param callback Called at the completion of the clear operation.
-       * If you specify the callback parameter, it should be a function that looks like this:
-       * function() {...};
-       */
-      clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
-    }
-
-    export var spokenFeedback: AccessibilityFeaturesSetting;
-    export var largeCursor: AccessibilityFeaturesSetting;
-    export var stickyKeys: AccessibilityFeaturesSetting;
-    export var highContrast: AccessibilityFeaturesSetting;
-    export var screenMagnifier: AccessibilityFeaturesSetting;
-    export var autoclick: AccessibilityFeaturesSetting;
-    export var virtualKeyboard: AccessibilityFeaturesSetting;
-    export var animationPolicy: AccessibilityFeaturesSetting;
-  }
-
-  ////////////////////
-  // Alarms
-  ////////////////////
-  /**
-   * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
-   * Availability: Since Chrome 22.
-   * Permissions:  "alarms"
-   */
-  namespace alarms {
-    interface AlarmCreateInfo {
-      /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
-      delayInMinutes?: number;
-      /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
-      periodInMinutes?: number;
-      /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
-      when?: number;
-    }
-
-    interface Alarm {
-      /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
-      periodInMinutes?: number;
-      /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
-      scheduledTime: number;
-      /** Name of this alarm. */
-      name: string;
-    }
-
-    interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
-
-    /**
-     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-     */
-    export function create(alarmInfo: AlarmCreateInfo): void;
-    /**
-     * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
-     * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-     * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
-     * @param name Optional name to identify this alarm. Defaults to the empty string.
-     * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
-     */
-    export function create(name: string, alarmInfo: AlarmCreateInfo): void;
-    /**
-     * Gets an array of all the alarms.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function(array of Alarm alarms) {...};
-     */
-    export function getAll(callback: (alarms: Alarm[]) => void): void;
-    /**
-     * Clears all alarms.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clearAll(callback?: (wasCleared: boolean) => void): void;
-    /**
-     * Clears the alarm with the given name.
-     * @param name The name of the alarm to clear. Defaults to the empty string.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
-    /**
-     * Clears the alarm without a name.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clear(callback: (wasCleared: boolean) => void): void;
-    /**
-     * Retrieves details about the specified alarm.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( Alarm alarm) {...};
-     */
-    export function get(callback: (alarm: Alarm) => void): void;
-    /**
-     * Retrieves details about the specified alarm.
-     * @param name The name of the alarm to get. Defaults to the empty string.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( Alarm alarm) {...};
-     */
-    export function get(name: string, callback: (alarm: Alarm) => void): void;
-
-    /** Fired when an alarm has elapsed. Useful for event pages. */
-    export var onAlarm: AlarmEvent;
-  }
-
-
-  ////////////////////
-  // App
-  ////////////////////
-  namespace app {
-    interface AppDetails extends chrome.runtime.Manifest {
-      id: string;
-    }
-
-    export function getDetails(): AppDetails;
-  }
-
-  ////////////////////
-  // App Runtime
-  ////////////////////
-  namespace app.runtime {
-    type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
-      'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
-      'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
-      'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
-
-    interface LaunchData {
-      id?: string;
-      items?: LaunchDataItem[];
-      url?: string;
-      referrerUrl?: string;
-      isKioskSession?: boolean;
-      isPublicSession?: boolean;
-      source?: LaunchSource;
-      actionData?: {};
-    }
-
-    interface LaunchDataItem {
-      entry: FileEntry;
-      type: string;
-    }
-
-    interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
-
-    interface RestartedEvent extends chrome.events.Event<() => void> { }
-
-    export var onLaunched: LaunchedEvent;
-    export var onRestarted: RestartedEvent;
-  }
-
-  ////////////////////
-  // App Window
-  ////////////////////
-  namespace app.window {
-    interface ContentBounds {
-      left?: number;
-      top?: number;
-      width?: number;
-      height?: number;
-    }
-
-    interface BoundsSpecification {
-      left?: number;
-      top?: number;
-      width?: number;
-      height?: number;
-      minWidth?: number;
-      minHeight?: number;
-      maxWidth?: number;
-      maxHeight?: number;
-    }
-
-    interface Bounds {
-      left: number;
-      top: number;
-      width: number;
-      height: number;
-      minWidth?: number;
-      minHeight?: number;
-      maxWidth?: number;
-      maxHeight?: number;
-      setPosition(left: number, top: number): void;
-      setSize(width: number, height: number): void;
-      setMinimumSize(minWidth: number, minHeight: number): void;
-      setMaximumSize(maxWidth: number, maxHeight: number): void;
-    }
-    interface FrameOptions {
-      type?: string;
-      color?: string;
-      activeColor?: string;
-      inactiveColor?: string;
-    }
-
-    interface CreateWindowOptions {
-      id?: string;
-      innerBounds?: BoundsSpecification;
-      outerBounds?: BoundsSpecification;
-      minWidth?: number;
-      minHeight?: number;
-      maxWidth?: number;
-      maxHeight?: number;
-      /**
-       * @description
-       * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
-       * @memberof CreateWindowOptions
-       */
-      frame?: string | FrameOptions;
-      bounds?: ContentBounds;
-      alphaEnabled?: boolean;
-      /**
-       * @description
-       * @type {string} "normal", "fullscreen", "maximized", "minimized"
-       * @memberof CreateWindowOptions
-       */
-      state?: string;
-      hidden?: boolean;
-      resizable?: boolean;
-      singleton?: boolean;
-      alwaysOnTop?: boolean;
-      focused?: boolean;
-      visibleOnAllWorkspaces?: boolean;
-    }
-
-    interface AppWindow {
-      focus: () => void;
-      fullscreen: () => void;
-      isFullscreen: () => boolean;
-      minimize: () => void;
-      isMinimized: () => boolean;
-      maximize: () => void;
-      isMaximized: () => boolean;
-      restore: () => void;
-      moveTo: (left: number, top: number) => void;
-      resizeTo: (width: number, height: number) => void;
-      drawAttention: () => void;
-      clearAttention: () => void;
-      close: () => void;
-      show: () => void;
-      hide: () => void;
-      getBounds: () => ContentBounds;
-      setBounds: (bounds: ContentBounds) => void;
-      isAlwaysOnTop: () => boolean;
-      setAlwaysOnTop: (alwaysOnTop: boolean) => void;
-      setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
-      contentWindow: Window;
-      id: string;
-      innerBounds: Bounds;
-      outerBounds: Bounds;
-      onBoundsChanged: WindowEvent;
-      onClosed: WindowEvent;
-      onFullscreened: WindowEvent;
-      onMaximized: WindowEvent;
-      onMinimized: WindowEvent;
-      onRestored: WindowEvent;
-    }
-
-    export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
-    export function current(): AppWindow;
-    export function get(id: string): AppWindow;
-    export function getAll(): AppWindow[];
-    export function canSetVisibleOnAllWorkspaces(): boolean;
-
-    interface WindowEvent extends chrome.events.Event<() => void> { }
-
-    export var onBoundsChanged: WindowEvent;
-    export var onClosed: WindowEvent;
-    export var onFullscreened: WindowEvent;
-    export var onMaximized: WindowEvent;
-    export var onMinimized: WindowEvent;
-    export var onRestored: WindowEvent;
-  }
-
-
-  ////////////////////
-  // Audio
-  ////////////////////
-  /**
-   * The chrome.audio API is provided to allow users to get information about and control the audio devices attached to the system. This API is currently only implemented for ChromeOS.
-   * @since Chrome 59
-   */
-  namespace audio {
-    export type StreamType = 'INPUT' | 'OUTPUT';
-    interface AudioDeviceInfo {
-      /** The unique identifier of the audio device. */
-      id: string;
-      /** Stream type associated with this device. */
-      streamType: StreamType;
-      /** Type of the device. */
-      deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
-      /** The user-friendly name (e.g. "USB Microphone"). */
-      displayName: string;
-      /** Device name. */
-      deviceName: string;
-      /** True if this is the current active device. */
-      isActive: boolean;
-      /** The sound level of the device, volume for output, gain for input. */
-      level: number;
-      /** The stable/persisted device id string when available. */
-      stableDeviceId?: string;
-    }
-    interface DeviceIdLists {
-      /**
-       * List of input devices specified by their ID.
-       * To indicate input devices should be unaffected, leave this property unset.
-       */
-      input?: string[];
-      /**
-       * List of output devices specified by their ID.
-       * To indicate output devices should be unaffected, leave this property unset.
-       */
-      output?: string[];
-    }
-    interface SetDeviceProperties {
-      /**
-       * The audio device's desired sound level. Defaults to the device's current sound level.
-       * If used with audio input device, represents audio device gain.
-       * If used with audio output device, represents audio device volume.
-       *
-       * Type: integer
-       */
-      level?: number;
-    }
-    interface OnLevelChangedEvent {
-      /**
-       * The callback parameter should be a function that looks like this:
-       *   function(object event) {...};
-       * @param {(event: {
-       *             deviceId: string,
-       *             level: number
-       *         }) => void} callback
-       */
-      addListener(callback: (event: {
-        deviceId: string,
-        level: number
-      }) => void): void;
-    }
-    interface OnMuteChangedEvent {
-      /**
-       * The callback parameter should be a function that looks like this:
-       * function(object event) {...};
-       */
-      addListener(callback: (event: {
-        streamType: StreamType[],
-        isMuted: boolean
-      }) => void): void;
-    }
-    interface OnDeviceListChangedEvent {
-      /**
-       * The callback parameter should be a function that looks like this:
-       *   function(array of AudioDeviceInfo devices) {...};
-       * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
-       */
-      addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
-    }
-    /**
-     * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
-     */
-    interface Filter {
-      /**
-       * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
-       */
-      streamTypes?: StreamType[];
-      /**
-       * @description If set, only audio devices whose active state matches this value will satisfy the filter.
-       */
-      isActive?: boolean;
-    }
-    /**
-     * @description Gets a list of audio devices filtered based on |filter|.
-     */
-    export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => void): void;
-    export function getDevices(callback: (devices: AudioDeviceInfo[]) => void): void;
-    /** Sets lists of active input and/or output devices. */
-    export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void): void;
-    /** Sets the properties for the input or output device. */
-    export function setProperties(id: string, properties: SetDeviceProperties, callback: () => void): void;
-    /**
-     * @description Gets the system-wide mute state for the specified stream type.
-     * @param {StreamType} streamType Stream type for which mute state should be fetched.
-     * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
-     */
-    export function getMute(streamType: StreamType, callback: (value: boolean) => void): void;
-    /**
-     * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
-     * @param {StreamType} streamType Stream type for which mute state should be set.
-     * @param {boolean} isMuted New mute value.
-     * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
-     */
-    export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => void): void;
-    /** Fired when sound level changes for an active audio device. */
-    export var onLevelChanged: OnLevelChangedEvent;
-    /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
-    export var onMuteChanged: OnMuteChangedEvent;
-    /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
-    export var onDeviceListChanged: OnDeviceListChangedEvent;
-  }
-
-  ////////////////////
-  // Bluetooth
-  ////////////////////
-  /**
-   * Use the chrome.bluetooth API to connect to a Bluetooth device. All functions report failures via chrome.runtime.lastError.
-   * Manifest: "bluetooth": {...}
-   * @since Chrome 37
-   */
-  namespace bluetooth {
-    interface AdapterState {
-      address: string;
-      name: string;
-      powered: boolean;
-      available: boolean;
-      discovering: boolean;
-    }
-    interface Device {
-      address: string;
-      name?: string;
-      deviceClass?: number;
-      vendorIdSource?: 'bluetooth' | 'usb';
-      vendorId?: number;
-      productId?: number;
-      deviceId?: number;
-      type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
-      paired?: boolean;
-      connected?: boolean;
-      /**
-       * @since Chrome 48
-       */
-      connecting?: boolean;
-      /**
-       * @since Chrome 48
-       */
-      connectable?: boolean;
-      uuids?: string[];
-      /**
-       * @since Chrome 44
-       */
-      inquiryRssi: number;
-      /**
-       * @since Chrome 44
-       */
-      inquiryTxPower: number;
-    }
-
-    interface BluetoothEvent<T> {
-      addListener(callback: (event: T) => void): void;
-    }
-
-    /**
-     * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
-     */
-    interface DeviceFilter {
-      /** Type of filter to apply to the device list. Default is all. */
-      filterType?: 'all' | 'known';
-      /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
-      limit?: number;
-    }
-    /** Get information about the Bluetooth adapter. */
-    export function getAdapterState(callback: (adapterInfo: AdapterState) => void): void;
-    /** Get information about a Bluetooth device known to the system. */
-    export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void): void;
-    /**
-     * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
-     * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
-     * @param callback Called when the search is completed.
-     */
-    export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void): void;
-    /**
-     * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
-     * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
-     */
-    export function startDiscovery(callback: () => void): void;
-    /** Stop discovery. */
-    export function stopDiscovery(callback: () => void): void;
-    /** Fired when the state of the Bluetooth adapter changes. */
-    export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
-    /** Fired when information about a new Bluetooth device is available. */
-    export var onDeviceAdded: BluetoothEvent<Device>;
-    /** Fired when information about a known Bluetooth device has changed. */
-    export var onDeviceChanged: BluetoothEvent<Device>;
-    /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
-    export var onDeviceRemoved: BluetoothEvent<Device>;
-  }
-  /**
-   * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
-   * Manifest: "bluetooth": {...}
-   * @since Chrome 37
-   * Important: This API works only on Chrome OS.
-   * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
-   */
-  namespace bluetoothLowEnergy {
-    /**
-     * NOT IMPLEMENTED YET
-     * @see https://developer.chrome.com/apps/bluetoothLowEnergy
-     * */
-  }
-  /**
-   * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
-   * @since Chrome 37
-   * Manifest: "bluetooth": {...}
-   * Important: This API works only on OS X, Windows and Chrome OS.
-   */
-  namespace bluetoothSocket {
-    /** NOT IMPLEMENTED YET */
-  }
-
-  ////////////////////
-  // Browser
-  ////////////////////
-  /**
-   * Use the chrome.browser API to interact with the Chrome browser associated with
-   * the current application and Chrome profile.
-   */
-  namespace browser {
-    interface Options {
-      /** The URL to navigate to when the new tab is initially opened. */
-      url: string;
-    }
-
-    /**
-     * Opens a new tab in a browser window associated with the current application
-     * and Chrome profile. If no browser window for the Chrome profile is opened,
-     * a new one is opened prior to creating the new tab.
-     * @param options Configures how the tab should be opened.
-     * @param callback Called when the tab was successfully
-     * created, or failed to be created. If failed, runtime.lastError will be set.
-     */
-    export function openTab(options: Options, callback: () => void): void;
-
-    /**
-    * Opens a new tab in a browser window associated with the current application
-    * and Chrome profile. If no browser window for the Chrome profile is opened,
-    * a new one is opened prior to creating the new tab. Since Chrome 42 only.
-    * @param options Configures how the tab should be opened.
-    */
-    export function openTab(options: Options): void;
-  }
-
-  ////////////////////
-  // Commands
-  ////////////////////
-  /**
-   * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
-   * Availability: Since Chrome 25.
-   * Manifest:  "commands": {...}
-   */
-  namespace commands {
-    interface Command {
-      /** Optional. The name of the Extension Command  */
-      name?: string;
-      /** Optional. The Extension Command description  */
-      description?: string;
-      /** Optional. The shortcut active for this command, or blank if not active.  */
-      shortcut?: string;
-    }
-
-    interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
-
-    /**
-     * Returns all the registered extension commands for this extension and their shortcut (if active).
-     * @param callback Called to return the registered commands.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(array of Command commands) {...};
-     */
-    export function getAll(callback: (commands: Command[]) => void): void;
-
-    /** Fired when a registered command is activated using a keyboard shortcut. */
-    export var onCommand: CommandEvent;
-  }
-
-  ////////////////////
-  // Context Menus
-  ////////////////////
-  /**
-   * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
-   * Availability: Since Chrome 6.
-   * Permissions:  "contextMenus"
-   */
-  namespace contextMenus {
-    /**
-    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
-    **/
-    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
-    /**
-    * The type of menu item.
-    **/
-    export type ItemType = "normal" | "checkbox" | "radio" | "separator";
-
-    interface OnClickData {
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * The text for the context selection, if any.
-       */
-      selectionText?: string;
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * A flag indicating the state of a checkbox or radio item after it is clicked.
-       */
-      checked?: boolean;
-      /**
-       * @since Since Chrome 35.
-       * The ID of the menu item that was clicked.
-       */
-      menuItemId: any;
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
-       */
-      frameUrl?: string;
-      /**
-       * @since Since Chrome 35.
-       * A flag indicating whether the element is editable (text input, textarea, etc.).
-       */
-      editable: boolean;
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
-       */
-      mediaType?: string;
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * A flag indicating the state of a checkbox or radio item before it was clicked.
-       */
-      wasChecked?: boolean;
-      /**
-       * @since Since Chrome 35.
-       * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
-       */
-      pageUrl: string;
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * If the element is a link, the URL it points to.
-       */
-      linkUrl?: string;
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * The parent ID, if any, for the item clicked.
-       */
-      parentMenuItemId?: any;
-      /**
-       * Optional.
-       * @since Since Chrome 35.
-       * Will be present for elements with a 'src' URL.
-       */
-      srcUrl?: string;
-    }
-
-    interface CreateProperties {
-      /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
-      documentUrlPatterns?: string[];
-      /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
-      checked?: boolean;
-      /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
-      title?: string;
-      /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
-      contexts?: string[];
-      /**
-       * Optional.
-       * Whether this context menu item is enabled or disabled. Defaults to true.
-       * @since Since Chrome 20.
-       */
-      enabled?: boolean;
-      /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
-      targetUrlPatterns?: string[];
-      /**
-       * Optional.
-       * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
-       * @param info Information sent when a context menu item is clicked.
-       */
-      onclick?: (info: OnClickData) => void;
-      /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
-      parentId?: any;
-      /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
-      type?: string;
-      /**
-       * Optional.
-       * @since Since Chrome 21.
-       * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-       */
-      id?: string;
-      /**
-       * @description Whether the item is visible in the menu.
-       * @since Since Chrome 62
-       */
-      visible?: boolean;
-    }
-
-    interface UpdateProperties {
-      documentUrlPatterns?: string[];
-      checked?: boolean;
-      title?: string;
-      contexts?: string[];
-      /**
-       * @since Chrome 20
-       **/
-      enabled?: boolean;
-      targetUrlPatterns?: string[];
-      onclick?: Function;
-      /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
-      parentId?: any;
-      type?: string;
-      /**
-       * @description Whether the item is visible or not.
-       * @since Since Chrome 62
-       */
-      visible?: boolean;
-    }
-
-    interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
-
-    /**
-     * Since Chrome 38.
-     * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
-     */
-    export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
-
-    /**
-     * Removes all context menu items added by this extension.
-     * @param callback Called when removal is complete.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function removeAll(callback?: () => void): void;
-    /**
-     * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-     * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function create(createProperties: CreateProperties, callback?: () => void): void;
-    /**
-     * Updates a previously created context menu item.
-     * @param id The ID of the item to update.
-     * @param updateProperties The properties to update. Accepts the same values as the create function.
-     * @param callback Called when the context menu has been updated.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
-    /**
-     * Updates a previously created context menu item.
-     * @param id The ID of the item to update.
-     * @param updateProperties The properties to update. Accepts the same values as the create function.
-     * @param callback Called when the context menu has been updated.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
-    /**
-     * Removes a context menu item.
-     * @param menuItemId The ID of the context menu item to remove.
-     * @param callback Called when the context menu has been removed.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function remove(menuItemId: string, callback?: () => void): void;
-    /**
-     * Removes a context menu item.
-     * @param menuItemId The ID of the context menu item to remove.
-     * @param callback Called when the context menu has been removed.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function remove(menuItemId: number, callback?: () => void): void;
-
-    /**
-     * Since Chrome 21.
-     * Fired when a context menu item is clicked.
-     */
-    export var onClicked: MenuClickedEvent;
-
-  }
-
-  ////////////////////
-  // Document Scan
-  ////////////////////
-  /**
-   * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
-   * Availability: Since Chrome 44.
-   * Permissions:  "documentScan"
-   * Important: This API works only on Chrome OS.
-   */
-  namespace documentScan {
-    interface DocumentScanOptions {
-      /** Optional. The MIME types that are accepted by the caller.  */
-      mimeTypes?: string[];
-      /** Optional. The number of scanned images allowed (defaults to 1).  */
-      maxImages?: number;
-    }
-
-    interface DocumentScanCallbackArg {
-      /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
-      dataUrls: string[];
-      /** The MIME type of dataUrls. */
-      mimeType: string;
-    }
-
-    /**
-     * Performs a document scan. On success, the PNG data will be sent to the callback.
-     * @param options Object containing scan parameters.
-     * @param callback Called with the result and data from the scan.
-     * The callback parameter should be a function that looks like this:
-     * function(object result) {...};
-     */
-    export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
-  }
-
-  ////////////////////
-  // Events
-  ////////////////////
-  /**
-   * The chrome.events namespace  contains common types used by APIs dispatching events to notify you when something interesting happens.
-   * Availability: Since Chrome 21.
-   */
-  namespace events {
-    /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
-    interface UrlFilter {
-      /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-      schemes?: string[];
-      /**
-       * Optional.
-        * Since Chrome 23.
-       * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-       */
-      urlMatches?: string;
-      /** Optional. Matches if the path segment of the URL contains a specified string.  */
-      pathContains?: string;
-      /** Optional. Matches if the host name of the URL ends with a specified string.  */
-      hostSuffix?: string;
-      /** Optional. Matches if the host name of the URL starts with a specified string.  */
-      hostPrefix?: string;
-      /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
-      hostContains?: string;
-      /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-      urlContains?: string;
-      /** Optional. Matches if the query segment of the URL ends with a specified string.  */
-      querySuffix?: string;
-      /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-      urlPrefix?: string;
-      /** Optional. Matches if the host name of the URL is equal to a specified string.  */
-      hostEquals?: string;
-      /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-      urlEquals?: string;
-      /** Optional. Matches if the query segment of the URL contains a specified string.  */
-      queryContains?: string;
-      /** Optional. Matches if the path segment of the URL starts with a specified string.  */
-      pathPrefix?: string;
-      /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-      pathEquals?: string;
-      /** Optional. Matches if the path segment of the URL ends with a specified string.  */
-      pathSuffix?: string;
-      /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-      queryEquals?: string;
-      /** Optional. Matches if the query segment of the URL starts with a specified string.  */
-      queryPrefix?: string;
-      /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-      urlSuffix?: string;
-      /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
-      ports?: any[];
-      /**
-       * Optional.
-        * Since Chrome 28.
-       * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
-       */
-      originAndPathMatches?: string;
-    }
-
-    /** An object which allows the addition and removal of listeners for a Chrome event. */
-    interface Event<T> {
-      /**
-       * Registers an event listener callback to an event.
-       * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
-       * The callback parameter should be a function that looks like this:
-       * function() {...};
-       */
-      addListener(callback: T): void;
-      /**
-       * Returns currently registered rules.
-       * @param callback Called with registered rules.
-       * The callback parameter should be a function that looks like this:
-       * function(array of Rule rules) {...};
-       * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-       */
-      getRules(callback: (rules: Rule[]) => void): void;
-      /**
-       * Returns currently registered rules.
-       * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
-       * @param callback Called with registered rules.
-       * The callback parameter should be a function that looks like this:
-       * function(array of Rule rules) {...};
-       * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-       */
-      getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
-      /**
-       * @param callback Listener whose registration status shall be tested.
-       */
-      hasListener(callback: T): boolean;
-      /**
-       * Unregisters currently registered rules.
-       * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
-       * @param callback Called when rules were unregistered.
-       * If you specify the callback parameter, it should be a function that looks like this:
-       * function() {...};
-       */
-      removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
-      /**
-       * Unregisters currently registered rules.
-       * @param callback Called when rules were unregistered.
-       * If you specify the callback parameter, it should be a function that looks like this:
-       * function() {...};
-       */
-      removeRules(callback?: () => void): void;
-      /**
-       * Registers rules to handle events.
-       * @param rules Rules to be registered. These do not replace previously registered rules.
-       * @param callback Called with registered rules.
-       * If you specify the callback parameter, it should be a function that looks like this:
-       * function(array of Rule rules) {...};
-       * Parameter rules: Rules that were registered, the optional parameters are filled with values.
-       */
-      addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
-      /**
-       * Deregisters an event listener callback from an event.
-       * @param callback Listener that shall be unregistered.
-       * The callback parameter should be a function that looks like this:
-       * function() {...};
-       */
-      removeListener(callback: T): void;
-      hasListeners(): boolean;
-    }
-
-    /** Description of a declarative rule for handling events. */
-    interface Rule {
-      /** Optional. Optional priority of this rule. Defaults to 100.  */
-      priority?: number;
-      /** List of conditions that can trigger the actions. */
-      conditions: any[];
-      /** Optional. Optional identifier that allows referencing this rule.  */
-      id?: string;
-      /** List of actions that are triggered if one of the condtions is fulfilled. */
-      actions: any[];
-      /**
-       * Optional.
-        * Since Chrome 28.
-       * Tags can be used to annotate rules and perform operations on sets of rules.
-       */
-      tags?: string[];
-    }
-  }
-
-  ////////////////////
-  // Extension Types
-  ////////////////////
-
-  /**
-   * Primary for extensions, but also used in apps.
-   * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
-   **/
-  namespace extensionTypes {
-    /**
-     * The format of an image.
-     **/
-    export type ImageFormat = 'jpeg' | 'png';
-    /**
-     * Details about the format and quality of an image.
-     */
-    interface ImageDetails {
-      /**
-       * @description The format of the resulting image. Default is "jpeg".
-       * @type {ImageFormat}
-       * @memberof ImageDetails
-       */
-      format?: ImageFormat;
-      /**
-       * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
-       * @type {number}
-       * @memberof ImageDetails
-       */
-      quality?: number;
-    }
-    /**
-     * The soonest that the JavaScript or CSS will be injected into the tab.
-     **/
-    export type RunAt = 'document_start' | 'document_end' | 'document_idle';
-    /**
-     * The origin of injected CSS.
-     **/
-    export type CSSOrigin = 'author' | 'user';
-    /**
-     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-     * @interface InjectDetails
-     */
-    interface InjectDetails {
-      /**
-       * JavaScript or CSS code to inject.
-       * Warning:
-       * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
-       * @type {string}
-       * @memberof InjectDetails
-       */
-      code?: string;
-      /**
-       * @description JavaScript or CSS file to inject.
-       * @type {string}
-       * @memberof InjectDetails
-       */
-      file?: string;
-      /**
-       * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
-       * @type {boolean}
-       * @memberof InjectDetails
-       */
-      allFrames?: boolean;
-      /**
-       * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
-       * @since Since Chrome 50.
-       * @type {number}
-       * @memberof InjectDetails
-       */
-      frameId?: number;
-      /**
-       * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
-       * @type {boolean}
-       * @memberof InjectDetails
-       */
-      matchAboutBlank?: boolean;
-      /**
-       * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-       * @type {RunAt}
-       * @memberof InjectDetails
-       */
-      runAt: RunAt;
-      /**
-       * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
-       * @since Since Chrome 66.
-       * @type {CSSOrigin}
-       * @memberof InjectDetails
-       */
-      cssOrigin: CSSOrigin;
-    }
-  }
-
-  ////////////////////
-  // FileSystem
-  ////////////////////
-  namespace fileSystem {
-
-    interface AcceptOptions {
-      description?: string;
-      mimeTypes?: string[];
-      extensions?: string[];
-    }
-
-    interface ChooseEntryOptions {
-      type?: string;
-      suggestedName?: string;
-      accepts?: AcceptOptions[];
-      acceptsAllTypes?: boolean;
-      acceptsMultiple?: boolean;
-    }
-
-    export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
-    export function getWritableEntry(entry: Entry, callback: (entry: Entry) => void): void;
-    export function isWritableEntry(entry: Entry, callback: (isWritable: boolean) => void): void;
-    export function chooseEntry(callback: (entry: Entry) => void): void;
-    export function chooseEntry(callback: (fileEntries: FileEntry[]) => void): void;
-    export function chooseEntry(options: ChooseEntryOptions, callback: (entry: Entry) => void): void;
-    export function chooseEntry(options: ChooseEntryOptions, callback: (fileEntries: FileEntry[]) => void): void;
-    export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
-    export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
-    export function retainEntry(entry: Entry): string;
-  }
-
-
-  ////////////////////
-  // File System Provider
-  ////////////////////
-  /**
-   * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
-   * Availability: Since Chrome 40.
-   * Permissions:  "fileSystemProvider"
-   * Important: This API works only on Chrome OS.
-   */
-  namespace fileSystemProvider {
-    interface OpenedFileInfo {
-      /** A request ID to be be used by consecutive read/write and close requests. */
-      openRequestId: number;
-      /** The path of the opened file. */
-      filePath: string;
-      /** Whether the file was opened for reading or writing. */
-      mode: string;
-    }
-
-    interface FileWatchersInfo {
-      /** The path of the entry being observed. */
-      entryPath: string;
-      /** Whether watching should include all child entries recursively. It can be true for directories only. */
-      recursive: boolean;
-      /** Optional. Tag used by the last notification for the watcher.  */
-      lastTag?: string;
-    }
-
-    interface EntryMetadata {
-      /** True if it is a directory. */
-      isDirectory: boolean;
-      /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
-      name: string;
-      /** File size in bytes. */
-      size: number;
-      /** The last modified time of this entry. */
-      modificationTime: Date;
-      /** Optional. Mime type for the entry.  */
-      mimeType?: string;
-      /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
-      thumbnail?: string;
-    }
-
-    interface FileSystemInfo {
-      /** The identifier of the file system. */
-      fileSystemId: string;
-      /** A human-readable name for the file system. */
-      displayName: string;
-      /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
-      writable: boolean;
-      /**
-       * The maximum number of files that can be opened at once. If 0, then not limited.
-       * @since Since Chrome 42.
-       */
-      openedFilesLimit: number;
-      /**
-       * List of currently opened files.
-       * @since Since Chrome 42.
-       */
-      openedFiles: OpenedFileInfo[];
-      /**
-       * Optional.
-        * Whether the file system supports the tag field for observing directories.
-       * @since Since Chrome 45. Warning: this is the current Beta channel.
-       */
-      supportsNotifyTag?: boolean;
-      /**
-       * List of watchers.
-       * @since Since Chrome 45. Warning: this is the current Beta channel.
-       */
-      watchers: FileWatchersInfo[];
-    }
-
-    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    interface GetActionsRequestedOptions {
-      /** The identifier of the file system related to this operation. */
-      fileSystemId: string;
-      /** The unique identifier of this request. */
-      requestId: number;
-      /** The path of the entry to return the list of actions for. */
-      entryPath: string;
-    }
-
-    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    interface Action {
-      /** The identifier of the action. Any string or CommonActionId for common actions. */
-      id: string;
-      /** Optional. The title of the action. It may be ignored for common actions.  */
-      title?: string;
-    }
-
-    /** @since Since Chrome 45. Warning: this is the current Beta channel. */
-    interface ExecuteActionRequestedOptions {
-      /** The identifier of the file system related to this operation. */
-      fileSystemId: string;
-      /** The unique identifier of this request. */
-      requestId: number;
-      /** The path of the entry to be used for the action. */
-      entryPath: string;
-      /** The identifier of the action to be executed. */
-      actionId: string;
-    }
-
-    interface MountOptions {
-      /** The string indentifier of the file system. Must be unique per each extension. */
-      fileSystemId: string;
-      /** A human-readable name for the file system. */
-      displayName: string;
-      /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
-      writable?: boolean;
-      /**
-       * Optional.
-        * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
-       * @since Since Chrome 41.
-       */
-      openedFilesLimit?: number;
-      /**
-       * Optional.
-        * Whether the file system supports the tag field for observed directories.
-       * @since Since Chrome 45. Warning: this is the current Beta channel.
-       */
-      supportsNotifyTag?: boolean;
-    }
-
-    interface UnmountOptions {
-      /** The identifier of the file system to be unmounted. */
-      fileSystemId: string;
-    }
-
-    interface NotificationChange {
-      /** The path of the changed entry. */
-      entryPath: string;
-      /** The type of the change which happened to the entry. */
-      changeType: string;
-    }
-
-    interface NotificationOptions {
-      /** The identifier of the file system related to this change. */
-      fileSystemId: string;
-      /** The path of the observed entry. */
-      observedPath: string;
-      /** Mode of the observed entry. */
-      recursive: boolean;
-      /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
-      changeType: string;
-      /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
-      changes?: NotificationChange[];
-      /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
-      tag?: string;
-    }
-
-    interface RequestedEventOptions {
-      /** The identifier of the file system related to this operation. */
-      fileSystemId: string;
-      /** The unique identifier of this request. */
-      requestId: number;
-    }
-
-    interface EntryPathRequestedEventOptions extends RequestedEventOptions {
-      /** The path of the entry to which this operation is related to. */
-      entryPath: string;
-    }
-
-    interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
-      /** Set to true if the thumbnail is requested. */
-      thumbnail: boolean;
-    }
-
-    interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
-      /** The path of the directory which is to be operated on. */
-      directoryPath: string;
-    }
-
-    interface FilePathRequestedEventOptions extends RequestedEventOptions {
-      /** The path of the entry for the operation */
-      filePath: string;
-    }
-
-    interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
-      /** Whether the file will be used for reading or writing. */
-      mode: string;
-    }
-
-    interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
-      /** A request ID used to open the file. */
-      openRequestId: number;
-    }
-
-    interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
-      /** Position in the file (in bytes) to start reading from. */
-      offset: number;
-      /** Number of bytes to be returned. */
-      length: number;
-    }
-
-    interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
-      /** Whether the operation is recursive (for directories only). */
-      recursive: boolean;
-    }
-
-    interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
-      /** Whether the operation is recursive (for directories only). */
-      recursive: boolean;
-    }
-
-    interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
-      /** The source path for the operation. */
-      sourcePath: string;
-      /** The destination path for the operation. */
-      targetPath: string;
-    }
-
-    interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
-      /** Number of bytes to be retained after the operation completes. */
-      length: number;
-    }
-
-    interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
-      /** Position in the file (in bytes) to start operating from. */
-      offset: number;
-      /** Buffer of bytes to be operated on the file. */
-      data: ArrayBuffer;
-    }
-
-    interface OperationRequestedEventOptions extends RequestedEventOptions {
-      /** An ID of the request to which this operation is related. */
-      operationRequestId: number;
-    }
-
-    interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
-
-    interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
-
-    interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
-
-    interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
-
-    /**
-     * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
-     * Depending on the type of the file system being mounted, the source option must be set appropriately.
-     * In case of an error, runtime.lastError will be set with a corresponding error code.
-     * @param callback A generic result callback to indicate success or failure.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function mount(options: MountOptions, callback?: () => void): void;
-    /**
-     * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
-     * In case of an error, runtime.lastError will be set with a corresponding error code.
-     * @param callback A generic result callback to indicate success or failure.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function unmount(options: UnmountOptions, callback?: () => void): void;
-    /**
-     * Returns all file systems mounted by the extension.
-     * @param callback Callback to receive the result of getAll function.
-     * The callback parameter should be a function that looks like this:
-     * function(array of FileSystemInfo fileSystems) {...};
-     */
-    export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
-    /**
-     * Returns information about a file system with the passed fileSystemId.
-     * @since Since Chrome 42.
-     * @param callback Callback to receive the result of get function.
-     * The callback parameter should be a function that looks like this:
-     * function(FileSystemInfo fileSystem) {...};
-     */
-    export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
-    /**
-     * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
-     * To use, the file_system_provider.notify manifest option must be set to true.
-     * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
-     * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
-     * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
-     * In case of an error, runtime.lastError will be set will a corresponding error code.
-     * @param callback A generic result callback to indicate success or failure.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function notify(options: NotificationOptions, callback: () => void): void;
-
-    /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
-    export var onUnmountRequested: RequestedEvent;
-    /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
-    export var onGetMetadataRequested: MetadataRequestedEvent;
-    /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
-    export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
-    /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
-    export var onOpenFileRequested: OpenFileRequestedEvent;
-    /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
-    export var onCloseFileRequested: OpenedFileRequestedEvent;
-    /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
-    export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
-    /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
-    export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
-    /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
-    export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
-    /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
-    export var onCreateFileRequested: FilePathRequestedEvent;
-    /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-    export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
-    /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-    export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
-    /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
-    export var onTruncateRequested: FilePathLengthRequestedEvent;
-    /** Raised when writing contents to a file opened previously with openRequestId is requested. */
-    export var onWriteFileRequested: OpenedFileIoRequestedEvent;
-    /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
-    export var onAbortRequested: OperationRequestedEvent;
-    /**
-     * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
-     * @since Since Chrome 44.
-     */
-    export var onConfigureRequested: RequestedEvent;
-    /**
-     * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
-     * @since Since Chrome 44.
-     */
-    export var onMountRequested: OptionlessRequestedEvent;
-    /**
-     * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
-     * @since Since Chrome 45. Warning: this is the current Beta channel.
-     */
-    export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
-    /**
-     * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
-     * @since Since Chrome 45. Warning: this is the current Beta channel.
-     */
-    export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
-  }
-
-  ////////////////////
-  // Google Cloud Messaging
-  ////////////////////
-  /**
-   * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
-   * Availability: Since Chrome 35.
-   * Permissions:  "gcm"
-   */
-  namespace gcm {
-    interface OutgoingMessage {
-      /** The ID of the server to send the message to as assigned by Google API Console. */
-      destinationId: string;
-      /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
-      messageId: string;
-      /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
-      timeToLive?: number;
-      /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
-      data: Object;
-    }
-
-    interface IncomingMessage {
-      /** The message data. */
-      data: Object;
-      /**
-       * Optional.
-       * The sender who issued the message.
-       * @since Since Chrome 41.
-       */
-      from?: string;
-      /**
-       * Optional.
-       * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
-       */
-      collapseKey?: string;
-    }
-
-    interface GcmError {
-      /** The error message describing the problem. */
-      errorMessage: string;
-      /** Optional. The ID of the message with this error, if error is related to a specific message. */
-      messageId?: string;
-      /** Additional details related to the error, when available. */
-      detail: Object;
-    }
-
-    interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
-
-    interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
-
-    interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
-
-    /** The maximum size (in bytes) of all key/value pairs in a message. */
-    export var MAX_MESSAGE_SIZE: number;
-
-    /**
-     * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
-     * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
-     * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
-     * The callback parameter should be a function that looks like this:
-     * function(string registrationId) {...};
-     * Parameter registrationId: A registration ID assigned to the application by the GCM.
-     */
-    export function register(senderIds: string[], callback: (registrationId: string) => void): void;
-    /**
-     * Unregisters the application from GCM.
-     * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
-     * The callback parameter should be a function that looks like this:
-     * function() {...};
-     */
-    export function unregister(callback: () => void): void;
-    /**
-     * Sends a message according to its contents.
-     * @param message A message to send to the other party via GCM.
-     * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
-     * The callback parameter should be a function that looks like this:
-     * function(string messageId) {...};
-     * Parameter messageId: The ID of the message that the callback was issued for.
-     */
-    export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
-
-    /** Fired when a message is received through GCM. */
-    export var onMessage: MessageReceptionEvent;
-    /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
-    export var onMessagesDeleted: MessageDeletionEvent;
-    /** Fired when it was not possible to send a message to the GCM server. */
-    export var onSendError: GcmErrorEvent;
-  }
-
-  ////////////////////
-  // HID
-  ////////////////////
-  /**
-   * Use the chrome.hid API to interact with connected HID devices. This API provides access to HID operations from within the context of an app. Using this API, apps can function as drivers for hardware devices. Errors generated by this API are reported by setting runtime.lastError and executing the function's regular callback. The callback's regular parameters will be undefined in this case.
-   * @since Chrome 38
-   */
-  namespace hid {
-    /** NOT YET IMPLEMENTED */
-  }
-
-  ////////////////////
-  // i18n
-  ////////////////////
-  /**
-   * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
-   * @since Chrome 5.
-   */
-  namespace i18n {
-    /** Holds detected ISO language code and its percentage in the input string */
-    interface DetectedLanguage {
-      /** An ISO language code such as 'en' or 'fr'.
-       * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
-       * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
-      language: string;
-
-      /** The percentage of the detected language */
-      percentage: number;
-    }
-
-    /** Holds detected language reliability and array of DetectedLanguage */
-    interface LanguageDetectionResult {
-      /** CLD detected language reliability */
-      isReliable: boolean;
-
-      /** Array of detectedLanguage */
-      languages: DetectedLanguage[];
-    }
-
-    /**
-     * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function(array of string languages) {...};
-     * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
-     */
-    export function getAcceptLanguages(callback: (languages: string[]) => void): void;
-    /**
-     * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
-     * @param messageName The name of the message, as specified in the messages.json file.
-     * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
-     */
-    export function getMessage(messageName: string, substitutions?: any): string;
-    /**
-     * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
-     * @since Chrome 35.
-     */
-    export function getUILanguage(): string;
-
-    /** Detects the language of the provided text using CLD.
-     * @param text User input string to be translated.
-     * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
-     */
-    export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
-  }
-
-  ////////////////////
-  // Identity
-  ////////////////////
-  /**
-   * Use the chrome.identity API to get OAuth2 access tokens.
-   * Permissions:  "identity"
-   * @since Chrome 29.
-   */
-  namespace identity {
-    /** @since Chrome 32. */
-    interface AccountInfo {
-      /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
-      id: string;
-    }
-
-    interface TokenDetails {
-      /**
-       * Optional.
-       * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
-       */
-      interactive?: boolean;
-      /**
-       * Optional.
-       * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
-       * account is only supported when the "enable-new-profile-management" flag is set.
-       * @since Chrome 37.
-       */
-      account?: AccountInfo;
-      /**
-       * Optional.
-       * A list of OAuth2 scopes to request.
-       * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
-       * @since Chrome 37.
-       */
-      scopes?: string[];
-    }
-
-    interface UserInfo {
-      /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
-      email: string;
-      /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
-      id: string;
-    }
-
-    interface TokenInformation {
-      /** The specific token that should be removed from the cache. */
-      token: string;
-    }
-
-    interface WebAuthFlowOptions {
-      /** The URL that initiates the auth flow. */
-      url: string;
-      /**
-       * Optional.
-       * Whether to launch auth flow in interactive mode.
-       * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
-       * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
-       */
-      interactive?: boolean;
-    }
-
-    interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
-
-    /**
-     * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
-     * getAccounts is only supported on dev channel.
-     * Dev channel only.
-     */
-    export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
-    /**
-     * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
-     * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
-     * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
-     * @param details Token options.
-     * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(string token) {...};
-     */
-    export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
-    /**
-     * Retrieves email address and obfuscated gaia id of the user signed into a profile.
-     * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
-     * @since Chrome 37.
-     */
-    export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
-    /**
-     * Removes an OAuth2 access token from the Identity API's token cache.
-     * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
-     * @param details Token information.
-     * @param callback Called when the token has been removed from the cache.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function() {...};
-     */
-    export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
-    /**
-     * Starts an auth flow at the specified URL.
-     * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
-     * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
-     * @param details WebAuth flow options.
-     * @param callback Called with the URL redirected back to your application.
-     * The callback parameter should be a function that looks like this:
-     * function(string responseUrl) {...};
-     */
-    export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
-    /**
-     * Generates a redirect URL to be used in launchWebAuthFlow.
-     * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
-     * @since Chrome 33.
-     * @param path Optional. The path appended to the end of the generated URL.
-     */
-    export function getRedirectURL(path?: string): string;
-
-    /**
-     * Fired when signin state changes for an account on the user's profile.
-     * @since Chrome 33.
-     */
-    export var onSignInChanged: SignInChangeEvent;
-  }
-
-  ////////////////////
-  // Idle
-  ////////////////////
-  /**
-   * Use the chrome.idle API to detect when the machine's idle state changes.
-   * Permissions:  "idle"
-   * @since Chrome 6.
-   */
-  namespace idle {
-    interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
-
-    /**
-     * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
-     * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
-     * Since Chrome 25.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( IdleState newState) {...};
-     */
-    export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
-    /**
-     * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
-     * @since Chrome 25.
-     * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
-     */
-    export function setDetectionInterval(intervalInSeconds: number): void;
-
-    /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
-    export var onStateChanged: IdleStateChangedEvent;
-  }
-
-  ////////////////////
-  // InstanceID
-  ////////////////////
-  /**
-   * Use chrome.instanceID to access the Instance ID service.
-   * @since Chrome 46
-   */
-  namespace instanceID {
-    /** NOT YET IMPLEMENTED */
-  }
-
-  ////////////////////
-  // mDNS
-  ////////////////////
-  /**
-   * 	Use the chrome.mdns API to discover services over mDNS. This comprises a subset of the features of the NSD spec: http://www.w3.org/TR/discovery-api/
-   * @since Chrome 31
-   */
-  namespace mdns {
-    /** NOT YET IMPLEMENTED */
-  }
-
-  ////////////////////
-  // Media Galleries
-  ////////////////////
-  namespace mediaGalleries {
-    interface MediaFileSystemsOptions {
-      interactive?: 'no' | 'yes' | 'if_needed';
-    }
-
-    interface MediaFileSystemMetadata {
-      name: string;
-      galleryId: string;
-      deviceId?: string;
-      isRemovable: boolean;
-      isMediaDevice: boolean;
-      isAvailable: boolean;
-    }
-
-    interface MetadataOptions {
-      metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
-    }
-
-    interface RawTag {
-      type: string;
-      tags: { [name: string]: string; };
-    }
-
-    interface Metadata {
-      // The browser sniffed mime type.
-      mimeType: string;
-      // Defined for images and video. In pixels.
-      height?: number;
-      width?: number;
-      // Defined for images only.
-      xResolution?: number;
-      yResolution?: number;
-      // Defined for audio and video. In seconds.
-      duration?: number;
-      // Defined for images and video. In degrees.
-      rotation?: number;
-      // Defined for images only.
-      cameraMake?: string;
-      cameraModel?: string;
-      exposureTimeSeconds?: number;
-      flashFired?: boolean;
-      fNumber?: number;
-      focalLengthMm?: number;
-      isoEquivalent?: number;
-      // Defined for audio and video only.
-      album?: string;
-      artist?: string;
-      comment?: string;
-      copyright?: string;
-      disc?: number;
-      genre?: string;
-      language?: string;
-      title?: string;
-      track?: number;
-      // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
-      rawTags: RawTag[];
-      // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
-      attachedImages: Blob[];
-    }
-
-    interface GalleryWatchResult {
-      galleryId: string;
-      success: boolean;
-    }
-
-    interface GalleryChangedEventArgs {
-      type: 'contents_changed' | 'watch_dropped';
-      galleryId: string;
-    }
-
-    interface ScanProgressEventArgs {
-      // The type of progress event, i.e. start, finish, etc.
-      type: 'start' | 'cancel' | 'finish' | 'error';
-      // The number of Galleries found.
-      galleryCount?: number;
-      // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
-      audioCount?: number;
-      imageCount?: number;
-      videoCount?: number;
-    }
-
-    export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
-    export function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
-    export function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
-    export function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
-    export function startMediaScan(): void;
-    export function cancelMediaScan(): void;
-    export function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
-    export function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
-    export function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
-    export function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
-    export function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
-    export function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
-    export function removeGalleryWatch(galleryId: string): void;
-    export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
-    export function removeAllGalleryWatch(): void;
-
-    export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
-    export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
-  }
-
-  ////////////////////////////////////
-  // Open Network Configuration (ONC)
-  ////////////////////////////////////
-  /**
-   * The chrome.networking.onc API is used for configuring network connections (Cellular, Ethernet, VPN, WiFi or WiMAX). This API is available in Chrome OS kiosk sessions.
-   * Network connection configurations are specified following Open Network Configuration (ONC) specification.
-   * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
-   */
-  namespace networking.onc {
-    export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
-    export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
-    export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
-    export type IPConfigType = 'DHCP' | 'Static';
-    export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
-    export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
-    interface ManagedBoolean {
-      /**
-       * @description The active value currently used by the network configuration manager (e.g. Shill).
-       * @type {boolean}
-       * @memberof ManagedBoolean
-       */
-      Active?: boolean,
-      /**
-       * @description The source from which the effective property value was determined.
-       * @type {string}
-       * @memberof ManagedBoolean
-       */
-      Effective?: string,
-      /**
-       * @description The property value provided by the user policy.
-       * @type {boolean}
-       * @memberof ManagedBoolean
-       */
-      UserPolicy?: boolean,
-      /**
-       * @description The property value provided by the device policy.
-       * @type {boolean}
-       * @memberof ManagedBoolean
-       */
-      DevicePolicy?: boolean,
-      /**
-       * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-       * @type {boolean}
-       * @memberof ManagedBoolean
-       */
-      UserSettings?: boolean,
-      /**
-       * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-       * @type {boolean}
-       * @memberof ManagedBoolean
-       */
-      SharedSettings?: boolean,
-      /**
-       * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-       * @type {boolean}
-       * @memberof ManagedBoolean
-       */
-      UserEditable?: boolean,
-      /**
-       * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-       * @type {boolean}
-       * @memberof ManagedBoolean
-       */
-      DeviceEditable?: boolean
-    }
-    interface ManagedLong {
-      /**
-       * @description The active value currently used by the network configuration manager (e.g. Shill).
-       * @type {number}
-       * @memberof ManagedLong
-       */
-      Active?: number,
-      /**
-       * @description The source from which the effective property value was determined.
-       * @type {string}
-       * @memberof ManagedLong
-       */
-      Effective?: string,
-      /**
-       * @description The property value provided by the user policy.
-       * @type {number}
-       * @memberof ManagedLong
-       */
-      UserPolicy?: number,
-      /**
-       * @description The property value provided by the device policy.
-       * @type {number}
-       * @memberof ManagedLong
-       */
-      DevicePolicy?: number,
-      /**
-       * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
-       * @type {number}
-       * @memberof ManagedLong
-       */
-      UserSettings?: number,
-      /**
-       * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
-       * @type {number}
-       * @memberof ManagedLong
-       */
-      SharedSettings?: number,
-      /**
-       * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-       * @type {boolean}
-       * @memberof ManagedLong
-       */
-      UserEditable?: boolean,
-      /**
-       * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
-       * @type {boolean}
-       * @memberof ManagedLong
-       */
-      DeviceEditable?: boolean
-    }
-  }
-
-  ////////////////////
-  // Notifications
-  // https://developer.chrome.com/extensions/notifications
-  ////////////////////
-  /**
-   * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
-   * Permissions:  "notifications"
-   * @since Chrome 28.
-   */
-  namespace notifications {
-    interface ButtonOptions {
-      title: string;
-      iconUrl?: string;
-    }
-
-    interface ItemOptions {
-      /** Title of one item of a list notification. */
-      title: string;
-      /** Additional details about this item. */
-      message: string;
-    }
-
-    interface NotificationOptions {
-      /** Optional. Which type of notification to display. Required for notifications.create method. */
-      type?: string;
-      /**
-       * Optional.
-       * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
-       * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
-       */
-      iconUrl?: string;
-      /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
-      title?: string;
-      /** Optional. Main notification content. Required for notifications.create method. */
-      message?: string;
-      /**
-       * Optional.
-       * Alternate notification content with a lower-weight font.
-       * @since Chrome 31.
-       */
-      contextMessage?: string;
-      /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
-      priority?: number;
-      /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
-      eventTime?: number;
-      /** Optional. Text and icons for up to two notification action buttons. */
-      buttons?: ButtonOptions[];
-      /** Optional. Items for multi-item notifications. */
-      items?: ItemOptions[];
-      /**
-       * Optional.
-       * Current progress ranges from 0 to 100.
-       * @since Chrome 30.
-       */
-      progress?: number;
-      /**
-       * Optional.
-       * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
-       * @since Chrome 32.
-       */
-      isClickable?: boolean;
-      /**
-       * Optional.
-       * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
-       * @since Chrome 38.
-       */
-      appIconMaskUrl?: string;
-      /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
-      imageUrl?: string;
-      /**
-       * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
-       * This defaults to false.
-       * @since Chrome 50
-       */
-      requireInteraction?: boolean;
-    }
-
-    interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
-
-    interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
-
-    interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
-
-    interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
-
-    interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
-
-    /** The notification closed, either by the system or by user action. */
-    export var onClosed: NotificationClosedEvent;
-    /** The user clicked in a non-button area of the notification. */
-    export var onClicked: NotificationClickedEvent;
-    /** The user pressed a button in the notification. */
-    export var onButtonClicked: NotificationButtonClickedEvent;
-    /**
-     * The user changes the permission level.
-     * @since Chrome 32.
-     */
-    export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
-    /**
-     * The user clicked on a link for the app's notification settings.
-     * @since Chrome 32.
-     */
-    export var onShowSettings: NotificationShowSettingsEvent;
-
-    /**
-     * Creates and displays a notification.
-     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-     * The notificationId parameter is required before Chrome 42.
-     * @param options Contents of the notification.
-     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(string notificationId) {...};
-     */
-    export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
-    /**
-     * Creates and displays a notification.
-     * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-     * The notificationId parameter is required before Chrome 42.
-     * @param options Contents of the notification.
-     * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(string notificationId) {...};
-     */
-    export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
-    /**
-     * Updates an existing notification.
-     * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
-     * @param options Contents of the notification to update to.
-     * @param callback Called to indicate whether a matching notification existed.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasUpdated) {...};
-     */
-    export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
-    /**
-     * Clears the specified notification.
-     * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
-     * @param callback Called to indicate whether a matching notification existed.
-     * The callback is required before Chrome 42.
-     * If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean wasCleared) {...};
-     */
-    export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
-    /**
-     * Retrieves all the notifications.
-     * @since Chrome 29.
-     * @param callback Returns the set of notification_ids currently in the system.
-     * The callback parameter should be a function that looks like this:
-     * function(object notifications) {...};
-     */
-    export function getAll(callback: (notifications: Object) => void): void;
-    /**
-     * Retrieves whether the user has enabled notifications from this app or extension.
-     * @since Chrome 32.
-     * @param callback Returns the current permission level.
-     * The callback parameter should be a function that looks like this:
-     * function( PermissionLevel level) {...};
-     */
-    export function getPermissionLevel(callback: (level: string) => void): void;
-  }
-
-  ////////////////////
-  // Permissions
-  ////////////////////
-  /**
-   * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
-   * @since Chrome 16.
-   */
-  namespace permissions {
-    interface Permissions {
-      /**
-       * Optional.
-       * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
-       */
-      origins?: string[];
-      /**
-       * Optional.
-       * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
-       */
-      permissions?: string[];
-    }
-
-    interface PermissionsRemovedEvent {
-      /**
-       * @param callback The callback parameter should be a function that looks like this:
-       * function( Permissions permissions) {...};
-       * Parameter permissions: The permissions that have been removed.
-       */
-      addListener(callback: (permissions: Permissions) => void): void;
-    }
-
-    interface PermissionsAddedEvent {
-      /**
-       * @param callback The callback parameter should be a function that looks like this:
-       * function( Permissions permissions) {...};
-       * Parameter permissions: The newly acquired permissions.
-       */
-      addListener(callback: (permissions: Permissions) => void): void;
-    }
-
-    /**
-     * Checks if the extension has the specified permissions.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function(boolean result) {...};
-     * Parameter result: True if the extension has the specified permissions.
-     */
-    export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
-    /**
-     * Gets the extension's current set of permissions.
-     * @param callback The callback parameter should be a function that looks like this:
-     * function( Permissions permissions) {...};
-     * Parameter permissions: The extension's active permissions.
-     */
-    export function getAll(callback: (permissions: Permissions) => void): void;
-    /**
-     * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean granted) {...};
-     * Parameter granted: True if the user granted the specified permissions.
-     */
-    export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
-    /**
-     * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
-     * @param callback If you specify the callback parameter, it should be a function that looks like this:
-     * function(boolean removed) {...};
-     * Parameter removed: True if the permissions were removed.
-     */
-    export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
-
-    /** Fired when access to permissions has been removed from the extension. */
-    export var onRemoved: PermissionsRemovedEvent;
-    /** Fired when the extension acquires new permissions. */
-    export var onAdded: PermissionsAddedEvent;
-  }
-
-  ////////////////////
-  // Power
-  ////////////////////
-  /**
-   * Use the chrome.power API to override the system's power management features.
-   * Permissions:  "power"
-   * @since Chrome 27.
-   */
-  namespace power {
-    /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
-    export function requestKeepAwake(level: string): void;
-    /** Releases a request previously made via requestKeepAwake(). */
-    export function releaseKeepAwake(): void;
-  }
-
-  ////////////////////
-  // Printer Provider
-  ////////////////////
-  /**
-   * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
-   * Permissions:  "printerProvider"
-   * @since Chrome 44.
-   */
-  namespace printerProvider {
-    interface PrinterInfo {
-      /** Unique printer ID. */
-      id: string;
-      /** Printer's human readable name. */
-      name: string;
-      /** Optional. Printer's human readable description. */
-      description?: string;
-    }
-
-    interface PrinterCapabilities {
-      /** Device capabilities in CDD format. */
-      capabilities: any;
-    }
-
-    interface PrintJob {
-      /** ID of the printer which should handle the job. */
-      printerId: string;
-      /** The print job title. */
-      title: string;
-      /** Print ticket in  CJT format. */
-      ticket: Object;
-      /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
-      contentType: string;
-      /** Blob containing the document data to print. Format must match |contentType|. */
-      document: Blob;
-    }
-
-    interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
-
-    interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
-
-    interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
-
-    interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
-
-    /** Event fired when print manager requests printers provided by extensions. */
-    export var onGetPrintersRequested: PrinterRequestedEvent;
-    /**
-     * Event fired when print manager requests information about a USB device that may be a printer.
-     * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
-     * @since Chrome 45.
-     */
-    export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
-    /** Event fired when print manager requests printer capabilities. */
-    export var onGetCapabilityRequested: CapabilityRequestedEvent;
-    /** Event fired when print manager requests printing. */
-    export var onPrintRequested: PrintRequestedEvent;
-  }
-
-  ////////////////////
-  // Runtime
-  ////////////////////
-  /**
-   * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
-   * @since Chrome 22
-   */
-  namespace runtime {
-    /** This will be defined during an API method callback if there was an error */
-    export var lastError: LastError | undefined;
-    /** The ID of the extension/app. */
-    export var id: string;
-
-    interface LastError {
-      /** Optional. Details about the error which occurred.  */
-      message?: string;
-    }
-
-    interface ConnectInfo {
-      name?: string;
-    }
-
-    interface InstalledDetails {
-      /**
-       * The reason that this event is being dispatched.
-       * One of: "install", "update", "chrome_update", or "shared_module_update"
-       */
-      reason: string;
-      /**
-       * Optional.
-       * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
-       */
-      previousVersion?: string;
-      /**
-       * Optional.
-       * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
-       * @since Chrome 29.
-       */
-      id?: string;
-    }
-
-    interface MessageOptions {
-      /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
-      includeTlsChannelId?: boolean;
-    }
-
-    /**
-     * An object containing information about the script context that sent a message or request.
-     * @since Chrome 26.
-     */
-    interface MessageSender {
-      /** The ID of the extension or app that opened the connection, if any. */
-      id?: string;
-      /**
-       * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
-       * @since Chrome 41.
-       */
-      frameId?: number;
-      /**
-       * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
-       * @since Chrome 28.
-       */
-      url?: string;
-      /**
-       * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
-       * @since Chrome 32.
-       */
-      tlsChannelId?: string;
-    }
-
-    /**
-     * An object containing information about the current platform.
-     * @since Chrome 36.
-     */
-    interface PlatformInfo {
-      /**
-       * The operating system chrome is running on.
-       * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
-       */
-      os: string;
-      /**
-       * The machine's processor architecture.
-       * One of: "arm", "x86-32", or "x86-64"
-       */
-      arch: string;
-      /**
-       * The native client architecture. This may be different from arch on some platforms.
-       * One of: "arm", "x86-32", or "x86-64"
-       */
-      nacl_arch: string;
-    }
-
-    /**
-     * An object which allows two way communication with other pages.
-     * @since Chrome 26.
-     */
-    interface Port {
-      postMessage: (message: Object) => void;
-      disconnect: () => void;
-      /**
-       * Optional.
-       * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
-       */
-      sender?: MessageSender;
-      /** An object which allows the addition and removal of listeners for a Chrome event. */
-      onDisconnect: PortDisconnectEvent;
-      /** An object which allows the addition and removal of listeners for a Chrome event. */
-      onMessage: PortMessageEvent;
-      name: string;
-    }
-
-    interface UpdateAvailableDetails {
-      /** The version number of the available update. */
-      version: string;
-    }
-
-    interface UpdateCheckDetails {
-      /** The version of the available update. */
-      version: string;
-    }
-
-    interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-    interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
-
-    interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
-
-    interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-    interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
-
-    interface RuntimeEvent extends chrome.events.Event<() => void> { }
-
-    interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
-
-    interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
-
-    interface ManifestIcons {
-      [size: number]: string;
-    }
-
-    interface ManifestAction {
-      default_icon?: ManifestIcons;
-      default_title?: string;
-      default_popup?: string;
-    }
-
-    interface SearchProvider {
-      name?: string;
-      keyword?: string;
-      favicon_url?: string;
-      search_url: string;
-      encoding?: string;
-      suggest_url?: string;
-      instant_url?: string;
-      image_url?: string;
-      search_url_post_params?: string;
-      suggest_url_post_params?: string;
-      instant_url_post_params?: string;
-      image_url_post_params?: string;
-      alternate_urls?: string[];
-      prepopulated_id?: number;
-      is_default?: boolean;
-    }
-
-    interface Manifest {
-      /** Required */
-      app: {
-        background: {
-          scripts?: string[];
+    namespace accessibilityFeatures {
+        interface AccessibilityFeaturesGetArg {
+            /** Optional. Whether to return the value that applies to the incognito session (default false).  */
+            incognito?: boolean;
         }
-      }
-      /** Should be set to 2 */
-      manifest_version: number;
-      name: string;
-      version: string;
 
-      // Recommended
-      default_locale?: string;
-      description?: string;
-      icons?: ManifestIcons;
-      // Optional
-      action_handlers?: string[];
-      author?: any;
-      automation?: any;
-      bluetooth?: {
-        uuids?: string[];
-        socket?: boolean;
-        low_energy?: boolean;
-        peripheral?: boolean;
-      };
-      commands?: {
-        [name: string]: {
-          suggested_key?: {
-            default?: string;
-            windows?: string;
-            mac?: string;
-            chromeos?: string;
-            linux?: string;
-          };
-          description?: string;
-          global?: boolean
+        interface AccessibilityFeaturesCallbackArg {
+            /** The value of the setting. */
+            value: any;
+            /**
+             * One of
+             * • not_controllable: cannot be controlled by any extension
+             * • controlled_by_other_extensions: controlled by extensions with higher precedence
+             * • controllable_by_this_extension: can be controlled by this extension
+             * • controlled_by_this_extension: controlled by this extension
+             */
+            levelOfControl: string;
+            /** Optional. Whether the effective value is specific to the incognito session. This property will only be present if the incognito property in the details parameter of get() was true.  */
+            incognitoSpecific?: boolean;
         }
-      };
-      current_locale?: string;
-      event_rules?: {
-        event?: string;
-        actions?: {
-          type: string;
-        }[];
-        conditions?: {
-          type: string,
-          css?: string[]
-        }[];
-      }[];
-      file_handlers?: {
-        [key: string]: {
-          extensions?: Array<'*' | string | { include_directories: boolean }>;
-          types?: Array<'*' | string | { include_directories: boolean }>;
+
+        interface AccessibilityFeaturesSetArg {
+            /**
+             * The value of the setting.
+             * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+             */
+            value: any;
+            /**
+             * Optional.
+              * The scope of the ChromeSetting. One of
+             * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+             * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+             * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+             * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+             */
+            scope?: string;
         }
-      }[];
-      file_system_provider_capabilities?: {
-        configurable?: boolean;
-        multiple_mounts?: boolean;
-        source?: string;
-      };
-      import?: {
-        id: string;
-      }[];
-      key?: string;
-      kiosk?: {
-        always_update: any;
-        required_platform_version: any;
-      };
-      kiosk_enabled?: boolean,
-      kiosk_only?: boolean,
-      kiosk_secondary_apps: any;
-      minimum_chrome_version?: string;
-      nacl_modules?: {
-        path: string;
-        mime_type: string;
-      }[];
-      oauth2?: {
-        client_id: string;
-        scopes?: string[];
-      };
-      offline_enabled?: boolean;
-      optional_permissions?: string[];
-      permissions?: string[];
-      platforms?: {
-        nacl_arch?: string;
-        sub_package_path: string;
-      }[];
-      /**
-       * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
-       */
-      requirements?: {
+
+        interface AccessibilityFeaturesClearArg {
+            /**
+             * Optional.
+              * The scope of the ChromeSetting. One of
+             * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+             * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+             * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+             * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+             */
+            scope?: string;
+        }
+
+        interface AccessibilityFeaturesSetting {
+            /**
+             * Gets the value of a setting.
+             * @param details Which setting to consider.
+             * @param callback The callback parameter should be a function that looks like this:
+             * function(object details) {...};
+             */
+            get(details: AccessibilityFeaturesGetArg, callback: (details: AccessibilityFeaturesCallbackArg) => void): void;
+            /**
+             * Sets the value of a setting.
+             * @param details Which setting to change.
+             * @param callback Called at the completion of the set operation.
+             * If you specify the callback parameter, it should be a function that looks like this:
+             * function() {...};
+             */
+            set(details: AccessibilityFeaturesSetArg, callback?: () => void): void;
+            /**
+             * Clears the setting, restoring any default value.
+             * @param details Which setting to clear.
+             * @param callback Called at the completion of the clear operation.
+             * If you specify the callback parameter, it should be a function that looks like this:
+             * function() {...};
+             */
+            clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
+        }
+
+        export var spokenFeedback: AccessibilityFeaturesSetting;
+        export var largeCursor: AccessibilityFeaturesSetting;
+        export var stickyKeys: AccessibilityFeaturesSetting;
+        export var highContrast: AccessibilityFeaturesSetting;
+        export var screenMagnifier: AccessibilityFeaturesSetting;
+        export var autoclick: AccessibilityFeaturesSetting;
+        export var virtualKeyboard: AccessibilityFeaturesSetting;
+        export var animationPolicy: AccessibilityFeaturesSetting;
+    }
+
+    ////////////////////
+    // Alarms
+    ////////////////////
+    /**
+     * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
+     * Availability: Since Chrome 22.
+     * Permissions:  "alarms"
+     */
+    namespace alarms {
+        interface AlarmCreateInfo {
+            /** Optional. Length of time in minutes after which the onAlarm event should fire.  */
+            delayInMinutes?: number;
+            /** Optional. If set, the onAlarm event should fire every periodInMinutes minutes after the initial event specified by when or delayInMinutes. If not set, the alarm will only fire once.  */
+            periodInMinutes?: number;
+            /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
+            when?: number;
+        }
+
+        interface Alarm {
+            /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
+            periodInMinutes?: number;
+            /** Time at which this alarm was scheduled to fire, in milliseconds past the epoch (e.g. Date.now() + n). For performance reasons, the alarm may have been delayed an arbitrary amount beyond this. */
+            scheduledTime: number;
+            /** Name of this alarm. */
+            name: string;
+        }
+
+        interface AlarmEvent extends chrome.events.Event<(alarm: Alarm) => void> { }
+
         /**
-         * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
-         * "requirements": {
-         *   "3D": {
-         *     "features": ["webgl"]
-         *   }
-         * }
+         * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+         * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+         * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+         * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
          */
-        '3D'?: {
-          features?: Array<string | 'webgl'>;
-        };
+        export function create(alarmInfo: AlarmCreateInfo): void;
         /**
-         * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
-         * "requirements": {
-         *   "plugins": {
-         *     "npapi": true
-         *   }
-         * }
+         * Creates an alarm. Near the time(s) specified by alarmInfo, the onAlarm event is fired. If there is another alarm with the same name (or no name if none is specified), it will be cancelled and replaced by this alarm.
+         * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
+         * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+         * @param name Optional name to identify this alarm. Defaults to the empty string.
+         * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
          */
-        plugins?: {
-          npapi?: boolean;
+        export function create(name: string, alarmInfo: AlarmCreateInfo): void;
+        /**
+         * Gets an array of all the alarms.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function(array of Alarm alarms) {...};
+         */
+        export function getAll(callback: (alarms: Alarm[]) => void): void;
+        /**
+         * Clears all alarms.
+         * @param callback If you specify the callback parameter, it should be a function that looks like this:
+         * function(boolean wasCleared) {...};
+         */
+        export function clearAll(callback?: (wasCleared: boolean) => void): void;
+        /**
+         * Clears the alarm with the given name.
+         * @param name The name of the alarm to clear. Defaults to the empty string.
+         * @param callback If you specify the callback parameter, it should be a function that looks like this:
+         * function(boolean wasCleared) {...};
+         */
+        export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
+        /**
+         * Clears the alarm without a name.
+         * @param callback If you specify the callback parameter, it should be a function that looks like this:
+         * function(boolean wasCleared) {...};
+         */
+        export function clear(callback: (wasCleared: boolean) => void): void;
+        /**
+         * Retrieves details about the specified alarm.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( Alarm alarm) {...};
+         */
+        export function get(callback: (alarm: Alarm) => void): void;
+        /**
+         * Retrieves details about the specified alarm.
+         * @param name The name of the alarm to get. Defaults to the empty string.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( Alarm alarm) {...};
+         */
+        export function get(name: string, callback: (alarm: Alarm) => void): void;
+
+        /** Fired when an alarm has elapsed. Useful for event pages. */
+        export var onAlarm: AlarmEvent;
+    }
+
+
+    ////////////////////
+    // App
+    ////////////////////
+    namespace app {
+        interface AppDetails extends chrome.runtime.Manifest {
+            id: string;
         }
 
-        [key: string]: any;
-      };
-      /**
-       * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
-       */
-      sandbox?: {
-        pages: string[];
-        content_security_policy?: string;
-      };
-      short_name?: string;
-      signature?: any;
-      sockets?: {
-        tcp?: {
-          connect: string | '*';
-        };
-        udp?: {
-          send: string | '*';
+        export function getDetails(): AppDetails;
+    }
+
+    ////////////////////
+    // App Runtime
+    ////////////////////
+    namespace app.runtime {
+        type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
+            'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
+            'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
+            'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
+
+        interface LaunchData {
+            id?: string;
+            items?: LaunchDataItem[];
+            url?: string;
+            referrerUrl?: string;
+            isKioskSession?: boolean;
+            isPublicSession?: boolean;
+            source?: LaunchSource;
+            actionData?: {};
         }
-      };
-      storage?: {
-        managed_schema: string
-      };
-      system_indicator?: any;
-      update_url?: string;
-      url_handlers?: {
-        [name: string]: {
-          matches: string[];
-          title?: string;
+
+        interface LaunchDataItem {
+            entry: FileEntry;
+            type: string;
         }
-      };
-      usb_printers?: {
-        filters: {
-          vendorId?: number;
-          productId?: number;
-          interfaceClass?: number;
-          interfaceSubclass?: number;
-          interfaceProtocol?: number;
-        }[]
-      };
-      version_name?: string;
-      webview?: {
-        partitions?: {
-          name: string;
-          accessible_resources: string[];
-        }[]
-      }
-      [key: string]: any;
+
+        interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
+
+        interface RestartedEvent extends chrome.events.Event<() => void> { }
+
+        export var onLaunched: LaunchedEvent;
+        export var onRestarted: RestartedEvent;
     }
 
-    /**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-     * @since Chrome 26.
-     */
-    export function connect(connectInfo?: ConnectInfo): Port;
-    /**
-     * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
-     * @since Chrome 26.
-     * @param extensionId Optional.
-     * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
-     */
-    export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
-    /**
-     * Connects to a native application in the host machine.
-     * @since Chrome 28.
-     * @param application The name of the registered application to connect to.
-     */
-    export function connectNative(application: string): Port;
-    /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
-    export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
-    /**
-     * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
-     * @returns The manifest details.
-     */
-    export function getManifest(): Manifest;
-    /**
-     * Returns a DirectoryEntry for the package directory.
-     * @since Chrome 29.
-     */
-    export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
-    /**
-     * Returns information about the current platform.
-     * @since Chrome 29.
-     * @param callback Called with results
-     */
-    export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
-    /**
-     * Converts a relative path within an app/extension install directory to a fully-qualified URL.
-     * @param path A path to a resource within an app/extension expressed relative to its install directory.
-     */
-    export function getURL(path: string): string;
-    /**
-     * Reloads the app or extension.
-     * @since Chrome 25.
-     */
-    export function reload(): void;
-    /**
-     * Requests an update check for this app/extension.
-     * @since Chrome 25.
-     * @param callback
-     * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
-     * Optional parameter details: If an update is available, this contains more information about the available update.
-     */
-    export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
-    /**
-     * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
-     * @since Chrome 32.
-     */
-    export function restart(): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 26.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 32.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 26.
-     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
-    /**
-     * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
-     * @since Chrome 32.
-     * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
-     * @param responseCallback Optional
-     * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
-    /**
-     * Send a single message to a native application.
-     * @since Chrome 28.
-     * @param application The of the native messaging host.
-     * @param message The message that will be passed to the native messaging host.
-     * @param responseCallback Optional.
-     * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-     */
-    export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
-    /**
-     * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
-     * @since Chrome 41.
-     * @param url Since Chrome 34.
-     * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
-     * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
-     */
-    export function setUninstallURL(url: string, callback?: () => void): void;
-    /**
-     * Open your Extension's options page, if possible.
-     * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
-     * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
-     * @since Chrome 42.
-     */
-    export function openOptionsPage(callback?: () => void): void;
+    ////////////////////
+    // App Window
+    ////////////////////
+    namespace app.window {
+        interface ContentBounds {
+            left?: number;
+            top?: number;
+            width?: number;
+            height?: number;
+        }
 
-    /**
-     * Fired when a connection is made from either an extension process or a content script.
-     * @since Chrome 26.
-     */
-    export var onConnect: ExtensionConnectEvent;
-    /**
-     * Fired when a connection is made from another extension.
-     * @since Chrome 26.
-     */
-    export var onConnectExternal: ExtensionConnectEvent;
-    /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
-    export var onSuspend: RuntimeEvent;
-    /**
-     * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
-     * @since Chrome 23.
-     */
-    export var onStartup: RuntimeEvent;
-    /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
-    export var onInstalled: RuntimeInstalledEvent;
-    /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
-    export var onSuspendCanceled: RuntimeEvent;
-    /**
-     * Fired when a message is sent from either an extension process or a content script.
-     * @since Chrome 26.
-     */
-    export var onMessage: ExtensionMessageEvent;
-    /**
-     * Fired when a message is sent from another extension/app. Cannot be used in a content script.
-     * @since Chrome 26.
-     */
-    export var onMessageExternal: ExtensionMessageEvent;
-    /**
-     * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
-     * @since Chrome 29.
-     */
-    export var onRestartRequired: RuntimeRestartRequiredEvent;
-    /**
-     * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
-     * @since Chrome 25.
-     */
-    export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
-    /**
-     * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
-     * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
-     */
-    export var onBrowserUpdateAvailable: RuntimeEvent;
-  }
+        interface BoundsSpecification {
+            left?: number;
+            top?: number;
+            width?: number;
+            height?: number;
+            minWidth?: number;
+            minHeight?: number;
+            maxWidth?: number;
+            maxHeight?: number;
+        }
 
-  ////////////////////
-  // Serial
-  ////////////////////
-  /**
-   * Use the chrome.serial API to read from and write to a device connected to a serial port.
-   * @since Chrome 23
-   */
-  namespace serial {
-    /** NOT YET IMPLEMENTED */
-  }
+        interface Bounds {
+            left: number;
+            top: number;
+            width: number;
+            height: number;
+            minWidth?: number;
+            minHeight?: number;
+            maxWidth?: number;
+            maxHeight?: number;
+            setPosition(left: number, top: number): void;
+            setSize(width: number, height: number): void;
+            setMinimumSize(minWidth: number, minHeight: number): void;
+            setMaximumSize(maxWidth: number, maxHeight: number): void;
+        }
+        interface FrameOptions {
+            type?: string;
+            color?: string;
+            activeColor?: string;
+            inactiveColor?: string;
+        }
 
-  ////////////////////
-  // Socket
-  ////////////////////
-  namespace socket {
-    interface CreateInfo {
-      socketId: number;
+        interface CreateWindowOptions {
+            id?: string;
+            innerBounds?: BoundsSpecification;
+            outerBounds?: BoundsSpecification;
+            minWidth?: number;
+            minHeight?: number;
+            maxWidth?: number;
+            maxHeight?: number;
+            /**
+             * @description
+             * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
+             * @memberof CreateWindowOptions
+             */
+            frame?: string | FrameOptions;
+            bounds?: ContentBounds;
+            alphaEnabled?: boolean;
+            /**
+             * @description
+             * @type {string} "normal", "fullscreen", "maximized", "minimized"
+             * @memberof CreateWindowOptions
+             */
+            state?: string;
+            hidden?: boolean;
+            resizable?: boolean;
+            singleton?: boolean;
+            alwaysOnTop?: boolean;
+            focused?: boolean;
+            visibleOnAllWorkspaces?: boolean;
+        }
+
+        interface AppWindow {
+            focus: () => void;
+            fullscreen: () => void;
+            isFullscreen: () => boolean;
+            minimize: () => void;
+            isMinimized: () => boolean;
+            maximize: () => void;
+            isMaximized: () => boolean;
+            restore: () => void;
+            moveTo: (left: number, top: number) => void;
+            resizeTo: (width: number, height: number) => void;
+            drawAttention: () => void;
+            clearAttention: () => void;
+            close: () => void;
+            show: () => void;
+            hide: () => void;
+            getBounds: () => ContentBounds;
+            setBounds: (bounds: ContentBounds) => void;
+            isAlwaysOnTop: () => boolean;
+            setAlwaysOnTop: (alwaysOnTop: boolean) => void;
+            setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
+            contentWindow: Window;
+            id: string;
+            innerBounds: Bounds;
+            outerBounds: Bounds;
+            onBoundsChanged: WindowEvent;
+            onClosed: WindowEvent;
+            onFullscreened: WindowEvent;
+            onMaximized: WindowEvent;
+            onMinimized: WindowEvent;
+            onRestored: WindowEvent;
+        }
+
+        export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
+        export function current(): AppWindow;
+        export function get(id: string): AppWindow;
+        export function getAll(): AppWindow[];
+        export function canSetVisibleOnAllWorkspaces(): boolean;
+
+        interface WindowEvent extends chrome.events.Event<() => void> { }
+
+        export var onBoundsChanged: WindowEvent;
+        export var onClosed: WindowEvent;
+        export var onFullscreened: WindowEvent;
+        export var onMaximized: WindowEvent;
+        export var onMinimized: WindowEvent;
+        export var onRestored: WindowEvent;
     }
 
-    interface AcceptInfo {
-      resultCode: number;
-      socketId?: number;
-    }
-
-    interface ReadInfo {
-      resultCode: number;
-      data: ArrayBuffer;
-    }
-
-    interface WriteInfo {
-      bytesWritten: number;
-    }
-
-    interface RecvFromInfo {
-      resultCode: number;
-      data: ArrayBuffer;
-      port: number;
-      address: string;
-    }
-
-    interface SocketInfo {
-      socketType: string;
-      localPort?: number;
-      peerAddress?: string;
-      peerPort?: number;
-      localAddress?: string;
-      connected: boolean;
-    }
-
-    interface NetworkInterface {
-      name: string;
-      address: string;
-    }
-
-    export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
-    export function destroy(socketId: number): void;
-    export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
-    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-    export function disconnect(socketId: number): void;
-    export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
-    export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
-    export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
-    export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
-    export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
-    export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
-    export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
-    export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
-    export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
-    export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
-  }
-
-  namespace sockets.tcp {
-    interface CreateInfo {
-      socketId: number;
-    }
-
-    interface SendInfo {
-      resultCode: number;
-      bytesSent?: number;
-    }
-
-    interface ReceiveEventArgs {
-      socketId: number;
-      data: ArrayBuffer;
-    }
-
-    interface ReceiveErrorEventArgs {
-      socketId: number;
-      resultCode: number;
-    }
-
-    interface SocketProperties {
-      persistent?: boolean;
-      name?: string;
-      bufferSize?: number;
-    }
-
-    interface SocketInfo {
-      socketId: number;
-      persistent: boolean;
-      name?: string;
-      bufferSize?: number;
-      paused: boolean;
-      connected: boolean;
-      localAddress?: string;
-      localPort?: number;
-      peerAddress?: string;
-      peerPort?: number;
-    }
-
-    export function create(callback: (createInfo: CreateInfo) => void): void;
-    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
-
-    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
-    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
-
-    export function setKeepAlive(socketId: number,
-      enable: boolean, callback: (result: number) => void): void;
-    export function setKeepAlive(socketId: number,
-      enable: boolean, delay: number, callback: (result: number) => void): void;
-
-    export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
-    export function connect(socketId: number,
-      peerAddress: string, peerPort: number, callback: (result: number) => void): void;
-    export function disconnect(socketId: number, callback?: () => void): void;
-    export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
-    export function close(socketId: number, callback?: () => void): void;
-    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
-
-    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
-    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
-  }
-
-  /**
-   * Use the chrome.sockets.tcpServer API to create server applications using TCP
-   * connections. This API supersedes the TCP functionality previously found in
-   * the chrome.socket API.
-   *
-   * @since Chrome 33
-   * @see https://developer.chrome.com/apps/sockets_tcpServer
-   */
-  namespace sockets.tcpServer {
-    interface CreateInfo {
-      socketId: number;
-    }
-
-    interface AcceptEventArgs {
-      socketId: number;
-      clientSocketId: number;
-    }
-
-    interface AcceptErrorEventArgs {
-      socketId: number;
-      resultCode: number;
-    }
 
+    ////////////////////
+    // Audio
+    ////////////////////
     /**
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
-     */
-    interface SocketProperties {
-      /**
-       * Flag indicating if the socket remains open when the event page of the
-       * application is unloaded. The default value is "false." When the
-       * application is loaded, any sockets previously opened with
-       * persistent=true can be fetched with getSockets.
-       *
-       * @see http://developer.chrome.com/apps/app_lifecycle.html
-       */
-      persistent?: boolean;
-
-      /** An application-defined string associated with the socket. */
-      name?: string;
-    }
-
-    /**
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
-     */
-    interface SocketInfo {
-      /** The socket identifier. */
-      socketId: number;
-
-      /**
-       * Flag indicating if the socket remains open when the event page of the
-       * application is unloaded (see SocketProperties.persistent). The
-       * default value is "false".
-       */
-      persistent: boolean;
-
-      /** Application-defined string associated with the socket. */
-      name?: string;
-
-      /**
-       * Flag indicating whether connection requests on a listening socket are
-       * dispatched through the onAccept event or queued up in the listen
-       * queue backlog. See setPaused. The default value is "false"
-       */
-      paused: boolean;
-
-      /** If the socket is listening, contains its local IPv4/6 address. */
-      localAddress?: string;
-
-      /** If the socket is listening, contains its local port. */
-      localPort?: number;
-    }
-
-    /**
-     * Creates a TCP server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-     * @param callback Called when the socket has been created.
-     */
-    export function create(callback: (createInfo: CreateInfo) => void): void;
-
-    /**
-     * Creates a TCP server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
-     * @param properties The socket properties.
-     * @param callback   Called when the socket has been created.
-     */
-    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
-
-    /**
-     * Updates the socket properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
-     * @param socketId   The socket identifier.
-     * @param properties The properties to update.
-     * @param callback   Called when the properties are updated.
-     */
-    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
-
-    /**
-     * Enables or disables a listening socket from accepting new connections.
-     * When paused, a listening socket accepts new connections until its backlog
-     * (see listen function) is full then refuses additional connection
-     * requests. onAccept events are raised only when the socket is un-paused.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
-     * @param callback Callback from the setPaused method.
-     */
-    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
-
-    /**
-     * Listens for connections on the specified port and address. If the
-     * port/address is in use, the callback indicates a failure.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-     * @param socketId The socket identifier.
-     * @param address  The address of the local machine.
-     * @param port     The port of the local machine. When set to 0, a free port
-     *                 is chosen dynamically. The dynamically allocated port can
-     *                 be found by calling getInfo.
-     * @param backlog  Length of the socket's listen queue. The default value
-     *                 depends on the Operating System (SOMAXCONN), which
-     *                 ensures a reasonable queue length for most applications.
-     * @param callback Called when listen operation completes.
-     */
-    export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
-
-    /**
-     * Listens for connections on the specified port and address. If the
-     * port/address is in use, the callback indicates a failure.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
-     * @param socketId The socket identifier.
-     * @param address  The address of the local machine.
-     * @param port     The port of the local machine. When set to 0, a free port
-     *                 is chosen dynamically. The dynamically allocated port can
-     *                 be found by calling getInfo.
-     * @param callback Called when listen operation completes.
-     */
-    export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-
-    /**
-     * Disconnects the listening socket, i.e. stops accepting new connections
-     * and releases the address/port the socket is bound to. The socket
-     * identifier remains valid, e.g. it can be used with listen to accept
-     * connections on a new port and address.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
-     * @param socketId The socket identifier.
-     * @param callback Called when the disconnect attempt is complete.
-     */
-    export function disconnect(socketId: number, callback?: () => void): void;
-
-    /**
-     * Disconnects and destroys the socket. Each socket created should be closed
-     * after use. The socket id is no longer valid as soon at the function is
-     * called. However, the socket is guaranteed to be closed only when the
-     * callback is invoked.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
-     * @param socketId The socket identifier.
-     * @param callback Called when the close operation completes.
-     */
-    export function close(socketId: number, callback?: () => void): void;
-
-    /**
-     * Retrieves the state of the given socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
-     * @param socketId The socket identifier.
-     * @param callback Called when the socket state is available.
-     */
-    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-
-    /**
-     * Retrieves the list of currently opened sockets owned by the application.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
-     * @param callback Called when the list of sockets is available.
-     */
-    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
-
-    /**
-     * Event raised when a connection has been made to the server socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
-     */
-    export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
-
-    /**
-     * Event raised when a network error occured while the runtime was waiting
-     * for new connections on the socket address and port. Once this event is
-     * raised, the socket is set to paused and no more onAccept events are
-     * raised for this socket until the socket is resumed.
-     *
-     * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
-     */
-    export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
-  }
-
-  /**
-   * Use the chrome.sockets.udp API to send and receive data over the network
-   * using UDP connections. This API supersedes the UDP functionality previously
-   * found in the "socket" API.
-   *
-   * @since Chrome 33
-   * @see https://developer.chrome.com/apps/sockets_udp
-   */
-  namespace sockets.udp {
-    interface CreateInfo {
-      socketId: number;
-    }
-
-    interface SendInfo {
-      resultCode: number;
-      bytesSent?: number;
-    }
-
-    interface ReceiveEventArgs {
-      socketId: number;
-      data: ArrayBuffer;
-      remoteAddress: string;
-      remotePort: number;
-    }
-
-    interface ReceiveErrorEventArgs {
-      socketId: number;
-      resultCode: number;
-    }
-
-    /**
-     * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
-     */
-    interface SocketProperties {
-      /**
-       * Flag indicating if the socket is left open when the event page of the
-       * application is unloaded. The default value is "false." When the
-       * application is loaded, any sockets previously opened with
-       * persistent=true can be fetched with getSockets.
-       * @see http://developer.chrome.com/apps/app_lifecycle.html
-       */
-      persistent?: boolean;
-
-      /** An application-defined string associated with the socket. */
-      name?: string;
-
-      /**
-       * The size of the buffer used to receive data. If the buffer is too
-       * small to receive the UDP packet, data is lost. The default value is
-       * 4096.
-       */
-      bufferSize?: number;
-    }
-
-    /**
-     * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
-     */
-    interface SocketInfo {
-      /** The socket identifier. */
-      socketId: number;
-
-      /**
-       * Flag indicating whether the socket is left open when the application
-       * is suspended (see SocketProperties.persistent).
-       */
-      persistent: boolean;
-
-      /** Application-defined string associated with the socket. */
-      name?: string;
-
-      /**
-       * The size of the buffer used to receive data. If no buffer size ha
-       * been specified explictly, the value is not provided.
-       */
-      bufferSize?: number;
-
-      /**
-       * Flag indicating whether the socket is blocked from firing onReceive
-       * events.
-       */
-      paused: boolean;
-
-      /**
-       * If the underlying socket is bound, contains its local IPv4/6 address.
-       */
-      localAddress?: string;
-
-      /**
-       * If the underlying socket is bound, contains its local port.
-       */
-      localPort?: number;
-    }
-
-    /**
-     * Creates a UDP socket with default properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-create
-     * @param createInfo.socketId The ID of the newly created socket.
-     */
-    export function create(callback: (createInfo: CreateInfo) => void): void;
-
-    /**
-     * Creates a UDP socket with the given properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-create
-     * @param properties          The socket properties.
-     * @param createInfo.socketId The ID of the newly created socket.
-     */
-    export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
-
-    /**
-     * Updates the socket properties.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-update
-     * @param socketId   The socket ID.
-     * @param properties The properties to update.
-     * @param callback   Called when the properties are updated.
-     */
-    export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
-
-    /**
-     * Pauses or unpauses a socket. A paused socket is blocked from firing
-     * onReceive events.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setPaused
-     * @param socketId The socket ID.
-     * @param paused   Flag to indicate whether to pause or unpause.
-     * @param callback Called when the socket has been successfully paused or
-     *                 unpaused.
-     */
-    export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
-
-    /**
-     * Binds the local address and port for the socket. For a client socket, it
-     * is recommended to use port 0 to let the platform pick a free port.
-     *
-     * Once the bind operation completes successfully, onReceive events are
-     * raised when UDP packets arrive on the address/port specified -- unless
-     * the socket is paused.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-bind
-     * @param socketId The socket ID.
-     * @param address  The address of the local machine. DNS name, IPv4 and IPv6
-     *                 formats are supported. Use "0.0.0.0" to accept packets
-     *                 from all local available network interfaces.
-     * @param port     The port of the local machine. Use "0" to bind to a free
-     *                 port.
-     * @param callback Called when the bind operation completes.
-     */
-    export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-
-    /**
-     * Sends data on the given socket to the given address and port. The socket
-     * must be bound to a local port before calling this method.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-send
-     * @param socketId The socket ID.
-     * @param data     The data to send.
-     * @param address  The address of the remote machine.
-     * @param port     The port of the remote machine.
-     * @param callback Called when the send operation completes.
-     */
-    export function send(socketId: number, data: ArrayBuffer, address: string, port: number, callback: (sendInfo: SendInfo) => void): void;
-
-    /**
-     * Closes the socket and releases the address/port the socket is bound to.
-     * Each socket created should be closed after use. The socket id is no
-     * longer valid as soon at the function is called. However, the socket is
-     * guaranteed to be closed only when the callback is invoked.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-close
-     * @param socketId The socket ID.
-     * @param callback Called when the close operation completes.
-     */
-    export function close(socketId: number, callback?: () => void): void;
-
-    /**
-     * Retrieves the state of the given socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-getInfo
-     * @param socketId The socket ID.
-     * @param callback Called when the socket state is available.
-     */
-    export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-
-    /**
-     * Retrieves the list of currently opened sockets owned by the application.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-getSockets
-     * @param callback Called when the list of sockets is available.
-     */
-    export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
-
-    /**
-     * Joins the multicast group and starts to receive packets from that group.
-     * The socket must be bound to a local port before calling this method.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-joinGroup
-     * @param socketId The socket ID.
-     * @param address  The group address to join. Domain names are not supported.
-     * @param callback Called when the joinGroup operation completes.
-     */
-    export function joinGroup(socketId: number, address: string, callback: (result: number) => void): void;
-
-    /**
-     * Leaves the multicast group previously joined using joinGroup. This is
-     * only necessary to call if you plan to keep using the socket afterwards,
-     * since it will be done automatically by the OS when the socket is closed.
-     *
-     * Leaving the group will prevent the router from sending multicast
-     * datagrams to the local host, presuming no other process on the host is
-     * still joined to the group.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-leaveGroup
-     * @param socketId The socket ID.
-     * @param address  The group address to leave. Domain names are not
-     *                 supported.
-     * @param callback Called when the leaveGroup operation completes.
-     */
-    export function leaveGroup(socketId: number, address: string, callback: (result: number) => void): void;
-
-    /**
-     * Sets the time-to-live of multicast packets sent to the multicast group.
-     *
-     * Calling this method does not require multicast permissions.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastTimeToLive
-     * @param socketId The socket ID.
-     * @param ttl      The time-to-live value.
-     * @param callback Called when the configuration operation completes.
-     */
-    export function setMulticastTimeToLive(socketId: number, ttl: number, callback: (result: number) => void): void;
-
-    /**
-     * Sets whether multicast packets sent from the host to the multicast group
-     * will be looped back to the host.
-     *
-     * Note: the behavior of setMulticastLoopbackMode is slightly different
-     * between Windows and Unix-like systems. The inconsistency happens only
-     * when there is more than one application on the same host joined to the
-     * same multicast group while having different settings on multicast
-     * loopback mode. On Windows, the applications with loopback off will not
-     * RECEIVE the loopback packets; while on Unix-like systems, the
-     * applications with loopback off will not SEND the loopback packets to
-     * other applications on the same host.
-     * @see MSDN: http://goo.gl/6vqbj
-     *
-     * Calling this method does not require multicast permissions.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastLoopbackMode
-     * @param socketId The socket ID.
-     * @param enabled  Indicate whether to enable loopback mode.
-     * @param callback Called when the configuration operation completes.
-     */
-    export function setMulticastLoopbackMode(socketId: number, enabled: boolean, callback: (result: number) => void): void;
-
-    /**
-     * Gets the multicast group addresses the socket is currently joined to.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#method-getJoinedGroups
-     * @param socketId The socket ID.
-     * @param callback Called with an array of strings of the result.
-     */
-    export function getJoinedGroups(socketId: number, callback: (groups: string[]) => void): void;
-
-    /**
-     * Enables or disables broadcast packets on this socket.
-     *
-     * @since Chrome 44
-     * @see https://developer.chrome.com/apps/sockets_udp#method-setBroadcast
-     * @param socketId The socket ID.
-     * @param enabled  true to enable broadcast packets, false to disable them.
-     * @param callback Callback from the setBroadcast method.
-     */
-    export function setBroadcast(socketId: number, enabled: boolean, callback?: (result: number) => void): void;
-
-    /**
-     * Event raised when a UDP packet has been received for the given socket.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
-     */
-    export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
-
-    /**
-     * Event raised when a network error occured while the runtime was waiting
-     * for data on the socket address and port. Once this event is raised, the
-     * socket is paused and no more onReceive events will be raised for this
-     * socket until the socket is resumed.
-     *
-     * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
-     */
-    export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
-  }
-
-  ////////////////////
-  // Storage
-  ////////////////////
-  /**
-   * Use the chrome.storage API to store, retrieve, and track changes to user data.
-   * Permissions:  "storage"
-   * @since Chrome 20.
-   */
-  namespace storage {
-    interface StorageArea {
-      /**
-       * Gets the amount of space (in bytes) being used by one or more items.
-       * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-       * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-       */
-      getBytesInUse(callback: (bytesInUse: number) => void): void;
-      /**
-       * Gets the amount of space (in bytes) being used by one or more items.
-       * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
-       * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
-       * Parameter bytesInUse: Amount of space being used in storage, in bytes.
-       */
-      getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
-      /**
-       * Removes all items from storage.
-       * @param callback Optional.
-       * Callback on success, or on failure (in which case runtime.lastError will be set).
-       */
-      clear(callback?: () => void): void;
-      /**
-       * Sets multiple items.
-       * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
-       * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
-       * @param callback Optional.
-       * Callback on success, or on failure (in which case runtime.lastError will be set).
-       */
-      set(items: Object, callback?: () => void): void;
-      /**
-       * Removes one or more items from storage.
-       * @param A single key or a list of keys for items to remove.
-       * @param callback Optional.
-       * Callback on success, or on failure (in which case runtime.lastError will be set).
-       */
-      remove(keys: string | string[], callback?: () => void): void;
-      /**
-       * Gets one or more items from storage.
-       * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-       * Parameter items: Object with items in their key-value mappings.
-       */
-      get(callback: (items: { [key: string]: any }) => void): void;
-      /**
-       * Gets one or more items from storage.
-       * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
-       * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
-       * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-       * Parameter items: Object with items in their key-value mappings.
-       */
-      get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
-    }
-
-    interface StorageChange {
-      /** Optional. The new value of the item, if there is a new value. */
-      newValue?: any;
-      /** Optional. The old value of the item, if there was an old value. */
-      oldValue?: any;
-    }
-
-    interface LocalStorageArea extends StorageArea {
-      /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-      QUOTA_BYTES: number;
-    }
-
-    interface SyncStorageArea extends StorageArea {
-      /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
-      MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
-      /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
-      QUOTA_BYTES: number;
-      /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
-      QUOTA_BYTES_PER_ITEM: number;
-      /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
-      MAX_ITEMS: number;
-      /**
-       * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
-       * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-       */
-      MAX_WRITE_OPERATIONS_PER_HOUR: number;
-      /**
-       * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
-       * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
-       * @since Chrome 40.
-       */
-      MAX_WRITE_OPERATIONS_PER_MINUTE: number;
-    }
-
-    interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
-
-    /** Items in the local storage area are local to each machine. */
-    export var local: LocalStorageArea;
-    /** Items in the sync storage area are synced using Chrome Sync. */
-    export var sync: SyncStorageArea;
-
-    /**
-     * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace  results in an error.
-     * @since Chrome 33.
-     */
-    export var managed: StorageArea;
-
-    /** Fired when one or more items change. */
-    export var onChanged: StorageChangedEvent;
-  }
-
-  ////////////////////
-  // SyncFileSystem
-  ////////////////////
-  /**
-   * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive. This API is NOT for accessing arbitrary user docs stored in Google Drive. It provides app-specific syncable storage for offline and caching usage so that the same data can be available across different clients. Read Manage Data for more on using this API.
-   * @since Chrome 27
-   */
-  namespace syncFileSystem {
-    /** NOT YET IMPLEMENTED */
-  }
-
-
-  ////////////////////
-  // System CPU
-  ////////////////////
-  /**
-   * Use the system.cpu API to query CPU metadata.
-   * Permissions: "system.cpu"
-   * @since Chrome 32.
-   */
-  namespace system.cpu {
-    interface ProcessorUsage {
-      /** The cumulative time used by userspace programs on this processor. */
-      user: number;
-      /** The cumulative time used by kernel programs on this processor. */
-      kernel: number;
-      /** The cumulative time spent idle by this processor. */
-      idle: number;
-      /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
-      total: number;
-    }
-
-    interface ProcessorInfo {
-      /** Cumulative usage info for this logical processor. */
-      usage: ProcessorUsage;
-    }
-
-    interface CpuInfo {
-      /** The number of logical processors. */
-      numOfProcessors: number;
-      /** The architecture name of the processors. */
-      archName: string;
-      /** The model name of the processors. */
-      modelName: string;
-      /**
-       * A set of feature codes indicating some of the processor's capabilities.
-       * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
-       */
-      features: string[];
-      /** Information about each logical processor. */
-      processors: ProcessorInfo[];
-    }
-
-    /** Queries basic CPU information of the system. */
-    export function getInfo(callback: (info: CpuInfo) => void): void;
-  }
-
-  ////////////////////
-  // System Display
-  ////////////////////
-  /**
-   * Use the system.display API to query display metadata.
-   * Permissions: "system.display"
-   * @since Chrome 30.
-   */
-  namespace system.display {
-    interface Bounds {
-      /**  The x-coordinate of the upper-left corner. */
-      left: number;
-      /**  The y-coordinate of the upper-left corner. */
-      top: number;
-      /** The width of the display in pixels. */
-      width: number;
-      /** The height of the display in pixels. */
-      height: number;
-    }
-
-    interface Insets {
-      /** The x-axis distance from the left bound. */
-      left: number;
-      /** The y-axis distance from the top bound. */
-      top: number;
-      /** The x-axis distance from the right bound. */
-      right: number;
-      /** The y-axis distance from the bottom bound. */
-      bottom: number;
-    }
-
-    /**
-     * @since Chrome 57
-     */
-    interface Point {
-      /** The x-coordinate of the point. */
-      x: number;
-      /** The y-coordinate of the point. */
-      y: number;
-    }
-
-    /**
-     * @since Chrome 57
-     */
-    interface TouchCalibrationPair {
-      /**	The coordinates of the display point. */
-      displayPoint: Point;
-      /** The coordinates of the touch point corresponding to the display point. */
-      touchPoint: Point;
-    }
-
-    /**
-     * @since Chrome 52
-     */
-    interface DisplayMode {
-      /** The display mode width in device independent (user visible) pixels. */
-      width: number;
-
-      /** The display mode height in device independent (user visible) pixels. */
-      height: number;
-
-      /** The display mode width in native pixels. */
-      widthInNativePixels: number;
-
-      /** The display mode height in native pixels. */
-      heightInNativePixels: number;
-
-      /** The display mode UI scale factor. */
-      uiScale: number;
-
-      /** The display mode device scale factor. */
-      deviceScaleFactor: number;
-
-      /** True if the mode is the display's native mode. */
-      isNative: boolean;
-
-      /** True if the display mode is currently selected. */
-      isSelected: boolean;
-    }
-
-    /**
-     * @since Chrome 53
-     */
-    interface DisplayLayout {
-      /** The unique identifier of the display. */
-      id: string;
-      /** The unique identifier of the parent display. Empty if this is the root. */
-      parentId: string;
-      /** The layout position of this display relative to the parent. This will be ignored for the root. */
-      position: 'top' | 'right' | 'bottom' | 'left';
-      /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
-      offset: number;
-    }
-
-    /**
-     * @description The pairs of point used to calibrate the display.
-     * @export
-     * @interface TouchCalibrationPairs
-     */
-    interface TouchCalibrationPairs {
-      /** First pair of touch and display point required for touch calibration. */
-      pair1: TouchCalibrationPair,
-      /** Second pair of touch and display point required for touch calibration. */
-      pair2: TouchCalibrationPair,
-      /** Third pair of touch and display point required for touch calibration. */
-      pair3: TouchCalibrationPair,
-      /** Fourth pair of touch and display point required for touch calibration. */
-      pair4: TouchCalibrationPair
-    }
-
-    /**
-     * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
-     * @export
-     * @interface DisplayPropertiesInfo
-     */
-    interface DisplayPropertiesInfo {
-      /**
-       * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
-       * @since Chrome 59
-       * */
-      isUnified?: boolean;
-
-      /**
-       * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
-       */
-      mirroringSourceId?: string;
-
-      /** If set to true, makes the display primary. No-op if set to false. */
-      isPrimary?: boolean;
-
-      /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-      overscan?: Insets;
-
-      /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-      rotation?: 0 | 90 | 180 | 270;
-
-      /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-      boundsOriginX?: number;
-
-      /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-      boundsOriginY: number;
-
-      /**
-       * @since Chrome 52
-       * @description If set, updates the display mode to the mode matching this value.
-       */
-      displayMode?: DisplayMode;
-    }
-
-    /**
-     * @description Options affecting how the information is returned.
+     * The chrome.audio API is provided to allow users to get information about and control the audio devices attached to the system. This API is currently only implemented for ChromeOS.
      * @since Chrome 59
-     * @export
-     * @interface DisplayInfoFlags
      */
-    interface DisplayInfoFlags {
-      /**
-       * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
-       * @type {boolean}
-       * @memberof DisplayInfoFlags
-       */
-      singleUnified?: boolean;
+    namespace audio {
+        export type StreamType = 'INPUT' | 'OUTPUT';
+        interface AudioDeviceInfo {
+            /** The unique identifier of the audio device. */
+            id: string;
+            /** Stream type associated with this device. */
+            streamType: StreamType;
+            /** Type of the device. */
+            deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
+            /** The user-friendly name (e.g. "USB Microphone"). */
+            displayName: string;
+            /** Device name. */
+            deviceName: string;
+            /** True if this is the current active device. */
+            isActive: boolean;
+            /** The sound level of the device, volume for output, gain for input. */
+            level: number;
+            /** The stable/persisted device id string when available. */
+            stableDeviceId?: string;
+        }
+        interface DeviceIdLists {
+            /**
+             * List of input devices specified by their ID.
+             * To indicate input devices should be unaffected, leave this property unset.
+             */
+            input?: string[];
+            /**
+             * List of output devices specified by their ID.
+             * To indicate output devices should be unaffected, leave this property unset.
+             */
+            output?: string[];
+        }
+        interface SetDeviceProperties {
+            /**
+             * The audio device's desired sound level. Defaults to the device's current sound level.
+             * If used with audio input device, represents audio device gain.
+             * If used with audio output device, represents audio device volume.
+             *
+             * Type: integer
+             */
+            level?: number;
+        }
+        interface OnLevelChangedEvent {
+            /**
+             * The callback parameter should be a function that looks like this:
+             *   function(object event) {...};
+             * @param {(event: {
+             *             deviceId: string,
+             *             level: number
+             *         }) => void} callback
+             */
+            addListener(callback: (event: {
+                deviceId: string,
+                level: number
+            }) => void): void;
+        }
+        interface OnMuteChangedEvent {
+            /**
+             * The callback parameter should be a function that looks like this:
+             * function(object event) {...};
+             */
+            addListener(callback: (event: {
+                streamType: StreamType[],
+                isMuted: boolean
+            }) => void): void;
+        }
+        interface OnDeviceListChangedEvent {
+            /**
+             * The callback parameter should be a function that looks like this:
+             *   function(array of AudioDeviceInfo devices) {...};
+             * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
+             */
+            addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
+        }
+        /**
+         * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
+         */
+        interface Filter {
+            /**
+             * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
+             */
+            streamTypes?: StreamType[];
+            /**
+             * @description If set, only audio devices whose active state matches this value will satisfy the filter.
+             */
+            isActive?: boolean;
+        }
+        /**
+         * @description Gets a list of audio devices filtered based on |filter|.
+         */
+        export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => void): void;
+        export function getDevices(callback: (devices: AudioDeviceInfo[]) => void): void;
+        /** Sets lists of active input and/or output devices. */
+        export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void): void;
+        /** Sets the properties for the input or output device. */
+        export function setProperties(id: string, properties: SetDeviceProperties, callback: () => void): void;
+        /**
+         * @description Gets the system-wide mute state for the specified stream type.
+         * @param {StreamType} streamType Stream type for which mute state should be fetched.
+         * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
+         */
+        export function getMute(streamType: StreamType, callback: (value: boolean) => void): void;
+        /**
+         * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
+         * @param {StreamType} streamType Stream type for which mute state should be set.
+         * @param {boolean} isMuted New mute value.
+         * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
+         */
+        export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => void): void;
+        /** Fired when sound level changes for an active audio device. */
+        export var onLevelChanged: OnLevelChangedEvent;
+        /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
+        export var onMuteChanged: OnMuteChangedEvent;
+        /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
+        export var onDeviceListChanged: OnDeviceListChangedEvent;
     }
 
-    /** Information about display properties. */
-    interface DisplayInfo {
-      /** The unique identifier of the display. */
-      id: string;
-      /** The user-friendly name (e.g. "HP LCD monitor"). */
-      name: string;
-      /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
-      mirroringSourceId: string;
-      /** True if this is the primary display. */
-      isPrimary: boolean;
-      /** True if this is an internal display. */
-      isInternal: boolean;
-      /** True if this display is enabled. */
-      isEnabled: boolean;
-      /** The number of pixels per inch along the x-axis. */
-      dpiX: number;
-      /** The number of pixels per inch along the y-axis. */
-      dpiY: number;
-      /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
-      rotation: number;
-      /** The display's logical bounds. */
-      bounds: Bounds;
-      /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
-      overscan: Insets;
-      /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
-      workArea: Bounds;
+    ////////////////////
+    // Bluetooth
+    ////////////////////
+    /**
+     * Use the chrome.bluetooth API to connect to a Bluetooth device. All functions report failures via chrome.runtime.lastError.
+     * Manifest: "bluetooth": {...}
+     * @since Chrome 37
+     */
+    namespace bluetooth {
+        interface AdapterState {
+            address: string;
+            name: string;
+            powered: boolean;
+            available: boolean;
+            discovering: boolean;
+        }
+        interface Device {
+            address: string;
+            name?: string;
+            deviceClass?: number;
+            vendorIdSource?: 'bluetooth' | 'usb';
+            vendorId?: number;
+            productId?: number;
+            deviceId?: number;
+            type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
+            paired?: boolean;
+            connected?: boolean;
+            /**
+             * @since Chrome 48
+             */
+            connecting?: boolean;
+            /**
+             * @since Chrome 48
+             */
+            connectable?: boolean;
+            uuids?: string[];
+            /**
+             * @since Chrome 44
+             */
+            inquiryRssi: number;
+            /**
+             * @since Chrome 44
+             */
+            inquiryTxPower: number;
+        }
+
+        interface BluetoothEvent<T> {
+            addListener(callback: (event: T) => void): void;
+        }
+
+        /**
+         * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+         */
+        interface DeviceFilter {
+            /** Type of filter to apply to the device list. Default is all. */
+            filterType?: 'all' | 'known';
+            /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
+            limit?: number;
+        }
+        /** Get information about the Bluetooth adapter. */
+        export function getAdapterState(callback: (adapterInfo: AdapterState) => void): void;
+        /** Get information about a Bluetooth device known to the system. */
+        export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void): void;
+        /**
+         * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
+         * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
+         * @param callback Called when the search is completed.
+         */
+        export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void): void;
+        /**
+         * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
+         * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
+         */
+        export function startDiscovery(callback: () => void): void;
+        /** Stop discovery. */
+        export function stopDiscovery(callback: () => void): void;
+        /** Fired when the state of the Bluetooth adapter changes. */
+        export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
+        /** Fired when information about a new Bluetooth device is available. */
+        export var onDeviceAdded: BluetoothEvent<Device>;
+        /** Fired when information about a known Bluetooth device has changed. */
+        export var onDeviceChanged: BluetoothEvent<Device>;
+        /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
+        export var onDeviceRemoved: BluetoothEvent<Device>;
+    }
+    /**
+     * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
+     * Manifest: "bluetooth": {...}
+     * @since Chrome 37
+     * Important: This API works only on Chrome OS.
+     * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
+     */
+    namespace bluetoothLowEnergy {
+        /**
+         * NOT IMPLEMENTED YET
+         * @see https://developer.chrome.com/apps/bluetoothLowEnergy
+         * */
+    }
+    /**
+     * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
+     * @since Chrome 37
+     * Manifest: "bluetooth": {...}
+     * Important: This API works only on OS X, Windows and Chrome OS.
+     */
+    namespace bluetoothSocket {
+        /** NOT IMPLEMENTED YET */
     }
 
-    /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
-    interface DisplayProps {
-      /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
-      mirroringSourceId?: string;
-      /** If set to true, makes the display primary. No-op if set to false. */
-      isPrimary?: boolean;
-      /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
-      overscan?: Insets;
-      /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
-      rotation?: number;
-      /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
-      boundsOriginX?: number;
-      /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
-      boundsOriginY?: number;
+    ////////////////////
+    // Browser
+    ////////////////////
+    /**
+     * Use the chrome.browser API to interact with the Chrome browser associated with
+     * the current application and Chrome profile.
+     */
+    namespace browser {
+        interface Options {
+            /** The URL to navigate to when the new tab is initially opened. */
+            url: string;
+        }
+
+        /**
+         * Opens a new tab in a browser window associated with the current application
+         * and Chrome profile. If no browser window for the Chrome profile is opened,
+         * a new one is opened prior to creating the new tab.
+         * @param options Configures how the tab should be opened.
+         * @param callback Called when the tab was successfully
+         * created, or failed to be created. If failed, runtime.lastError will be set.
+         */
+        export function openTab(options: Options, callback: () => void): void;
+
+        /**
+        * Opens a new tab in a browser window associated with the current application
+        * and Chrome profile. If no browser window for the Chrome profile is opened,
+        * a new one is opened prior to creating the new tab. Since Chrome 42 only.
+        * @param options Configures how the tab should be opened.
+        */
+        export function openTab(options: Options): void;
     }
 
+    ////////////////////
+    // Commands
+    ////////////////////
     /**
-     * @description Fired when anything changes to the display configuration.
-     * @export
-     * @interface DisplayChangedEvent
-     * @extends {chrome.events.Event<() => void>}
+     * Use the commands API to add keyboard shortcuts that trigger actions in your extension, for example, an action to open the browser action or send a command to the extension.
+     * Availability: Since Chrome 25.
+     * Manifest:  "commands": {...}
      */
-    interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
+    namespace commands {
+        interface Command {
+            /** Optional. The name of the Extension Command  */
+            name?: string;
+            /** Optional. The Extension Command description  */
+            description?: string;
+            /** Optional. The shortcut active for this command, or blank if not active.  */
+            shortcut?: string;
+        }
+
+        interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
+
+        /**
+         * Returns all the registered extension commands for this extension and their shortcut (if active).
+         * @param callback Called to return the registered commands.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(array of Command commands) {...};
+         */
+        export function getAll(callback: (commands: Command[]) => void): void;
+
+        /** Fired when a registered command is activated using a keyboard shortcut. */
+        export var onCommand: CommandEvent;
+    }
+
+    ////////////////////
+    // Context Menus
+    ////////////////////
+    /**
+     * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
+     * Availability: Since Chrome 6.
+     * Permissions:  "contextMenus"
+     */
+    namespace contextMenus {
+        /**
+        * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
+        **/
+        export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
+        /**
+        * The type of menu item.
+        **/
+        export type ItemType = "normal" | "checkbox" | "radio" | "separator";
+
+        interface OnClickData {
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * The text for the context selection, if any.
+             */
+            selectionText?: string;
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * A flag indicating the state of a checkbox or radio item after it is clicked.
+             */
+            checked?: boolean;
+            /**
+             * @since Since Chrome 35.
+             * The ID of the menu item that was clicked.
+             */
+            menuItemId: any;
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
+             */
+            frameUrl?: string;
+            /**
+             * @since Since Chrome 35.
+             * A flag indicating whether the element is editable (text input, textarea, etc.).
+             */
+            editable: boolean;
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
+             */
+            mediaType?: string;
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * A flag indicating the state of a checkbox or radio item before it was clicked.
+             */
+            wasChecked?: boolean;
+            /**
+             * @since Since Chrome 35.
+             * The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu.
+             */
+            pageUrl: string;
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * If the element is a link, the URL it points to.
+             */
+            linkUrl?: string;
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * The parent ID, if any, for the item clicked.
+             */
+            parentMenuItemId?: any;
+            /**
+             * Optional.
+             * @since Since Chrome 35.
+             * Will be present for elements with a 'src' URL.
+             */
+            srcUrl?: string;
+        }
+
+        interface CreateProperties {
+            /** Optional. Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see Match Patterns.  */
+            documentUrlPatterns?: string[];
+            /** Optional. The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.  */
+            checked?: boolean;
+            /** Optional. The text to be displayed in the item; this is required unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".  */
+            title?: string;
+            /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
+            contexts?: string[];
+            /**
+             * Optional.
+             * Whether this context menu item is enabled or disabled. Defaults to true.
+             * @since Since Chrome 20.
+             */
+            enabled?: boolean;
+            /** Optional. Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.  */
+            targetUrlPatterns?: string[];
+            /**
+             * Optional.
+             * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for chrome.contextMenus.onClicked.
+             * @param info Information sent when a context menu item is clicked.
+             */
+            onclick?: (info: OnClickData) => void;
+            /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
+            parentId?: any;
+            /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
+            type?: string;
+            /**
+             * Optional.
+             * @since Since Chrome 21.
+             * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+             */
+            id?: string;
+            /**
+             * @description Whether the item is visible in the menu.
+             * @since Since Chrome 62
+             */
+            visible?: boolean;
+        }
+
+        interface UpdateProperties {
+            documentUrlPatterns?: string[];
+            checked?: boolean;
+            title?: string;
+            contexts?: string[];
+            /**
+             * @since Chrome 20
+             **/
+            enabled?: boolean;
+            targetUrlPatterns?: string[];
+            onclick?: (info: OnClickData) => void;
+            /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
+            parentId?: any;
+            type?: string;
+            /**
+             * @description Whether the item is visible or not.
+             * @since Since Chrome 62
+             */
+            visible?: boolean;
+        }
+
+        interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => void> { }
+
+        /**
+         * Since Chrome 38.
+         * The maximum number of top level extension items that can be added to an extension action context menu. Any items beyond this limit will be ignored.
+         */
+        export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
+
+        /**
+         * Removes all context menu items added by this extension.
+         * @param callback Called when removal is complete.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function removeAll(callback?: () => void): void;
+        /**
+         * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+         * @param callback Called when the item has been created in the browser. If there were any problems creating the item, details will be available in chrome.runtime.lastError.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function create(createProperties: CreateProperties, callback?: () => void): void;
+        /**
+         * Updates a previously created context menu item.
+         * @param id The ID of the item to update.
+         * @param updateProperties The properties to update. Accepts the same values as the create function.
+         * @param callback Called when the context menu has been updated.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
+        /**
+         * Updates a previously created context menu item.
+         * @param id The ID of the item to update.
+         * @param updateProperties The properties to update. Accepts the same values as the create function.
+         * @param callback Called when the context menu has been updated.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
+        /**
+         * Removes a context menu item.
+         * @param menuItemId The ID of the context menu item to remove.
+         * @param callback Called when the context menu has been removed.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function remove(menuItemId: string, callback?: () => void): void;
+        /**
+         * Removes a context menu item.
+         * @param menuItemId The ID of the context menu item to remove.
+         * @param callback Called when the context menu has been removed.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function remove(menuItemId: number, callback?: () => void): void;
+
+        /**
+         * Since Chrome 21.
+         * Fired when a context menu item is clicked.
+         */
+        export var onClicked: MenuClickedEvent;
+
+    }
+
+    ////////////////////
+    // Document Scan
+    ////////////////////
+    /**
+     * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
+     * Availability: Since Chrome 44.
+     * Permissions:  "documentScan"
+     * Important: This API works only on Chrome OS.
+     */
+    namespace documentScan {
+        interface DocumentScanOptions {
+            /** Optional. The MIME types that are accepted by the caller.  */
+            mimeTypes?: string[];
+            /** Optional. The number of scanned images allowed (defaults to 1).  */
+            maxImages?: number;
+        }
+
+        interface DocumentScanCallbackArg {
+            /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
+            dataUrls: string[];
+            /** The MIME type of dataUrls. */
+            mimeType: string;
+        }
+
+        /**
+         * Performs a document scan. On success, the PNG data will be sent to the callback.
+         * @param options Object containing scan parameters.
+         * @param callback Called with the result and data from the scan.
+         * The callback parameter should be a function that looks like this:
+         * function(object result) {...};
+         */
+        export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
+    }
+
+    ////////////////////
+    // Events
+    ////////////////////
+    /**
+     * The chrome.events namespace  contains common types used by APIs dispatching events to notify you when something interesting happens.
+     * Availability: Since Chrome 21.
+     */
+    namespace events {
+        /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
+        interface UrlFilter {
+            /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
+            schemes?: string[];
+            /**
+             * Optional.
+              * Since Chrome 23.
+             * Matches if the URL (without fragment identifier) matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+             */
+            urlMatches?: string;
+            /** Optional. Matches if the path segment of the URL contains a specified string.  */
+            pathContains?: string;
+            /** Optional. Matches if the host name of the URL ends with a specified string.  */
+            hostSuffix?: string;
+            /** Optional. Matches if the host name of the URL starts with a specified string.  */
+            hostPrefix?: string;
+            /** Optional. Matches if the host name of the URL contains a specified string. To test whether a host name component has a prefix 'foo', use hostContains: '.foo'. This matches 'www.foobar.com' and 'foo.com', because an implicit dot is added at the beginning of the host name. Similarly, hostContains can be used to match against component suffix ('foo.') and to exactly match against components ('.foo.'). Suffix- and exact-matching for the last components need to be done separately using hostSuffix, because no implicit dot is added at the end of the host name.  */
+            hostContains?: string;
+            /** Optional. Matches if the URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+            urlContains?: string;
+            /** Optional. Matches if the query segment of the URL ends with a specified string.  */
+            querySuffix?: string;
+            /** Optional. Matches if the URL (without fragment identifier) starts with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+            urlPrefix?: string;
+            /** Optional. Matches if the host name of the URL is equal to a specified string.  */
+            hostEquals?: string;
+            /** Optional. Matches if the URL (without fragment identifier) is equal to a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+            urlEquals?: string;
+            /** Optional. Matches if the query segment of the URL contains a specified string.  */
+            queryContains?: string;
+            /** Optional. Matches if the path segment of the URL starts with a specified string.  */
+            pathPrefix?: string;
+            /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
+            pathEquals?: string;
+            /** Optional. Matches if the path segment of the URL ends with a specified string.  */
+            pathSuffix?: string;
+            /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
+            queryEquals?: string;
+            /** Optional. Matches if the query segment of the URL starts with a specified string.  */
+            queryPrefix?: string;
+            /** Optional. Matches if the URL (without fragment identifier) ends with a specified string. Port numbers are stripped from the URL if they match the default port number.  */
+            urlSuffix?: string;
+            /** Optional. Matches if the port of the URL is contained in any of the specified port lists. For example [80, 443, [1000, 1200]] matches all requests on port 80, 443 and in the range 1000-1200.  */
+            ports?: any[];
+            /**
+             * Optional.
+              * Since Chrome 28.
+             * Matches if the URL without query segment and fragment identifier matches a specified regular expression. Port numbers are stripped from the URL if they match the default port number. The regular expressions use the RE2 syntax.
+             */
+            originAndPathMatches?: string;
+        }
+
+        /** An object which allows the addition and removal of listeners for a Chrome event. */
+        interface Event<T> {
+            /**
+             * Registers an event listener callback to an event.
+             * @param callback Called when an event occurs. The parameters of this function depend on the type of event.
+             * The callback parameter should be a function that looks like this:
+             * function() {...};
+             */
+            addListener(callback: T): void;
+            /**
+             * Returns currently registered rules.
+             * @param callback Called with registered rules.
+             * The callback parameter should be a function that looks like this:
+             * function(array of Rule rules) {...};
+             * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+             */
+            getRules(callback: (rules: Rule[]) => void): void;
+            /**
+             * Returns currently registered rules.
+             * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+             * @param callback Called with registered rules.
+             * The callback parameter should be a function that looks like this:
+             * function(array of Rule rules) {...};
+             * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+             */
+            getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
+            /**
+             * @param callback Listener whose registration status shall be tested.
+             */
+            hasListener(callback: T): boolean;
+            /**
+             * Unregisters currently registered rules.
+             * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
+             * @param callback Called when rules were unregistered.
+             * If you specify the callback parameter, it should be a function that looks like this:
+             * function() {...};
+             */
+            removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
+            /**
+             * Unregisters currently registered rules.
+             * @param callback Called when rules were unregistered.
+             * If you specify the callback parameter, it should be a function that looks like this:
+             * function() {...};
+             */
+            removeRules(callback?: () => void): void;
+            /**
+             * Registers rules to handle events.
+             * @param rules Rules to be registered. These do not replace previously registered rules.
+             * @param callback Called with registered rules.
+             * If you specify the callback parameter, it should be a function that looks like this:
+             * function(array of Rule rules) {...};
+             * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+             */
+            addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
+            /**
+             * Deregisters an event listener callback from an event.
+             * @param callback Listener that shall be unregistered.
+             * The callback parameter should be a function that looks like this:
+             * function() {...};
+             */
+            removeListener(callback: T): void;
+            hasListeners(): boolean;
+        }
+
+        /** Description of a declarative rule for handling events. */
+        interface Rule {
+            /** Optional. Optional priority of this rule. Defaults to 100.  */
+            priority?: number;
+            /** List of conditions that can trigger the actions. */
+            conditions: any[];
+            /** Optional. Optional identifier that allows referencing this rule.  */
+            id?: string;
+            /** List of actions that are triggered if one of the condtions is fulfilled. */
+            actions: any[];
+            /**
+             * Optional.
+              * Since Chrome 28.
+             * Tags can be used to annotate rules and perform operations on sets of rules.
+             */
+            tags?: string[];
+        }
+    }
+
+    ////////////////////
+    // Extension Types
+    ////////////////////
 
     /**
-     * @description Requests the information for all attached display devices.
-     * @export
-     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
-     */
-    export function getInfo(callback: (info: DisplayInfo[]) => void): void;
-    /**
-     * @description Requests the information for all attached display devices.
-     * @export
-     * @since Chrome 59
-     * @param {DisplayInfoFlags} [flags] Options affecting how the information is returned.
-     * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
-     */
-    export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
+     * Primary for extensions, but also used in apps.
+     * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
+     **/
+    namespace extensionTypes {
+        /**
+         * The format of an image.
+         **/
+        export type ImageFormat = 'jpeg' | 'png';
+        /**
+         * Details about the format and quality of an image.
+         */
+        interface ImageDetails {
+            /**
+             * @description The format of the resulting image. Default is "jpeg".
+             * @type {ImageFormat}
+             * @memberof ImageDetails
+             */
+            format?: ImageFormat;
+            /**
+             * @description When format is "jpeg", controls the quality of the resulting image. This value is ignored for PNG images. As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease.
+             * @type {number}
+             * @memberof ImageDetails
+             */
+            quality?: number;
+        }
+        /**
+         * The soonest that the JavaScript or CSS will be injected into the tab.
+         **/
+        export type RunAt = 'document_start' | 'document_end' | 'document_idle';
+        /**
+         * The origin of injected CSS.
+         **/
+        export type CSSOrigin = 'author' | 'user';
+        /**
+         * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+         * @interface InjectDetails
+         */
+        interface InjectDetails {
+            /**
+             * JavaScript or CSS code to inject.
+             * Warning:
+             * Be careful using the code parameter. Incorrect use of it may open your extension to cross site scripting attacks.
+             * @type {string}
+             * @memberof InjectDetails
+             */
+            code?: string;
+            /**
+             * @description JavaScript or CSS file to inject.
+             * @type {string}
+             * @memberof InjectDetails
+             */
+            file?: string;
+            /**
+             * @description If allFrames is true, implies that the JavaScript or CSS should be injected into all frames of current page. By default, it's false and is only injected into the top frame. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
+             * @type {boolean}
+             * @memberof InjectDetails
+             */
+            allFrames?: boolean;
+            /**
+             * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
+             * @since Since Chrome 50.
+             * @type {number}
+             * @memberof InjectDetails
+             */
+            frameId?: number;
+            /**
+             * @description If matchAboutBlank is true, then the code is also injected in about:blank and about:srcdoc frames if your extension has access to its parent document. Code cannot be inserted in top-level about:-frames. By default it is false.
+             * @type {boolean}
+             * @memberof InjectDetails
+             */
+            matchAboutBlank?: boolean;
+            /**
+             * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+             * @type {RunAt}
+             * @memberof InjectDetails
+             */
+            runAt: RunAt;
+            /**
+             * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
+             * @since Since Chrome 66.
+             * @type {CSSOrigin}
+             * @memberof InjectDetails
+             */
+            cssOrigin: CSSOrigin;
+        }
+    }
 
-    /**
-     * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-     * @since Chrome 53
-     * @export
-     * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
-     */
-    export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
+    ////////////////////
+    // FileSystem
+    ////////////////////
+    namespace fileSystem {
 
-    /**
-     * @description Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-     * @export
-     * @param {string} id The display's unique identifier.
-     * @param {DisplayPropertiesInfo} info The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|.
-     * @param {() => void} [callback] Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
-     */
-    export function setDisplayProperties(id: string, info: DisplayPropertiesInfo, callback?: () => void): void;
+        interface AcceptOptions {
+            description?: string;
+            mimeTypes?: string[];
+            extensions?: string[];
+        }
 
-    /**
-     * @description Set the layout for all displays. Any display not included will use the default layout. If a layout would overlap or be otherwise invalid it will be adjusted to a valid layout. After layout is resolved, an onDisplayChanged event will be triggered. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
-     * @since Chrome 53
-     * @export
-     * @param {DisplayLayout[]} layouts The layout information, required for all displays except the primary display.
-     * @param {() => void} callback Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
-     */
-    export function setDisplayLayout(layouts: DisplayLayout[], callback?: () => void): void;
+        interface ChooseEntryOptions {
+            type?: string;
+            suggestedName?: string;
+            accepts?: AcceptOptions[];
+            acceptsAllTypes?: boolean;
+            acceptsMultiple?: boolean;
+        }
 
+        export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
+        export function getWritableEntry(entry: Entry, callback: (entry: Entry) => void): void;
+        export function isWritableEntry(entry: Entry, callback: (isWritable: boolean) => void): void;
+        export function chooseEntry(callback: (entry: Entry) => void): void;
+        export function chooseEntry(callback: (fileEntries: FileEntry[]) => void): void;
+        export function chooseEntry(options: ChooseEntryOptions, callback: (entry: Entry) => void): void;
+        export function chooseEntry(options: ChooseEntryOptions, callback: (fileEntries: FileEntry[]) => void): void;
+        export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
+        export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
+        export function retainEntry(entry: Entry): string;
+    }
+
+
+    ////////////////////
+    // File System Provider
+    ////////////////////
     /**
-     * @description Enables/disables the unified desktop feature. Note that this simply enables the feature, but will not change the actual desktop mode. (That is, if the desktop is in mirror mode, it will stay in mirror mode) NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+     * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
+     * Availability: Since Chrome 40.
+     * Permissions:  "fileSystemProvider"
+     * Important: This API works only on Chrome OS.
+     */
+    namespace fileSystemProvider {
+        interface OpenedFileInfo {
+            /** A request ID to be be used by consecutive read/write and close requests. */
+            openRequestId: number;
+            /** The path of the opened file. */
+            filePath: string;
+            /** Whether the file was opened for reading or writing. */
+            mode: string;
+        }
+
+        interface FileWatchersInfo {
+            /** The path of the entry being observed. */
+            entryPath: string;
+            /** Whether watching should include all child entries recursively. It can be true for directories only. */
+            recursive: boolean;
+            /** Optional. Tag used by the last notification for the watcher.  */
+            lastTag?: string;
+        }
+
+        interface EntryMetadata {
+            /** True if it is a directory. */
+            isDirectory: boolean;
+            /** Name of this entry (not full path name). Must not contain '/'. For root it must be empty. */
+            name: string;
+            /** File size in bytes. */
+            size: number;
+            /** The last modified time of this entry. */
+            modificationTime: Date;
+            /** Optional. Mime type for the entry.  */
+            mimeType?: string;
+            /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
+            thumbnail?: string;
+        }
+
+        interface FileSystemInfo {
+            /** The identifier of the file system. */
+            fileSystemId: string;
+            /** A human-readable name for the file system. */
+            displayName: string;
+            /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
+            writable: boolean;
+            /**
+             * The maximum number of files that can be opened at once. If 0, then not limited.
+             * @since Since Chrome 42.
+             */
+            openedFilesLimit: number;
+            /**
+             * List of currently opened files.
+             * @since Since Chrome 42.
+             */
+            openedFiles: OpenedFileInfo[];
+            /**
+             * Optional.
+              * Whether the file system supports the tag field for observing directories.
+             * @since Since Chrome 45. Warning: this is the current Beta channel.
+             */
+            supportsNotifyTag?: boolean;
+            /**
+             * List of watchers.
+             * @since Since Chrome 45. Warning: this is the current Beta channel.
+             */
+            watchers: FileWatchersInfo[];
+        }
+
+        /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+        interface GetActionsRequestedOptions {
+            /** The identifier of the file system related to this operation. */
+            fileSystemId: string;
+            /** The unique identifier of this request. */
+            requestId: number;
+            /** The path of the entry to return the list of actions for. */
+            entryPath: string;
+        }
+
+        /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+        interface Action {
+            /** The identifier of the action. Any string or CommonActionId for common actions. */
+            id: string;
+            /** Optional. The title of the action. It may be ignored for common actions.  */
+            title?: string;
+        }
+
+        /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+        interface ExecuteActionRequestedOptions {
+            /** The identifier of the file system related to this operation. */
+            fileSystemId: string;
+            /** The unique identifier of this request. */
+            requestId: number;
+            /** The path of the entry to be used for the action. */
+            entryPath: string;
+            /** The identifier of the action to be executed. */
+            actionId: string;
+        }
+
+        interface MountOptions {
+            /** The string indentifier of the file system. Must be unique per each extension. */
+            fileSystemId: string;
+            /** A human-readable name for the file system. */
+            displayName: string;
+            /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
+            writable?: boolean;
+            /**
+             * Optional.
+              * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
+             * @since Since Chrome 41.
+             */
+            openedFilesLimit?: number;
+            /**
+             * Optional.
+              * Whether the file system supports the tag field for observed directories.
+             * @since Since Chrome 45. Warning: this is the current Beta channel.
+             */
+            supportsNotifyTag?: boolean;
+        }
+
+        interface UnmountOptions {
+            /** The identifier of the file system to be unmounted. */
+            fileSystemId: string;
+        }
+
+        interface NotificationChange {
+            /** The path of the changed entry. */
+            entryPath: string;
+            /** The type of the change which happened to the entry. */
+            changeType: string;
+        }
+
+        interface NotificationOptions {
+            /** The identifier of the file system related to this change. */
+            fileSystemId: string;
+            /** The path of the observed entry. */
+            observedPath: string;
+            /** Mode of the observed entry. */
+            recursive: boolean;
+            /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
+            changeType: string;
+            /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
+            changes?: NotificationChange[];
+            /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
+            tag?: string;
+        }
+
+        interface RequestedEventOptions {
+            /** The identifier of the file system related to this operation. */
+            fileSystemId: string;
+            /** The unique identifier of this request. */
+            requestId: number;
+        }
+
+        interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+            /** The path of the entry to which this operation is related to. */
+            entryPath: string;
+        }
+
+        interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
+            /** Set to true if the thumbnail is requested. */
+            thumbnail: boolean;
+        }
+
+        interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+            /** The path of the directory which is to be operated on. */
+            directoryPath: string;
+        }
+
+        interface FilePathRequestedEventOptions extends RequestedEventOptions {
+            /** The path of the entry for the operation */
+            filePath: string;
+        }
+
+        interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
+            /** Whether the file will be used for reading or writing. */
+            mode: string;
+        }
+
+        interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+            /** A request ID used to open the file. */
+            openRequestId: number;
+        }
+
+        interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+            /** Position in the file (in bytes) to start reading from. */
+            offset: number;
+            /** Number of bytes to be returned. */
+            length: number;
+        }
+
+        interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+            /** Whether the operation is recursive (for directories only). */
+            recursive: boolean;
+        }
+
+        interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+            /** Whether the operation is recursive (for directories only). */
+            recursive: boolean;
+        }
+
+        interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+            /** The source path for the operation. */
+            sourcePath: string;
+            /** The destination path for the operation. */
+            targetPath: string;
+        }
+
+        interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
+            /** Number of bytes to be retained after the operation completes. */
+            length: number;
+        }
+
+        interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+            /** Position in the file (in bytes) to start operating from. */
+            offset: number;
+            /** Buffer of bytes to be operated on the file. */
+            data: ArrayBuffer;
+        }
+
+        interface OperationRequestedEventOptions extends RequestedEventOptions {
+            /** An ID of the request to which this operation is related. */
+            operationRequestId: number;
+        }
+
+        interface RequestedEvent extends chrome.events.Event<(options: RequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface MetadataRequestedEvent extends chrome.events.Event<(options: MetadataRequestedEventOptions, successCallback: (metadata: EntryMetadata) => void, errorCallback: (error: string) => void) => void> { }
+
+        interface DirectoryPathRequestedEvent extends chrome.events.Event<(options: DirectoryPathRequestedEventOptions, successCallback: (entries: EntryMetadata[], hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+        interface OpenFileRequestedEvent extends chrome.events.Event<(options: OpenFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface OpenedFileRequestedEvent extends chrome.events.Event<(options: OpenedFileRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface OpenedFileOffsetRequestedEvent extends chrome.events.Event<(options: OpenedFileOffsetRequestedEventOptions, successCallback: (data: ArrayBuffer, hasMore: boolean) => void, errorCallback: (error: string) => void) => void> { }
+
+        interface DirectoryPathRecursiveRequestedEvent extends chrome.events.Event<(options: DirectoryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface EntryPathRecursiveRequestedEvent extends chrome.events.Event<(options: EntryPathRecursiveRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface FilePathRequestedEvent extends chrome.events.Event<(options: FilePathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface SourceTargetPathRequestedEvent extends chrome.events.Event<(options: SourceTargetPathRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface FilePathLengthRequestedEvent extends chrome.events.Event<(options: FilePathLengthRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface OpenedFileIoRequestedEvent extends chrome.events.Event<(options: OpenedFileIoRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface OperationRequestedEvent extends chrome.events.Event<(options: OperationRequestedEventOptions, successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        interface OptionlessRequestedEvent extends chrome.events.Event<(successCallback: Function, errorCallback: (error: string) => void) => void> { }
+
+        /**
+         * Mounts a file system with the given fileSystemId and displayName. displayName will be shown in the left panel of Files.app. displayName can contain any characters including '/', but cannot be an empty string. displayName must be descriptive but doesn't have to be unique. The fileSystemId must not be an empty string.
+         * Depending on the type of the file system being mounted, the source option must be set appropriately.
+         * In case of an error, runtime.lastError will be set with a corresponding error code.
+         * @param callback A generic result callback to indicate success or failure.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function mount(options: MountOptions, callback?: () => void): void;
+        /**
+         * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
+         * In case of an error, runtime.lastError will be set with a corresponding error code.
+         * @param callback A generic result callback to indicate success or failure.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function unmount(options: UnmountOptions, callback?: () => void): void;
+        /**
+         * Returns all file systems mounted by the extension.
+         * @param callback Callback to receive the result of getAll function.
+         * The callback parameter should be a function that looks like this:
+         * function(array of FileSystemInfo fileSystems) {...};
+         */
+        export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
+        /**
+         * Returns information about a file system with the passed fileSystemId.
+         * @since Since Chrome 42.
+         * @param callback Callback to receive the result of get function.
+         * The callback parameter should be a function that looks like this:
+         * function(FileSystemInfo fileSystem) {...};
+         */
+        export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
+        /**
+         * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
+         * To use, the file_system_provider.notify manifest option must be set to true.
+         * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
+         * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
+         * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
+         * In case of an error, runtime.lastError will be set will a corresponding error code.
+         * @param callback A generic result callback to indicate success or failure.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function notify(options: NotificationOptions, callback: () => void): void;
+
+        /** Raised when unmounting for the file system with the fileSystemId identifier is requested. In the response, the unmount API method must be called together with successCallback. If unmounting is not possible (eg. due to a pending operation), then errorCallback must be called.  */
+        export var onUnmountRequested: RequestedEvent;
+        /** Raised when metadata of a file or a directory at entryPath is requested. The metadata must be returned with the successCallback call. In case of an error, errorCallback must be called. */
+        export var onGetMetadataRequested: MetadataRequestedEvent;
+        /** Raised when contents of a directory at directoryPath are requested. The results must be returned in chunks by calling the successCallback several times. In case of an error, errorCallback must be called. */
+        export var onReadDirectoryRequested: DirectoryPathRequestedEvent;
+        /** Raised when opening a file at filePath is requested. If the file does not exist, then the operation must fail. Maximum number of files opened at once can be specified with MountOptions. */
+        export var onOpenFileRequested: OpenFileRequestedEvent;
+        /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
+        export var onCloseFileRequested: OpenedFileRequestedEvent;
+        /** Raised when reading contents of a file opened previously with openRequestId is requested. The results must be returned in chunks by calling successCallback several times. In case of an error, errorCallback must be called. */
+        export var onReadFileRequested: OpenedFileOffsetRequestedEvent;
+        /** Raised when creating a directory is requested. The operation must fail with the EXISTS error if the target directory already exists. If recursive is true, then all of the missing directories on the directory path must be created. */
+        export var onCreateDirectoryRequested: DirectoryPathRecursiveRequestedEvent;
+        /** Raised when deleting an entry is requested. If recursive is true, and the entry is a directory, then all of the entries inside must be recursively deleted as well. */
+        export var onDeleteEntryRequested: EntryPathRecursiveRequestedEvent;
+        /** Raised when creating a file is requested. If the file already exists, then errorCallback must be called with the "EXISTS" error code. */
+        export var onCreateFileRequested: FilePathRequestedEvent;
+        /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+        export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
+        /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
+        export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
+        /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
+        export var onTruncateRequested: FilePathLengthRequestedEvent;
+        /** Raised when writing contents to a file opened previously with openRequestId is requested. */
+        export var onWriteFileRequested: OpenedFileIoRequestedEvent;
+        /** Raised when aborting an operation with operationRequestId is requested. The operation executed with operationRequestId must be immediately stopped and successCallback of this abort request executed. If aborting fails, then errorCallback must be called. Note, that callbacks of the aborted operation must not be called, as they will be ignored. Despite calling errorCallback, the request may be forcibly aborted. */
+        export var onAbortRequested: OperationRequestedEvent;
+        /**
+         * Raised when showing a configuration dialog for fileSystemId is requested. If it's handled, the file_system_provider.configurable manfiest option must be set to true.
+         * @since Since Chrome 44.
+         */
+        export var onConfigureRequested: RequestedEvent;
+        /**
+         * Raised when showing a dialog for mounting a new file system is requested. If the extension/app is a file handler, then this event shouldn't be handled. Instead app.runtime.onLaunched should be handled in order to mount new file systems when a file is opened. For multiple mounts, the file_system_provider.multiple_mounts manifest option must be set to true.
+         * @since Since Chrome 44.
+         */
+        export var onMountRequested: OptionlessRequestedEvent;
+        /**
+         * Raised when setting a new directory watcher is requested. If an error occurs, then errorCallback must be called.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
+        /**
+         * Raised when the watcher should be removed. If an error occurs, then errorCallback must be called.
+         * @since Since Chrome 45. Warning: this is the current Beta channel.
+         */
+        export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
+    }
+
+    ////////////////////
+    // Google Cloud Messaging
+    ////////////////////
+    /**
+     * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
+     * Availability: Since Chrome 35.
+     * Permissions:  "gcm"
+     */
+    namespace gcm {
+        interface OutgoingMessage {
+            /** The ID of the server to send the message to as assigned by Google API Console. */
+            destinationId: string;
+            /** The ID of the message. It must be unique for each message in scope of the applications. See the Cloud Messaging documentation for advice for picking and handling an ID. */
+            messageId: string;
+            /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
+            timeToLive?: number;
+            /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
+            data: Object;
+        }
+
+        interface IncomingMessage {
+            /** The message data. */
+            data: Object;
+            /**
+             * Optional.
+             * The sender who issued the message.
+             * @since Since Chrome 41.
+             */
+            from?: string;
+            /**
+             * Optional.
+             * The collapse key of a message. See Collapsible Messages section of Cloud Messaging documentation for details.
+             */
+            collapseKey?: string;
+        }
+
+        interface GcmError {
+            /** The error message describing the problem. */
+            errorMessage: string;
+            /** Optional. The ID of the message with this error, if error is related to a specific message. */
+            messageId?: string;
+            /** Additional details related to the error, when available. */
+            detail: Object;
+        }
+
+        interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
+
+        interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
+
+        interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
+
+        /** The maximum size (in bytes) of all key/value pairs in a message. */
+        export var MAX_MESSAGE_SIZE: number;
+
+        /**
+         * Registers the application with GCM. The registration ID will be returned by the callback. If register is called again with the same list of senderIds, the same registration ID will be returned.
+         * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
+         * @param callback Function called when registration completes. It should check runtime.lastError for error when registrationId is empty.
+         * The callback parameter should be a function that looks like this:
+         * function(string registrationId) {...};
+         * Parameter registrationId: A registration ID assigned to the application by the GCM.
+         */
+        export function register(senderIds: string[], callback: (registrationId: string) => void): void;
+        /**
+         * Unregisters the application from GCM.
+         * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
+         * The callback parameter should be a function that looks like this:
+         * function() {...};
+         */
+        export function unregister(callback: () => void): void;
+        /**
+         * Sends a message according to its contents.
+         * @param message A message to send to the other party via GCM.
+         * @param callback A function called after the message is successfully queued for sending. runtime.lastError should be checked, to ensure a message was sent without problems.
+         * The callback parameter should be a function that looks like this:
+         * function(string messageId) {...};
+         * Parameter messageId: The ID of the message that the callback was issued for.
+         */
+        export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
+
+        /** Fired when a message is received through GCM. */
+        export var onMessage: MessageReceptionEvent;
+        /** Fired when a GCM server had to delete messages sent by an app server to the application. See Messages deleted event section of Cloud Messaging documentation for details on handling this event. */
+        export var onMessagesDeleted: MessageDeletionEvent;
+        /** Fired when it was not possible to send a message to the GCM server. */
+        export var onSendError: GcmErrorEvent;
+    }
+
+    ////////////////////
+    // HID
+    ////////////////////
+    /**
+     * Use the chrome.hid API to interact with connected HID devices. This API provides access to HID operations from within the context of an app. Using this API, apps can function as drivers for hardware devices. Errors generated by this API are reported by setting runtime.lastError and executing the function's regular callback. The callback's regular parameters will be undefined in this case.
+     * @since Chrome 38
+     */
+    namespace hid {
+        /** NOT YET IMPLEMENTED */
+    }
+
+    ////////////////////
+    // i18n
+    ////////////////////
+    /**
+     * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
+     * @since Chrome 5.
+     */
+    namespace i18n {
+        /** Holds detected ISO language code and its percentage in the input string */
+        interface DetectedLanguage {
+            /** An ISO language code such as 'en' or 'fr'.
+             * For a complete list of languages supported by this method, see  [kLanguageInfoTable]{@link https://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/languages/internal/languages.cc}.
+             * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
+            language: string;
+
+            /** The percentage of the detected language */
+            percentage: number;
+        }
+
+        /** Holds detected language reliability and array of DetectedLanguage */
+        interface LanguageDetectionResult {
+            /** CLD detected language reliability */
+            isReliable: boolean;
+
+            /** Array of detectedLanguage */
+            languages: DetectedLanguage[];
+        }
+
+        /**
+         * Gets the accept-languages of the browser. This is different from the locale used by the browser; to get the locale, use i18n.getUILanguage.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function(array of string languages) {...};
+         * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
+         */
+        export function getAcceptLanguages(callback: (languages: string[]) => void): void;
+        /**
+         * Gets the localized string for the specified message. If the message is missing, this method returns an empty string (''). If the format of the getMessage() call is wrong — for example, messageName is not a string or the substitutions array has more than 9 elements — this method returns undefined.
+         * @param messageName The name of the message, as specified in the messages.json file.
+         * @param substitutions Optional. Up to 9 substitution strings, if the message requires any.
+         */
+        export function getMessage(messageName: string, substitutions?: any): string;
+        /**
+         * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+         * @since Chrome 35.
+         */
+        export function getUILanguage(): string;
+
+        /** Detects the language of the provided text using CLD.
+         * @param text User input string to be translated.
+         * @param callback The callback parameter should be a function that looks like this: function(object result) {...};
+         */
+        export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
+    }
+
+    ////////////////////
+    // Identity
+    ////////////////////
+    /**
+     * Use the chrome.identity API to get OAuth2 access tokens.
+     * Permissions:  "identity"
+     * @since Chrome 29.
+     */
+    namespace identity {
+        /** @since Chrome 32. */
+        interface AccountInfo {
+            /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+            id: string;
+        }
+
+        interface TokenDetails {
+            /**
+             * Optional.
+             * Fetching a token may require the user to sign-in to Chrome, or approve the application's requested scopes. If the interactive flag is true, getAuthToken will prompt the user as necessary. When the flag is false or omitted, getAuthToken will return failure any time a prompt would be required.
+             */
+            interactive?: boolean;
+            /**
+             * Optional.
+             * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
+             * account is only supported when the "enable-new-profile-management" flag is set.
+             * @since Chrome 37.
+             */
+            account?: AccountInfo;
+            /**
+             * Optional.
+             * A list of OAuth2 scopes to request.
+             * When the scopes field is present, it overrides the list of scopes specified in manifest.json.
+             * @since Chrome 37.
+             */
+            scopes?: string[];
+        }
+
+        interface UserInfo {
+            /** An email address for the user account signed into the current profile. Empty if the user is not signed in or the identity.email manifest permission is not specified. */
+            email: string;
+            /** A unique identifier for the account. This ID will not change for the lifetime of the account. Empty if the user is not signed in or (in M41+) the identity.email manifest permission is not specified. */
+            id: string;
+        }
+
+        interface TokenInformation {
+            /** The specific token that should be removed from the cache. */
+            token: string;
+        }
+
+        interface WebAuthFlowOptions {
+            /** The URL that initiates the auth flow. */
+            url: string;
+            /**
+             * Optional.
+             * Whether to launch auth flow in interactive mode.
+             * Since some auth flows may immediately redirect to a result URL, launchWebAuthFlow hides its web view until the first navigation either redirects to the final URL, or finishes loading a page meant to be displayed.
+             * If the interactive flag is true, the window will be displayed when a page load completes. If the flag is false or omitted, launchWebAuthFlow will return with an error if the initial navigation does not complete the flow.
+             */
+            interactive?: boolean;
+        }
+
+        interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
+
+        /**
+         * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
+         * getAccounts is only supported on dev channel.
+         * Dev channel only.
+         */
+        export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
+        /**
+         * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
+         * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
+         * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
+         * @param details Token options.
+         * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(string token) {...};
+         */
+        export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
+        /**
+         * Retrieves email address and obfuscated gaia id of the user signed into a profile.
+         * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
+         * @since Chrome 37.
+         */
+        export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
+        /**
+         * Removes an OAuth2 access token from the Identity API's token cache.
+         * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
+         * @param details Token information.
+         * @param callback Called when the token has been removed from the cache.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function() {...};
+         */
+        export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
+        /**
+         * Starts an auth flow at the specified URL.
+         * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
+         * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
+         * @param details WebAuth flow options.
+         * @param callback Called with the URL redirected back to your application.
+         * The callback parameter should be a function that looks like this:
+         * function(string responseUrl) {...};
+         */
+        export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
+        /**
+         * Generates a redirect URL to be used in launchWebAuthFlow.
+         * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
+         * @since Chrome 33.
+         * @param path Optional. The path appended to the end of the generated URL.
+         */
+        export function getRedirectURL(path?: string): string;
+
+        /**
+         * Fired when signin state changes for an account on the user's profile.
+         * @since Chrome 33.
+         */
+        export var onSignInChanged: SignInChangeEvent;
+    }
+
+    ////////////////////
+    // Idle
+    ////////////////////
+    /**
+     * Use the chrome.idle API to detect when the machine's idle state changes.
+     * Permissions:  "idle"
+     * @since Chrome 6.
+     */
+    namespace idle {
+        interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
+
+        /**
+         * Returns "locked" if the system is locked, "idle" if the user has not generated any input for a specified number of seconds, or "active" otherwise.
+         * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
+         * Since Chrome 25.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( IdleState newState) {...};
+         */
+        export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
+        /**
+         * Sets the interval, in seconds, used to determine when the system is in an idle state for onStateChanged events. The default interval is 60 seconds.
+         * @since Chrome 25.
+         * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
+         */
+        export function setDetectionInterval(intervalInSeconds: number): void;
+
+        /** Fired when the system changes to an active, idle or locked state. The event fires with "locked" if the screen is locked or the screensaver activates, "idle" if the system is unlocked and the user has not generated any input for a specified number of seconds, and "active" when the user generates input on an idle system. */
+        export var onStateChanged: IdleStateChangedEvent;
+    }
+
+    ////////////////////
+    // InstanceID
+    ////////////////////
+    /**
+     * Use chrome.instanceID to access the Instance ID service.
      * @since Chrome 46
-     * @export
-     * @param {boolean} enabled True if unified desktop should be enabled.
      */
-    export function enableUnifiedDesktop(enabled: boolean): void;
-    /**
-     * @description Starts overscan calibration for a display. This will show an overlay on the screen indicating the current overscan insets. If overscan calibration for display |id| is in progress this will reset calibration.
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function overscanCalibrationStart(id: string): void;
-    /**
-     * @description Adjusts the current overscan insets for a display. Typically this should etiher move the display along an axis (e.g. left+right have the same value) or scale it along an axis (e.g. top+bottom have opposite values). Each Adjust call is cumulative with previous calls since Start.
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     * @param {Insets} delta The amount to change the overscan insets.
-     */
-    export function overscanCalibrationAdjust(id: string, delta: Insets): void;
-
-    /**
-     * @description Resets the overscan insets for a display to the last saved value (i.e before Start was called).
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function overscanCalibrationReset(id: string): void;
-
-    /**
-     * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
-     * @since Chrome 53
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function overscanCalibrationComplete(id: string): void;
-
-    /**
-     * @description Displays the native touch calibration UX for the display with |id| as display id. This will show an overlay on the screen with required instructions on how to proceed. The callback will be invoked in case of successful calibraion only. If the calibration fails, this will throw an error.
-     * @since Chrome 57
-     * @export
-     * @param {string} id The display's unique identifier.
-     * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
-     */
-    export function showNativeTouchCalibration(id: string, callback: (success: boolean) => void): void;
-
-    /**
-     * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.
-     * @since Chrome 57
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function startCustomTouchCalibration(id: string): void;
-
-    /**
-     * @description Sets the touch calibration pairs for a display. These |pairs| would be used to calibrate the touch screen for display with |id| called in startCustomTouchCalibration(). Always call |startCustomTouchCalibration| before calling this method. If another touch calibration is already in progress this will throw an error.
-     * @since Chrome 57
-     * @export
-     * @param {TouchCalibrationPairs} pairs The pairs of point used to calibrate the display.
-     * @param {Bounds} bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
-     */
-    export function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
-    /**
-     * @description Resets the touch calibration for the display and brings it back to its default state by clearing any touch calibration data associated with the display.
-     * @since Chrome 57
-     * @export
-     * @param {string} id The display's unique identifier.
-     */
-    export function clearTouchCalibration(id: string): void;
-
-    /**
-     * @description Fired when anything changes to the display configuration.
-     * @export
-     */
-    export var onDisplayChanged: DisplayChangedEvent;
-  }
-
-  ////////////////////
-  // System Memory
-  ////////////////////
-  /**
-   * The chrome.system.memory API.
-   * Permissions:  "system.memory"
-   * @since Chrome 32.
-   */
-  namespace system.memory {
-    interface MemoryInfo {
-      /** The total amount of physical memory capacity, in bytes. */
-      capacity: number;
-      /** The amount of available capacity, in bytes. */
-      availableCapacity: number;
-    }
-
-    /** Get physical memory information. */
-    export function getInfo(callback: (info: MemoryInfo) => void): void;
-  }
-
-  ////////////////////
-  // System - Network
-  ////////////////////
-  namespace system.network {
-    interface NetworkInterface {
-      name: string;
-      address: string;
-      prefixLength: number;
-    }
-
-    export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
-  }
-
-  ////////////////////
-  // System Storage
-  ////////////////////
-  /**
-   * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
-   * Permissions:  "system.storage"
-   * @since Chrome 30.
-   */
-  namespace system.storage {
-    interface StorageUnitInfo {
-      /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
-      id: string;
-      /** The name of the storage unit. */
-      name: string;
-      /**
-       * The media type of the storage unit.
-       * fixed: The storage has fixed media, e.g. hard disk or SSD.
-       * removable: The storage is removable, e.g. USB flash drive.
-       * unknown: The storage type is unknown.
-       */
-      type: string;
-      /** The total amount of the storage space, in bytes. */
-      capacity: number;
-    }
-
-    interface StorageCapacityInfo {
-      /** A copied |id| of getAvailableCapacity function parameter |id|. */
-      id: string;
-      /** The available capacity of the storage device, in bytes. */
-      availableCapacity: number;
-    }
-
-    interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
-
-    interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
-
-    /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
-    export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
-    /**
-     * Ejects a removable storage device.
-     * @param callback
-     * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
-     */
-    export function ejectDevice(id: string, callback: (result: string) => void): void;
-    /**
-     * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
-     * @since Dev channel only.
-     */
-    export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
-
-    /** Fired when a new removable storage is attached to the system. */
-    export var onAttached: SystemStorageAttachedEvent;
-    /** Fired when a removable storage is detached from the system. */
-    export var onDetached: SystemStorageDetachedEvent;
-  }
-
-  ////////////////////
-  // Text to Speech
-  ////////////////////
-  /**
-   * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
-   * Permissions:  "tts"
-   * @since Chrome 14.
-   */
-  namespace tts {
-    /** An event from the TTS engine to communicate the status of an utterance. */
-    interface TtsEvent {
-      /** Optional. The index of the current character in the utterance. */
-      charIndex?: number;
-      /** Optional. The error description, if the event type is 'error'. */
-      errorMessage?: string;
-      /**
-       * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
-       * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
-       */
-      type: string;
-    }
-
-    /** A description of a voice available for speech synthesis. */
-    interface TtsVoice {
-      /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-      lang?: string;
-      /**
-       * Optional. This voice's gender.
-       * One of: "male", or "female"
-       */
-      gender?: string;
-      /** Optional. The name of the voice. */
-      voiceName?: string;
-      /** The ID of the extension providing this voice. */
-      extensionsId?: string;
-      /** All of the callback event types that this voice is capable of sending. */
-      eventTypes?: string[];
-      /**
-       * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
-       * @since Chrome 33.
-       */
-      remote?: boolean;
-    }
-
-    interface SpeakOptions {
-      /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
-      volume?: number;
-      /**
-       * Optional.
-       * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
-       */
-      enqueue?: boolean;
-      /**
-       * Optional.
-       * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
-       */
-      rate?: number;
-      /**
-       * Optional. This function is called with events that occur in the process of speaking the utterance.
-       * @param event The update event from the text-to-speech engine indicating the status of this utterance.
-       */
-      onEvent?: (event: TtsEvent) => void;
-      /**
-       * Optional.
-       * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
-       */
-      pitch?: number;
-      /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
-      lang?: string;
-      /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
-      voiceName?: string;
-      /** Optional. The extension ID of the speech engine to use, if known. */
-      extensionId?: string;
-      /**
-       * Optional. Gender of voice for synthesized speech.
-       * One of: "male", or "female"
-       */
-      gender?: string;
-      /** Optional. The TTS event types the voice must support. */
-      requiredEventTypes?: string[];
-      /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
-      desiredEventTypes?: string[];
-    }
-
-    /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
-    export function isSpeaking(callback?: (speaking: boolean) => void): void;
-    /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
-    export function stop(): void;
-    /** Gets an array of all available voices. */
-    export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
-    /**
-     * Speaks text using a text-to-speech engine.
-     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-     */
-    export function speak(utterance: string, callback?: Function): void;
-    /**
-     * Speaks text using a text-to-speech engine.
-     * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-     * @param options Optional. The speech options.
-     * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
-     */
-    export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
-    /**
-     * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
-     * @since Chrome 29.
-     */
-    export function pause(): void;
-    /**
-     * If speech was paused, resumes speaking where it left off.
-     * @since Chrome 29.
-     */
-    export function resume(): void;
-  }
-
-  ////////////////////
-  // Types
-  ////////////////////
-  /**
-   * The chrome.types API contains type declarations for Chrome.
-   * @since Chrome 13.
-   */
-  namespace types {
-    interface ChromeSettingClearDetails {
-      /**
-       * Optional.
-       * The scope of the ChromeSetting. One of
-       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-       */
-      scope?: string;
-    }
-
-    interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
-      /**
-       * The value of the setting.
-       * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
-       */
-      value: any;
-      /**
-       * Optional.
-       * The scope of the ChromeSetting. One of
-       * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
-       * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
-       * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
-       * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
-       */
-      scope?: string;
-    }
-
-    interface ChromeSettingGetDetails {
-      /** Optional. Whether to return the value that applies to the incognito session (default false). */
-      incognito?: boolean;
-    }
-
-    /**
-     * @param details Details of the currently effective value.
-     */
-    export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
-
-    interface ChromeSettingGetResultDetails {
-      /**
-       * One of
-       * • not_controllable: cannot be controlled by any extension
-       * • controlled_by_other_extensions: controlled by extensions with higher precedence
-       * • controllable_by_this_extension: can be controlled by this extension
-       * • controlled_by_this_extension: controlled by this extension
-       */
-      levelOfControl: string;
-      /** The value of the setting. */
-      value: any;
-      /**
-       * Optional.
-       * Whether the effective value is specific to the incognito session.
-       * This property will only be present if the incognito property in the details parameter of get() was true.
-       */
-      incognitoSpecific?: boolean;
-    }
-
-    interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
-
-    /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
-    interface ChromeSetting {
-      /**
-       * Sets the value of a setting.
-       * @param details Which setting to change.
-       * @param callback Optional. Called at the completion of the set operation.
-       */
-      set(details: ChromeSettingSetDetails, callback?: Function): void;
-      /**
-       * Gets the value of a setting.
-       * @param details Which setting to consider.
-       */
-      get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
-      /**
-       * Clears the setting, restoring any default value.
-       * @param details Which setting to clear.
-       * @param callback Optional. Called at the completion of the clear operation.
-       */
-      clear(details: ChromeSettingClearDetails, callback?: Function): void;
-      /** Fired after the setting changes. */
-      onChange: ChromeSettingChangedEvent;
-    }
-  }
-
-  ////////////////////
-  // USB
-  ////////////////////
-  namespace usb {
-    type Direction = 'in' | 'out';
-
-    interface Device {
-      device: number,
-      vendorId: number,
-      productId: number,
-      productName: string,
-      manufacturerName: string,
-      serialNumber: string
-    }
-
-    interface ConnectionHandle {
-      handle: number,
-      vendorId: number,
-      productId: number
-    }
-
-    interface EndpointDescriptor {
-      address: number,
-      type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
-      direction: Direction,
-      maximumPacketSize: number,
-      synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
-      usage?: 'data' | 'feedback' | 'explicitFeedback',
-      pollingInterval?: number,
-      extra_data: ArrayBuffer
-    }
-
-    interface InterfaceDescriptor {
-      interfaceNumber: number,
-      alternateSetting: number,
-      interfaceClass: number,
-      interfaceSubclass: number,
-      interfaceProtocol: number,
-      description?: string,
-      endpoints: EndpointDescriptor[],
-      extra_data: ArrayBuffer
-    }
-
-    interface ConfigDescriptor {
-      active: boolean,
-      configurationValue: number,
-      description?: string,
-      selfPowered: boolean,
-      remoteWakeup: boolean,
-      maxPower: number,
-      interfaces: InterfaceDescriptor[],
-      extra_data: ArrayBuffer
-    }
-
-    interface GenericTransferInfo {
-      direction: Direction,
-      endpoint: number,
-      length?: number,
-      data?: ArrayBuffer,
-      timeout?: number
-    }
-
-    interface TransferResultInfo {
-      resultCode: number,
-      data?: ArrayBuffer
-    }
-
-    interface DeviceFilter {
-      vendorId?: number,
-      productId?: number,
-      interfaceClass?: number,
-      interfaceSubclass?: number,
-      interfaceProtocol?: number
-    }
-
-    interface TransferInfo {
-      direction: Direction;
-      recipient: 'device' | 'interface' | 'endpoint' | 'other';
-      requestType: 'standard' | 'class' | 'vendor' | 'reserved';
-      request: number;
-      value: number;
-      index: number;
-      length?: number;
-      data?: ArrayBuffer;
-      timeout?: number;
-    }
-
-    interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
-
-    export var onDeviceAdded: DeviceEvent;
-    export var onDeviceRemoved: DeviceEvent;
-
-    export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-    export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
-    export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
-    export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
-    export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
-    export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
-    export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
-    export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
-    export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
-    export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
-    export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-    export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
-    export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
-    export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
-    export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-    export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
-    export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
-    export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
-  }
-
-
-  ////////////////////
-  // VPN Provider
-  ////////////////////
-  /**
-   * Use the chrome.vpnProvider API to implement a VPN client.
-   * Permissions:  "vpnProvider"
-   * Important: This API works only on Chrome OS.
-   * @since Chrome 43.
-   */
-  namespace vpnProvider {
-    interface VpnSessionParameters {
-      /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
-      address: string;
-      /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
-      broadcastAddress?: string;
-      /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
-      mtu?: string;
-      /**
-       * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-       */
-      exclusionList: string[];
-      /**
-       * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
-       */
-      inclusionList: string[];
-      /** Optional. A list of search domains. (default: no search domain) */
-      domainSearch?: string[];
-      /** A list of IPs for the DNS servers. */
-      dnsServer: string[];
-    }
-
-    interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
-
-    interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
-
-    interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
-
-    interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
-
-    interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
-
-    /**
-     * Creates a new VPN configuration that persists across multiple login sessions of the user.
-     * @param name The name of the VPN configuration.
-     * @param callback Called when the configuration is created or if there is an error.
-     * Parameter id: A unique ID for the created configuration, empty string on failure.
-     */
-    export function createConfig(name: string, callback: (id: string) => void): void;
-    /**
-     * Destroys a VPN configuration created by the extension.
-     * @param id ID of the VPN configuration to destroy.
-     * @param callback Optional. Called when the configuration is destroyed or if there is an error.
-     */
-    export function destroyConfig(id: string, callback?: Function): void;
-    /**
-     * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
-     * @param parameters The parameters for the VPN session.
-     * @param callback Called when the parameters are set or if there is an error.
-     */
-    export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
-    /**
-     * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
-     * @param data The IP packet to be sent to the platform.
-     * @param callback Optional. Called when the packet is sent or if there is an error.
-     */
-    export function sendPacket(data: ArrayBuffer, callback?: Function): void;
-    /**
-     * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
-     * @param state The VPN session state of the VPN client.
-     * connected: VPN connection was successful.
-     * failure: VPN connection failed.
-     * @param callback Optional. Called when the notification is complete or if there is an error.
-     */
-    export function notifyConnectionStateChanged(state: string, callback?: Function): void;
-
-    /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
-    export var onPlatformMessage: VpnPlatformMessageEvent;
-    /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
-    export var onPacketReceived: VpnPacketReceptionEvent;
-    /** Triggered when a configuration created by the extension is removed by the platform. */
-    export var onConfigRemoved: VpnConfigRemovalEvent;
-    /** Triggered when a configuration is created by the platform for the extension. */
-    export var onConfigCreated: VpnConfigCreationEvent;
-    /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
-    export var onUIEvent: VpnUiEvent;
-  }
-
-  ////////////////////
-  // Wallpaper
-  ////////////////////
-  /**
-   * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
-   * Permissions:  "wallpaper"
-   * Important: This API works only on Chrome OS.
-   * @since Chrome 43.
-   */
-  namespace wallpaper {
-    interface WallpaperDetails {
-      /** Optional. The jpeg or png encoded wallpaper image. */
-      data?: any;
-      /** Optional. The URL of the wallpaper to be set. */
-      url?: string;
-      /**
-       * The supported wallpaper layouts.
-       * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
-       */
-      layout: string;
-      /** The file name of the saved wallpaper. */
-      filename: string;
-      /** Optional. True if a 128x60 thumbnail should be generated. */
-      thumbnail?: boolean;
-    }
-
-    /**
-     * Sets wallpaper to the image at url or wallpaperData with the specified layout
-     * @param callback
-     * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
-     */
-    export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
-  }
-
-
-  ///////////////////
-  // Webview Tag
-  ///////////////////
-  /**
-   * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
-   */
-  namespace webview {
-    /** Options that determine what data should be cleared by `clearData`. */
-    interface ClearDataOptions {
-      /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
-      since?: number;
-    }
-    interface WindowEvent extends chrome.events.Event<() => void> { }
-
-    interface ConsoleEvent extends Event {
-      /**
-       * @description The severity level of the log message. Ranges from 0 to 4.
-       * @type {number}
-       * @memberof ConsoleEvent
-       */
-      level: number;
-      /**
-       * @description The logged message contents.
-       * @type {string}
-       * @memberof ConsoleEvent
-       */
-      message: string;
-      /**
-       * @description The line number of the message source.
-       * @type {number}
-       * @memberof ConsoleEvent
-       */
-      line: number;
-      /**
-       * @description A string identifying the resource which logged the message.
-       * @type {string}
-       * @memberof ConsoleEvent
-       */
-      sourceId: string;
-    }
-
-    interface ExitEvent extends Event {
-      /**
-       * @description Chrome's internal ID of the process that exited.
-       * @type {number}
-       * @memberof ExitEvent
-       */
-      processID: number;
-      /**
-       * @description String indicating the reason for the exit.
-       * @type {string}
-       * @memberof ExitEvent
-       */
-      reason: 'normal' | 'abnormal' | 'crash' | 'kill';
-    }
-
-    /** Description of a declarative rule for handling events. */
-    interface Rule {
-      /** Optional priority of this rule. Defaults to 100.  */
-      priority?: number;
-      /** List of conditions that can trigger the actions. */
-      conditions: any[];
-      /** Optional. Optional identifier that allows referencing this rule.  */
-      id?: string;
-      /** List of actions that are triggered if one of the condtions is fulfilled. */
-      actions: any[];
-      /**
-       * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
-       * @since Chrome 28
-       * @type {string[]}
-       * @memberof Rule
-       */
-      tags?: string[];
-    }
-
-    /**
-     * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
-     * @export
-     * @interface InjectDetails
-     */
-    interface InjectDetails {
-      /**
-       * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
-       * @type {string}
-       * @memberof InjectDetails
-       */
-      code?: string,
-      /**
-       * @description JavaScript or CSS file to inject.
-       * @type {string}
-       * @memberof InjectDetails
-       */
-      file?: string
-    }
-
-    interface WebViewElementEventMap {
-      'close': Event,
-      'consolemessage': IConsolemessage,
-      'contentload': Event,
-      'dialog': IDialog,
-      'exit': IExit,
-      'findupdate': IFindupdate,
-      'loadabort': ILoadabort,
-      'loadcommit': ILoadcommit,
-      'loadredirect': ILoadredirect,
-      'loadstart': ILoadstart,
-      'loadstop': Event,
-      'newwindow': INewwindow,
-      'permissionrequest': IPermissionrequest,
-      'responsive': IResponsive,
-      'sizechanged': ISizechanged,
-      'unresponsive': IUnresponsive,
-      'zoomchange': IZoomchange,
-    }
-
-
-    /**
-     * @description
-     * @export
-     * @interface HTMLWebViewElement
-     * @extends {Element}
-     */
-    interface HTMLWebViewElement extends Element {
-      executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
-      src: string;
-      contentWindow: Window;
-      addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
-    }
-
-    /**Options that determine what data should be cleared by clearData. */
-    interface ClearDataOptions {
-
-      /**
-      * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
-       */
-      since?: number;
-    }
-    /**A set of data types. Missing properties are interpreted as false. */
-    interface ClearDataTypeSet {
-
-      /**
-      * @description Websites' appcaches.
-       */
-      appcache?: boolean
-
-      /**
-      * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
-       */
-      cache?: boolean
-
-      /**
-      * @description The partition's cookies.
-       */
-      cookies?: boolean
-
-      /**
-      * @description The partition's session cookies.
-       */
-      sessionCookies?: boolean
-
-      /**
-      * @description The partition's persistent cookies.
-       */
-      persistentCookies?: boolean
-
-      /**
-      * @description Websites' filesystems.
-       */
-      fileSystems?: boolean
-
-      /**
-      * @description Websites' IndexedDB data.
-       */
-      indexedDB?: boolean
-
-      /**
-      * @description Websites' local storage data.
-       */
-      localStorage?: boolean
-
-      /**
-      * @description Websites' WebSQL data.
-       */
-      webSQL?: boolean
-    }
-    /**
-    * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
-    * Enum values:
-    * "all"
-    * "page"
-    * "frame"
-    * "selection"
-    * "link"
-    * "editable"
-    * "image"
-    * "video"
-    * "audio" */
-    export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
-    /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
-    interface InjectDetails {
-
-      /**
-      * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
-       */
-      code?: string
-
-      /**
-      * @description JavaScript or CSS file to inject.
-       */
-      file?: string
-    }
-    /**The type of injection item: code or a set of files. */
-    interface InjectionItems {
-
-      /**
-      * @description JavaScript code or CSS to be injected into matching pages.
-       */
-      code?: string
-
-      /**
-      * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
-       */
-      files?: any[]
-    }
-    /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
-    interface ContentScriptDetails {
-
-      /**
-      * @description The name of the content script to inject.
-       */
-      name: string
-
-      /**
-      * @description Specifies which pages this content script will be injected into.
-       */
-      matches: any[]
-
-      /**
-      * @description Excludes pages that this content script would otherwise be injected into.
-       */
-      exclude_matches?: any[]
-
-      /**
-      * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
-       */
-      match_about_blank?: boolean
-
-      /**
-      * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
-       */
-      css?: InjectionItems
-
-      /**
-      * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
-       */
-      js?: InjectionItems
-
-      /**
-      * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-       */
-      run_at?: chrome.extensionTypes.RunAt;
-
-      /**
-      * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
-       */
-      all_frames?: boolean;
-
-      /**
-      * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
-       */
-      include_globs?: string[];
-
-      /**
-      * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
-       */
-      exclude_globs?: string[];
-    }
-    /**@todo Add documentation */
-    interface ContextMenuCreateProperties {
-
-      /**
-      * @description The type of menu item. Defaults to 'normal' if not specified.
-       */
-      type?: chrome.contextMenus.ItemType
-
-      /**
-      * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-       */
-      id?: string
-
-      /**
-      * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
-       */
-      title?: string
-
-      /**
-      * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-       */
-      checked?: boolean
-
-      /**
-      * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
-       */
-      contexts?: any[]
-
-      /**
-      * @description A function that will be called back when the menu item is clicked.
-      * @param {any} [object Object]
-       */
-      onclick?: (info: any) => void
-
-      /**
-      * @description The ID of a parent menu item; this makes the item a child of a previously added item.
-       */
-      parentId?: number | string
-
-      /**
-      * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-       */
-      documentUrlPatterns?: any[]
-
-      /**
-      * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-       */
-      targetUrlPatterns?: any[]
-
-      /**
-      * @description Whether this context menu item is enabled or disabled. Defaults to true.
-       */
-      enabled?: boolean
-    }
-    /**@todo Add documentation */
-    interface ContextMenuUpdateProperties {
-
-      /**
-      * @description The type of menu item.
-       */
-      type?: chrome.webview.ContextType;
-
-      /**
-      * @description The text to be displayed in the item
-       */
-      title?: string
-
-      /**
-      * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
-       */
-      checked?: boolean
-
-      /**
-      * @description List of contexts this menu item will appear in.
-       */
-      contexts?: any[]
-
-      /**
-      * @description A function that will be called back when the menu item is clicked.
-      * @param {any} [object Object]
-       */
-      onclick?: (info: any) => void
-
-      /**
-      * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
-       */
-      parentId?: number | string
-
-      /**
-      * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
-       */
-      documentUrlPatterns?: any[]
-
-      /**
-      * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-       */
-      targetUrlPatterns?: any[]
-
-      /**
-      * @description Whether this context menu item is enabled or disabled.
-       */
-      enabled?: boolean
-    }
-    interface ContextMenus {
-
-      /**
-      * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
-      * @param {object} createProperties The properties used to create the item
-      * @param {any} [object Object]
-       */
-      create(createProperties: object, callback?: () => void): void;
-
-      /**
-      * @description Updates a previously created context menu item.
-      * @param {any} id The ID of the item to update.
-      * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
-      * @param {any} [object Object]
-       */
-      update(id: number | string, updateProperties: object, callback?: () => void): void;
-
-      /**
-      * @description Removes a context menu item.
-      * @param {any} menuItemId The ID of the context menu item to remove.
-      * @param {any} [object Object]
-       */
-      remove(menuItemId: number | string, callback?: () => void): void;
-
-      /**
-      * @description Removes all context menu items added to this webview.
-      * @param {any} [object Object]
-       */
-      removeAll(callback?: () => void): void;
-
-
-      /**
-      * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
-       */
-      onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
-
-    }
-    interface IOnShowEvent {
-      /**
-       * @description Call this to prevent showing the context menu.
-       * @memberof IOnShowEvent
-       */
-      preventDefault: () => void;
-    }
-    interface ContentWindow {
-
-      /**
-      * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
-      * @param {any} message Message object to send to the guest.
-      * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
-       */
-      postMessage(message: any, targetOrigin: string): void;
-
-    }
-    interface DialogController {
-
-      /**
-      * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
-      * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
-       */
-      ok(response?: string): void;
-
-      /**
-      * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
-       */
-      cancel(): void;
-
-    }
-    /**Contains all of the results of the find request. */
-    interface FindCallbackResults {
-
-      /**
-      * @description The number of times searchText was matched on the page.
-       */
-      numberOfMatches: number
-
-      /**
-      * @description The ordinal number of the current match.
-       */
-      activeMatchOrdinal: number
-
-      /**
-      * @description Describes a rectangle around the active match in screen coordinates.
-       */
-      selectionRect: SelectionRect
-
-      /**
-      * @description Indicates whether this find request was canceled.
-       */
-      canceled: boolean
-    }
-    /**Options for the find request. */
-    interface FindOptions {
-
-      /**
-      * @description Flag to find matches in reverse order. The default value is false.
-       */
-      backward?: boolean
-
-      /**
-      * @description Flag to match with case-sensitivity. The default value is false.
-       */
-      matchCase?: boolean
-    }
-    interface NewWindow {
-
-      /**
-      * @description Attach the requested target page to an existing webview element.
-      * @param {object} webview The webview element to which the target page should be attached.
-       */
-      attach(webview: object): void;
-
-      /**
-      * @description Cancel the new window request.
-       */
-      discard(): void;
-
-    }
-    interface MediaPermissionRequest {
-
-      /**
-      * @description Allow the permission request.
-       */
-      allow(): void;
-
-      /**
-      * @description Deny the permission request. This is the default behavior if allow is not called.
-       */
-      deny(): void;
-
-    }
-    interface GeolocationPermissionRequest {
-
-      /**
-      * @description Allow the permission request.
-       */
-      allow(): void;
-
-      /**
-      * @description Deny the permission request. This is the default behavior if allow is not called.
-       */
-      deny(): void;
-
-    }
-    interface PointerLockPermissionRequest {
-
-      /**
-      * @description Allow the permission request.
-       */
-      allow(): void;
-
-      /**
-      * @description Deny the permission request. This is the default behavior if allow is not called.
-       */
-      deny(): void;
-
-    }
-    interface DownloadPermissionRequest {
-
-      /**
-      * @description Allow the permission request.
-       */
-      allow(): void;
-
-      /**
-      * @description Deny the permission request. This is the default behavior if allow is not called.
-       */
-      deny(): void;
-
-    }
-    interface FileSystemPermissionRequest {
-
-      /**
-      * @description Allow the permission request.
-       */
-      allow(): void;
-
-      /**
-      * @description Deny the permission request.
-       */
-      deny(): void;
-
-    }
-    interface FullscreenPermissionRequest {
-
-      /**
-      * @description Allow the permission request.
-       */
-      allow(): void;
-
-      /**
-      * @description Deny the permission request.
-       */
-      deny(): void;
-
-    }
-    interface LoadPluginPermissionRequest {
-
-      /**
-      * @description Allow the permission request. This is the default behavior if deny is not called..
-       */
-      allow(): void;
-
-      /**
-      * @description Deny the permission request.
-       */
-      deny(): void;
-
-    }
-    /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
-    interface SelectionRect {
-
-      /**
-      * @description Distance from the left edge of the screen to the left edge of the rectangle.
-       */
-      left: number
-
-      /**
-      * @description Distance from the top edge of the screen to the top edge of the rectangle.
-       */
-      top: number
-
-      /**
-      * @description Width of the rectangle.
-       */
-      width: number
-
-      /**
-      * @description Height of the rectangle.
-       */
-      height: number
-    }
-    /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
-      function(details) { return {cancel: true}; },
-      {urls: ["*://www.evil.com/*"]},
-      ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
-      conditions: [
-        new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
-      ],
-      actions: [ new chrome.webViewRequest.CancelRequest() ]
-    };
-    myWebview.request.onRequest.addRules([rule]);</pre> */
-    interface WebRequestEventInterface {
-    }
-    /**
-    * Defines the how zooming is handled in the webview.
-    * Enum values:
-    * "per-origin"
-    * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor.
-    * "per-view"
-    * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
-    * "disabled"
-    * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
-    export type ZoomMode = "per-origin" | "per-view" | "disabled";
-
-    /**
-    * @description Queries audio state.
-    * @param {any} [object Object]
-     */
-    export function getAudioState(callback: (audible: boolean) => void): void;
-
-    /**
-    * @description Sets audio mute state of the webview.
-    * @param {boolean} mute Mute audio value
-     */
-    export function setAudioMuted(mute: boolean): void;
-
-    /**
-    * @description Queries whether audio is muted.
-    * @param {any} [object Object]
-     */
-    export function isAudioMuted(callback: (muted: boolean) => void): void;
-
-    /**
-     * @description Captures the visible region of the webview.
-     * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
-     */
-    export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
-    /**
-     * @description Captures the visible region of the webview.
-     * @param {*} options
-     * @param {(dataUrl: string) => void} callback
-     */
-    export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
-
-    /**
-    * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
-      {
-        name: 'myRule',
-        matches: ['http://www.foo.com/*'],
-        css: { files: ['mystyles.css'] },
-        js: { files: ['jquery.js', 'myscript.js'] },
-        run_at: 'document_start'
-      },
-      {
-        name: 'anotherRule',
-        matches: ['http://www.bar.com/*'],
-        js: { code: "document.body.style.backgroundColor = 'red';" },
-        run_at: 'document_end'
-      }]);
-     ...
-
-    // Navigates webview.
-    webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
-        name: 'rule',
-        matches: ['http://www.foo.com/*'],
-        js: { files: ['scriptA.js'] },
-        run_at: 'document_start'}]);
-
-    // Do something.
-    webview.src = 'http://www.foo.com/*';
-     ...
-    // Overwrite 'rule' defined before.
-    webview.addContentScripts([{
-        name: 'rule',
-        matches: ['http://www.bar.com/*'],
-        js: { files: ['scriptB.js'] },
-        run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
-    * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
-     */
-    export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
-
-    /**
-    * @description Navigates backward one history entry if possible. Equivalent to go(-1).
-    * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
-     */
-    export function back(callback?: (success: boolean) => void): void;
-
-    /**
-    * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-     */
-    export function canGoBack(): void;
-
-    /**
-    * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-     */
-    export function canGoForward(): void;
-
-    /**
-    * @description <p>Clears browsing data for the webview partition.</p>
-    * @param {any} options Options determining which data to clear.
-    * @param {any} types The types of data to be cleared.
-    * @param {any} [object Object]
-     */
-    export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
-
-    /**
-    * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
-    * @param {any} details Details of the script to run.
-    * @param {any} [object Object]
-     */
-    export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
-
-    /**
-    * @description Initiates a find-in-page request.
-    * @param {string} searchText The string to find in the page.
-    * @param {any} options Options for the find request.
-    * @param {any} [object Object]
-     */
-    export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
-
-    /**
-    * @description Navigates forward one history entry if possible. Equivalent to go(1).
-    * @param {any} [object Object]
-     */
-    export function forward(callback?: (success: boolean) => void): void;
-
-    /**
-    * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
-     */
-    export function getProcessId(): void;
-
-    /**
-    * @description Returns the user agent string used by the webview for guest page requests.
-     */
-    export function getUserAgent(): void;
-
-    /**
-    * @description Gets the current zoom factor.
-    * @param {any} [object Object]
-     */
-    export function getZoom(callback: (zoomFactor: number) => void): void;
-
-    /**
-    * @description Gets the current zoom mode.
-    * @param {any} [object Object]
-     */
-    export function getZoomMode(callback: (ZoomMode: any) => void): void;
-
-    /**
-    * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
-    * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
-    * @param {any} [object Object]
-     */
-    export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
-
-    /**
-    * @description Injects CSS into the guest page.
-    * @param {any} details Details of the CSS to insert.
-    * @param {any} [object Object]
-     */
-    export function insertCSS(details: InjectDetails, callback?: () => void): void;
-
-    /**
-    * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
-     */
-    export function isUserAgentOverridden(): void;
-
-    /**
-    * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
-     */
-    export function print(): void;
-
-    /**
-    * @description Reloads the current top-level page.
-     */
-    export function reload(): void;
-
-    /**
-    * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
-    * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
-     */
-    export function removeContentScripts(scriptNameList?: any[]): void;
-
-    /**
-    * @description Override the user agent string used by the webview for guest page requests.
-    * @param {string} userAgent The user agent string to use.
-     */
-    export function setUserAgentOverride(userAgent: string): void;
-
-    /**
-    * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
-    * @param {number} zoomFactor The new zoom factor.
-    * @param {any} [object Object]
-     */
-    export function setZoom(zoomFactor: number, callback?: () => void): void;
-
-    /**
-    * @description Sets the zoom mode of the webview.
-    * @param {any} ZoomMode Defines how zooming is handled in the webview.
-    * @param {any} [object Object]
-     */
-    export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
-
-    /**
-    * @description Stops loading the current webview navigation if in progress.
-     */
-    export function stop(): void;
-
-    /**
-    * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
-    * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
-     */
-    export function stopFinding(action?: string): void;
-
-    /**
-    * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
-    * @param {string} dataUrl The data URL to load.
-    * @param {string} baseUrl The base URL that will be used for relative links.
-    * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
-     */
-    export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
-
-    /**
-    * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
-     */
-    export function terminate(): void;
-
-    /**
-    * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
-      webview.src = 'about:blank';
-    });</pre>
-     */
-
-    export function close(event: chrome.events.Event<Event>): void;
-
-    /**
-    * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
-      console.log('Guest page logged a message: ', e.message);
-    });</pre>
-    * @param {any} [object Object]
-     */
-
-    export var consolemessage: chrome.events.Event<IConsolemessage>;
-
-    /**
-    * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
-      webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
-    });</pre>
-     */
-
-    export var contentload: (event: chrome.events.Event<Event>) => void;
-
-    /**
-    * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
-    * @param {any} [object Object]
-     */
-
-    export var dialog: chrome.events.Event<IDialog>;
-
-    /**
-    * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
-      if (e.reason === 'crash') {
-        webview.src = 'data:text/plain,Goodbye, world!';
-      }
-    });</pre>
-    * @param {any} [object Object]
-     */
-
-    export var exit: chrome.events.Event<IExit>;
-
-    /**
-    * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
-    * @param {any} [object Object]
-     */
-
-    export var findupdate: chrome.events.Event<IFindupdate>;
-
-    /**
-    * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
-    * @param {any} [object Object]
-     */
-
-    export var loadabort: chrome.events.Event<ILoadabort>;
-
-    /**
-    * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
-    * @param {any} [object Object]
-     */
-
-    export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
-
-    /**
-    * @description Fired when a top-level load request has redirected to a different URL.
-    * @param {any} [object Object]
-     */
-
-    export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
-
-    /**
-    * @description Fired when a load has begun.
-    * @param {any} [object Object]
-     */
-
-    export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
+    namespace instanceID {
+        /** NOT YET IMPLEMENTED */
+    }
+
+    ////////////////////
+    // mDNS
+    ////////////////////
+    /**
+     * 	Use the chrome.mdns API to discover services over mDNS. This comprises a subset of the features of the NSD spec: http://www.w3.org/TR/discovery-api/
+     * @since Chrome 31
+     */
+    namespace mdns {
+        /** NOT YET IMPLEMENTED */
+    }
+
+    ////////////////////
+    // Media Galleries
+    ////////////////////
+    namespace mediaGalleries {
+        interface MediaFileSystemsOptions {
+            interactive?: 'no' | 'yes' | 'if_needed';
+        }
+
+        interface MediaFileSystemMetadata {
+            name: string;
+            galleryId: string;
+            deviceId?: string;
+            isRemovable: boolean;
+            isMediaDevice: boolean;
+            isAvailable: boolean;
+        }
+
+        interface MetadataOptions {
+            metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
+        }
+
+        interface RawTag {
+            type: string;
+            tags: { [name: string]: string; };
+        }
+
+        interface Metadata {
+            // The browser sniffed mime type.
+            mimeType: string;
+            // Defined for images and video. In pixels.
+            height?: number;
+            width?: number;
+            // Defined for images only.
+            xResolution?: number;
+            yResolution?: number;
+            // Defined for audio and video. In seconds.
+            duration?: number;
+            // Defined for images and video. In degrees.
+            rotation?: number;
+            // Defined for images only.
+            cameraMake?: string;
+            cameraModel?: string;
+            exposureTimeSeconds?: number;
+            flashFired?: boolean;
+            fNumber?: number;
+            focalLengthMm?: number;
+            isoEquivalent?: number;
+            // Defined for audio and video only.
+            album?: string;
+            artist?: string;
+            comment?: string;
+            copyright?: string;
+            disc?: number;
+            genre?: string;
+            language?: string;
+            title?: string;
+            track?: number;
+            // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
+            rawTags: RawTag[];
+            // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
+            attachedImages: Blob[];
+        }
+
+        interface GalleryWatchResult {
+            galleryId: string;
+            success: boolean;
+        }
+
+        interface GalleryChangedEventArgs {
+            type: 'contents_changed' | 'watch_dropped';
+            galleryId: string;
+        }
+
+        interface ScanProgressEventArgs {
+            // The type of progress event, i.e. start, finish, etc.
+            type: 'start' | 'cancel' | 'finish' | 'error';
+            // The number of Galleries found.
+            galleryCount?: number;
+            // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
+            audioCount?: number;
+            imageCount?: number;
+            videoCount?: number;
+        }
+
+        export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
+        export function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
+        export function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
+        export function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
+        export function startMediaScan(): void;
+        export function cancelMediaScan(): void;
+        export function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
+        export function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
+        export function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
+        export function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
+        export function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
+        export function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
+        export function removeGalleryWatch(galleryId: string): void;
+        export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
+        export function removeAllGalleryWatch(): void;
+
+        export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
+        export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
+    }
+
+    ////////////////////////////////////
+    // Open Network Configuration (ONC)
+    ////////////////////////////////////
+    /**
+     * The chrome.networking.onc API is used for configuring network connections (Cellular, Ethernet, VPN, WiFi or WiMAX). This API is available in Chrome OS kiosk sessions.
+     * Network connection configurations are specified following Open Network Configuration (ONC) specification.
+     * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
+     */
+    namespace networking.onc {
+        export type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
+        export type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
+        export type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected';
+        export type IPConfigType = 'DHCP' | 'Static';
+        export type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX';
+        export type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
+        interface ManagedBoolean {
+            /**
+             * @description The active value currently used by the network configuration manager (e.g. Shill).
+             * @type {boolean}
+             * @memberof ManagedBoolean
+             */
+            Active?: boolean,
+            /**
+             * @description The source from which the effective property value was determined.
+             * @type {string}
+             * @memberof ManagedBoolean
+             */
+            Effective?: string,
+            /**
+             * @description The property value provided by the user policy.
+             * @type {boolean}
+             * @memberof ManagedBoolean
+             */
+            UserPolicy?: boolean,
+            /**
+             * @description The property value provided by the device policy.
+             * @type {boolean}
+             * @memberof ManagedBoolean
+             */
+            DevicePolicy?: boolean,
+            /**
+             * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+             * @type {boolean}
+             * @memberof ManagedBoolean
+             */
+            UserSettings?: boolean,
+            /**
+             * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+             * @type {boolean}
+             * @memberof ManagedBoolean
+             */
+            SharedSettings?: boolean,
+            /**
+             * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+             * @type {boolean}
+             * @memberof ManagedBoolean
+             */
+            UserEditable?: boolean,
+            /**
+             * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+             * @type {boolean}
+             * @memberof ManagedBoolean
+             */
+            DeviceEditable?: boolean
+        }
+        interface ManagedLong {
+            /**
+             * @description The active value currently used by the network configuration manager (e.g. Shill).
+             * @type {number}
+             * @memberof ManagedLong
+             */
+            Active?: number,
+            /**
+             * @description The source from which the effective property value was determined.
+             * @type {string}
+             * @memberof ManagedLong
+             */
+            Effective?: string,
+            /**
+             * @description The property value provided by the user policy.
+             * @type {number}
+             * @memberof ManagedLong
+             */
+            UserPolicy?: number,
+            /**
+             * @description The property value provided by the device policy.
+             * @type {number}
+             * @memberof ManagedLong
+             */
+            DevicePolicy?: number,
+            /**
+             * @description The property value set by the logged in user. Only provided if |UserEditable| is true.
+             * @type {number}
+             * @memberof ManagedLong
+             */
+            UserSettings?: number,
+            /**
+             * @description The value set for all users of the device. Only provided if |DeviceEditiable| is true.
+             * @type {number}
+             * @memberof ManagedLong
+             */
+            SharedSettings?: number,
+            /**
+             * @description Whether a UserPolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+             * @type {boolean}
+             * @memberof ManagedLong
+             */
+            UserEditable?: boolean,
+            /**
+             * @description Whether a DevicePolicy for the property exists and allows the property to be edited (i.e. the policy set recommended property value). Defaults to false.
+             * @type {boolean}
+             * @memberof ManagedLong
+             */
+            DeviceEditable?: boolean
+        }
+    }
+
+    ////////////////////
+    // Notifications
+    // https://developer.chrome.com/extensions/notifications
+    ////////////////////
+    /**
+     * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
+     * Permissions:  "notifications"
+     * @since Chrome 28.
+     */
+    namespace notifications {
+        interface ButtonOptions {
+            title: string;
+            iconUrl?: string;
+        }
+
+        interface ItemOptions {
+            /** Title of one item of a list notification. */
+            title: string;
+            /** Additional details about this item. */
+            message: string;
+        }
+
+        interface NotificationOptions {
+            /** Optional. Which type of notification to display. Required for notifications.create method. */
+            type?: string;
+            /**
+             * Optional.
+             * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
+             * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
+             */
+            iconUrl?: string;
+            /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
+            title?: string;
+            /** Optional. Main notification content. Required for notifications.create method. */
+            message?: string;
+            /**
+             * Optional.
+             * Alternate notification content with a lower-weight font.
+             * @since Chrome 31.
+             */
+            contextMessage?: string;
+            /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
+            priority?: number;
+            /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
+            eventTime?: number;
+            /** Optional. Text and icons for up to two notification action buttons. */
+            buttons?: ButtonOptions[];
+            /** Optional. Items for multi-item notifications. */
+            items?: ItemOptions[];
+            /**
+             * Optional.
+             * Current progress ranges from 0 to 100.
+             * @since Chrome 30.
+             */
+            progress?: number;
+            /**
+             * Optional.
+             * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
+             * @since Chrome 32.
+             */
+            isClickable?: boolean;
+            /**
+             * Optional.
+             * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
+             * @since Chrome 38.
+             */
+            appIconMaskUrl?: string;
+            /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
+            imageUrl?: string;
+            /**
+             * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
+             * This defaults to false.
+             * @since Chrome 50
+             */
+            requireInteraction?: boolean;
+        }
+
+        interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
+
+        interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
+
+        interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
+
+        interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
+
+        interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
+
+        /** The notification closed, either by the system or by user action. */
+        export var onClosed: NotificationClosedEvent;
+        /** The user clicked in a non-button area of the notification. */
+        export var onClicked: NotificationClickedEvent;
+        /** The user pressed a button in the notification. */
+        export var onButtonClicked: NotificationButtonClickedEvent;
+        /**
+         * The user changes the permission level.
+         * @since Chrome 32.
+         */
+        export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
+        /**
+         * The user clicked on a link for the app's notification settings.
+         * @since Chrome 32.
+         */
+        export var onShowSettings: NotificationShowSettingsEvent;
+
+        /**
+         * Creates and displays a notification.
+         * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+         * The notificationId parameter is required before Chrome 42.
+         * @param options Contents of the notification.
+         * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+         * The callback is required before Chrome 42.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(string notificationId) {...};
+         */
+        export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
+        /**
+         * Creates and displays a notification.
+         * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+         * The notificationId parameter is required before Chrome 42.
+         * @param options Contents of the notification.
+         * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
+         * The callback is required before Chrome 42.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(string notificationId) {...};
+         */
+        export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
+        /**
+         * Updates an existing notification.
+         * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
+         * @param options Contents of the notification to update to.
+         * @param callback Called to indicate whether a matching notification existed.
+         * The callback is required before Chrome 42.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(boolean wasUpdated) {...};
+         */
+        export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
+        /**
+         * Clears the specified notification.
+         * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
+         * @param callback Called to indicate whether a matching notification existed.
+         * The callback is required before Chrome 42.
+         * If you specify the callback parameter, it should be a function that looks like this:
+         * function(boolean wasCleared) {...};
+         */
+        export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
+        /**
+         * Retrieves all the notifications.
+         * @since Chrome 29.
+         * @param callback Returns the set of notification_ids currently in the system.
+         * The callback parameter should be a function that looks like this:
+         * function(object notifications) {...};
+         */
+        export function getAll(callback: (notifications: Object) => void): void;
+        /**
+         * Retrieves whether the user has enabled notifications from this app or extension.
+         * @since Chrome 32.
+         * @param callback Returns the current permission level.
+         * The callback parameter should be a function that looks like this:
+         * function( PermissionLevel level) {...};
+         */
+        export function getPermissionLevel(callback: (level: string) => void): void;
+    }
+
+    ////////////////////
+    // Permissions
+    ////////////////////
+    /**
+     * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
+     * @since Chrome 16.
+     */
+    namespace permissions {
+        interface Permissions {
+            /**
+             * Optional.
+             * List of named permissions (does not include hosts or origins). Anything listed here must appear in the optional_permissions list in the manifest.
+             */
+            origins?: string[];
+            /**
+             * Optional.
+             * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
+             */
+            permissions?: string[];
+        }
+
+        interface PermissionsRemovedEvent {
+            /**
+             * @param callback The callback parameter should be a function that looks like this:
+             * function( Permissions permissions) {...};
+             * Parameter permissions: The permissions that have been removed.
+             */
+            addListener(callback: (permissions: Permissions) => void): void;
+        }
+
+        interface PermissionsAddedEvent {
+            /**
+             * @param callback The callback parameter should be a function that looks like this:
+             * function( Permissions permissions) {...};
+             * Parameter permissions: The newly acquired permissions.
+             */
+            addListener(callback: (permissions: Permissions) => void): void;
+        }
+
+        /**
+         * Checks if the extension has the specified permissions.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function(boolean result) {...};
+         * Parameter result: True if the extension has the specified permissions.
+         */
+        export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+        /**
+         * Gets the extension's current set of permissions.
+         * @param callback The callback parameter should be a function that looks like this:
+         * function( Permissions permissions) {...};
+         * Parameter permissions: The extension's active permissions.
+         */
+        export function getAll(callback: (permissions: Permissions) => void): void;
+        /**
+         * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
+         * @param callback If you specify the callback parameter, it should be a function that looks like this:
+         * function(boolean granted) {...};
+         * Parameter granted: True if the user granted the specified permissions.
+         */
+        export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
+        /**
+         * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
+         * @param callback If you specify the callback parameter, it should be a function that looks like this:
+         * function(boolean removed) {...};
+         * Parameter removed: True if the permissions were removed.
+         */
+        export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
+
+        /** Fired when access to permissions has been removed from the extension. */
+        export var onRemoved: PermissionsRemovedEvent;
+        /** Fired when the extension acquires new permissions. */
+        export var onAdded: PermissionsAddedEvent;
+    }
+
+    ////////////////////
+    // Power
+    ////////////////////
+    /**
+     * Use the chrome.power API to override the system's power management features.
+     * Permissions:  "power"
+     * @since Chrome 27.
+     */
+    namespace power {
+        /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
+        export function requestKeepAwake(level: string): void;
+        /** Releases a request previously made via requestKeepAwake(). */
+        export function releaseKeepAwake(): void;
+    }
+
+    ////////////////////
+    // Printer Provider
+    ////////////////////
+    /**
+     * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
+     * Permissions:  "printerProvider"
+     * @since Chrome 44.
+     */
+    namespace printerProvider {
+        interface PrinterInfo {
+            /** Unique printer ID. */
+            id: string;
+            /** Printer's human readable name. */
+            name: string;
+            /** Optional. Printer's human readable description. */
+            description?: string;
+        }
+
+        interface PrinterCapabilities {
+            /** Device capabilities in CDD format. */
+            capabilities: any;
+        }
+
+        interface PrintJob {
+            /** ID of the printer which should handle the job. */
+            printerId: string;
+            /** The print job title. */
+            title: string;
+            /** Print ticket in  CJT format. */
+            ticket: Object;
+            /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
+            contentType: string;
+            /** Blob containing the document data to print. Format must match |contentType|. */
+            document: Blob;
+        }
+
+        interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
+
+        interface PrinterInfoRequestedEvent extends chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void> { }
+
+        interface CapabilityRequestedEvent extends chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void> { }
+
+        interface PrintRequestedEvent extends chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void> { }
+
+        /** Event fired when print manager requests printers provided by extensions. */
+        export var onGetPrintersRequested: PrinterRequestedEvent;
+        /**
+         * Event fired when print manager requests information about a USB device that may be a printer.
+         * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
+         * @since Chrome 45.
+         */
+        export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
+        /** Event fired when print manager requests printer capabilities. */
+        export var onGetCapabilityRequested: CapabilityRequestedEvent;
+        /** Event fired when print manager requests printing. */
+        export var onPrintRequested: PrintRequestedEvent;
+    }
+
+    ////////////////////
+    // Runtime
+    ////////////////////
+    /**
+     * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app or extension lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
+     * @since Chrome 22
+     */
+    namespace runtime {
+        /** This will be defined during an API method callback if there was an error */
+        export var lastError: LastError | undefined;
+        /** The ID of the extension/app. */
+        export var id: string;
+
+        interface LastError {
+            /** Optional. Details about the error which occurred.  */
+            message?: string;
+        }
+
+        interface ConnectInfo {
+            name?: string;
+        }
+
+        interface InstalledDetails {
+            /**
+             * The reason that this event is being dispatched.
+             * One of: "install", "update", "chrome_update", or "shared_module_update"
+             */
+            reason: string;
+            /**
+             * Optional.
+             * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
+             */
+            previousVersion?: string;
+            /**
+             * Optional.
+             * Indicates the ID of the imported shared module extension which updated. This is present only if 'reason' is 'shared_module_update'.
+             * @since Chrome 29.
+             */
+            id?: string;
+        }
+
+        interface MessageOptions {
+            /** Whether the TLS channel ID will be passed into onMessageExternal for processes that are listening for the connection event. */
+            includeTlsChannelId?: boolean;
+        }
+
+        /**
+         * An object containing information about the script context that sent a message or request.
+         * @since Chrome 26.
+         */
+        interface MessageSender {
+            /** The ID of the extension or app that opened the connection, if any. */
+            id?: string;
+            /**
+             * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
+             * @since Chrome 41.
+             */
+            frameId?: number;
+            /**
+             * The URL of the page or frame that opened the connection. If the sender is in an iframe, it will be iframe's URL not the URL of the page which hosts it.
+             * @since Chrome 28.
+             */
+            url?: string;
+            /**
+             * The TLS channel ID of the page or frame that opened the connection, if requested by the extension or app, and if available.
+             * @since Chrome 32.
+             */
+            tlsChannelId?: string;
+        }
+
+        /**
+         * An object containing information about the current platform.
+         * @since Chrome 36.
+         */
+        interface PlatformInfo {
+            /**
+             * The operating system chrome is running on.
+             * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
+             */
+            os: string;
+            /**
+             * The machine's processor architecture.
+             * One of: "arm", "x86-32", or "x86-64"
+             */
+            arch: string;
+            /**
+             * The native client architecture. This may be different from arch on some platforms.
+             * One of: "arm", "x86-32", or "x86-64"
+             */
+            nacl_arch: string;
+        }
+
+        /**
+         * An object which allows two way communication with other pages.
+         * @since Chrome 26.
+         */
+        interface Port {
+            postMessage: (message: Object) => void;
+            disconnect: () => void;
+            /**
+             * Optional.
+             * This property will only be present on ports passed to onConnect/onConnectExternal listeners.
+             */
+            sender?: MessageSender;
+            /** An object which allows the addition and removal of listeners for a Chrome event. */
+            onDisconnect: PortDisconnectEvent;
+            /** An object which allows the addition and removal of listeners for a Chrome event. */
+            onMessage: PortMessageEvent;
+            name: string;
+        }
+
+        interface UpdateAvailableDetails {
+            /** The version number of the available update. */
+            version: string;
+        }
+
+        interface UpdateCheckDetails {
+            /** The version of the available update. */
+            version: string;
+        }
+
+        interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+        interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
+
+        interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
+
+        interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+        interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
+
+        interface RuntimeEvent extends chrome.events.Event<() => void> { }
+
+        interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
+
+        interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
+
+        interface ManifestIcons {
+            [size: number]: string;
+        }
+
+        interface ManifestAction {
+            default_icon?: ManifestIcons;
+            default_title?: string;
+            default_popup?: string;
+        }
+
+        interface SearchProvider {
+            name?: string;
+            keyword?: string;
+            favicon_url?: string;
+            search_url: string;
+            encoding?: string;
+            suggest_url?: string;
+            instant_url?: string;
+            image_url?: string;
+            search_url_post_params?: string;
+            suggest_url_post_params?: string;
+            instant_url_post_params?: string;
+            image_url_post_params?: string;
+            alternate_urls?: string[];
+            prepopulated_id?: number;
+            is_default?: boolean;
+        }
+
+        interface Manifest {
+            /** Required */
+            app: {
+                background: {
+                    scripts?: string[];
+                }
+            }
+            /** Should be set to 2 */
+            manifest_version: number;
+            name: string;
+            version: string;
+
+            // Recommended
+            default_locale?: string;
+            description?: string;
+            icons?: ManifestIcons;
+            // Optional
+            action_handlers?: string[];
+            author?: any;
+            automation?: any;
+            bluetooth?: {
+                uuids?: string[];
+                socket?: boolean;
+                low_energy?: boolean;
+                peripheral?: boolean;
+            };
+            commands?: {
+                [name: string]: {
+                    suggested_key?: {
+                        default?: string;
+                        windows?: string;
+                        mac?: string;
+                        chromeos?: string;
+                        linux?: string;
+                    };
+                    description?: string;
+                    global?: boolean
+                }
+            };
+            current_locale?: string;
+            event_rules?: {
+                event?: string;
+                actions?: {
+                    type: string;
+                }[];
+                conditions?: {
+                    type: string,
+                    css?: string[]
+                }[];
+            }[];
+            file_handlers?: {
+                [key: string]: {
+                    extensions?: Array<'*' | string | { include_directories: boolean }>;
+                    types?: Array<'*' | string | { include_directories: boolean }>;
+                }
+            }[];
+            file_system_provider_capabilities?: {
+                configurable?: boolean;
+                multiple_mounts?: boolean;
+                source?: string;
+            };
+            import?: {
+                id: string;
+            }[];
+            key?: string;
+            kiosk?: {
+                always_update: any;
+                required_platform_version: any;
+            };
+            kiosk_enabled?: boolean,
+            kiosk_only?: boolean,
+            kiosk_secondary_apps: any;
+            minimum_chrome_version?: string;
+            nacl_modules?: {
+                path: string;
+                mime_type: string;
+            }[];
+            oauth2?: {
+                client_id: string;
+                scopes?: string[];
+            };
+            offline_enabled?: boolean;
+            optional_permissions?: string[];
+            permissions?: string[];
+            platforms?: {
+                nacl_arch?: string;
+                sub_package_path: string;
+            }[];
+            /**
+             * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
+             */
+            requirements?: {
+                /**
+                 * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
+                 * "requirements": {
+                 *   "3D": {
+                 *     "features": ["webgl"]
+                 *   }
+                 * }
+                 */
+                '3D'?: {
+                    features?: Array<string | 'webgl'>;
+                };
+                /**
+                 * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
+                 * "requirements": {
+                 *   "plugins": {
+                 *     "npapi": true
+                 *   }
+                 * }
+                 */
+                plugins?: {
+                    npapi?: boolean;
+                }
+
+                [key: string]: any;
+            };
+            /**
+             * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
+             */
+            sandbox?: {
+                pages: string[];
+                content_security_policy?: string;
+            };
+            short_name?: string;
+            signature?: any;
+            sockets?: {
+                tcp?: {
+                    connect: string | '*';
+                };
+                udp?: {
+                    send: string | '*';
+                }
+            };
+            storage?: {
+                managed_schema: string
+            };
+            system_indicator?: any;
+            update_url?: string;
+            url_handlers?: {
+                [name: string]: {
+                    matches: string[];
+                    title?: string;
+                }
+            };
+            usb_printers?: {
+                filters: {
+                    vendorId?: number;
+                    productId?: number;
+                    interfaceClass?: number;
+                    interfaceSubclass?: number;
+                    interfaceProtocol?: number;
+                }[]
+            };
+            version_name?: string;
+            webview?: {
+                partitions?: {
+                    name: string;
+                    accessible_resources: string[];
+                }[]
+            }
+            [key: string]: any;
+        }
+
+        /**
+         * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+         * @since Chrome 26.
+         */
+        export function connect(connectInfo?: ConnectInfo): Port;
+        /**
+         * Attempts to connect to connect listeners within an extension/app (such as the background page), or other extensions/apps. This is useful for content scripts connecting to their extension processes, inter-app/extension communication, and web messaging. Note that this does not connect to any listeners in a content script. Extensions may connect to content scripts embedded in tabs via tabs.connect.
+         * @since Chrome 26.
+         * @param extensionId Optional.
+         * The ID of the extension or app to connect to. If omitted, a connection will be attempted with your own extension. Required if sending messages from a web page for web messaging.
+         */
+        export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
+        /**
+         * Connects to a native application in the host machine.
+         * @since Chrome 28.
+         * @param application The name of the registered application to connect to.
+         */
+        export function connectNative(application: string): Port;
+        /** Retrieves the JavaScript 'window' object for the background page running inside the current extension/app. If the background page is an event page, the system will ensure it is loaded before calling the callback. If there is no background page, an error is set. */
+        export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
+        /**
+         * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
+         * @returns The manifest details.
+         */
+        export function getManifest(): Manifest;
+        /**
+         * Returns a DirectoryEntry for the package directory.
+         * @since Chrome 29.
+         */
+        export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
+        /**
+         * Returns information about the current platform.
+         * @since Chrome 29.
+         * @param callback Called with results
+         */
+        export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
+        /**
+         * Converts a relative path within an app/extension install directory to a fully-qualified URL.
+         * @param path A path to a resource within an app/extension expressed relative to its install directory.
+         */
+        export function getURL(path: string): string;
+        /**
+         * Reloads the app or extension.
+         * @since Chrome 25.
+         */
+        export function reload(): void;
+        /**
+         * Requests an update check for this app/extension.
+         * @since Chrome 25.
+         * @param callback
+         * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+         * Optional parameter details: If an update is available, this contains more information about the available update.
+         */
+        export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
+        /**
+         * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
+         * @since Chrome 32.
+         */
+        export function restart(): void;
+        /**
+         * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+         * @since Chrome 26.
+         * @param responseCallback Optional
+         * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+         */
+        export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
+        /**
+         * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+         * @since Chrome 32.
+         * @param responseCallback Optional
+         * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+         */
+        export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+        /**
+         * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+         * @since Chrome 26.
+         * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+         * @param responseCallback Optional
+         * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+         */
+        export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
+        /**
+         * Sends a single message to event listeners within your extension/app or a different extension/app. Similar to runtime.connect but only sends a single message, with an optional response. If sending to your extension, the runtime.onMessage event will be fired in each page, or runtime.onMessageExternal, if a different extension. Note that extensions cannot send messages to content scripts using this method. To send messages to content scripts, use tabs.sendMessage.
+         * @since Chrome 32.
+         * @param extensionId The ID of the extension/app to send the message to. If omitted, the message will be sent to your own extension/app. Required if sending messages from a web page for web messaging.
+         * @param responseCallback Optional
+         * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+         */
+        export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+        /**
+         * Send a single message to a native application.
+         * @since Chrome 28.
+         * @param application The of the native messaging host.
+         * @param message The message that will be passed to the native messaging host.
+         * @param responseCallback Optional.
+         * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
+         */
+        export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
+        /**
+         * Sets the URL to be visited upon uninstallation. This may be used to clean up server-side data, do analytics, and implement surveys. Maximum 255 characters.
+         * @since Chrome 41.
+         * @param url Since Chrome 34.
+         * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
+         * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
+         */
+        export function setUninstallURL(url: string, callback?: () => void): void;
+        /**
+         * Open your Extension's options page, if possible.
+         * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
+         * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
+         * @since Chrome 42.
+         */
+        export function openOptionsPage(callback?: () => void): void;
+
+        /**
+         * Fired when a connection is made from either an extension process or a content script.
+         * @since Chrome 26.
+         */
+        export var onConnect: ExtensionConnectEvent;
+        /**
+         * Fired when a connection is made from another extension.
+         * @since Chrome 26.
+         */
+        export var onConnectExternal: ExtensionConnectEvent;
+        /** Sent to the event page just before it is unloaded. This gives the extension opportunity to do some clean up. Note that since the page is unloading, any asynchronous operations started while handling this event are not guaranteed to complete. If more activity for the event page occurs before it gets unloaded the onSuspendCanceled event will be sent and the page won't be unloaded. */
+        export var onSuspend: RuntimeEvent;
+        /**
+         * Fired when a profile that has this extension installed first starts up. This event is not fired when an incognito profile is started, even if this extension is operating in 'split' incognito mode.
+         * @since Chrome 23.
+         */
+        export var onStartup: RuntimeEvent;
+        /** Fired when the extension is first installed, when the extension is updated to a new version, and when Chrome is updated to a new version. */
+        export var onInstalled: RuntimeInstalledEvent;
+        /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
+        export var onSuspendCanceled: RuntimeEvent;
+        /**
+         * Fired when a message is sent from either an extension process or a content script.
+         * @since Chrome 26.
+         */
+        export var onMessage: ExtensionMessageEvent;
+        /**
+         * Fired when a message is sent from another extension/app. Cannot be used in a content script.
+         * @since Chrome 26.
+         */
+        export var onMessageExternal: ExtensionMessageEvent;
+        /**
+         * Fired when an app or the device that it runs on needs to be restarted. The app should close all its windows at its earliest convenient time to let the restart to happen. If the app does nothing, a restart will be enforced after a 24-hour grace period has passed. Currently, this event is only fired for Chrome OS kiosk apps.
+         * @since Chrome 29.
+         */
+        export var onRestartRequired: RuntimeRestartRequiredEvent;
+        /**
+         * Fired when an update is available, but isn't installed immediately because the app is currently running. If you do nothing, the update will be installed the next time the background page gets unloaded, if you want it to be installed sooner you can explicitly call chrome.runtime.reload(). If your extension is using a persistent background page, the background page of course never gets unloaded, so unless you call chrome.runtime.reload() manually in response to this event the update will not get installed until the next time chrome itself restarts. If no handlers are listening for this event, and your extension has a persistent background page, it behaves as if chrome.runtime.reload() is called in response to this event.
+         * @since Chrome 25.
+         */
+        export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+        /**
+         * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
+         * Fired when a Chrome update is available, but isn't installed immediately because a browser restart is required.
+         */
+        export var onBrowserUpdateAvailable: RuntimeEvent;
+    }
+
+    ////////////////////
+    // Serial
+    ////////////////////
+    /**
+     * Use the chrome.serial API to read from and write to a device connected to a serial port.
+     * @since Chrome 23
+     */
+    namespace serial {
+        /** NOT YET IMPLEMENTED */
+    }
+
+    ////////////////////
+    // Socket
+    ////////////////////
+    namespace socket {
+        interface CreateInfo {
+            socketId: number;
+        }
+
+        interface AcceptInfo {
+            resultCode: number;
+            socketId?: number;
+        }
+
+        interface ReadInfo {
+            resultCode: number;
+            data: ArrayBuffer;
+        }
+
+        interface WriteInfo {
+            bytesWritten: number;
+        }
+
+        interface RecvFromInfo {
+            resultCode: number;
+            data: ArrayBuffer;
+            port: number;
+            address: string;
+        }
+
+        interface SocketInfo {
+            socketType: string;
+            localPort?: number;
+            peerAddress?: string;
+            peerPort?: number;
+            localAddress?: string;
+            connected: boolean;
+        }
+
+        interface NetworkInterface {
+            name: string;
+            address: string;
+        }
+
+        export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
+        export function destroy(socketId: number): void;
+        export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
+        export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+        export function disconnect(socketId: number): void;
+        export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
+        export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
+        export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
+        export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
+        export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
+        export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
+        export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
+        export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
+        export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
+        export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
+    }
+
+    namespace sockets.tcp {
+        interface CreateInfo {
+            socketId: number;
+        }
+
+        interface SendInfo {
+            resultCode: number;
+            bytesSent?: number;
+        }
+
+        interface ReceiveEventArgs {
+            socketId: number;
+            data: ArrayBuffer;
+        }
+
+        interface ReceiveErrorEventArgs {
+            socketId: number;
+            resultCode: number;
+        }
+
+        interface SocketProperties {
+            persistent?: boolean;
+            name?: string;
+            bufferSize?: number;
+        }
+
+        interface SocketInfo {
+            socketId: number;
+            persistent: boolean;
+            name?: string;
+            bufferSize?: number;
+            paused: boolean;
+            connected: boolean;
+            localAddress?: string;
+            localPort?: number;
+            peerAddress?: string;
+            peerPort?: number;
+        }
+
+        export function create(callback: (createInfo: CreateInfo) => void): void;
+        export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+
+        export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+        export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+
+        export function setKeepAlive(socketId: number,
+            enable: boolean, callback: (result: number) => void): void;
+        export function setKeepAlive(socketId: number,
+            enable: boolean, delay: number, callback: (result: number) => void): void;
+
+        export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
+        export function connect(socketId: number,
+            peerAddress: string, peerPort: number, callback: (result: number) => void): void;
+        export function disconnect(socketId: number, callback?: () => void): void;
+        export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
+        export function close(socketId: number, callback?: () => void): void;
+        export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+        export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+
+        export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+        export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+    }
+
+    /**
+     * Use the chrome.sockets.tcpServer API to create server applications using TCP
+     * connections. This API supersedes the TCP functionality previously found in
+     * the chrome.socket API.
+     *
+     * @since Chrome 33
+     * @see https://developer.chrome.com/apps/sockets_tcpServer
+     */
+    namespace sockets.tcpServer {
+        interface CreateInfo {
+            socketId: number;
+        }
+
+        interface AcceptEventArgs {
+            socketId: number;
+            clientSocketId: number;
+        }
+
+        interface AcceptErrorEventArgs {
+            socketId: number;
+            resultCode: number;
+        }
+
+        /**
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
+         */
+        interface SocketProperties {
+            /**
+             * Flag indicating if the socket remains open when the event page of the
+             * application is unloaded. The default value is "false." When the
+             * application is loaded, any sockets previously opened with
+             * persistent=true can be fetched with getSockets.
+             *
+             * @see http://developer.chrome.com/apps/app_lifecycle.html
+             */
+            persistent?: boolean;
+
+            /** An application-defined string associated with the socket. */
+            name?: string;
+        }
+
+        /**
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketInfo
+         */
+        interface SocketInfo {
+            /** The socket identifier. */
+            socketId: number;
+
+            /**
+             * Flag indicating if the socket remains open when the event page of the
+             * application is unloaded (see SocketProperties.persistent). The
+             * default value is "false".
+             */
+            persistent: boolean;
+
+            /** Application-defined string associated with the socket. */
+            name?: string;
+
+            /**
+             * Flag indicating whether connection requests on a listening socket are
+             * dispatched through the onAccept event or queued up in the listen
+             * queue backlog. See setPaused. The default value is "false"
+             */
+            paused: boolean;
+
+            /** If the socket is listening, contains its local IPv4/6 address. */
+            localAddress?: string;
+
+            /** If the socket is listening, contains its local port. */
+            localPort?: number;
+        }
+
+        /**
+         * Creates a TCP server socket.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+         * @param callback Called when the socket has been created.
+         */
+        export function create(callback: (createInfo: CreateInfo) => void): void;
+
+        /**
+         * Creates a TCP server socket.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
+         * @param properties The socket properties.
+         * @param callback   Called when the socket has been created.
+         */
+        export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+
+        /**
+         * Updates the socket properties.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-update
+         * @param socketId   The socket identifier.
+         * @param properties The properties to update.
+         * @param callback   Called when the properties are updated.
+         */
+        export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+
+        /**
+         * Enables or disables a listening socket from accepting new connections.
+         * When paused, a listening socket accepts new connections until its backlog
+         * (see listen function) is full then refuses additional connection
+         * requests. onAccept events are raised only when the socket is un-paused.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
+         * @param callback Callback from the setPaused method.
+         */
+        export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+
+        /**
+         * Listens for connections on the specified port and address. If the
+         * port/address is in use, the callback indicates a failure.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+         * @param socketId The socket identifier.
+         * @param address  The address of the local machine.
+         * @param port     The port of the local machine. When set to 0, a free port
+         *                 is chosen dynamically. The dynamically allocated port can
+         *                 be found by calling getInfo.
+         * @param backlog  Length of the socket's listen queue. The default value
+         *                 depends on the Operating System (SOMAXCONN), which
+         *                 ensures a reasonable queue length for most applications.
+         * @param callback Called when listen operation completes.
+         */
+        export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
+
+        /**
+         * Listens for connections on the specified port and address. If the
+         * port/address is in use, the callback indicates a failure.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-listen
+         * @param socketId The socket identifier.
+         * @param address  The address of the local machine.
+         * @param port     The port of the local machine. When set to 0, a free port
+         *                 is chosen dynamically. The dynamically allocated port can
+         *                 be found by calling getInfo.
+         * @param callback Called when listen operation completes.
+         */
+        export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+
+        /**
+         * Disconnects the listening socket, i.e. stops accepting new connections
+         * and releases the address/port the socket is bound to. The socket
+         * identifier remains valid, e.g. it can be used with listen to accept
+         * connections on a new port and address.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-disconnect
+         * @param socketId The socket identifier.
+         * @param callback Called when the disconnect attempt is complete.
+         */
+        export function disconnect(socketId: number, callback?: () => void): void;
+
+        /**
+         * Disconnects and destroys the socket. Each socket created should be closed
+         * after use. The socket id is no longer valid as soon at the function is
+         * called. However, the socket is guaranteed to be closed only when the
+         * callback is invoked.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-close
+         * @param socketId The socket identifier.
+         * @param callback Called when the close operation completes.
+         */
+        export function close(socketId: number, callback?: () => void): void;
+
+        /**
+         * Retrieves the state of the given socket.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getInfo
+         * @param socketId The socket identifier.
+         * @param callback Called when the socket state is available.
+         */
+        export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+
+        /**
+         * Retrieves the list of currently opened sockets owned by the application.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
+         * @param callback Called when the list of sockets is available.
+         */
+        export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+
+        /**
+         * Event raised when a connection has been made to the server socket.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
+         */
+        export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
+
+        /**
+         * Event raised when a network error occured while the runtime was waiting
+         * for new connections on the socket address and port. Once this event is
+         * raised, the socket is set to paused and no more onAccept events are
+         * raised for this socket until the socket is resumed.
+         *
+         * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
+         */
+        export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
+    }
+
+    /**
+     * Use the chrome.sockets.udp API to send and receive data over the network
+     * using UDP connections. This API supersedes the UDP functionality previously
+     * found in the "socket" API.
+     *
+     * @since Chrome 33
+     * @see https://developer.chrome.com/apps/sockets_udp
+     */
+    namespace sockets.udp {
+        interface CreateInfo {
+            socketId: number;
+        }
+
+        interface SendInfo {
+            resultCode: number;
+            bytesSent?: number;
+        }
+
+        interface ReceiveEventArgs {
+            socketId: number;
+            data: ArrayBuffer;
+            remoteAddress: string;
+            remotePort: number;
+        }
+
+        interface ReceiveErrorEventArgs {
+            socketId: number;
+            resultCode: number;
+        }
+
+        /**
+         * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
+         */
+        interface SocketProperties {
+            /**
+             * Flag indicating if the socket is left open when the event page of the
+             * application is unloaded. The default value is "false." When the
+             * application is loaded, any sockets previously opened with
+             * persistent=true can be fetched with getSockets.
+             * @see http://developer.chrome.com/apps/app_lifecycle.html
+             */
+            persistent?: boolean;
+
+            /** An application-defined string associated with the socket. */
+            name?: string;
+
+            /**
+             * The size of the buffer used to receive data. If the buffer is too
+             * small to receive the UDP packet, data is lost. The default value is
+             * 4096.
+             */
+            bufferSize?: number;
+        }
+
+        /**
+         * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
+         */
+        interface SocketInfo {
+            /** The socket identifier. */
+            socketId: number;
+
+            /**
+             * Flag indicating whether the socket is left open when the application
+             * is suspended (see SocketProperties.persistent).
+             */
+            persistent: boolean;
+
+            /** Application-defined string associated with the socket. */
+            name?: string;
+
+            /**
+             * The size of the buffer used to receive data. If no buffer size ha
+             * been specified explictly, the value is not provided.
+             */
+            bufferSize?: number;
+
+            /**
+             * Flag indicating whether the socket is blocked from firing onReceive
+             * events.
+             */
+            paused: boolean;
+
+            /**
+             * If the underlying socket is bound, contains its local IPv4/6 address.
+             */
+            localAddress?: string;
+
+            /**
+             * If the underlying socket is bound, contains its local port.
+             */
+            localPort?: number;
+        }
+
+        /**
+         * Creates a UDP socket with default properties.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-create
+         * @param createInfo.socketId The ID of the newly created socket.
+         */
+        export function create(callback: (createInfo: CreateInfo) => void): void;
+
+        /**
+         * Creates a UDP socket with the given properties.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-create
+         * @param properties          The socket properties.
+         * @param createInfo.socketId The ID of the newly created socket.
+         */
+        export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+
+        /**
+         * Updates the socket properties.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-update
+         * @param socketId   The socket ID.
+         * @param properties The properties to update.
+         * @param callback   Called when the properties are updated.
+         */
+        export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+
+        /**
+         * Pauses or unpauses a socket. A paused socket is blocked from firing
+         * onReceive events.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-setPaused
+         * @param socketId The socket ID.
+         * @param paused   Flag to indicate whether to pause or unpause.
+         * @param callback Called when the socket has been successfully paused or
+         *                 unpaused.
+         */
+        export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+
+        /**
+         * Binds the local address and port for the socket. For a client socket, it
+         * is recommended to use port 0 to let the platform pick a free port.
+         *
+         * Once the bind operation completes successfully, onReceive events are
+         * raised when UDP packets arrive on the address/port specified -- unless
+         * the socket is paused.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-bind
+         * @param socketId The socket ID.
+         * @param address  The address of the local machine. DNS name, IPv4 and IPv6
+         *                 formats are supported. Use "0.0.0.0" to accept packets
+         *                 from all local available network interfaces.
+         * @param port     The port of the local machine. Use "0" to bind to a free
+         *                 port.
+         * @param callback Called when the bind operation completes.
+         */
+        export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+
+        /**
+         * Sends data on the given socket to the given address and port. The socket
+         * must be bound to a local port before calling this method.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-send
+         * @param socketId The socket ID.
+         * @param data     The data to send.
+         * @param address  The address of the remote machine.
+         * @param port     The port of the remote machine.
+         * @param callback Called when the send operation completes.
+         */
+        export function send(socketId: number, data: ArrayBuffer, address: string, port: number, callback: (sendInfo: SendInfo) => void): void;
+
+        /**
+         * Closes the socket and releases the address/port the socket is bound to.
+         * Each socket created should be closed after use. The socket id is no
+         * longer valid as soon at the function is called. However, the socket is
+         * guaranteed to be closed only when the callback is invoked.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-close
+         * @param socketId The socket ID.
+         * @param callback Called when the close operation completes.
+         */
+        export function close(socketId: number, callback?: () => void): void;
+
+        /**
+         * Retrieves the state of the given socket.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-getInfo
+         * @param socketId The socket ID.
+         * @param callback Called when the socket state is available.
+         */
+        export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+
+        /**
+         * Retrieves the list of currently opened sockets owned by the application.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-getSockets
+         * @param callback Called when the list of sockets is available.
+         */
+        export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+
+        /**
+         * Joins the multicast group and starts to receive packets from that group.
+         * The socket must be bound to a local port before calling this method.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-joinGroup
+         * @param socketId The socket ID.
+         * @param address  The group address to join. Domain names are not supported.
+         * @param callback Called when the joinGroup operation completes.
+         */
+        export function joinGroup(socketId: number, address: string, callback: (result: number) => void): void;
+
+        /**
+         * Leaves the multicast group previously joined using joinGroup. This is
+         * only necessary to call if you plan to keep using the socket afterwards,
+         * since it will be done automatically by the OS when the socket is closed.
+         *
+         * Leaving the group will prevent the router from sending multicast
+         * datagrams to the local host, presuming no other process on the host is
+         * still joined to the group.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-leaveGroup
+         * @param socketId The socket ID.
+         * @param address  The group address to leave. Domain names are not
+         *                 supported.
+         * @param callback Called when the leaveGroup operation completes.
+         */
+        export function leaveGroup(socketId: number, address: string, callback: (result: number) => void): void;
+
+        /**
+         * Sets the time-to-live of multicast packets sent to the multicast group.
+         *
+         * Calling this method does not require multicast permissions.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastTimeToLive
+         * @param socketId The socket ID.
+         * @param ttl      The time-to-live value.
+         * @param callback Called when the configuration operation completes.
+         */
+        export function setMulticastTimeToLive(socketId: number, ttl: number, callback: (result: number) => void): void;
+
+        /**
+         * Sets whether multicast packets sent from the host to the multicast group
+         * will be looped back to the host.
+         *
+         * Note: the behavior of setMulticastLoopbackMode is slightly different
+         * between Windows and Unix-like systems. The inconsistency happens only
+         * when there is more than one application on the same host joined to the
+         * same multicast group while having different settings on multicast
+         * loopback mode. On Windows, the applications with loopback off will not
+         * RECEIVE the loopback packets; while on Unix-like systems, the
+         * applications with loopback off will not SEND the loopback packets to
+         * other applications on the same host.
+         * @see MSDN: http://goo.gl/6vqbj
+         *
+         * Calling this method does not require multicast permissions.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-setMulticastLoopbackMode
+         * @param socketId The socket ID.
+         * @param enabled  Indicate whether to enable loopback mode.
+         * @param callback Called when the configuration operation completes.
+         */
+        export function setMulticastLoopbackMode(socketId: number, enabled: boolean, callback: (result: number) => void): void;
+
+        /**
+         * Gets the multicast group addresses the socket is currently joined to.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#method-getJoinedGroups
+         * @param socketId The socket ID.
+         * @param callback Called with an array of strings of the result.
+         */
+        export function getJoinedGroups(socketId: number, callback: (groups: string[]) => void): void;
+
+        /**
+         * Enables or disables broadcast packets on this socket.
+         *
+         * @since Chrome 44
+         * @see https://developer.chrome.com/apps/sockets_udp#method-setBroadcast
+         * @param socketId The socket ID.
+         * @param enabled  true to enable broadcast packets, false to disable them.
+         * @param callback Callback from the setBroadcast method.
+         */
+        export function setBroadcast(socketId: number, enabled: boolean, callback?: (result: number) => void): void;
+
+        /**
+         * Event raised when a UDP packet has been received for the given socket.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
+         */
+        export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+
+        /**
+         * Event raised when a network error occured while the runtime was waiting
+         * for data on the socket address and port. Once this event is raised, the
+         * socket is paused and no more onReceive events will be raised for this
+         * socket until the socket is resumed.
+         *
+         * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
+         */
+        export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+    }
+
+    ////////////////////
+    // Storage
+    ////////////////////
+    /**
+     * Use the chrome.storage API to store, retrieve, and track changes to user data.
+     * Permissions:  "storage"
+     * @since Chrome 20.
+     */
+    namespace storage {
+        interface StorageArea {
+            /**
+             * Gets the amount of space (in bytes) being used by one or more items.
+             * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+             * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+             */
+            getBytesInUse(callback: (bytesInUse: number) => void): void;
+            /**
+             * Gets the amount of space (in bytes) being used by one or more items.
+             * @param keys A single key or list of keys to get the total usage for. An empty list will return 0. Pass in null to get the total usage of all of storage.
+             * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
+             * Parameter bytesInUse: Amount of space being used in storage, in bytes.
+             */
+            getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
+            /**
+             * Removes all items from storage.
+             * @param callback Optional.
+             * Callback on success, or on failure (in which case runtime.lastError will be set).
+             */
+            clear(callback?: () => void): void;
+            /**
+             * Sets multiple items.
+             * @param items An object which gives each key/value pair to update storage with. Any other key/value pairs in storage will not be affected.
+             * Primitive values such as numbers will serialize as expected. Values with a typeof "object" and "function" will typically serialize to {}, with the exception of Array (serializes as expected), Date, and Regex (serialize using their String representation).
+             * @param callback Optional.
+             * Callback on success, or on failure (in which case runtime.lastError will be set).
+             */
+            set(items: Object, callback?: () => void): void;
+            /**
+             * Removes one or more items from storage.
+             * @param A single key or a list of keys for items to remove.
+             * @param callback Optional.
+             * Callback on success, or on failure (in which case runtime.lastError will be set).
+             */
+            remove(keys: string | string[], callback?: () => void): void;
+            /**
+             * Gets one or more items from storage.
+             * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+             * Parameter items: Object with items in their key-value mappings.
+             */
+            get(callback: (items: { [key: string]: any }) => void): void;
+            /**
+             * Gets one or more items from storage.
+             * @param keys A single key to get, list of keys to get, or a dictionary specifying default values.
+             * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+             * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+             * Parameter items: Object with items in their key-value mappings.
+             */
+            get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
+        }
+
+        interface StorageChange {
+            /** Optional. The new value of the item, if there is a new value. */
+            newValue?: any;
+            /** Optional. The old value of the item, if there was an old value. */
+            oldValue?: any;
+        }
+
+        interface LocalStorageArea extends StorageArea {
+            /** The maximum amount (in bytes) of data that can be stored in local storage, as measured by the JSON stringification of every value plus every key's length. This value will be ignored if the extension has the unlimitedStorage permission. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+            QUOTA_BYTES: number;
+        }
+
+        interface SyncStorageArea extends StorageArea {
+            /** @deprecated since Chrome 40. The storage.sync API no longer has a sustained write operation quota. */
+            MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: number;
+            /** The maximum total amount (in bytes) of data that can be stored in sync storage, as measured by the JSON stringification of every value plus every key's length. Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError. */
+            QUOTA_BYTES: number;
+            /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
+            QUOTA_BYTES_PER_ITEM: number;
+            /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
+            MAX_ITEMS: number;
+            /**
+             * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
+             * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+             */
+            MAX_WRITE_OPERATIONS_PER_HOUR: number;
+            /**
+             * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
+             * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
+             * @since Chrome 40.
+             */
+            MAX_WRITE_OPERATIONS_PER_MINUTE: number;
+        }
+
+        interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
+
+        /** Items in the local storage area are local to each machine. */
+        export var local: LocalStorageArea;
+        /** Items in the sync storage area are synced using Chrome Sync. */
+        export var sync: SyncStorageArea;
+
+        /**
+         * Items in the managed storage area are set by the domain administrator, and are read-only for the extension; trying to modify this namespace  results in an error.
+         * @since Chrome 33.
+         */
+        export var managed: StorageArea;
+
+        /** Fired when one or more items change. */
+        export var onChanged: StorageChangedEvent;
+    }
+
+    ////////////////////
+    // SyncFileSystem
+    ////////////////////
+    /**
+     * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive. This API is NOT for accessing arbitrary user docs stored in Google Drive. It provides app-specific syncable storage for offline and caching usage so that the same data can be available across different clients. Read Manage Data for more on using this API.
+     * @since Chrome 27
+     */
+    namespace syncFileSystem {
+        /** NOT YET IMPLEMENTED */
+    }
+
+
+    ////////////////////
+    // System CPU
+    ////////////////////
+    /**
+     * Use the system.cpu API to query CPU metadata.
+     * Permissions: "system.cpu"
+     * @since Chrome 32.
+     */
+    namespace system.cpu {
+        interface ProcessorUsage {
+            /** The cumulative time used by userspace programs on this processor. */
+            user: number;
+            /** The cumulative time used by kernel programs on this processor. */
+            kernel: number;
+            /** The cumulative time spent idle by this processor. */
+            idle: number;
+            /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
+            total: number;
+        }
+
+        interface ProcessorInfo {
+            /** Cumulative usage info for this logical processor. */
+            usage: ProcessorUsage;
+        }
+
+        interface CpuInfo {
+            /** The number of logical processors. */
+            numOfProcessors: number;
+            /** The architecture name of the processors. */
+            archName: string;
+            /** The model name of the processors. */
+            modelName: string;
+            /**
+             * A set of feature codes indicating some of the processor's capabilities.
+             * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
+             */
+            features: string[];
+            /** Information about each logical processor. */
+            processors: ProcessorInfo[];
+        }
+
+        /** Queries basic CPU information of the system. */
+        export function getInfo(callback: (info: CpuInfo) => void): void;
+    }
+
+    ////////////////////
+    // System Display
+    ////////////////////
+    /**
+     * Use the system.display API to query display metadata.
+     * Permissions: "system.display"
+     * @since Chrome 30.
+     */
+    namespace system.display {
+        interface Bounds {
+            /**  The x-coordinate of the upper-left corner. */
+            left: number;
+            /**  The y-coordinate of the upper-left corner. */
+            top: number;
+            /** The width of the display in pixels. */
+            width: number;
+            /** The height of the display in pixels. */
+            height: number;
+        }
+
+        interface Insets {
+            /** The x-axis distance from the left bound. */
+            left: number;
+            /** The y-axis distance from the top bound. */
+            top: number;
+            /** The x-axis distance from the right bound. */
+            right: number;
+            /** The y-axis distance from the bottom bound. */
+            bottom: number;
+        }
+
+        /**
+         * @since Chrome 57
+         */
+        interface Point {
+            /** The x-coordinate of the point. */
+            x: number;
+            /** The y-coordinate of the point. */
+            y: number;
+        }
+
+        /**
+         * @since Chrome 57
+         */
+        interface TouchCalibrationPair {
+            /**	The coordinates of the display point. */
+            displayPoint: Point;
+            /** The coordinates of the touch point corresponding to the display point. */
+            touchPoint: Point;
+        }
+
+        /**
+         * @since Chrome 52
+         */
+        interface DisplayMode {
+            /** The display mode width in device independent (user visible) pixels. */
+            width: number;
+
+            /** The display mode height in device independent (user visible) pixels. */
+            height: number;
+
+            /** The display mode width in native pixels. */
+            widthInNativePixels: number;
+
+            /** The display mode height in native pixels. */
+            heightInNativePixels: number;
+
+            /** The display mode UI scale factor. */
+            uiScale: number;
+
+            /** The display mode device scale factor. */
+            deviceScaleFactor: number;
+
+            /** True if the mode is the display's native mode. */
+            isNative: boolean;
+
+            /** True if the display mode is currently selected. */
+            isSelected: boolean;
+        }
+
+        /**
+         * @since Chrome 53
+         */
+        interface DisplayLayout {
+            /** The unique identifier of the display. */
+            id: string;
+            /** The unique identifier of the parent display. Empty if this is the root. */
+            parentId: string;
+            /** The layout position of this display relative to the parent. This will be ignored for the root. */
+            position: 'top' | 'right' | 'bottom' | 'left';
+            /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
+            offset: number;
+        }
+
+        /**
+         * @description The pairs of point used to calibrate the display.
+         * @export
+         * @interface TouchCalibrationPairs
+         */
+        interface TouchCalibrationPairs {
+            /** First pair of touch and display point required for touch calibration. */
+            pair1: TouchCalibrationPair,
+            /** Second pair of touch and display point required for touch calibration. */
+            pair2: TouchCalibrationPair,
+            /** Third pair of touch and display point required for touch calibration. */
+            pair3: TouchCalibrationPair,
+            /** Fourth pair of touch and display point required for touch calibration. */
+            pair4: TouchCalibrationPair
+        }
+
+        /**
+         * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
+         * @export
+         * @interface DisplayPropertiesInfo
+         */
+        interface DisplayPropertiesInfo {
+            /**
+             * @description Chrome OS only. If set to true, changes the display mode to unified desktop (see enableUnifiedDesktop for details). If set to false, unified desktop mode will be disabled. This is only valid for the primary display. If provided, mirroringSourceId must not be provided and other properties may not apply. This is has no effect if not provided.
+             * @since Chrome 59
+             * */
+            isUnified?: boolean;
+
+            /**
+             * Chrome OS only. If set and not empty, enables mirroring for this display. Otherwise disables mirroring for this display. This value should indicate the id of the source display to mirror, which must not be the same as the id passed to setDisplayProperties. If set, no other property may be set.
+             */
+            mirroringSourceId?: string;
+
+            /** If set to true, makes the display primary. No-op if set to false. */
+            isPrimary?: boolean;
+
+            /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+            overscan?: Insets;
+
+            /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+            rotation?: 0 | 90 | 180 | 270;
+
+            /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+            boundsOriginX?: number;
+
+            /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+            boundsOriginY: number;
+
+            /**
+             * @since Chrome 52
+             * @description If set, updates the display mode to the mode matching this value.
+             */
+            displayMode?: DisplayMode;
+        }
+
+        /**
+         * @description Options affecting how the information is returned.
+         * @since Chrome 59
+         * @export
+         * @interface DisplayInfoFlags
+         */
+        interface DisplayInfoFlags {
+            /**
+             * @description If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode (see enableUnifiedDesktop). Defaults to false.
+             * @type {boolean}
+             * @memberof DisplayInfoFlags
+             */
+            singleUnified?: boolean;
+        }
+
+        /** Information about display properties. */
+        interface DisplayInfo {
+            /** The unique identifier of the display. */
+            id: string;
+            /** The user-friendly name (e.g. "HP LCD monitor"). */
+            name: string;
+            /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
+            mirroringSourceId: string;
+            /** True if this is the primary display. */
+            isPrimary: boolean;
+            /** True if this is an internal display. */
+            isInternal: boolean;
+            /** True if this display is enabled. */
+            isEnabled: boolean;
+            /** The number of pixels per inch along the x-axis. */
+            dpiX: number;
+            /** The number of pixels per inch along the y-axis. */
+            dpiY: number;
+            /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
+            rotation: number;
+            /** The display's logical bounds. */
+            bounds: Bounds;
+            /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
+            overscan: Insets;
+            /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
+            workArea: Bounds;
+        }
+
+        /** The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|. */
+        interface DisplayProps {
+            /** If set and not empty, starts mirroring between this and the display with the provided id (the system will determine which of the displays is actually mirrored). If set and not empty, stops mirroring between this and the display with the specified id (if mirroring is in progress). If set, no other parameter may be set. */
+            mirroringSourceId?: string;
+            /** If set to true, makes the display primary. No-op if set to false. */
+            isPrimary?: boolean;
+            /** If set, sets the display's overscan insets to the provided values. Note that overscan values may not be negative or larger than a half of the screen's size. Overscan cannot be changed on the internal monitor. It's applied after isPrimary parameter. */
+            overscan?: Insets;
+            /** If set, updates the display's rotation. Legal values are [0, 90, 180, 270]. The rotation is set clockwise, relative to the display's vertical position. It's applied after overscan paramter. */
+            rotation?: number;
+            /** If set, updates the display's logical bounds origin along x-axis. Applied together with boundsOriginY, if boundsOriginY is set. Note that, when updating the display origin, some constraints will be applied, so the final bounds origin may be different than the one set. The final bounds can be retrieved using getInfo. The bounds origin is applied after rotation. The bounds origin cannot be changed on the primary display. Note that is also invalid to set bounds origin values if isPrimary is also set (as isPrimary parameter is applied first). */
+            boundsOriginX?: number;
+            /** If set, updates the display's logical bounds origin along y-axis. See documentation for boundsOriginX parameter. */
+            boundsOriginY?: number;
+        }
+
+        /**
+         * @description Fired when anything changes to the display configuration.
+         * @export
+         * @interface DisplayChangedEvent
+         * @extends {chrome.events.Event<() => void>}
+         */
+        interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
+
+        /**
+         * @description Requests the information for all attached display devices.
+         * @export
+         * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+         */
+        export function getInfo(callback: (info: DisplayInfo[]) => void): void;
+        /**
+         * @description Requests the information for all attached display devices.
+         * @export
+         * @since Chrome 59
+         * @param {DisplayInfoFlags} [flags] Options affecting how the information is returned.
+         * @param {(info: DisplayInfo[]) => void} callback The callback to invoke with the results.
+         */
+        export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
+
+        /**
+         * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+         * @since Chrome 53
+         * @export
+         * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
+         */
+        export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
+
+        /**
+         * @description Updates the properties for the display specified by |id|, according to the information provided in |info|. On failure, runtime.lastError will be set. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+         * @export
+         * @param {string} id The display's unique identifier.
+         * @param {DisplayPropertiesInfo} info The information about display properties that should be changed. A property will be changed only if a new value for it is specified in |info|.
+         * @param {() => void} [callback] Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+         */
+        export function setDisplayProperties(id: string, info: DisplayPropertiesInfo, callback?: () => void): void;
+
+        /**
+         * @description Set the layout for all displays. Any display not included will use the default layout. If a layout would overlap or be otherwise invalid it will be adjusted to a valid layout. After layout is resolved, an onDisplayChanged event will be triggered. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+         * @since Chrome 53
+         * @export
+         * @param {DisplayLayout[]} layouts The layout information, required for all displays except the primary display.
+         * @param {() => void} callback Empty function called when the function finishes. To find out whether the function succeeded, runtime.lastError should be queried.
+         */
+        export function setDisplayLayout(layouts: DisplayLayout[], callback?: () => void): void;
+
+        /**
+         * @description Enables/disables the unified desktop feature. Note that this simply enables the feature, but will not change the actual desktop mode. (That is, if the desktop is in mirror mode, it will stay in mirror mode) NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+         * @since Chrome 46
+         * @export
+         * @param {boolean} enabled True if unified desktop should be enabled.
+         */
+        export function enableUnifiedDesktop(enabled: boolean): void;
+        /**
+         * @description Starts overscan calibration for a display. This will show an overlay on the screen indicating the current overscan insets. If overscan calibration for display |id| is in progress this will reset calibration.
+         * @since Chrome 53
+         * @export
+         * @param {string} id The display's unique identifier.
+         */
+        export function overscanCalibrationStart(id: string): void;
+        /**
+         * @description Adjusts the current overscan insets for a display. Typically this should etiher move the display along an axis (e.g. left+right have the same value) or scale it along an axis (e.g. top+bottom have opposite values). Each Adjust call is cumulative with previous calls since Start.
+         * @since Chrome 53
+         * @export
+         * @param {string} id The display's unique identifier.
+         * @param {Insets} delta The amount to change the overscan insets.
+         */
+        export function overscanCalibrationAdjust(id: string, delta: Insets): void;
+
+        /**
+         * @description Resets the overscan insets for a display to the last saved value (i.e before Start was called).
+         * @since Chrome 53
+         * @export
+         * @param {string} id The display's unique identifier.
+         */
+        export function overscanCalibrationReset(id: string): void;
+
+        /**
+         * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
+         * @since Chrome 53
+         * @export
+         * @param {string} id The display's unique identifier.
+         */
+        export function overscanCalibrationComplete(id: string): void;
+
+        /**
+         * @description Displays the native touch calibration UX for the display with |id| as display id. This will show an overlay on the screen with required instructions on how to proceed. The callback will be invoked in case of successful calibraion only. If the calibration fails, this will throw an error.
+         * @since Chrome 57
+         * @export
+         * @param {string} id The display's unique identifier.
+         * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
+         */
+        export function showNativeTouchCalibration(id: string, callback: (success: boolean) => void): void;
+
+        /**
+         * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.
+         * @since Chrome 57
+         * @export
+         * @param {string} id The display's unique identifier.
+         */
+        export function startCustomTouchCalibration(id: string): void;
+
+        /**
+         * @description Sets the touch calibration pairs for a display. These |pairs| would be used to calibrate the touch screen for display with |id| called in startCustomTouchCalibration(). Always call |startCustomTouchCalibration| before calling this method. If another touch calibration is already in progress this will throw an error.
+         * @since Chrome 57
+         * @export
+         * @param {TouchCalibrationPairs} pairs The pairs of point used to calibrate the display.
+         * @param {Bounds} bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
+         */
+        export function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
+        /**
+         * @description Resets the touch calibration for the display and brings it back to its default state by clearing any touch calibration data associated with the display.
+         * @since Chrome 57
+         * @export
+         * @param {string} id The display's unique identifier.
+         */
+        export function clearTouchCalibration(id: string): void;
+
+        /**
+         * @description Fired when anything changes to the display configuration.
+         * @export
+         */
+        export var onDisplayChanged: DisplayChangedEvent;
+    }
+
+    ////////////////////
+    // System Memory
+    ////////////////////
+    /**
+     * The chrome.system.memory API.
+     * Permissions:  "system.memory"
+     * @since Chrome 32.
+     */
+    namespace system.memory {
+        interface MemoryInfo {
+            /** The total amount of physical memory capacity, in bytes. */
+            capacity: number;
+            /** The amount of available capacity, in bytes. */
+            availableCapacity: number;
+        }
+
+        /** Get physical memory information. */
+        export function getInfo(callback: (info: MemoryInfo) => void): void;
+    }
+
+    ////////////////////
+    // System - Network
+    ////////////////////
+    namespace system.network {
+        interface NetworkInterface {
+            name: string;
+            address: string;
+            prefixLength: number;
+        }
+
+        export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
+    }
+
+    ////////////////////
+    // System Storage
+    ////////////////////
+    /**
+     * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
+     * Permissions:  "system.storage"
+     * @since Chrome 30.
+     */
+    namespace system.storage {
+        interface StorageUnitInfo {
+            /** The transient ID that uniquely identifies the storage device. This ID will be persistent within the same run of a single application. It will not be a persistent identifier between different runs of an application, or between different applications. */
+            id: string;
+            /** The name of the storage unit. */
+            name: string;
+            /**
+             * The media type of the storage unit.
+             * fixed: The storage has fixed media, e.g. hard disk or SSD.
+             * removable: The storage is removable, e.g. USB flash drive.
+             * unknown: The storage type is unknown.
+             */
+            type: string;
+            /** The total amount of the storage space, in bytes. */
+            capacity: number;
+        }
+
+        interface StorageCapacityInfo {
+            /** A copied |id| of getAvailableCapacity function parameter |id|. */
+            id: string;
+            /** The available capacity of the storage device, in bytes. */
+            availableCapacity: number;
+        }
+
+        interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
+
+        interface SystemStorageDetachedEvent extends chrome.events.Event<(id: string) => void> { }
+
+        /** Get the storage information from the system. The argument passed to the callback is an array of StorageUnitInfo objects. */
+        export function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
+        /**
+         * Ejects a removable storage device.
+         * @param callback
+         * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
+         */
+        export function ejectDevice(id: string, callback: (result: string) => void): void;
+        /**
+         * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
+         * @since Dev channel only.
+         */
+        export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
+
+        /** Fired when a new removable storage is attached to the system. */
+        export var onAttached: SystemStorageAttachedEvent;
+        /** Fired when a removable storage is detached from the system. */
+        export var onDetached: SystemStorageDetachedEvent;
+    }
+
+    ////////////////////
+    // Text to Speech
+    ////////////////////
+    /**
+     * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
+     * Permissions:  "tts"
+     * @since Chrome 14.
+     */
+    namespace tts {
+        /** An event from the TTS engine to communicate the status of an utterance. */
+        interface TtsEvent {
+            /** Optional. The index of the current character in the utterance. */
+            charIndex?: number;
+            /** Optional. The error description, if the event type is 'error'. */
+            errorMessage?: string;
+            /**
+             * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
+             * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
+             */
+            type: string;
+        }
+
+        /** A description of a voice available for speech synthesis. */
+        interface TtsVoice {
+            /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+            lang?: string;
+            /**
+             * Optional. This voice's gender.
+             * One of: "male", or "female"
+             */
+            gender?: string;
+            /** Optional. The name of the voice. */
+            voiceName?: string;
+            /** The ID of the extension providing this voice. */
+            extensionsId?: string;
+            /** All of the callback event types that this voice is capable of sending. */
+            eventTypes?: string[];
+            /**
+             * If true, the synthesis engine is a remote network resource. It may be higher latency and may incur bandwidth costs.
+             * @since Chrome 33.
+             */
+            remote?: boolean;
+        }
+
+        interface SpeakOptions {
+            /** Optional. Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+            volume?: number;
+            /**
+             * Optional.
+             * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
+             */
+            enqueue?: boolean;
+            /**
+             * Optional.
+             * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
+             */
+            rate?: number;
+            /**
+             * Optional. This function is called with events that occur in the process of speaking the utterance.
+             * @param event The update event from the text-to-speech engine indicating the status of this utterance.
+             */
+            onEvent?: (event: TtsEvent) => void;
+            /**
+             * Optional.
+             * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
+             */
+            pitch?: number;
+            /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+            lang?: string;
+            /** Optional. The name of the voice to use for synthesis. If empty, uses any available voice. */
+            voiceName?: string;
+            /** Optional. The extension ID of the speech engine to use, if known. */
+            extensionId?: string;
+            /**
+             * Optional. Gender of voice for synthesized speech.
+             * One of: "male", or "female"
+             */
+            gender?: string;
+            /** Optional. The TTS event types the voice must support. */
+            requiredEventTypes?: string[];
+            /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
+            desiredEventTypes?: string[];
+        }
+
+        /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
+        export function isSpeaking(callback?: (speaking: boolean) => void): void;
+        /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
+        export function stop(): void;
+        /** Gets an array of all available voices. */
+        export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
+        /**
+         * Speaks text using a text-to-speech engine.
+         * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+         * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+         */
+        export function speak(utterance: string, callback?: Function): void;
+        /**
+         * Speaks text using a text-to-speech engine.
+         * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
+         * @param options Optional. The speech options.
+         * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+         */
+        export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
+        /**
+         * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
+         * @since Chrome 29.
+         */
+        export function pause(): void;
+        /**
+         * If speech was paused, resumes speaking where it left off.
+         * @since Chrome 29.
+         */
+        export function resume(): void;
+    }
+
+    ////////////////////
+    // Types
+    ////////////////////
+    /**
+     * The chrome.types API contains type declarations for Chrome.
+     * @since Chrome 13.
+     */
+    namespace types {
+        interface ChromeSettingClearDetails {
+            /**
+             * Optional.
+             * The scope of the ChromeSetting. One of
+             * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+             * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+             * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+             * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+             */
+            scope?: string;
+        }
+
+        interface ChromeSettingSetDetails extends ChromeSettingClearDetails {
+            /**
+             * The value of the setting.
+             * Note that every setting has a specific value type, which is described together with the setting. An extension should not set a value of a different type.
+             */
+            value: any;
+            /**
+             * Optional.
+             * The scope of the ChromeSetting. One of
+             * • regular: setting for the regular profile (which is inherited by the incognito profile if not overridden elsewhere),
+             * • regular_only: setting for the regular profile only (not inherited by the incognito profile),
+             * • incognito_persistent: setting for the incognito profile that survives browser restarts (overrides regular preferences),
+             * • incognito_session_only: setting for the incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular and incognito_persistent preferences).
+             */
+            scope?: string;
+        }
+
+        interface ChromeSettingGetDetails {
+            /** Optional. Whether to return the value that applies to the incognito session (default false). */
+            incognito?: boolean;
+        }
+
+        /**
+         * @param details Details of the currently effective value.
+         */
+        export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+
+        interface ChromeSettingGetResultDetails {
+            /**
+             * One of
+             * • not_controllable: cannot be controlled by any extension
+             * • controlled_by_other_extensions: controlled by extensions with higher precedence
+             * • controllable_by_this_extension: can be controlled by this extension
+             * • controlled_by_this_extension: controlled by this extension
+             */
+            levelOfControl: string;
+            /** The value of the setting. */
+            value: any;
+            /**
+             * Optional.
+             * Whether the effective value is specific to the incognito session.
+             * This property will only be present if the incognito property in the details parameter of get() was true.
+             */
+            incognitoSpecific?: boolean;
+        }
+
+        interface ChromeSettingChangedEvent extends chrome.events.Event<DetailsCallback> { }
+
+        /** An interface that allows access to a Chrome browser setting. See accessibilityFeatures for an example. */
+        interface ChromeSetting {
+            /**
+             * Sets the value of a setting.
+             * @param details Which setting to change.
+             * @param callback Optional. Called at the completion of the set operation.
+             */
+            set(details: ChromeSettingSetDetails, callback?: Function): void;
+            /**
+             * Gets the value of a setting.
+             * @param details Which setting to consider.
+             */
+            get(details: ChromeSettingGetDetails, callback?: DetailsCallback): void;
+            /**
+             * Clears the setting, restoring any default value.
+             * @param details Which setting to clear.
+             * @param callback Optional. Called at the completion of the clear operation.
+             */
+            clear(details: ChromeSettingClearDetails, callback?: Function): void;
+            /** Fired after the setting changes. */
+            onChange: ChromeSettingChangedEvent;
+        }
+    }
+
+    ////////////////////
+    // USB
+    ////////////////////
+    namespace usb {
+        type Direction = 'in' | 'out';
+
+        interface Device {
+            device: number,
+            vendorId: number,
+            productId: number,
+            productName: string,
+            manufacturerName: string,
+            serialNumber: string
+        }
+
+        interface ConnectionHandle {
+            handle: number,
+            vendorId: number,
+            productId: number
+        }
+
+        interface EndpointDescriptor {
+            address: number,
+            type: 'control' | 'interrupt' | 'isochronous' | 'bulk',
+            direction: Direction,
+            maximumPacketSize: number,
+            synchronization?: 'asynchronous' | 'adaptive' | 'synchronous',
+            usage?: 'data' | 'feedback' | 'explicitFeedback',
+            pollingInterval?: number,
+            extra_data: ArrayBuffer
+        }
+
+        interface InterfaceDescriptor {
+            interfaceNumber: number,
+            alternateSetting: number,
+            interfaceClass: number,
+            interfaceSubclass: number,
+            interfaceProtocol: number,
+            description?: string,
+            endpoints: EndpointDescriptor[],
+            extra_data: ArrayBuffer
+        }
+
+        interface ConfigDescriptor {
+            active: boolean,
+            configurationValue: number,
+            description?: string,
+            selfPowered: boolean,
+            remoteWakeup: boolean,
+            maxPower: number,
+            interfaces: InterfaceDescriptor[],
+            extra_data: ArrayBuffer
+        }
+
+        interface GenericTransferInfo {
+            direction: Direction,
+            endpoint: number,
+            length?: number,
+            data?: ArrayBuffer,
+            timeout?: number
+        }
+
+        interface TransferResultInfo {
+            resultCode: number,
+            data?: ArrayBuffer
+        }
+
+        interface DeviceFilter {
+            vendorId?: number,
+            productId?: number,
+            interfaceClass?: number,
+            interfaceSubclass?: number,
+            interfaceProtocol?: number
+        }
+
+        interface TransferInfo {
+            direction: Direction;
+            recipient: 'device' | 'interface' | 'endpoint' | 'other';
+            requestType: 'standard' | 'class' | 'vendor' | 'reserved';
+            request: number;
+            value: number;
+            index: number;
+            length?: number;
+            data?: ArrayBuffer;
+            timeout?: number;
+        }
+
+        interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
+
+        export var onDeviceAdded: DeviceEvent;
+        export var onDeviceRemoved: DeviceEvent;
+
+        export function getDevices(options: { vendorId?: number, productId?: number, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+        export function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+        export function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
+        export function requestAccess(device: Device, interfaceId: number, callback: (success: boolean) => void): void;
+        export function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
+        export function findDevices(options: { vendorId: number, productId: number, interfaceId?: number }, callback: (handles: ConnectionHandle[]) => void): void;
+        export function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
+        export function setConfiguration(handle: ConnectionHandle, configurationValue: number, callback: () => void): void;
+        export function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
+        export function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
+        export function claimInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+        export function releaseInterface(handle: ConnectionHandle, interfaceNumber: number, callback: () => void): void;
+        export function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: number, alternateSetting: number, callback: () => void): void;
+        export function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
+        export function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+        export function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+        export function isochronousTransfer(handle: ConnectionHandle, transferInfo: { transferInfo: GenericTransferInfo, packets: number, packetLength: number }, callback: (info: TransferResultInfo) => void): void;
+        export function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
+    }
+
+
+    ////////////////////
+    // VPN Provider
+    ////////////////////
+    /**
+     * Use the chrome.vpnProvider API to implement a VPN client.
+     * Permissions:  "vpnProvider"
+     * Important: This API works only on Chrome OS.
+     * @since Chrome 43.
+     */
+    namespace vpnProvider {
+        interface VpnSessionParameters {
+            /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
+            address: string;
+            /** Optional. Broadcast address for the VPN interface. (default: deduced from IP address and mask) */
+            broadcastAddress?: string;
+            /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
+            mtu?: string;
+            /**
+             * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+             */
+            exclusionList: string[];
+            /**
+             * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+             */
+            inclusionList: string[];
+            /** Optional. A list of search domains. (default: no search domain) */
+            domainSearch?: string[];
+            /** A list of IPs for the DNS servers. */
+            dnsServer: string[];
+        }
+
+        interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
+
+        interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
+
+        interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
+
+        interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
+
+        interface VpnUiEvent extends chrome.events.Event<(event: string, id?: string) => void> { }
+
+        /**
+         * Creates a new VPN configuration that persists across multiple login sessions of the user.
+         * @param name The name of the VPN configuration.
+         * @param callback Called when the configuration is created or if there is an error.
+         * Parameter id: A unique ID for the created configuration, empty string on failure.
+         */
+        export function createConfig(name: string, callback: (id: string) => void): void;
+        /**
+         * Destroys a VPN configuration created by the extension.
+         * @param id ID of the VPN configuration to destroy.
+         * @param callback Optional. Called when the configuration is destroyed or if there is an error.
+         */
+        export function destroyConfig(id: string, callback?: Function): void;
+        /**
+         * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+         * @param parameters The parameters for the VPN session.
+         * @param callback Called when the parameters are set or if there is an error.
+         */
+        export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
+        /**
+         * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
+         * @param data The IP packet to be sent to the platform.
+         * @param callback Optional. Called when the packet is sent or if there is an error.
+         */
+        export function sendPacket(data: ArrayBuffer, callback?: Function): void;
+        /**
+         * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
+         * @param state The VPN session state of the VPN client.
+         * connected: VPN connection was successful.
+         * failure: VPN connection failed.
+         * @param callback Optional. Called when the notification is complete or if there is an error.
+         */
+        export function notifyConnectionStateChanged(state: string, callback?: Function): void;
+
+        /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
+        export var onPlatformMessage: VpnPlatformMessageEvent;
+        /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
+        export var onPacketReceived: VpnPacketReceptionEvent;
+        /** Triggered when a configuration created by the extension is removed by the platform. */
+        export var onConfigRemoved: VpnConfigRemovalEvent;
+        /** Triggered when a configuration is created by the platform for the extension. */
+        export var onConfigCreated: VpnConfigCreationEvent;
+        /** Triggered when there is a UI event for the extension. UI events are signals from the platform that indicate to the app that a UI dialog needs to be shown to the user. */
+        export var onUIEvent: VpnUiEvent;
+    }
+
+    ////////////////////
+    // Wallpaper
+    ////////////////////
+    /**
+     * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
+     * Permissions:  "wallpaper"
+     * Important: This API works only on Chrome OS.
+     * @since Chrome 43.
+     */
+    namespace wallpaper {
+        interface WallpaperDetails {
+            /** Optional. The jpeg or png encoded wallpaper image. */
+            data?: any;
+            /** Optional. The URL of the wallpaper to be set. */
+            url?: string;
+            /**
+             * The supported wallpaper layouts.
+             * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
+             */
+            layout: string;
+            /** The file name of the saved wallpaper. */
+            filename: string;
+            /** Optional. True if a 128x60 thumbnail should be generated. */
+            thumbnail?: boolean;
+        }
+
+        /**
+         * Sets wallpaper to the image at url or wallpaperData with the specified layout
+         * @param callback
+         * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
+         */
+        export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
+    }
+
+
+    ///////////////////
+    // Webview Tag
+    ///////////////////
+    /**
+     * Use the webview tag to actively load live content from the web over the network and embed it in your Chrome App. Your app can control the appearance of the <code>webview</code> and interact with the web content, initiate navigations in an embedded web page, react to error events that happen within it, and more (see <a href=\"#usage\">Usage</a>).
+     */
+    namespace webview {
+        /** Options that determine what data should be cleared by `clearData`. */
+        interface ClearDataOptions {
+            /** Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript <code>Date</code> object). If absent, defaults to <code>0</code> (which would remove all browsing data). */
+            since?: number;
+        }
+        interface WindowEvent extends chrome.events.Event<() => void> { }
+
+        interface ConsoleEvent extends Event {
+            /**
+             * @description The severity level of the log message. Ranges from 0 to 4.
+             * @type {number}
+             * @memberof ConsoleEvent
+             */
+            level: number;
+            /**
+             * @description The logged message contents.
+             * @type {string}
+             * @memberof ConsoleEvent
+             */
+            message: string;
+            /**
+             * @description The line number of the message source.
+             * @type {number}
+             * @memberof ConsoleEvent
+             */
+            line: number;
+            /**
+             * @description A string identifying the resource which logged the message.
+             * @type {string}
+             * @memberof ConsoleEvent
+             */
+            sourceId: string;
+        }
+
+        interface ExitEvent extends Event {
+            /**
+             * @description Chrome's internal ID of the process that exited.
+             * @type {number}
+             * @memberof ExitEvent
+             */
+            processID: number;
+            /**
+             * @description String indicating the reason for the exit.
+             * @type {string}
+             * @memberof ExitEvent
+             */
+            reason: 'normal' | 'abnormal' | 'crash' | 'kill';
+        }
+
+        /** Description of a declarative rule for handling events. */
+        interface Rule {
+            /** Optional priority of this rule. Defaults to 100.  */
+            priority?: number;
+            /** List of conditions that can trigger the actions. */
+            conditions: any[];
+            /** Optional. Optional identifier that allows referencing this rule.  */
+            id?: string;
+            /** List of actions that are triggered if one of the condtions is fulfilled. */
+            actions: any[];
+            /**
+             * @description Tags can be used to annotate rules and perform operations on sets of rules.¨
+             * @since Chrome 28
+             * @type {string[]}
+             * @memberof Rule
+             */
+            tags?: string[];
+        }
+
+        /**
+         * @description Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time.
+         * @export
+         * @interface InjectDetails
+         */
+        interface InjectDetails {
+            /**
+             * @description JavaScript or CSS code to inject.<br><br><b>Warning:</b><br>Be careful using the <code>code</code> parameter. Incorrect use of it may open your app to <a href=\"https://en.wikipedia.org/wiki/Cross-site_scripting\">cross site scripting</a> attacks.
+             * @type {string}
+             * @memberof InjectDetails
+             */
+            code?: string,
+            /**
+             * @description JavaScript or CSS file to inject.
+             * @type {string}
+             * @memberof InjectDetails
+             */
+            file?: string
+        }
+
+        interface WebViewElementEventMap {
+            'close': Event,
+            'consolemessage': IConsolemessage,
+            'contentload': Event,
+            'dialog': IDialog,
+            'exit': IExit,
+            'findupdate': IFindupdate,
+            'loadabort': ILoadabort,
+            'loadcommit': ILoadcommit,
+            'loadredirect': ILoadredirect,
+            'loadstart': ILoadstart,
+            'loadstop': Event,
+            'newwindow': INewwindow,
+            'permissionrequest': IPermissionrequest,
+            'responsive': IResponsive,
+            'sizechanged': ISizechanged,
+            'unresponsive': IUnresponsive,
+            'zoomchange': IZoomchange,
+        }
+
+
+        /**
+         * @description
+         * @export
+         * @interface HTMLWebViewElement
+         * @extends {Element}
+         */
+        interface HTMLWebViewElement extends Element {
+            executeScript?: (details: InjectDetails, callback?: (result: any) => void) => void;
+            src: string;
+            contentWindow: Window;
+            addEventListener<K extends keyof WebViewElementEventMap>(type: K, listener: (this: HTMLWebViewElement, ev: WebViewElementEventMap[K]) => any, useCapture?: boolean): void;
+        }
+
+        /**Options that determine what data should be cleared by clearData. */
+        interface ClearDataOptions {
+
+            /**
+            * @description Clear data accumulated on or after this date, represented in milliseconds since the epoch (accessible via the getTime method of the JavaScript Date object). If absent, defaults to 0 (which would remove all browsing data).
+             */
+            since?: number;
+        }
+        /**A set of data types. Missing properties are interpreted as false. */
+        interface ClearDataTypeSet {
+
+            /**
+            * @description Websites' appcaches.
+             */
+            appcache?: boolean
+
+            /**
+            * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
+             */
+            cache?: boolean
+
+            /**
+            * @description The partition's cookies.
+             */
+            cookies?: boolean
+
+            /**
+            * @description The partition's session cookies.
+             */
+            sessionCookies?: boolean
+
+            /**
+            * @description The partition's persistent cookies.
+             */
+            persistentCookies?: boolean
+
+            /**
+            * @description Websites' filesystems.
+             */
+            fileSystems?: boolean
+
+            /**
+            * @description Websites' IndexedDB data.
+             */
+            indexedDB?: boolean
+
+            /**
+            * @description Websites' local storage data.
+             */
+            localStorage?: boolean
+
+            /**
+            * @description Websites' WebSQL data.
+             */
+            webSQL?: boolean
+        }
+        /**
+        * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
+        * Enum values:
+        * "all"
+        * "page"
+        * "frame"
+        * "selection"
+        * "link"
+        * "editable"
+        * "image"
+        * "video"
+        * "audio" */
+        export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
+        /**Details of the script or CSS to inject. Either the code or the file property must be set, but both may not be set at the same time. */
+        interface InjectDetails {
+
+            /**
+            * @description JavaScript or CSS code to inject.   Warning:  Be careful using the code parameter. Incorrect use of it may open your app to <a href="https://en.wikipedia.org/wiki/Cross-site_scripting">cross site scripting</a> attacks.
+             */
+            code?: string
+
+            /**
+            * @description JavaScript or CSS file to inject.
+             */
+            file?: string
+        }
+        /**The type of injection item: code or a set of files. */
+        interface InjectionItems {
+
+            /**
+            * @description JavaScript code or CSS to be injected into matching pages.
+             */
+            code?: string
+
+            /**
+            * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
+             */
+            files?: any[]
+        }
+        /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
+        interface ContentScriptDetails {
+
+            /**
+            * @description The name of the content script to inject.
+             */
+            name: string
+
+            /**
+            * @description Specifies which pages this content script will be injected into.
+             */
+            matches: any[]
+
+            /**
+            * @description Excludes pages that this content script would otherwise be injected into.
+             */
+            exclude_matches?: any[]
+
+            /**
+            * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
+             */
+            match_about_blank?: boolean
+
+            /**
+            * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
+             */
+            css?: InjectionItems
+
+            /**
+            * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
+             */
+            js?: InjectionItems
+
+            /**
+            * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
+             */
+            run_at?: chrome.extensionTypes.RunAt;
+
+            /**
+            * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
+             */
+            all_frames?: boolean;
+
+            /**
+            * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
+             */
+            include_globs?: string[];
+
+            /**
+            * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
+             */
+            exclude_globs?: string[];
+        }
+        /**@todo Add documentation */
+        interface ContextMenuCreateProperties {
+
+            /**
+            * @description The type of menu item. Defaults to 'normal' if not specified.
+             */
+            type?: chrome.contextMenus.ItemType
+
+            /**
+            * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
+             */
+            id?: string
+
+            /**
+            * @description The text to be displayed in the item; this is <em>required</em> unless type is 'separator'. When the context is 'selection', you can use %s within the string to show the selected text. For example, if this parameter's value is "Translate '%s' to Pig Latin" and the user selects the word "cool", the context menu item for the selection is "Translate 'cool' to Pig Latin".
+             */
+            title?: string
+
+            /**
+            * @description The initial state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+             */
+            checked?: boolean
+
+            /**
+            * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
+             */
+            contexts?: any[]
+
+            /**
+            * @description A function that will be called back when the menu item is clicked.
+            * @param {any} [object Object]
+             */
+            onclick?: (info: any) => void
+
+            /**
+            * @description The ID of a parent menu item; this makes the item a child of a previously added item.
+             */
+            parentId?: number | string
+
+            /**
+            * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+             */
+            documentUrlPatterns?: any[]
+
+            /**
+            * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+             */
+            targetUrlPatterns?: any[]
+
+            /**
+            * @description Whether this context menu item is enabled or disabled. Defaults to true.
+             */
+            enabled?: boolean
+        }
+        /**@todo Add documentation */
+        interface ContextMenuUpdateProperties {
+
+            /**
+            * @description The type of menu item.
+             */
+            type?: chrome.webview.ContextType;
+
+            /**
+            * @description The text to be displayed in the item
+             */
+            title?: string
+
+            /**
+            * @description The state of a checkbox or radio item: true for selected and false for unselected. Only one radio item can be selected at a time in a given group of radio items.
+             */
+            checked?: boolean
+
+            /**
+            * @description List of contexts this menu item will appear in.
+             */
+            contexts?: any[]
+
+            /**
+            * @description A function that will be called back when the menu item is clicked.
+            * @param {any} [object Object]
+             */
+            onclick?: (info: any) => void
+
+            /**
+            * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
+             */
+            parentId?: number | string
+
+            /**
+            * @description Lets you restrict the item to apply only to documents whose URL matches one of the given patterns. (This applies to frames as well.) For details on the format of a pattern, see <a href='match_patterns'>Match Patterns</a>.
+             */
+            documentUrlPatterns?: any[]
+
+            /**
+            * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+             */
+            targetUrlPatterns?: any[]
+
+            /**
+            * @description Whether this context menu item is enabled or disabled.
+             */
+            enabled?: boolean
+        }
+        interface ContextMenus {
+
+            /**
+            * @description Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in chrome.runtime.lastError).
+            * @param {object} createProperties The properties used to create the item
+            * @param {any} [object Object]
+             */
+            create(createProperties: object, callback?: () => void): void;
+
+            /**
+            * @description Updates a previously created context menu item.
+            * @param {any} id The ID of the item to update.
+            * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
+            * @param {any} [object Object]
+             */
+            update(id: number | string, updateProperties: object, callback?: () => void): void;
+
+            /**
+            * @description Removes a context menu item.
+            * @param {any} menuItemId The ID of the context menu item to remove.
+            * @param {any} [object Object]
+             */
+            remove(menuItemId: number | string, callback?: () => void): void;
+
+            /**
+            * @description Removes all context menu items added to this webview.
+            * @param {any} [object Object]
+             */
+            removeAll(callback?: () => void): void;
+
+
+            /**
+            * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
+             */
+            onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
+
+        }
+        interface IOnShowEvent {
+            /**
+             * @description Call this to prevent showing the context menu.
+             * @memberof IOnShowEvent
+             */
+            preventDefault: () => void;
+        }
+        interface ContentWindow {
+
+            /**
+            * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
+            * @param {any} message Message object to send to the guest.
+            * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
+             */
+            postMessage(message: any, targetOrigin: string): void;
+
+        }
+        interface DialogController {
+
+            /**
+            * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
+            * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
+             */
+            ok(response?: string): void;
+
+            /**
+            * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
+             */
+            cancel(): void;
+
+        }
+        /**Contains all of the results of the find request. */
+        interface FindCallbackResults {
+
+            /**
+            * @description The number of times searchText was matched on the page.
+             */
+            numberOfMatches: number
+
+            /**
+            * @description The ordinal number of the current match.
+             */
+            activeMatchOrdinal: number
+
+            /**
+            * @description Describes a rectangle around the active match in screen coordinates.
+             */
+            selectionRect: SelectionRect
+
+            /**
+            * @description Indicates whether this find request was canceled.
+             */
+            canceled: boolean
+        }
+        /**Options for the find request. */
+        interface FindOptions {
+
+            /**
+            * @description Flag to find matches in reverse order. The default value is false.
+             */
+            backward?: boolean
+
+            /**
+            * @description Flag to match with case-sensitivity. The default value is false.
+             */
+            matchCase?: boolean
+        }
+        interface NewWindow {
+
+            /**
+            * @description Attach the requested target page to an existing webview element.
+            * @param {object} webview The webview element to which the target page should be attached.
+             */
+            attach(webview: object): void;
+
+            /**
+            * @description Cancel the new window request.
+             */
+            discard(): void;
+
+        }
+        interface MediaPermissionRequest {
+
+            /**
+            * @description Allow the permission request.
+             */
+            allow(): void;
+
+            /**
+            * @description Deny the permission request. This is the default behavior if allow is not called.
+             */
+            deny(): void;
+
+        }
+        interface GeolocationPermissionRequest {
+
+            /**
+            * @description Allow the permission request.
+             */
+            allow(): void;
+
+            /**
+            * @description Deny the permission request. This is the default behavior if allow is not called.
+             */
+            deny(): void;
+
+        }
+        interface PointerLockPermissionRequest {
+
+            /**
+            * @description Allow the permission request.
+             */
+            allow(): void;
+
+            /**
+            * @description Deny the permission request. This is the default behavior if allow is not called.
+             */
+            deny(): void;
+
+        }
+        interface DownloadPermissionRequest {
+
+            /**
+            * @description Allow the permission request.
+             */
+            allow(): void;
+
+            /**
+            * @description Deny the permission request. This is the default behavior if allow is not called.
+             */
+            deny(): void;
+
+        }
+        interface FileSystemPermissionRequest {
+
+            /**
+            * @description Allow the permission request.
+             */
+            allow(): void;
+
+            /**
+            * @description Deny the permission request.
+             */
+            deny(): void;
+
+        }
+        interface FullscreenPermissionRequest {
+
+            /**
+            * @description Allow the permission request.
+             */
+            allow(): void;
+
+            /**
+            * @description Deny the permission request.
+             */
+            deny(): void;
+
+        }
+        interface LoadPluginPermissionRequest {
+
+            /**
+            * @description Allow the permission request. This is the default behavior if deny is not called..
+             */
+            allow(): void;
+
+            /**
+            * @description Deny the permission request.
+             */
+            deny(): void;
+
+        }
+        /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
+        interface SelectionRect {
+
+            /**
+            * @description Distance from the left edge of the screen to the left edge of the rectangle.
+             */
+            left: number
+
+            /**
+            * @description Distance from the top edge of the screen to the top edge of the rectangle.
+             */
+            top: number
+
+            /**
+            * @description Width of the rectangle.
+             */
+            width: number
+
+            /**
+            * @description Height of the rectangle.
+             */
+            height: number
+        }
+        /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
+          function(details) { return {cancel: true}; },
+          {urls: ["*://www.evil.com/*"]},
+          ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
+          conditions: [
+            new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
+          ],
+          actions: [ new chrome.webViewRequest.CancelRequest() ]
+        };
+        myWebview.request.onRequest.addRules([rule]);</pre> */
+        interface WebRequestEventInterface {
+        }
+        /**
+        * Defines the how zooming is handled in the webview.
+        * Enum values:
+        * "per-origin"
+        * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are navigated to that same origin will be zoomed as well. Moreover, per-origin zoom changes are saved with the origin, meaning that when navigating to other pages in the same origin, they will all be zoomed to the same zoom factor.
+        * "per-view"
+        * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
+        * "disabled"
+        * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
+        export type ZoomMode = "per-origin" | "per-view" | "disabled";
+
+        /**
+        * @description Queries audio state.
+        * @param {any} [object Object]
+         */
+        export function getAudioState(callback: (audible: boolean) => void): void;
+
+        /**
+        * @description Sets audio mute state of the webview.
+        * @param {boolean} mute Mute audio value
+         */
+        export function setAudioMuted(mute: boolean): void;
+
+        /**
+        * @description Queries whether audio is muted.
+        * @param {any} [object Object]
+         */
+        export function isAudioMuted(callback: (muted: boolean) => void): void;
+
+        /**
+         * @description Captures the visible region of the webview.
+         * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
+         */
+        export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
+        /**
+         * @description Captures the visible region of the webview.
+         * @param {*} options
+         * @param {(dataUrl: string) => void} callback
+         */
+        export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
+
+        /**
+        * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
+          {
+            name: 'myRule',
+            matches: ['http://www.foo.com/*'],
+            css: { files: ['mystyles.css'] },
+            js: { files: ['jquery.js', 'myscript.js'] },
+            run_at: 'document_start'
+          },
+          {
+            name: 'anotherRule',
+            matches: ['http://www.bar.com/*'],
+            js: { code: "document.body.style.backgroundColor = 'red';" },
+            run_at: 'document_end'
+          }]);
+         ...
+
+        // Navigates webview.
+        webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
+            name: 'rule',
+            matches: ['http://www.foo.com/*'],
+            js: { files: ['scriptA.js'] },
+            run_at: 'document_start'}]);
+
+        // Do something.
+        webview.src = 'http://www.foo.com/*';
+         ...
+        // Overwrite 'rule' defined before.
+        webview.addContentScripts([{
+            name: 'rule',
+            matches: ['http://www.bar.com/*'],
+            js: { files: ['scriptB.js'] },
+            run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
+        * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
+         */
+        export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
+
+        /**
+        * @description Navigates backward one history entry if possible. Equivalent to go(-1).
+        * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
+         */
+        export function back(callback?: (success: boolean) => void): void;
+
+        /**
+        * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
+         */
+        export function canGoBack(): void;
+
+        /**
+        * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
+         */
+        export function canGoForward(): void;
+
+        /**
+        * @description <p>Clears browsing data for the webview partition.</p>
+        * @param {any} options Options determining which data to clear.
+        * @param {any} types The types of data to be cleared.
+        * @param {any} [object Object]
+         */
+        export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
+
+        /**
+        * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
+        * @param {any} details Details of the script to run.
+        * @param {any} [object Object]
+         */
+        export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
+
+        /**
+        * @description Initiates a find-in-page request.
+        * @param {string} searchText The string to find in the page.
+        * @param {any} options Options for the find request.
+        * @param {any} [object Object]
+         */
+        export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
+
+        /**
+        * @description Navigates forward one history entry if possible. Equivalent to go(1).
+        * @param {any} [object Object]
+         */
+        export function forward(callback?: (success: boolean) => void): void;
+
+        /**
+        * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
+         */
+        export function getProcessId(): void;
+
+        /**
+        * @description Returns the user agent string used by the webview for guest page requests.
+         */
+        export function getUserAgent(): void;
+
+        /**
+        * @description Gets the current zoom factor.
+        * @param {any} [object Object]
+         */
+        export function getZoom(callback: (zoomFactor: number) => void): void;
+
+        /**
+        * @description Gets the current zoom mode.
+        * @param {any} [object Object]
+         */
+        export function getZoomMode(callback: (ZoomMode: any) => void): void;
+
+        /**
+        * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
+        * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
+        * @param {any} [object Object]
+         */
+        export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
+
+        /**
+        * @description Injects CSS into the guest page.
+        * @param {any} details Details of the CSS to insert.
+        * @param {any} [object Object]
+         */
+        export function insertCSS(details: InjectDetails, callback?: () => void): void;
+
+        /**
+        * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
+         */
+        export function isUserAgentOverridden(): void;
+
+        /**
+        * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
+         */
+        export function print(): void;
+
+        /**
+        * @description Reloads the current top-level page.
+         */
+        export function reload(): void;
+
+        /**
+        * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
+        * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
+         */
+        export function removeContentScripts(scriptNameList?: any[]): void;
+
+        /**
+        * @description Override the user agent string used by the webview for guest page requests.
+        * @param {string} userAgent The user agent string to use.
+         */
+        export function setUserAgentOverride(userAgent: string): void;
+
+        /**
+        * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
+        * @param {number} zoomFactor The new zoom factor.
+        * @param {any} [object Object]
+         */
+        export function setZoom(zoomFactor: number, callback?: () => void): void;
+
+        /**
+        * @description Sets the zoom mode of the webview.
+        * @param {any} ZoomMode Defines how zooming is handled in the webview.
+        * @param {any} [object Object]
+         */
+        export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
+
+        /**
+        * @description Stops loading the current webview navigation if in progress.
+         */
+        export function stop(): void;
+
+        /**
+        * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
+        * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
+         */
+        export function stopFinding(action?: string): void;
+
+        /**
+        * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
+        * @param {string} dataUrl The data URL to load.
+        * @param {string} baseUrl The base URL that will be used for relative links.
+        * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
+         */
+        export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
+
+        /**
+        * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
+         */
+        export function terminate(): void;
+
+        /**
+        * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
+          webview.src = 'about:blank';
+        });</pre>
+         */
+
+        export function close(event: chrome.events.Event<Event>): void;
+
+        /**
+        * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
+          console.log('Guest page logged a message: ', e.message);
+        });</pre>
+        * @param {any} [object Object]
+         */
+
+        export var consolemessage: chrome.events.Event<IConsolemessage>;
+
+        /**
+        * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
+          webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
+        });</pre>
+         */
+
+        export var contentload: (event: chrome.events.Event<Event>) => void;
+
+        /**
+        * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
+        * @param {any} [object Object]
+         */
+
+        export var dialog: chrome.events.Event<IDialog>;
+
+        /**
+        * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
+          if (e.reason === 'crash') {
+            webview.src = 'data:text/plain,Goodbye, world!';
+          }
+        });</pre>
+        * @param {any} [object Object]
+         */
+
+        export var exit: chrome.events.Event<IExit>;
+
+        /**
+        * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
+        * @param {any} [object Object]
+         */
+
+        export var findupdate: chrome.events.Event<IFindupdate>;
+
+        /**
+        * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
+        * @param {any} [object Object]
+         */
+
+        export var loadabort: chrome.events.Event<ILoadabort>;
+
+        /**
+        * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
+        * @param {any} [object Object]
+         */
+
+        export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
+
+        /**
+        * @description Fired when a top-level load request has redirected to a different URL.
+        * @param {any} [object Object]
+         */
+
+        export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
+
+        /**
+        * @description Fired when a load has begun.
+        * @param {any} [object Object]
+         */
+
+        export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
+
+        /**
+        * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
+         */
+
+        export function loadstop(event: chrome.events.Event<Event>): void;
+
+        /**
+        * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
+          var newWebview = document.createElement('webview');
+          document.body.appendChild(newWebview);
+          e.window.attach(newWebview);
+        });</pre>
+        * @param {any} [object Object]
+         */
+
+        export var newwindow: chrome.events.Event<INewwindow>;
+
+        /**
+        * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
+          if (e.permission === 'media') {
+            e.request.allow();
+          }
+        });</pre>
+        * @param {any} [object Object]
+         */
+
+        export var permissionrequest: chrome.events.Event<IPermissionrequest>;
+
+        /**
+        * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
+        webview.addEventListener('unresponsive', function() {
+          webview.style.opacity = '0.5';
+        });
+        webview.addEventListener('responsive', function() {
+          webview.style.opacity = '1';
+        });</pre>
+        * @param {any} [object Object]
+         */
+
+        export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
+
+        /**
+        * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
+        * @param {any} [object Object]
+         */
+
+        export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
+
+        /**
+        * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
+        * @param {any} [object Object]
+         */
+
+        export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
+
+        /**
+        * @description Fired when the page's zoom changes.
+        * @param {any} [object Object]
+         */
+
+        export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
+        /**IConsolemessage (Auto generated interface) */
+        interface IConsolemessage {
+
+            /**
+            * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
+             */
+            level: number
+
+            /**
+            * @description The logged message contents.
+             */
+            message: string
+
+            /**
+            * @description The line number of the message source.
+             */
+            line: number
+
+            /**
+            * @description A string identifying the resource which logged the message.
+             */
+            sourceId: string
+        }
+        /**IDialog (Auto generated interface) */
+        interface IDialog {
+
+            /**
+            * @description The type of modal dialog requested by the guest.
+             */
+            messageType: 'alert' | 'confirm' | 'prompt'
+
+            /**
+            * @description The text the guest attempted to display in the modal dialog.
+             */
+            messageText: string
+
+            /**
+            * @description An interface that can be used to respond to the guest's modal request.
+             */
+            dialog: DialogController
+        }
+        /**IExit (Auto generated interface) */
+        interface IExit {
+
+            /**
+            * @description Chrome's internal ID of the process that exited.
+             */
+            processID: number
+
+            /**
+            * @description String indicating the reason for the exit.
+             */
+            reason: 'normal' | 'abnormal' | 'crash' | 'kill'
+        }
+        /**IFindupdate (Auto generated interface) */
+        interface IFindupdate {
+
+            /**
+            * @description The string that is being searched for in the page.
+             */
+            searchText: string
+
+            /**
+            * @description The number of matches found for searchText on the page so far.
+             */
+            numberOfMatches: number
+
+            /**
+            * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
+             */
+            activeMatchOrdinal: number
+
+            /**
+            * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
+             */
+            selectionRect: SelectionRect
+
+            /**
+            * @description Indicates whether the find request was canceled.
+             */
+            canceled: boolean
+
+            /**
+            * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
+             */
+            finalUpdate: string
+        }
+        /**ILoadabort (Auto generated interface) */
+        interface ILoadabort {
+
+            /**
+            * @description Requested URL.
+             */
+            url: string
+
+            /**
+            * @description Whether the load was top-level or in a subframe.
+             */
+            isTopLevel: boolean
+
+            /**
+            * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
+             */
+            code: number
+
+            /**
+            * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
+             */
+            reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
+        }
+        /**ILoadcommit (Auto generated interface) */
+        interface ILoadcommit {
+
+            /**
+            * @description The URL that committed.
+             */
+            url: string
+
+            /**
+            * @description Whether the load is top-level or in a subframe.
+             */
+            isTopLevel: boolean
+        }
+        /**ILoadredirect (Auto generated interface) */
+        interface ILoadredirect {
+
+            /**
+            * @description The requested URL before the redirect.
+             */
+            oldUrl: string
+
+            /**
+            * @description The new URL after the redirect.
+             */
+            newUrl: string
+
+            /**
+            * @description Whether or not the redirect happened at top-level or in a subframe.
+             */
+            isTopLevel: boolean
+        }
+        /**ILoadstart (Auto generated interface) */
+        interface ILoadstart {
+
+            /**
+            * @description Requested URL.
+             */
+            url: string
+
+            /**
+            * @description Whether the load is top-level or in a subframe.
+             */
+            isTopLevel: boolean
+        }
+        /**INewwindow (Auto generated interface) */
+        interface INewwindow {
+
+            /**
+            * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
+             */
+            window: NewWindow
+
+            /**
+            * @description The target URL requested for the new window.
+             */
+            targetUrl: string
+
+            /**
+            * @description The initial width requested for the new window.
+             */
+            initialWidth: number
+
+            /**
+            * @description The initial height requested for the new window.
+             */
+            initialHeight: number
+
+            /**
+            * @description The requested name of the new window.
+             */
+            name: string
+
+            /**
+            * @description The requested disposition of the new window.
+             */
+            windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
+        }
+        /**IPermissionrequest (Auto generated interface) */
+        interface IPermissionrequest {
+
+            /**
+            * @description The type of permission being requested.
+             */
+            permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
+
+            /**
+            * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
+             */
+            request: object
+        }
+        /**IResponsive (Auto generated interface) */
+        interface IResponsive {
+
+            /**
+            * @description Chrome's internal ID of the process that became responsive.
+             */
+            processID: number
+        }
+        /**ISizechanged (Auto generated interface) */
+        interface ISizechanged {
+
+            /**
+            * @description Old width of embedded web content.
+             */
+            oldWidth: number
+
+            /**
+            * @description Old height of embedded web content.
+             */
+            oldHeight: number
+
+            /**
+            * @description New width of embedded web content.
+             */
+            newWidth: number
+
+            /**
+            * @description New height of embedded web content.
+             */
+            newHeight: number
+        }
+        /**IUnresponsive (Auto generated interface) */
+        interface IUnresponsive {
+
+            /**
+            * @description Chrome's internal ID of the process that has become unresponsive.
+             */
+            processID: number
+        }
+        /**IZoomchange (Auto generated interface) */
+        interface IZoomchange {
+
+            /**
+            * @description The page's previous zoom factor.
+             */
+            oldZoomFactor: number
+
+            /**
+            * @description The new zoom factor that the page was zoomed to.
+             */
+            newZoomFactor: number
+        }
 
-    /**
-    * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
-     */
-
-    export function loadstop(event: chrome.events.Event<Event>): void;
-
-    /**
-    * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
-      var newWebview = document.createElement('webview');
-      document.body.appendChild(newWebview);
-      e.window.attach(newWebview);
-    });</pre>
-    * @param {any} [object Object]
-     */
-
-    export var newwindow: chrome.events.Event<INewwindow>;
-
-    /**
-    * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
-      if (e.permission === 'media') {
-        e.request.allow();
-      }
-    });</pre>
-    * @param {any} [object Object]
-     */
-
-    export var permissionrequest: chrome.events.Event<IPermissionrequest>;
-
-    /**
-    * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
-    webview.addEventListener('unresponsive', function() {
-      webview.style.opacity = '0.5';
-    });
-    webview.addEventListener('responsive', function() {
-      webview.style.opacity = '1';
-    });</pre>
-    * @param {any} [object Object]
-     */
-
-    export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
-
-    /**
-    * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
-    * @param {any} [object Object]
-     */
-
-    export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
-
-    /**
-    * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
-    * @param {any} [object Object]
-     */
-
-    export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
-
-    /**
-    * @description Fired when the page's zoom changes.
-    * @param {any} [object Object]
-     */
-
-    export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
-    /**IConsolemessage (Auto generated interface) */
-    interface IConsolemessage {
-
-      /**
-      * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
-       */
-      level: number
-
-      /**
-      * @description The logged message contents.
-       */
-      message: string
-
-      /**
-      * @description The line number of the message source.
-       */
-      line: number
-
-      /**
-      * @description A string identifying the resource which logged the message.
-       */
-      sourceId: string
-    }
-    /**IDialog (Auto generated interface) */
-    interface IDialog {
-
-      /**
-      * @description The type of modal dialog requested by the guest.
-       */
-      messageType: 'alert' | 'confirm' | 'prompt'
-
-      /**
-      * @description The text the guest attempted to display in the modal dialog.
-       */
-      messageText: string
-
-      /**
-      * @description An interface that can be used to respond to the guest's modal request.
-       */
-      dialog: DialogController
-    }
-    /**IExit (Auto generated interface) */
-    interface IExit {
-
-      /**
-      * @description Chrome's internal ID of the process that exited.
-       */
-      processID: number
-
-      /**
-      * @description String indicating the reason for the exit.
-       */
-      reason: 'normal' | 'abnormal' | 'crash' | 'kill'
-    }
-    /**IFindupdate (Auto generated interface) */
-    interface IFindupdate {
-
-      /**
-      * @description The string that is being searched for in the page.
-       */
-      searchText: string
-
-      /**
-      * @description The number of matches found for searchText on the page so far.
-       */
-      numberOfMatches: number
-
-      /**
-      * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
-       */
-      activeMatchOrdinal: number
-
-      /**
-      * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
-       */
-      selectionRect: SelectionRect
-
-      /**
-      * @description Indicates whether the find request was canceled.
-       */
-      canceled: boolean
-
-      /**
-      * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
-       */
-      finalUpdate: string
-    }
-    /**ILoadabort (Auto generated interface) */
-    interface ILoadabort {
-
-      /**
-      * @description Requested URL.
-       */
-      url: string
-
-      /**
-      * @description Whether the load was top-level or in a subframe.
-       */
-      isTopLevel: boolean
-
-      /**
-      * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
-       */
-      code: number
-
-      /**
-      * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
-       */
-      reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
-    }
-    /**ILoadcommit (Auto generated interface) */
-    interface ILoadcommit {
-
-      /**
-      * @description The URL that committed.
-       */
-      url: string
-
-      /**
-      * @description Whether the load is top-level or in a subframe.
-       */
-      isTopLevel: boolean
-    }
-    /**ILoadredirect (Auto generated interface) */
-    interface ILoadredirect {
-
-      /**
-      * @description The requested URL before the redirect.
-       */
-      oldUrl: string
-
-      /**
-      * @description The new URL after the redirect.
-       */
-      newUrl: string
-
-      /**
-      * @description Whether or not the redirect happened at top-level or in a subframe.
-       */
-      isTopLevel: boolean
     }
-    /**ILoadstart (Auto generated interface) */
-    interface ILoadstart {
-
-      /**
-      * @description Requested URL.
-       */
-      url: string
-
-      /**
-      * @description Whether the load is top-level or in a subframe.
-       */
-      isTopLevel: boolean
-    }
-    /**INewwindow (Auto generated interface) */
-    interface INewwindow {
-
-      /**
-      * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
-       */
-      window: NewWindow
-
-      /**
-      * @description The target URL requested for the new window.
-       */
-      targetUrl: string
-
-      /**
-      * @description The initial width requested for the new window.
-       */
-      initialWidth: number
-
-      /**
-      * @description The initial height requested for the new window.
-       */
-      initialHeight: number
-
-      /**
-      * @description The requested name of the new window.
-       */
-      name: string
-
-      /**
-      * @description The requested disposition of the new window.
-       */
-      windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
-    }
-    /**IPermissionrequest (Auto generated interface) */
-    interface IPermissionrequest {
-
-      /**
-      * @description The type of permission being requested.
-       */
-      permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
-
-      /**
-      * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
-       */
-      request: object
-    }
-    /**IResponsive (Auto generated interface) */
-    interface IResponsive {
-
-      /**
-      * @description Chrome's internal ID of the process that became responsive.
-       */
-      processID: number
-    }
-    /**ISizechanged (Auto generated interface) */
-    interface ISizechanged {
-
-      /**
-      * @description Old width of embedded web content.
-       */
-      oldWidth: number
-
-      /**
-      * @description Old height of embedded web content.
-       */
-      oldHeight: number
-
-      /**
-      * @description New width of embedded web content.
-       */
-      newWidth: number
-
-      /**
-      * @description New height of embedded web content.
-       */
-      newHeight: number
-    }
-    /**IUnresponsive (Auto generated interface) */
-    interface IUnresponsive {
-
-      /**
-      * @description Chrome's internal ID of the process that has become unresponsive.
-       */
-      processID: number
-    }
-    /**IZoomchange (Auto generated interface) */
-    interface IZoomchange {
-
-      /**
-      * @description The page's previous zoom factor.
-       */
-      oldZoomFactor: number
-
-      /**
-      * @description The new zoom factor that the page was zoomed to.
-       */
-      newZoomFactor: number
-    }
-
-  }
 
 }
 
@@ -5779,5 +5779,5 @@ declare namespace chrome {
 // EXPORT
 /////////////////////
 interface Window {
-  chrome: typeof chrome;
+    chrome: typeof chrome;
 }
diff --git a/types/chrome-apps/tsconfig.json b/types/chrome-apps/tsconfig.json
index 14d255475e..f06899c6eb 100644
--- a/types/chrome-apps/tsconfig.json
+++ b/types/chrome-apps/tsconfig.json
@@ -2,14 +2,14 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
+            "es2017",
             "dom"
         ],
-        "noImplicitAny": false,
-        "noImplicitThis": false,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": ".",
         "typeRoots": [
             "../"
         ],

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 0621/1124] 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 0622/1124] 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 0623/1124] 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 0624/1124] 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 0625/1124] 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 0626/1124] 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 0627/1124] 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 0628/1124] 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 0629/1124] [@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 0630/1124] 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 0631/1124] 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 0632/1124] 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 0633/1124] 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 80987f14289ed45458c4ef2bcad5ab8baaeae151 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Thu, 24 May 2018 00:41:03 +0700
Subject: [PATCH 0634/1124] Set type of symlink parameter 'type' to a union

---
 types/fs-extra/index.d.ts | 8 +++++---
 types/node/index.d.ts     | 6 ++++--
 types/node/v8/index.d.ts  | 6 ++++--
 types/node/v9/index.d.ts  | 6 ++++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts
index adf236955b..153b285ae1 100644
--- a/types/fs-extra/index.d.ts
+++ b/types/fs-extra/index.d.ts
@@ -10,7 +10,8 @@
 
 /// <reference types="node" />
 
-import { Stats } from "fs";
+import * as fs from "fs";
+import Stats = fs.Stats;
 
 export * from "fs";
 
@@ -206,8 +207,9 @@ export function rmdir(path: string | Buffer): Promise<void>;
 export function stat(path: string | Buffer, callback: (err: NodeJS.ErrnoException, stats: Stats) => any): void;
 export function stat(path: string | Buffer): Promise<Stats>;
 
-export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type: string, callback: (err: NodeJS.ErrnoException) => void): void;
-export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: string): Promise<void>;
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type: fs.symlink.Type | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: fs.symlink.Type): Promise<void>;
 
 export function truncate(path: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
 export function truncate(path: string | Buffer, len: number, callback: (err: NodeJS.ErrnoException) => void): void;
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index d964a41c43..14e4bf4a64 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -3461,7 +3461,7 @@ declare module "fs" {
      * @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.
      */
-    export function symlink(target: PathLike, path: PathLike, type: string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+    export function symlink(target: PathLike, path: PathLike, type: symlink.Type | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
 
     /**
      * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
@@ -3480,6 +3480,8 @@ declare module "fs" {
          * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
          */
         export function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        export type Type = "dir" | "file" | "junction";
     }
 
     /**
@@ -3489,7 +3491,7 @@ declare module "fs" {
      * @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.
      */
-    export function symlinkSync(target: PathLike, path: PathLike, type?: string | null): void;
+    export function symlinkSync(target: PathLike, path: PathLike, type?: symlink.Type | null): void;
 
     /**
      * Asynchronous readlink(2) - read value of a symbolic link.
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 27014e0cb0..8a27035ecc 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -3368,7 +3368,7 @@ declare module "fs" {
      * @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.
      */
-    export function symlink(target: PathLike, path: PathLike, type: string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+    export function symlink(target: PathLike, path: PathLike, type: symlink.Type | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
 
     /**
      * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
@@ -3387,6 +3387,8 @@ declare module "fs" {
          * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
          */
         export function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        export type Type = "dir" | "file" | "junction";
     }
 
     /**
@@ -3396,7 +3398,7 @@ declare module "fs" {
      * @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.
      */
-    export function symlinkSync(target: PathLike, path: PathLike, type?: string | null): void;
+    export function symlinkSync(target: PathLike, path: PathLike, type?: symlink.Type | null): void;
 
     /**
      * Asynchronous readlink(2) - read value of a symbolic link.
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 014fd9bac1..3fffc0a576 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -3450,7 +3450,7 @@ declare module "fs" {
      * @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.
      */
-    export function symlink(target: PathLike, path: PathLike, type: string | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
+    export function symlink(target: PathLike, path: PathLike, type: symlink.Type | undefined | null, callback: (err: NodeJS.ErrnoException) => void): void;
 
     /**
      * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
@@ -3469,6 +3469,8 @@ declare module "fs" {
          * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
          */
         export function __promisify__(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        export type Type = "dir" | "file" | "junction";
     }
 
     /**
@@ -3478,7 +3480,7 @@ declare module "fs" {
      * @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.
      */
-    export function symlinkSync(target: PathLike, path: PathLike, type?: string | null): void;
+    export function symlinkSync(target: PathLike, path: PathLike, type?: symlink.Type | null): void;
 
     /**
      * Asynchronous readlink(2) - read value of a symbolic link.

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 0635/1124] 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 0636/1124] 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 0637/1124] [@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 0638/1124] 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 0639/1124] 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 0640/1124] 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 0641/1124] 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 0642/1124] 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 0643/1124] 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 0644/1124] 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 813279ba32db4f5434d5e30bc5f61d1b68dd40b5 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Thu, 24 May 2018 09:29:15 +0700
Subject: [PATCH 0645/1124] Update fs-extra-promise and fs-extra-promise-es6

* Edit `symlinkAsync` and `symlinkSync`
* Fix test
---
 types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts | 6 +++---
 types/fs-extra-promise-es6/index.d.ts                    | 4 ++--
 types/fs-extra-promise/fs-extra-promise-tests.ts         | 6 +++---
 types/fs-extra-promise/index.d.ts                        | 5 +++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts b/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
index bdff193912..9e076ff8eb 100644
--- a/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
+++ b/types/fs-extra-promise-es6/fs-extra-promise-es6-tests.ts
@@ -18,7 +18,7 @@ let buffer: Buffer;
 declare const modeNum: number;
 declare const modeStr: string;
 declare const encoding: string;
-declare const type: string;
+declare const symlinkType: "file" | "dir" | "junction";
 declare const flags: string;
 declare const srcpath: string;
 declare const dstpath: string;
@@ -117,8 +117,8 @@ stats = fs.lstatSync(path);
 stats = fs.fstatSync(fd);
 fs.link(srcpath, dstpath, errorCallback);
 fs.linkSync(srcpath, dstpath);
-fs.symlink(srcpath, dstpath, type, errorCallback);
-fs.symlinkSync(srcpath, dstpath, type);
+fs.symlink(srcpath, dstpath, symlinkType, errorCallback);
+fs.symlinkSync(srcpath, dstpath, symlinkType);
 fs.readlink(path, (err: Error, linkString: string) => {
 });
 fs.realpath(path, (err: Error, resolvedPath: string) => {
diff --git a/types/fs-extra-promise-es6/index.d.ts b/types/fs-extra-promise-es6/index.d.ts
index 2b7dacd108..125fa51679 100644
--- a/types/fs-extra-promise-es6/index.d.ts
+++ b/types/fs-extra-promise-es6/index.d.ts
@@ -90,7 +90,7 @@ export function fstatSync(fd: number): Stats;
 export function link(srcpath: string, dstpath: string, callback?: (err: Error) => void): void;
 export function linkSync(srcpath: string, dstpath: string): void;
 export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err: Error) => void): void;
-export function symlinkSync(srcpath: string, dstpath: string, type?: string): void;
+export function symlinkSync(srcpath: string, dstpath: string, type?: fs.symlink.Type): void;
 export function readlink(path: string, callback?: (err: Error, linkString: string) => void): void;
 export function realpath(path: string, callback?: (err: Error, resolvedPath: string) => void): void;
 export function realpath(path: string, cache: string, callback: (err: Error, resolvedPath: string) => void): void;
@@ -189,7 +189,7 @@ export function statAsync(path: string): Promise<Stats>;
 export function lstatAsync(path: string): Promise<Stats>;
 export function fstatAsync(fd: number): Promise<Stats>;
 export function linkAsync(srcpath: string, dstpath: string): Promise<void>;
-export function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
+export function symlinkAsync(srcpath: string, dstpath: string, type?: fs.symlink.Type): Promise<void>;
 export function readlinkAsync(path: string): Promise<string>;
 export function realpathAsync(path: string, cache?: string): Promise<string>;
 export function unlinkAsync(path: string): Promise<void>;
diff --git a/types/fs-extra-promise/fs-extra-promise-tests.ts b/types/fs-extra-promise/fs-extra-promise-tests.ts
index 61549a55ad..441e62b884 100644
--- a/types/fs-extra-promise/fs-extra-promise-tests.ts
+++ b/types/fs-extra-promise/fs-extra-promise-tests.ts
@@ -20,7 +20,7 @@ let buffer: Buffer;
 declare const modeNum: number;
 declare const modeStr: string;
 declare const encoding: string;
-declare const type: string;
+declare const symlinkType: "file" | "dir" | "junction";
 declare const flags: string;
 declare const srcpath: string;
 declare const dstpath: string;
@@ -117,8 +117,8 @@ stats = fs.lstatSync(path);
 stats = fs.fstatSync(fd);
 fs.link(srcpath, dstpath, errorCallback);
 fs.linkSync(srcpath, dstpath);
-fs.symlink(srcpath, dstpath, type, errorCallback);
-fs.symlinkSync(srcpath, dstpath, type);
+fs.symlink(srcpath, dstpath, symlinkType, errorCallback);
+fs.symlinkSync(srcpath, dstpath, symlinkType);
 fs.readlink(path, (err: Error, linkString: string) => {
 });
 fs.realpath(path, (err: Error, resolvedPath: string) => {
diff --git a/types/fs-extra-promise/index.d.ts b/types/fs-extra-promise/index.d.ts
index b4ac5be133..a7222b9d5d 100644
--- a/types/fs-extra-promise/index.d.ts
+++ b/types/fs-extra-promise/index.d.ts
@@ -7,9 +7,10 @@
 /// <reference types="node" />
 
 import * as stream from 'stream';
-import { Stats } from 'fs';
+import * as fs from 'fs';
 import * as Promise from 'bluebird';
 import { CopyFilter, CopyOptions, ReadOptions, WriteOptions, MoveOptions } from 'fs-extra';
+import Stats = fs.Stats;
 
 export * from 'fs-extra';
 
@@ -53,7 +54,7 @@ export function statAsync(path: string): Promise<Stats>;
 export function lstatAsync(path: string): Promise<Stats>;
 export function fstatAsync(fd: number): Promise<Stats>;
 export function linkAsync(srcpath: string, dstpath: string): Promise<void>;
-export function symlinkAsync(srcpath: string, dstpath: string, type?: string): Promise<void>;
+export function symlinkAsync(srcpath: string, dstpath: string, type?: fs.symlink.Type): Promise<void>;
 export function readlinkAsync(path: string): Promise<string>;
 export function realpathAsync(path: string, cache?: { [path: string]: string }): Promise<string>;
 export function unlinkAsync(path: string): Promise<void>;

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 0646/1124] 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 0647/1124] [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 0648/1124] 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 0649/1124] 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 0650/1124] [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 0651/1124] 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 0652/1124] 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 0653/1124] 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 0654/1124] 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 0655/1124] 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 0656/1124] 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 0657/1124] 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 0658/1124] 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 0659/1124] 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 0660/1124] 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 0661/1124] 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 0662/1124] 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 0663/1124] 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 8c14e0808a942badfa59919724a070867ffa0e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Sm=C3=B3=C5=82ka?=
 <msmolka@users.noreply.github.com>
Date: Thu, 24 May 2018 10:41:22 +0200
Subject: [PATCH 0664/1124] kendo-ui: CalendarOptions footer accepts boolean as
 well

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

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index b854d92b29..5da967f60b 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -1848,7 +1848,7 @@ declare namespace kendo.ui {
         dates?: any;
         depth?: string;
         disableDates?: any|Function;
-        footer?: string|Function;
+        footer?: boolean|string|Function;
         format?: string;
         max?: Date;
         messages?: CalendarMessages;

From 52e08c103853dd49fd77694e799189fd4058b8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Sm=C3=B3=C5=82ka?=
 <msmolka@users.noreply.github.com>
Date: Thu, 24 May 2018 08:54:55 +0200
Subject: [PATCH 0665/1124] kendo-ui gridoptions should allow string as well.
 #25123 Based on docs: Can be set to a string ("inline", "incell" or "popup")
 to specify the editing mode.

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

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index b854d92b29..95f6d5c6a0 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -4046,7 +4046,7 @@ declare namespace kendo.ui {
         columnMenu?: boolean | GridColumnMenu;
         dataSource?: any|any|kendo.data.DataSource;
         detailTemplate?: string|Function;
-        editable?: boolean | GridEditable;
+        editable?: boolean | string | GridEditable;
         excel?: GridExcel;
         filterable?: boolean | GridFilterable;
         groupable?: boolean | GridGroupable;

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 0666/1124] 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 0667/1124] 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 0668/1124] 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 0669/1124] [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 0670/1124] 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 0671/1124] 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 0672/1124] 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 0673/1124] 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 817264d9db437b6239ef31c41cb365dcb887d3d2 Mon Sep 17 00:00:00 2001
From: Krzysztof Miemiec <krzysztof.miemiec@gmail.com>
Date: Fri, 18 May 2018 23:37:34 +0200
Subject: [PATCH 0674/1124] * Removed `@types` dependencies from `package.json`
 * Don't require style prop for chart components * Include style for Axis *
 Treat svg props as partials

---
 types/react-native-svg-charts/index.d.ts   | 16 ++++++++++------
 types/react-native-svg-charts/package.json |  2 --
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/types/react-native-svg-charts/index.d.ts b/types/react-native-svg-charts/index.d.ts
index e35f30d410..88bde6c6d0 100644
--- a/types/react-native-svg-charts/index.d.ts
+++ b/types/react-native-svg-charts/index.d.ts
@@ -33,10 +33,10 @@ export type OrderFunction = (series: Series<any, any>) => number[];
 
 export interface ChartProps<T> {
     data: T[];
-    style: StyleProp<ViewStyle>;
+    style?: StyleProp<ViewStyle>;
     animate?: boolean;
     animationDuration?: number;
-    svg?: PathProps;
+    svg?: Partial<PathProps>;
     width?: number;
     height?: number;
     curve?: CurveFactory;
@@ -64,7 +64,7 @@ export class LineChart<T> extends React.PureComponent<ChartProps<T>> {
 // Pie Chart
 
 export interface PieChartData {
-    svg?: PathProps;
+    svg?: Partial<PathProps>;
     key: string | number;
     value?: number;
     arc?: {
@@ -150,18 +150,21 @@ export interface BarChartProps<T> extends ChartProps<T> {
 export class BarChart<T> extends React.PureComponent<BarChartProps<T>> {
 }
 
-// XAxis
+// Axis
 
 export interface AxisProps<T> {
+    style?: StyleProp<ViewStyle>;
     data: T[];
     spacingInner?: number;
     spacingOuter?: number;
     formatLabel?: (value: any, index: number) => number | string;
     scale?: ScaleFunction;
     numberOfTicks?: number;
-    svg?: TextProps;
+    svg?: Partial<TextProps>;
 }
 
+// XAxis
+
 export interface XAxisProps<T> extends AxisProps<T> {
     contentInset?: {
         left?: number;
@@ -176,6 +179,7 @@ export class XAxis<T> extends React.PureComponent<XAxisProps<T>> {
 // YAxis
 
 export interface YAxisProps<T> extends AxisProps<T> {
+    style?: StyleProp<ViewStyle>;
     contentInset?: {
         top?: number;
         bottom?: number;
@@ -246,7 +250,7 @@ export type GridDirection = 'VERTICAL' | 'HORIZONTAL' | 'BOTH';
 export interface GridProps<T> {
     direction?: GridDirection;
     belowChart?: boolean;
-    svg?: LineProps;
+    svg?: Partial<LineProps>;
     ticks?: T[];
     x?: (t: T) => number;
     y?: (t: T) => number;
diff --git a/types/react-native-svg-charts/package.json b/types/react-native-svg-charts/package.json
index 21ce5da517..2ca3d929ed 100644
--- a/types/react-native-svg-charts/package.json
+++ b/types/react-native-svg-charts/package.json
@@ -1,8 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "@types/d3-scale": "^2.0.0",
-        "@types/d3-shape": "^1.2.2",
         "react-native-svg": "^6.2.1"
     }
 }

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 0675/1124] 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 6f780349c2c4f0a8c9ec6be28a83bfd6124a8a7e Mon Sep 17 00:00:00 2001
From: Dan Freeman <dfreeman@salsify.com>
Date: Thu, 24 May 2018 11:20:37 -0400
Subject: [PATCH 0676/1124] Introduce declarations for `ember-resolver`

---
 types/ember-resolver/ember-resolver-tests.ts | 12 ++++++++++
 types/ember-resolver/index.d.ts              | 14 ++++++++++++
 types/ember-resolver/tsconfig.json           | 23 ++++++++++++++++++++
 types/ember-resolver/tslint.json             |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 types/ember-resolver/ember-resolver-tests.ts
 create mode 100644 types/ember-resolver/index.d.ts
 create mode 100644 types/ember-resolver/tsconfig.json
 create mode 100644 types/ember-resolver/tslint.json

diff --git a/types/ember-resolver/ember-resolver-tests.ts b/types/ember-resolver/ember-resolver-tests.ts
new file mode 100644
index 0000000000..d22a0d31be
--- /dev/null
+++ b/types/ember-resolver/ember-resolver-tests.ts
@@ -0,0 +1,12 @@
+import Application from '@ember/application';
+import EmberResolver from 'ember-resolver';
+
+const MyResolver = EmberResolver.extend({
+    pluralizedTypes: {
+        sheep: 'sheep'
+    }
+});
+
+const App = Application.extend({
+    Resolver: MyResolver
+});
diff --git a/types/ember-resolver/index.d.ts b/types/ember-resolver/index.d.ts
new file mode 100644
index 0000000000..7c9ac5b6d0
--- /dev/null
+++ b/types/ember-resolver/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for ember-resolver 4.5
+// Project: https://github.com/ember-cli/ember-resolver#readme
+// Definitions by: Dan Freeman <https://github.com/dfreeman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="ember" />
+
+import Resolver from '@ember/application/resolver';
+
+/**
+ * An Ember `Resolver` implementation used by ember-cli.
+ */
+export default class EmberResolver extends Resolver {}
diff --git a/types/ember-resolver/tsconfig.json b/types/ember-resolver/tsconfig.json
new file mode 100644
index 0000000000..981bd60243
--- /dev/null
+++ b/types/ember-resolver/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",
+        "ember-resolver-tests.ts"
+    ]
+}
diff --git a/types/ember-resolver/tslint.json b/types/ember-resolver/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ember-resolver/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0677/1124] 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 d4b884967ee667942d570a68c55d3b6fd8c9a047 Mon Sep 17 00:00:00 2001
From: Denis Malinochkin <mrmlnc@yandex-team.ru>
Date: Thu, 24 May 2018 19:40:07 +0300
Subject: [PATCH 0678/1124] feat(types): Add typings for "run-parallel-limit"
 package

---
 types/run-parallel-limit/index.d.ts           | 21 ++++++++
 .../run-parallel-limit-tests.ts               | 52 +++++++++++++++++++
 types/run-parallel-limit/tsconfig.json        | 23 ++++++++
 types/run-parallel-limit/tslint.json          |  1 +
 4 files changed, 97 insertions(+)
 create mode 100644 types/run-parallel-limit/index.d.ts
 create mode 100644 types/run-parallel-limit/run-parallel-limit-tests.ts
 create mode 100644 types/run-parallel-limit/tsconfig.json
 create mode 100644 types/run-parallel-limit/tslint.json

diff --git a/types/run-parallel-limit/index.d.ts b/types/run-parallel-limit/index.d.ts
new file mode 100644
index 0000000000..90bd61f2c5
--- /dev/null
+++ b/types/run-parallel-limit/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for run-parallel-limit 1.0
+// Project: https://github.com/feross/run-parallel-limit
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare namespace RunParallelLimit {
+    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 RunParallelLimit<T>(tasks: Array<RunParallelLimit.Task<T>>, limit: number): T[];
+declare function RunParallelLimit<T>(tasks: Array<RunParallelLimit.Task<T>>, limit: number, callback: RunParallelLimit.Callback<T[]>): void;
+
+declare function RunParallelLimit<T>(tasks: RunParallelLimit.TaskObj<T>, limit: number): Record<string, T>;
+declare function RunParallelLimit<T>(tasks: RunParallelLimit.TaskObj<T>, limit: number, callback: RunParallelLimit.Callback<Record<string, T>>): void;
+
+export = RunParallelLimit;
diff --git a/types/run-parallel-limit/run-parallel-limit-tests.ts b/types/run-parallel-limit/run-parallel-limit-tests.ts
new file mode 100644
index 0000000000..3a4c209fcc
--- /dev/null
+++ b/types/run-parallel-limit/run-parallel-limit-tests.ts
@@ -0,0 +1,52 @@
+import rpl = require('run-parallel-limit');
+
+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, 5, (err, results) => {
+    // $ExpectType Error
+    err;
+
+    // $ExpectType string[]
+    results;
+});
+
+// $ExpectType string[]
+const results = rpl(tasks, 5);
+
+const tasksObj: rpl.TaskObj<string> = {
+    one: (callback) => () => callback(null, 'string'),
+    two: (callback) => () => callback(new Error('boom')),
+
+    // $ExpectError
+    three: (callback) => () => callback(1)
+};
+
+rpl(tasksObj, 5, (err, results) => {
+    // $ExpectType Error
+    err;
+
+    // $ExpectType Record<string, string>
+    results;
+});
+
+// $ExpectType Record<string, string>
+const resultsObj = rpl(tasksObj, 5);
diff --git a/types/run-parallel-limit/tsconfig.json b/types/run-parallel-limit/tsconfig.json
new file mode 100644
index 0000000000..bc8072befe
--- /dev/null
+++ b/types/run-parallel-limit/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-limit-tests.ts"
+    ]
+}
diff --git a/types/run-parallel-limit/tslint.json b/types/run-parallel-limit/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/run-parallel-limit/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0679/1124] 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 0680/1124] 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 0681/1124] 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 0682/1124] 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 0683/1124] 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 0684/1124] @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 0685/1124] 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 0686/1124] 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 0687/1124] 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 0688/1124] 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 0689/1124] 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 0690/1124] 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 0691/1124] 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 0692/1124] 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 0693/1124] 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 0694/1124] 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 75e87f578a3f700e0bb91fb8e1f396b494c2275a Mon Sep 17 00:00:00 2001
From: Nathan Holland <github@hub.net.nz>
Date: Fri, 25 May 2018 14:59:29 +1200
Subject: [PATCH 0695/1124] Add DayPickerSingleDateController Types

---
 types/react-dates/index.d.ts | 192 +++++++++++++++++++++++------------
 1 file changed, 125 insertions(+), 67 deletions(-)

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index 92fa68e8d7..4454f03154 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-dates v16.0.0
 // Project: https://github.com/airbnb/react-dates
-// Definitions by: Artur Ampilogov <https://github.com/Artur-A>
+// Definitions by: Artur Ampilogov <https://github.com/Artur-A> 
+//                 Nathan Holland <https://github.com/NathanNZ>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,8 +22,69 @@ declare namespace ReactDates {
     type FocusedInputShape = 'startDate' | 'endDate';
     type OrientationShape = 'horizontal' | 'vertical';
     type ScrollableOrientationShape = 'horizontal' | 'vertical' | 'verticalScrollable';
+    type CalendarInfoPositionShape = 'top' | 'bottom' | 'before' | 'after';
 
+    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/defaultPhrases.js
+    type SingleDatePickerPhrases  = {
+        closeDatePicker: string,
+        clearDate: 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,
 
+        chooseAvailableDate: (date: string) => string,
+        dateIsUnavailable: (date: string) => string,
+    };
+
+    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/defaultPhrases.js
+    type DateRangePickerPhrases = {
+        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
+    };
+    
+    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/shapes/DateRangePickerShape.js
     interface DateRangePickerShape {
         // REQUIRED props
         startDate: momentPropTypes.momentObj | null,
@@ -60,7 +122,7 @@ declare namespace ReactDates {
         withPortal?: boolean,
         withFullScreenPortal?: boolean,
         initialVisibleMonth?: () => momentPropTypes.momentObj,
-        firstDayOfWeek? : 0 | 1 | 2 | 3 | 4 | 5 | 6,
+        firstDayOfWeek?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
         numberOfMonths?: number,
         keepOpenOnDateSelect?: boolean,
         reopenPickerOnClearDates?: boolean,
@@ -91,40 +153,13 @@ declare namespace ReactDates {
         displayFormat?: (string | (() => string)),
         monthFormat?: string,
         weekDayFormat?: string,
-        phrases?: {
-            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
-        }
+        phrases?: DateRangePickerPhrases
     }
 
     type DateRangePicker = React.ClassicComponentClass<DateRangePickerShape>;
     var DateRangePicker: React.ClassicComponentClass<DateRangePickerShape>;
 
+    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/shapes/SingleDatePickerShape.js
     interface SingleDatePickerShape {
         // REQUIRED props
         date: momentPropTypes.momentObj | null,
@@ -158,7 +193,7 @@ declare namespace ReactDates {
         withPortal?: boolean,
         withFullScreenPortal?: boolean,
         initialVisibleMonth?: () => momentPropTypes.momentObj,
-        firstDayOfWeek? : 0 | 1 | 2 | 3 | 4 | 5 | 6,
+        firstDayOfWeek?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
         numberOfMonths?: number,
         keepOpenOnDateSelect?: boolean,
         reopenPickerOnClearDates?: boolean,
@@ -167,7 +202,7 @@ declare namespace ReactDates {
         daySize?: number,
         isRTL?: boolean,
         verticalSpacing?: number,
-        verticalHeight?: number| null,
+        verticalHeight?: number | null,
 
         // navigation related props
         navPrev?: string | JSX.Element,
@@ -188,39 +223,12 @@ declare namespace ReactDates {
         // internationalization props
         displayFormat?: (string | (() => string)),
         monthFormat?: string,
-        phrases?: {
-            closeDatePicker: string,
-            clearDate: 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,
-
-            chooseAvailableDate: (date: string) => string,
-            dateIsUnavailable: (date: string) => string,
-        },
+        phrases?: SingleDatePickerPhrases,
     }
     type SingleDatePicker = React.ClassicComponentClass<SingleDatePickerShape>;
     var SingleDatePicker: React.ClassicComponentClass<SingleDatePickerShape>;
 
-
-
+    //https://github.com/airbnb/react-dates/blob/v16.0.1/src/components/DayPickerRangeController.jsx
     interface DayPickerRangeControllerShape {
         // REQUIRED props
         startDate: momentPropTypes.momentObj | null,
@@ -265,18 +273,68 @@ declare namespace ReactDates {
 
         // internationalization props
         monthFormat?: string,
-        phrases?: {
-            focusStartDate: string,
-            clearDates: string,
-            keyboardNavigationInstructions: string,
-        }
+        phrases?: DateRangePickerPhrases
     }
 
     type DayPickerRangeController = React.ClassicComponentClass<DayPickerRangeControllerShape>;
     var DayPickerRangeController: React.ClassicComponentClass<DayPickerRangeControllerShape>;
 
+    //https://github.com/airbnb/react-dates/blob/97bf16e72dbf5ce88f0181c49212080061a83f69/src/components/DayPickerSingleDateController.jsx
+    interface DayPickerSingleDateControllerShape {
+        date: momentPropTypes.momentObj | null,
+        onDateChange: (date: momentPropTypes.momentObj | null) => void,
+        focused: boolean,
 
+        onFocusChange: (arg: { focused: boolean | null }) => void,
+        onClose?: (final: { date: momentPropTypes.momentObj }) => void,
 
+        keepOpenOnDateSelect?: boolean,
+        isOutsideRange?: (day: any) => boolean,
+        isDayBlocked?: (day: any) => boolean,
+        isDayHighlighted?: (day: any) => boolean,
+
+        // DayPicker props
+        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        enableOutsideDays?: boolean,
+        numberOfMonths?: number,
+        orientation?: ScrollableOrientationShape,
+        withPortal?: boolean,
+        initialVisibleMonth?: () => momentPropTypes.momentObj,
+        firstDayOfWeek?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
+        hideKeyboardShortcutsPanel?: boolean,
+        daySize?: number,
+        verticalHeight?: number,
+        noBorder?: boolean,
+        transitionDuration?: number,
+
+        navPrev?: string | JSX.Element,
+        navNext?: string | JSX.Element,
+
+        onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
+        onOutsideClick?: (e: any) => void,
+        renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderCalendarInfo?: () => (string | JSX.Element),
+        calendarInfoPosition?: CalendarInfoPositionShape,
+
+        // accessibility
+        onBlur?: () => void,
+        isFocused?: boolean,
+        showKeyboardShortcuts?: boolean,
+
+        // i18n
+        monthFormat?: string,
+        weekDayFormat?: string,
+        phrases?: SingleDatePickerPhrases,
+        dayAriaLabelFormat?: string,
+
+        isRTL?: boolean,
+
+    }
+
+    type DayPickerSingleDateController = React.ClassicComponentClass<DayPickerSingleDateControllerShape>;
+    var DayPickerSingleDateController: React.ClassicComponentClass<DayPickerSingleDateControllerShape>;
 
     var isInclusivelyAfterDay: (a: moment.Moment, b: moment.Moment) => boolean;
     var isInclusivelyBeforeDay: (a: moment.Moment, b: moment.Moment) => boolean;

From 560c02952cafd766f2b01354b48ba75a53aa7cb8 Mon Sep 17 00:00:00 2001
From: Nathan Holland <github@hub.net.nz>
Date: Fri, 25 May 2018 15:00:31 +1200
Subject: [PATCH 0696/1124] Add test for DayPickerSingleDateController

---
 types/react-dates/react-dates-tests.tsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/types/react-dates/react-dates-tests.tsx b/types/react-dates/react-dates-tests.tsx
index 6462a6ebd5..2d0aaae431 100644
--- a/types/react-dates/react-dates-tests.tsx
+++ b/types/react-dates/react-dates-tests.tsx
@@ -5,6 +5,7 @@ import {
         SingleDatePicker,
         DateRangePicker,
         DayPickerRangeController,
+        DayPickerSingleDateController,
         isInclusivelyAfterDay,
         isInclusivelyBeforeDay,
         isNextDay,
@@ -137,16 +138,16 @@ class DayPickerRangeControllerMinimumTest extends React.Component {
     }
 }
 
-
-
-
-
-
-
-
-
-
-
+class DayPickerSingleDateControllerMinimumTest extends React.Component {
+    render() {
+         return <DayPickerSingleDateController
+                date={moment()}
+                onDateChange={(arg)=> {}}
+                focused={true}
+                onFocusChange={(arg) => {}}
+            />
+    }
+}
 
 const isInclusivelyAfterDayResult: boolean = isInclusivelyAfterDay(moment(),moment());
 const isInclusivelyBeforeDayResult: boolean = isInclusivelyBeforeDay(moment(),moment());

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 0697/1124] 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 0698/1124] 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 0699/1124] 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 0700/1124] 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 0701/1124] 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 0702/1124] 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 0703/1124] 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 0704/1124] 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 0705/1124] 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 0706/1124] 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 0707/1124] 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 0708/1124] 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 6ee1eb467f65130735c41bfb30ece910806c9b37 Mon Sep 17 00:00:00 2001
From: Retsam <chess19@gmail.com>
Date: Fri, 25 May 2018 15:58:37 -0400
Subject: [PATCH 0709/1124] [backo2] Add types for backo2 npm module

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

diff --git a/types/backo2/backo2-tests.ts b/types/backo2/backo2-tests.ts
new file mode 100644
index 0000000000..d257408b2d
--- /dev/null
+++ b/types/backo2/backo2-tests.ts
@@ -0,0 +1,13 @@
+import * as Backoff from "backo2";
+
+const backoff = new Backoff();
+const backoff2 = new Backoff({});
+const backoff3 = new Backoff({
+    min: 0,
+    max: 0,
+    jitter: 0,
+    factor: 0
+});
+
+const y: number = backoff3.duration();
+backoff3.reset();
diff --git a/types/backo2/index.d.ts b/types/backo2/index.d.ts
new file mode 100644
index 0000000000..4050fd813d
--- /dev/null
+++ b/types/backo2/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for backo2 1.0
+// Project: https://github.com/mokesmokes/backo
+// Definitions by: Retsam <https://github.com/Retsam>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+type BackoffOptions = Partial<{
+    min: number,
+    max: number,
+    jitter: number,
+    factor: number,
+}>;
+
+declare class Backoff {
+    constructor(opts?: BackoffOptions);
+
+    duration(): number;
+    /**
+     * Reset the number of attempts.
+     */
+    reset(): void;
+    /**
+     * Set the minimum duration
+     */
+    setMin(min: number): void;
+    /**
+     * Set the maximum duration
+     */
+    setMax(max: number): void;
+    /**
+     * Set the jitter
+     */
+    setJitter(jitter: number): void;
+}
+declare namespace Backoff {}
+
+export = Backoff;
diff --git a/types/backo2/tsconfig.json b/types/backo2/tsconfig.json
new file mode 100644
index 0000000000..2abe4e6c11
--- /dev/null
+++ b/types/backo2/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",
+        "backo2-tests.ts"
+    ]
+}
diff --git a/types/backo2/tslint.json b/types/backo2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/backo2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0710/1124] 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 0711/1124] 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 0712/1124] 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 0713/1124] 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 0714/1124] 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 0715/1124] 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 0716/1124] 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 0717/1124] 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 0718/1124] 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 0719/1124] 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 0720/1124] 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 0721/1124] 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 0722/1124] 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 0723/1124] 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 cf180375d0cff657f9c27d18a077e784fe6ad61f Mon Sep 17 00:00:00 2001
From: Viko <viko@vikomprenas.com>
Date: Sat, 26 May 2018 15:32:56 -0600
Subject: [PATCH 0724/1124] ejs: Add support for the async option

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

diff --git a/types/ejs/ejs-tests.ts b/types/ejs/ejs-tests.ts
index a7b7b66944..8a0b2404d7 100644
--- a/types/ejs/ejs-tests.ts
+++ b/types/ejs/ejs-tests.ts
@@ -3,7 +3,7 @@
 import ejs = require("ejs");
 import { readFileSync as read } from 'fs';
 import LRU = require("lru-cache");
-import { TemplateFunction, Options } from "ejs";
+import { TemplateFunction, AsyncTemplateFunction, Options } from "ejs";
 
 const fileName = 'test.ejs';
 const people = ['geddy', 'neil', 'alex'];
@@ -12,6 +12,8 @@ const template = '<%= people.join(", "); %>';
 const options = { filename: fileName };
 let result: string;
 let ejsFunction: TemplateFunction;
+let asyncResult: Promise<string>;
+let ejsAsyncFunction: AsyncTemplateFunction;
 
 const SimpleCallback = (err: any, html?: string) => {
     if (err) {
@@ -44,11 +46,19 @@ ejsFunction = ejs.compile('<%= it.people.join(", "); %>', { _with: false, locals
 ejsFunction = ejs.compile(template, { rmWhitespace: true });
 const customEscape = (str: string) => !str ? '' : str.toUpperCase();
 ejsFunction = ejs.compile(template, { escape: customEscape });
+ejsFunction = ejs.compile(template, { async: false });
+
+ejsAsyncFunction = ejs.compile(template, { async: true });
+ejsAsyncFunction = ejs.compile(template, { client: true, async: true });
 
 result = ejsFunction();
 result = ejsFunction({});
 result = ejsFunction(data);
 
+asyncResult = ejsAsyncFunction();
+asyncResult = ejsAsyncFunction({});
+asyncResult = ejsAsyncFunction(data);
+
 /** @see https://github.com/mde/ejs/tree/v2.5.7#custom-fileloader */
 ejs.fileLoader = (path: string) => "";
 
diff --git a/types/ejs/index.d.ts b/types/ejs/index.d.ts
index e56ad1a8ec..655d6563e6 100644
--- a/types/ejs/index.d.ts
+++ b/types/ejs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://ejs.co/
 // Definitions by: Ben Liddicott <https://github.com/benliddicott>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 export interface Data {
     [name: string]: any;
@@ -28,14 +28,22 @@ export function resolveInclude(name: string, filename: string, isDir: boolean):
 /**
  * Compile the given `str` of ejs into a template function.
  */
-export function compile(template: string, opts?: Options): (TemplateFunction);
+export function compile(template: string, opts?: Options & { async: false }): TemplateFunction;
+export function compile(template: string, opts: Options & { async: true }): AsyncTemplateFunction;
+export function compile(template: string, opts: Options & { async: boolean }): TemplateFunction | AsyncTemplateFunction;
+export function compile(template: string, opts: Exclude<Options, { async: any }>): TemplateFunction;
+export function compile(template: string, opts?: Options): TemplateFunction | AsyncTemplateFunction;
 /**
  * Render the given `template` of ejs.
  *
  * If you would like to include options but not data, you need to explicitly
  * call this function with `data` being an empty object or `null`.
  */
-export function render(template: string, data?: Data, opts?: Options): string;
+export function render(template: string, data?: Data, opts?: Options & { async: false }): string;
+export function render(template: string, data: Data, opts: Options & { async: true }): Promise<string>;
+export function render(template: string, data: Data, opts: Options & { async: boolean }): string | Promise<string>;
+export function render(template: string, data: Data, opts: Exclude<Options, { async: any }>): string;
+export function render(template: string, data?: Data, opts?: Options): string | Promise<string>;
 
 export type RenderFileCallback<T> = (err: Error, str?: string) => T;
 
@@ -55,6 +63,7 @@ export function renderFile<T>(path: string, data: Data, opts: Options, cb: Rende
 export function clearCache(): void;
 
 export type TemplateFunction = (data?: Data) => string;
+export type AsyncTemplateFunction = (data?: Data) => Promise<string>;
 export interface Options {
     /** Compiled functions are cached, requires `filename` */
     cache?: boolean;
@@ -95,6 +104,8 @@ export interface Options {
      * (By default escapes XML).
      */
     escape?(str: string): string;
+    /** Whether or not to use a Promise */
+    async?: boolean;
 }
 
 export function escapeRegexChars(s: string): string;

From ca6c7c59e3c721cfa1eaa767657bf9f351467c8f Mon Sep 17 00:00:00 2001
From: Viko <viko@vikomprenas.com>
Date: Sat, 26 May 2018 15:53:02 -0600
Subject: [PATCH 0725/1124] ejs: Fix mem-fs-editor and version in header

---
 types/ejs/index.d.ts           | 2 +-
 types/mem-fs-editor/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/ejs/index.d.ts b/types/ejs/index.d.ts
index 655d6563e6..9371bb0da7 100644
--- a/types/ejs/index.d.ts
+++ b/types/ejs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ejs.js 2.5
+// Type definitions for ejs.js 2.6
 // Project: http://ejs.co/
 // Definitions by: Ben Liddicott <https://github.com/benliddicott>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/mem-fs-editor/index.d.ts b/types/mem-fs-editor/index.d.ts
index 01234bbc0c..636afa2698 100644
--- a/types/mem-fs-editor/index.d.ts
+++ b/types/mem-fs-editor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/SBoudrias/mem-fs-editor#readme
 // Definitions by: My Food Bag <https://github.com/MyFoodBag>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 

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 0726/1124] 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 863697bf30a248a7d273e3ab8b3236bf54c22160 Mon Sep 17 00:00:00 2001
From: Mosh Feu <moshfeu@gmail.com>
Date: Sun, 27 May 2018 21:30:38 +0300
Subject: [PATCH 0727/1124] takePictureAsync should take a optional param

`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 fe3000b4547d102fd904d53a7b92eda13159666d Mon Sep 17 00:00:00 2001
From: Philippe Bourdages <philippe.bourdages@gmail.com>
Date: Sun, 27 May 2018 14:37:55 -0400
Subject: [PATCH 0728/1124] Add ErrorList props support react-jsonschema-form

Complete details about ErrorList here : https://github.com/mozilla-services/react-jsonschema-form#error-list-template
---
 types/react-jsonschema-form/index.d.ts        | 79 ++++++++++-------
 .../react-jsonschema-form-tests.tsx           | 86 ++++++++++++-------
 2 files changed, 103 insertions(+), 62 deletions(-)

diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index 5cce3d38c2..ef1b359e5d 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -4,6 +4,7 @@
 //                 Jon Surrell <https://github.com/sirreal>
 //                 Ivan Jiang <https://github.com/iplus26>
 //                 Kurt Preston <https://github.com/KurtPreston>
+//                 Philippe Bourdages <https://github.com/phbou72>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,6 +22,7 @@ declare module "react-jsonschema-form" {
         noValidate?: boolean;
         noHtml5Validate?: boolean;
         showErrorList?: boolean;
+        ErrorList?: React.StatelessComponent<ErrorListProps>;
         validate?: (formData: T, errors: FormValidation) => FormValidation;
         onChange?: (e: IChangeEvent<T>) => any;
         onError?: (e: any) => any;
@@ -28,7 +30,9 @@ declare module "react-jsonschema-form" {
         liveValidate?: boolean;
         FieldTemplate?: React.StatelessComponent<FieldTemplateProps>;
         ArrayFieldTemplate?: React.StatelessComponent<ArrayFieldTemplateProps>;
-        ObjectFieldTemplate?: React.StatelessComponent<ObjectFieldTemplateProps>;
+        ObjectFieldTemplate?: React.StatelessComponent<
+            ObjectFieldTemplateProps
+        >;
         safeRenderCompletion?: boolean;
         transformErrors?: (errors: AjvError[]) => AjvError[];
 
@@ -44,23 +48,23 @@ declare module "react-jsonschema-form" {
         acceptcharset?: string;
     }
 
-    export default class Form<T> extends React.Component<FormProps<T>> { }
+    export default class Form<T> extends React.Component<FormProps<T>> {}
 
     export type UiSchema = {
-        'ui:field'?: Field | string;
-        'ui:widget'?: Widget | string;
-        'ui:options'?: object;
-        'ui:order'?: string[];
+        "ui:field"?: Field | string;
+        "ui:widget"?: Widget | string;
+        "ui:options"?: object;
+        "ui:order"?: string[];
         [name: string]: any;
     };
 
     export type FieldId = {
         $id: string;
-    }
+    };
 
     export type IdSchema = FieldId & {
         [key: string]: FieldId;
-    }
+    };
 
     export interface WidgetProps extends React.HTMLAttributes<HTMLElement> {
         id: string;
@@ -75,7 +79,9 @@ declare module "react-jsonschema-form" {
         formContext: any;
     }
 
-    export type Widget = React.StatelessComponent<WidgetProps> | React.ComponentClass<WidgetProps>;
+    export type Widget =
+        | React.StatelessComponent<WidgetProps>
+        | React.ComponentClass<WidgetProps>;
 
     export interface FieldProps extends React.HTMLAttributes<HTMLElement> {
         schema: JSONSchema6;
@@ -99,7 +105,9 @@ declare module "react-jsonschema-form" {
         [prop: string]: any;
     }
 
-    export type Field = React.StatelessComponent<FieldProps> | React.ComponentClass<FieldProps>;
+    export type Field =
+        | React.StatelessComponent<FieldProps>
+        | React.ComponentClass<FieldProps>;
 
     export type FieldTemplateProps = {
         id: string;
@@ -121,7 +129,7 @@ declare module "react-jsonschema-form" {
         schema: JSONSchema6;
         uiSchema: UiSchema;
         formContext: any;
-    }
+    };
 
     export type ArrayFieldTemplateProps = {
         DescriptionField: object;
@@ -131,7 +139,7 @@ declare module "react-jsonschema-form" {
         disabled: boolean;
         idSchema: IdSchema;
         items: {
-            children: React.ReactElement<any>,
+            children: React.ReactElement<any>;
             className: string;
             disabled: boolean;
             hasMoveDown: boolean;
@@ -140,7 +148,10 @@ declare module "react-jsonschema-form" {
             hasToolbar: boolean;
             index: number;
             onDropIndexClick: (index: number) => (event: any) => void;
-            onReorderClick: (index: number, newIndex: number) => (event: any) => void;
+            onReorderClick: (
+                index: number,
+                newIndex: number
+            ) => (event: any) => void;
             readonly: boolean;
         }[];
         onAddClick: (event: any) => (event: any) => void;
@@ -151,7 +162,7 @@ declare module "react-jsonschema-form" {
         title: string;
         formContext: any;
         formData: any;
-    }
+    };
 
     export type ObjectFieldTemplateProps = {
         DescriptionField: object;
@@ -159,23 +170,39 @@ declare module "react-jsonschema-form" {
         title: string;
         description: string;
         properties: {
-            content: React.ReactElement<any>,
+            content: React.ReactElement<any>;
             name: string;
             disabled: boolean;
             readonly: boolean;
-        }[],
+        }[];
         required: boolean;
         schema: JSONSchema6;
         uiSchema: UiSchema;
         idSchema: IdSchema;
         formData: any;
         formContext: any;
-    }
+    };
+
+    export type AjvError = {
+        message: string;
+        name: string;
+        params: any;
+        property: string;
+        stack: string;
+    };
+
+    export type ErrorListProps = {
+        errorSchema: FormValidation;
+        errors: AjvError[];
+        formContext: any;
+        schema: JSONSchema6;
+        uiSchema: UiSchema;
+    };
 
     export interface IChangeEvent<T = any> {
         edit: boolean;
         formData: T;
-        errors: { stack: string }[];
+        errors: AjvError[];
         errorSchema: FormValidation;
         idSchema: IdSchema;
         schema: JSONSchema6;
@@ -185,26 +212,18 @@ declare module "react-jsonschema-form" {
 
     export type ISubmitEvent<T> = IChangeEvent<T>;
 
-    export type AjvError = {
-        message: string;
-        name: string;
-        params: any;
-        property: string;
-        stack: string;
-    }
-
-    export type FieldError = string
+    export type FieldError = string;
 
     type FieldValidation = {
         __errors: FieldError[];
         addError: (message: string) => void;
-    }
+    };
 
     type FormValidation = FieldValidation & {
         [fieldName: string]: FieldValidation;
-    }
+    };
 
     type FormSubmit<T> = {
         formData: T;
-    }
+    };
 }
diff --git a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
index 519a642ebb..0bb6715372 100644
--- a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
+++ b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
@@ -1,38 +1,35 @@
 import * as React from "react";
-import Form, { UiSchema } from "react-jsonschema-form";
+import Form, { UiSchema, ErrorListProps } from "react-jsonschema-form";
 import { JSONSchema6 } from "json-schema";
 
 // example taken from the react-jsonschema-form playground:
 // https://github.com/mozilla-services/react-jsonschema-form/blob/fedd830294417969d88e38fb9f6b3a85e6ad105e/playground/samples/simple.js
 
-const schema: JSONSchema6 =  {
-    "title": "A registration form",
-    "type": "object",
-    "required": [
-        "firstName",
-        "lastName"
-    ],
-    "properties": {
-        "firstName": {
-            "type": "string",
-            "title": "First name"
+const schema: JSONSchema6 = {
+    title: "A registration form",
+    type: "object",
+    required: ["firstName", "lastName"],
+    properties: {
+        firstName: {
+            type: "string",
+            title: "First name"
         },
-        "lastName": {
-            "type": "string",
-            "title": "Last name"
+        lastName: {
+            type: "string",
+            title: "Last name"
         },
-        "age": {
-            "type": "integer",
-            "title": "Age"
+        age: {
+            type: "integer",
+            title: "Age"
         },
-        "bio": {
-            "type": "string",
-            "title": "Bio"
+        bio: {
+            type: "string",
+            title: "Bio"
         },
-        "password": {
-            "type": "string",
-            "title": "Password",
-            "minLength": 3
+        password: {
+            type: "string",
+            title: "Password",
+            minLength: 3
         }
     }
 };
@@ -57,6 +54,26 @@ interface IExampleState {
     formData: any;
 }
 
+export default function ErrorListExample(props: ErrorListProps) {
+    const { errors } = props;
+    return (
+        <div className="panel panel-danger errors">
+            <div className="panel-heading">
+                <h3 className="panel-title">Errors</h3>
+            </div>
+            <ul className="list-group">
+                {errors.map((error, i) => {
+                    return (
+                        <li key={i} className="list-group-item text-danger">
+                            {error.stack}
+                        </li>
+                    );
+                })}
+            </ul>
+        </div>
+    );
+}
+
 export class Example extends React.Component<any, IExampleState> {
     public state: IExampleState = {
         formData: {
@@ -66,23 +83,28 @@ export class Example extends React.Component<any, IExampleState> {
             bio: "Roundhouse kicking asses since 1940",
             password: "noneed"
         }
-    }
+    };
 
     constructor(props: any) {
         super(props);
     }
 
     public render() {
-      return (
-          <div className="react-jsonschema-form-example">
-              {   <Form schema={schema}
+        return (
+            <div className="react-jsonschema-form-example">
+                {
+                    <Form
+                        schema={schema}
                         uiSchema={uiSchema}
                         showErrorList={false}
                         noValidate={false}
                         noHtml5Validate={false}
                         formData={this.state}
-                        onChange={(formData) => this.setState({formData})} /> }
-          </div>
-      );
+                        ErrorList={ErrorListExample}
+                        onChange={formData => this.setState({ formData })}
+                    />
+                }
+            </div>
+        );
     }
 }

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 0729/1124] [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 b875a296ffb56a74061b1dcda4cdfafc2aec781e Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 28 May 2018 00:35:26 +0200
Subject: [PATCH 0730/1124] Added type definitions for imperium

---
 types/imperium/imperium-tests.ts | 21 ++++++++
 types/imperium/index.d.ts        | 93 ++++++++++++++++++++++++++++++++
 types/imperium/tsconfig.json     | 23 ++++++++
 3 files changed, 137 insertions(+)
 create mode 100644 types/imperium/imperium-tests.ts
 create mode 100644 types/imperium/index.d.ts
 create mode 100644 types/imperium/tsconfig.json

diff --git a/types/imperium/imperium-tests.ts b/types/imperium/imperium-tests.ts
new file mode 100644
index 0000000000..2f6cbaa8b4
--- /dev/null
+++ b/types/imperium/imperium-tests.ts
@@ -0,0 +1,21 @@
+import imperium from 'imperium'
+
+import { Imperium, ImperiumUnauthorizedError } from 'imperium'
+
+imperium.role('admin', async (req) => {
+    return req.session.role === 'admin'
+})
+
+imperium.role('user')
+    .can('seeUser', { user: '@' })
+    .can('manageUser', { user: '@' })
+
+imperium.role('admin')
+    .is('user', { user: '*' })
+
+imperium.can('seeUser')
+imperium.can(['seeUser', 'manageUser'])
+imperium.can({ action: 'seeUser', user: ':userId' })
+imperium.can([{ action: 'manageUser', user: ':userId' }])
+imperium.is('admin')
+imperium.is(['admin', 'user'])
diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
new file mode 100644
index 0000000000..2695e79574
--- /dev/null
+++ b/types/imperium/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for imperium v2.0.2
+// Project: https://www.npmjs.org/package/mono-js/imperium
+// Definitions by: Gaetan SENN <https://github.com/gaetansenn>
+// Definitions: https://github.com/psnider/DefinitelyTyped/imperium
+// TypeScript Version: 2.7
+
+/// <reference types="node" />
+/// <reference types="express" />
+
+declare module 'imperium' {
+    type ImperiumMiddleware = (req: Express.Request, res: Express.Response, next: Function) => Promise<void>
+    type ImperiumGetAcl = (req: Express.Request) => Promise<Boolean> | Promise<Object>
+    type ImperiumActions = Array<String> | String
+    type ImperiumContext = Array<'params' | 'query' | 'headers' | 'body'>
+    // Can contain when key that is evaluated during route action
+    type ImperiumRoleParams = { [key: string]: String }
+
+    export class Imperium {
+        constructor()
+
+        context: Array<String>
+        roles: Roles
+
+        // Add new role with specific ImperiumGetAcl
+        role(roleName: String, getAcl: ImperiumGetAcl): ImperiumRole
+
+        // Return specific imperium role instance
+        role(roleName: String): ImperiumRole
+
+        // Check if user has role
+        is(roleName: String): ImperiumMiddleware
+
+        // Check if user has on of listed roles act like an OR
+        is(roleNames: Array<String>): ImperiumMiddleware
+
+        // Check if current user can do action
+        can(action: String): ImperiumMiddleware
+
+        can(actions: Array<String>): ImperiumMiddleware
+
+        can(action: Action): ImperiumMiddleware
+
+        can(actions: Array<Action>): ImperiumMiddleware
+
+        private addRole(roleName: String, getAcl: ImperiumGetAcl): void
+
+        private evaluateRouteActions(req: Express.Request, action: Array<Action>, context: ImperiumContext): ImperiumActions
+
+        private evaluateRouteAction(req: Express.Request, expr: String, key: String, context: ImperiumContext): String
+
+        private evaluateUserActions(req: Express.Request, roles: Array<ImperiumRole>): Promise<Array<Action>>
+
+        private evaluateUserAction(action: ImperiumRoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
+    }
+
+    interface Roles {
+        [key: string]: Role
+    }
+
+    interface Role {
+        actions: Array<Action>
+        getAcl?: ImperiumGetAcl
+    }
+
+    interface Action {
+        action: String
+        [key: string]: String
+    }
+
+    export class ImperiumRole {
+        constructor(imperium: Imperium, roleName: String)
+
+        // Imperium instance to retreive child role
+        imperium: Imperium
+        // Role name
+        roleName: String
+        // Contain all the actions for this specific role
+        role: Role
+
+        /* Add action with specific params */
+        can(action: String, params: ImperiumRoleParams): ImperiumRole
+
+        /* Get actions of childRoleName and replace params */
+        is(childRoleName: String, params: ImperiumRoleParams): ImperiumRole
+    }
+
+    export class ImperiumUnauthorizedError extends Error {
+        constructor(message: String, status: number, context: any)
+    }
+
+    const out: Imperium
+    export default out
+}
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
new file mode 100644
index 0000000000..597aae24fa
--- /dev/null
+++ b/types/imperium/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "imperium-tests.ts"
+  ]
+}

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 0731/1124] 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 0732/1124] 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 0733/1124] 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 0734/1124] [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 0735/1124] [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 0736/1124] [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 0737/1124] [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 0738/1124] [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 0739/1124] [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 65594147bab27abf66f220866c3e45989a9ea318 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Mon, 28 May 2018 09:18:32 +0200
Subject: [PATCH 0740/1124] Fixed header part of file so that it will not fail
 testing

---
 types/chrome-apps/index.d.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index f089c56a7a..ad452faceb 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -1,16 +1,14 @@
 // Type definitions for Chrome packaged application development
 // Project: http://developer.chrome.com/apps/
-// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>, see also the contributers on the chrome types (for extensions)
+// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingvar Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// WebView ref: https://chromium.googlesource.com/chromium/src/+/68.0.3432.1/chrome/common/extensions/api/webview_tag.json
 // TypeScript Version: 2.4
 
 /// <reference types="filesystem"/>
 
-////////////////////
-// Global object
-////////////////////
-
+///////////////
+// WebView ref: https://chromium.googlesource.com/chromium/src/+/68.0.3432.1/chrome/common/extensions/api/webview_tag.json
+///////////////
 
 ////////////////////
 // Accessibility Features

From 6a46246d9e0ae2a8e839a449525b8fd658946f76 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Mon, 28 May 2018 09:19:01 +0200
Subject: [PATCH 0741/1124] Removed unnecessary reference

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

diff --git a/types/chrome-apps/test/index.ts b/types/chrome-apps/test/index.ts
index d0a7234553..f976fc57b4 100644
--- a/types/chrome-apps/test/index.ts
+++ b/types/chrome-apps/test/index.ts
@@ -1,4 +1,3 @@
-/// <reference types="chrome-apps" />
 import runtime = chrome.app.runtime;
 import cwindow = chrome.app.window;
 

From 63e7ea1e8658ecace90b830b737a8c3380fa9a1f Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Mon, 28 May 2018 09:27:30 +0200
Subject: [PATCH 0742/1124] Chrome apps tsconfig: Fix base url

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

diff --git a/types/chrome-apps/tsconfig.json b/types/chrome-apps/tsconfig.json
index f06899c6eb..50a50c3193 100644
--- a/types/chrome-apps/tsconfig.json
+++ b/types/chrome-apps/tsconfig.json
@@ -9,7 +9,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "baseUrl": ".",
+        "baseUrl": "../",
         "typeRoots": [
             "../"
         ],

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 0743/1124] 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 a948d8b97dfbb4982d150001f214eb6f102fae9a Mon Sep 17 00:00:00 2001
From: Daniel Waxweiler <daniel.waxweiler@gmail.com>
Date: Mon, 28 May 2018 10:37:41 +0200
Subject: [PATCH 0744/1124] add dictUploadCanceled to DropzoneOptions & make
 JQuery interface global & add access to Dropzone via HTMLElement

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

diff --git a/types/dropzone/dropzone-tests.ts b/types/dropzone/dropzone-tests.ts
index 4abc3a6223..d79ea2e5ad 100644
--- a/types/dropzone/dropzone-tests.ts
+++ b/types/dropzone/dropzone-tests.ts
@@ -57,6 +57,7 @@ const dropzoneWithOptions = new Dropzone(".test", {
 	dictRemoveFileConfirmation: "",
 	dictMaxFilesExceeded: "",
 	dictFileSizeUnits: { tb: "", gb: "", mb: "", kb: "", b: "" },
+	dictUploadCanceled: "",
 
 	accept: (file: Dropzone.DropzoneFile, done: (error?: string | Error) => void) => {
 		if (file.accepted) {
@@ -228,6 +229,8 @@ dropzone.resizeImage(firstFile, 120, 120);
 dropzone.resizeImage(firstFile, 120, 120, 'contain');
 dropzone.resizeImage(firstFile, 120, 120, 'contain', function () { });
 
+document.createElement("div").dropzone;
+
 dropzone
 	.on("drop", () => {
 		console.count('drop');
diff --git a/types/dropzone/index.d.ts b/types/dropzone/index.d.ts
index 0295afbed2..588749823f 100644
--- a/types/dropzone/index.d.ts
+++ b/types/dropzone/index.d.ts
@@ -81,6 +81,7 @@ declare namespace Dropzone {
 		dictRemoveFileConfirmation?: string;
 		dictMaxFilesExceeded?: string;
 		dictFileSizeUnits?: DropzoneDictFileSizeUnits;
+		dictUploadCanceled?: string;
 
 		accept?(file: DropzoneFile, done: (error?: string | Error) => void): void;
 		init?(): void;
@@ -299,8 +300,14 @@ declare class Dropzone {
 
 }
 
-interface JQuery {
-	dropzone(options: Dropzone.DropzoneOptions): Dropzone;
+declare global {
+	interface JQuery {
+		dropzone(options: Dropzone.DropzoneOptions): Dropzone;
+	}
+
+	interface HTMLElement {
+		dropzone: Dropzone;
+	}
 }
 
 export = Dropzone;

From 60ca8e490a315cef3e1bfcb405788b3582b5e54f Mon Sep 17 00:00:00 2001
From: Daniel Waxweiler <daniel.waxweiler@gmail.com>
Date: Mon, 28 May 2018 10:44:46 +0200
Subject: [PATCH 0745/1124] add name

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

diff --git a/types/dropzone/index.d.ts b/types/dropzone/index.d.ts
index 588749823f..8c55f18fc7 100644
--- a/types/dropzone/index.d.ts
+++ b/types/dropzone/index.d.ts
@@ -1,6 +1,12 @@
 // Type definitions for Dropzone 5.0.0
 // Project: http://www.dropzonejs.com/
-// Definitions by: Natan Vivo <https://github.com/nvivo>, Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>, Vasya Aksyonov <https://github.com/outring>, Simon Huber <https://github.com/renuo>, Sebastiaan de Rooij <https://github.com/Hikariii>, Ted Bicknell <https://github.com/tedbcsgpro>
+// Definitions by: Natan Vivo <https://github.com/nvivo>
+//                 Andy Hawkins <https://github.com/a904guy/,http://a904guy.com/,http://www.bmbsqd.com>
+//                 Vasya Aksyonov <https://github.com/outring>
+//                 Simon Huber <https://github.com/renuo>
+//                 Sebastiaan de Rooij <https://github.com/Hikariii>
+//                 Ted Bicknell <https://github.com/tedbcsgpro>
+//                 Daniel Waxweiler <https://github.com/dwaxweiler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

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 0746/1124] 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 a78b7f9d7e0b4be38aeb472c6100920c267e71bc Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 28 May 2018 16:15:06 +0200
Subject: [PATCH 0747/1124] imperium: Add tslint and fix compilation

---
 types/imperium/imperium-tests.ts |  4 +-
 types/imperium/index.d.ts        | 54 +++++++++++-----------
 types/imperium/tsconfig.json     | 43 ++++++++---------
 types/imperium/tslint.json       | 79 ++++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+), 49 deletions(-)
 create mode 100644 types/imperium/tslint.json

diff --git a/types/imperium/imperium-tests.ts b/types/imperium/imperium-tests.ts
index 2f6cbaa8b4..72fda8f52a 100644
--- a/types/imperium/imperium-tests.ts
+++ b/types/imperium/imperium-tests.ts
@@ -1,9 +1,9 @@
 import imperium from 'imperium'
 
-import { Imperium, ImperiumUnauthorizedError } from 'imperium'
+import { Imperium, UnauthorizedError } from 'imperium'
 
 imperium.role('admin', async (req) => {
-    return req.session.role === 'admin'
+    return true
 })
 
 imperium.role('user')
diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index 2695e79574..f7f2191a3f 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -8,12 +8,14 @@
 /// <reference types="express" />
 
 declare module 'imperium' {
-    type ImperiumMiddleware = (req: Express.Request, res: Express.Response, next: Function) => Promise<void>
-    type ImperiumGetAcl = (req: Express.Request) => Promise<Boolean> | Promise<Object>
-    type ImperiumActions = Array<String> | String
-    type ImperiumContext = Array<'params' | 'query' | 'headers' | 'body'>
+    import express = require('express')
+
+    type Middleware = (req: express.Request, res: express.Response, next: Function) => Promise<void>
+    type GetAcl = (req: express.Request) => Promise<Boolean> | Promise<Object>
+    type Actions = Array<String> | String
+    type Context = Array<'params' | 'query' | 'headers' | 'body'>
     // Can contain when key that is evaluated during route action
-    type ImperiumRoleParams = { [key: string]: String }
+    type RoleParams = { [key: string]: String }
 
     export class Imperium {
         constructor()
@@ -22,44 +24,44 @@ declare module 'imperium' {
         roles: Roles
 
         // Add new role with specific ImperiumGetAcl
-        role(roleName: String, getAcl: ImperiumGetAcl): ImperiumRole
+        role(roleName: String, getAcl: GetAcl): Role
 
         // Return specific imperium role instance
-        role(roleName: String): ImperiumRole
+        role(roleName: String): Role
 
         // Check if user has role
-        is(roleName: String): ImperiumMiddleware
+        is(roleName: String): Middleware
 
         // Check if user has on of listed roles act like an OR
-        is(roleNames: Array<String>): ImperiumMiddleware
+        is(roleNames: Array<String>): Middleware
 
         // Check if current user can do action
-        can(action: String): ImperiumMiddleware
+        can(action: String): Middleware
 
-        can(actions: Array<String>): ImperiumMiddleware
+        can(actions: Array<String>): Middleware
 
-        can(action: Action): ImperiumMiddleware
+        can(action: Action): Middleware
 
-        can(actions: Array<Action>): ImperiumMiddleware
+        can(actions: Array<Action>): Middleware
 
-        private addRole(roleName: String, getAcl: ImperiumGetAcl): void
+        private addRole(roleName: String, getAcl: GetAcl): void
 
-        private evaluateRouteActions(req: Express.Request, action: Array<Action>, context: ImperiumContext): ImperiumActions
+        private evaluateRouteActions(req: express.Request, action: Array<Action>, context: Context): Actions
 
-        private evaluateRouteAction(req: Express.Request, expr: String, key: String, context: ImperiumContext): String
+        private evaluateRouteAction(req: express.Request, expr: String, key: String, context: Context): String
 
-        private evaluateUserActions(req: Express.Request, roles: Array<ImperiumRole>): Promise<Array<Action>>
+        private evaluateUserActions(req: express.Request, roles: Array<Role>): Promise<Array<Action>>
 
-        private evaluateUserAction(action: ImperiumRoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
+        private evaluateUserAction(action: RoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
     }
 
     interface Roles {
-        [key: string]: Role
+        [key: string]: RoleActions
     }
 
-    interface Role {
+    interface RoleActions {
         actions: Array<Action>
-        getAcl?: ImperiumGetAcl
+        getAcl?: GetAcl
     }
 
     interface Action {
@@ -67,7 +69,7 @@ declare module 'imperium' {
         [key: string]: String
     }
 
-    export class ImperiumRole {
+    export class Role {
         constructor(imperium: Imperium, roleName: String)
 
         // Imperium instance to retreive child role
@@ -75,16 +77,16 @@ declare module 'imperium' {
         // Role name
         roleName: String
         // Contain all the actions for this specific role
-        role: Role
+        role: RoleActions
 
         /* Add action with specific params */
-        can(action: String, params: ImperiumRoleParams): ImperiumRole
+        can(action: String, params: RoleParams): Role
 
         /* Get actions of childRoleName and replace params */
-        is(childRoleName: String, params: ImperiumRoleParams): ImperiumRole
+        is(childRoleName: String, params: RoleParams): Role
     }
 
-    export class ImperiumUnauthorizedError extends Error {
+    export class UnauthorizedError extends Error {
         constructor(message: String, status: number, context: any)
     }
 
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
index 597aae24fa..98e23e4de8 100644
--- a/types/imperium/tsconfig.json
+++ b/types/imperium/tsconfig.json
@@ -1,23 +1,24 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": false,
-    "strictFunctionTypes": true,
-    "baseUrl": "../",
-    "typeRoots": [
-      "../"
-    ],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-    "index.d.ts",
-    "imperium-tests.ts"
-  ]
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "imperium-tests.ts"
+    ]
 }
diff --git a/types/imperium/tslint.json b/types/imperium/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/imperium/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 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 0748/1124] 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 0749/1124] 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 0750/1124] [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 0751/1124] 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 0752/1124] 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 0753/1124] [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 0754/1124] 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 0755/1124] 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 0756/1124] [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 0757/1124] [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 0758/1124] [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 5e1813e38094c30921afa90c73509dfaded6bf63 Mon Sep 17 00:00:00 2001
From: Schlaefer <openmail+sourcecode@siezi.com>
Date: Tue, 29 May 2018 10:12:43 +0200
Subject: [PATCH 0759/1124] [backbone.marionette] adds .getUI()

---
 .../backbone.marionette/backbone.marionette-tests.ts  | 11 +++++++++++
 types/backbone.marionette/index.d.ts                  | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/types/backbone.marionette/backbone.marionette-tests.ts b/types/backbone.marionette/backbone.marionette-tests.ts
index f57e9e2edc..c6400b2672 100644
--- a/types/backbone.marionette/backbone.marionette-tests.ts
+++ b/types/backbone.marionette/backbone.marionette-tests.ts
@@ -1,3 +1,4 @@
+import * as JQuery from 'jquery';
 import * as Marionette from 'backbone.marionette';
 import * as Backbone from 'backbone';
 
@@ -9,6 +10,10 @@ class DestroyWarn extends Marionette.Behavior {
         message: 'you are destroying!'
     };
 
+    ui = {
+        destroy: '.foo'
+    };
+
     // behaviors have events that are bound to the views DOM
     events = {
         'click @ui.destroy': 'warnBeforeDestroy'
@@ -258,12 +263,18 @@ function RegionTests() {
     });
 }
 
+function BehaviorTest() {
+    const b = new DestroyWarn();
+    const uiHandle: JQuery = b.getUI('destroy');
+}
+
 function ViewTests() {
     const v = new MyView(new MyModel());
     const isDestroyed: boolean = v.isDestroyed();
     const isRendered: boolean = v.isRendered();
     const isAttached: boolean = v.isAttached();
     const vv: Marionette.View<Backbone.Model> = v.delegateEntityEvents();
+    const uiHandle: JQuery = v.getUI('destroy');
 }
 
 function CollectionViewTests() {
diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 7626d60d56..0b717c9bb1 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1143,6 +1143,11 @@ export class View<TModel extends Backbone.Model> extends Backbone.View<TModel> i
      * throughout the view with the ui attribute.
      */
     ui: any;
+
+    /**
+     * Get handle on UI element defined in ui hash
+     */
+    getUI(ui: string): JQuery;
 }
 
 export interface CollectionViewOptions<
@@ -1561,6 +1566,11 @@ export class Behavior extends Object {
      */
     ui: any;
 
+    /**
+     * Get handle on UI element defined in ui hash
+     */
+    getUI(ui: string): JQuery;
+
     /**
      * Any triggers you define on the Behavior will be triggered in response to the appropriate event on the view.
      */

From 9cb77195a439c097b6778f113c0c24c17eac02ef Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Tue, 29 May 2018 11:33:45 +0200
Subject: [PATCH 0760/1124] imperium: Fix feedback from plantain-00

---
 types/imperium/index.d.ts    |  2 +-
 types/imperium/tsconfig.json |  2 +-
 types/imperium/tslint.json   | 78 +-----------------------------------
 3 files changed, 3 insertions(+), 79 deletions(-)

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index f7f2191a3f..cdfbf3da39 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for imperium v2.0.2
-// Project: https://www.npmjs.org/package/mono-js/imperium
+// Project: https://www.npmjs.org/package/imperium
 // Definitions by: Gaetan SENN <https://github.com/gaetansenn>
 // Definitions: https://github.com/psnider/DefinitelyTyped/imperium
 // TypeScript Version: 2.7
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
index 98e23e4de8..c8563caffe 100644
--- a/types/imperium/tsconfig.json
+++ b/types/imperium/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/imperium/tslint.json b/types/imperium/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/imperium/tslint.json
+++ b/types/imperium/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 804f2e4a6ffae02cffffa104d7d4ce5048d8fb5d Mon Sep 17 00:00:00 2001
From: Peter Keuter <github@peterkeuter.nl>
Date: Tue, 29 May 2018 11:55:33 +0200
Subject: [PATCH 0761/1124] Add label render function

---
 types/recharts/index.d.ts         | 10 +++++-----
 types/recharts/recharts-tests.tsx |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index ecdcd1f420..1bbb1b158e 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -163,7 +163,7 @@ export interface AreaProps extends EventAttributes, Partial<PresentationAttribut
     connectNulls?: boolean;
     activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
-    label?: boolean | object | React.ReactElement<any> | LabelProps['content'];
+    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any> | LabelProps['content'];
     hide?: boolean;
     layout?: LayoutType;
     baseLine?: number | any[];
@@ -207,7 +207,7 @@ export interface BarProps extends EventAttributes, Partial<PresentationAttribute
     shape?: React.ReactElement<any> | ContentRenderer<RectangleProps>;
     data?: BarData[];
     // see label section at http://recharts.org/#/en-US/api/Bar
-    label?: boolean | Label | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<Label>;
+    label?: boolean | Label | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<any>;
 }
 
 export class Bar extends React.Component<BarProps> { }
@@ -404,7 +404,7 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     width?: number;
     height?: number;
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
-    label?: boolean | object | React.ReactElement<any> | LabelProps['content'];
+    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'];
     points?: Point[];
 }
 
@@ -437,7 +437,7 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
     label?: {
         offsetRadius: number;
-    } | LabelProps['content'] | React.ReactElement<any> | boolean;
+    } | LabelProps['content'] | React.ReactElement<any> | ContentRenderer<any> | boolean;
     activeShape?: object |ContentRenderer<any> | React.ReactElement<any>;
     activeIndex?: number | number[];
 }
@@ -552,7 +552,7 @@ export interface RadarProps extends EventAttributes, Partial<PresentationAttribu
     shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
     activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
     dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
-    label?: object | React.ReactElement<any> | LabelProps['content'] | boolean;
+    label?: object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'] | boolean;
     legendType?: LegendType;
     hide?: boolean;
 }
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 7eed634119..3b6775d2d9 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -160,6 +160,7 @@ class Component extends React.Component<{}, ComponentState> {
                 <ResponsiveContainer>
                     <PieChart width={800} height={400}>
                         <Pie
+                            label={(props: {name: string}) => <Label>{name}</Label>}
                             dataKey="value"
                             activeIndex={this.state.activeIndex}
                             activeShape={renderActiveShape}

From 5f9d43f6ea13b7bafeba115ec5f29f32d3665271 Mon Sep 17 00:00:00 2001
From: Peter Keuter <github@peterkeuter.nl>
Date: Tue, 29 May 2018 11:57:51 +0200
Subject: [PATCH 0762/1124] Add author

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 1bbb1b158e..a2e2024343 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -6,6 +6,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>
 //                 Rich Baird <https://github.com/richbai90>
 //                 Dan Torberg <https://github.com/caspeco-dan>
+//                 Peter Keuter <https://github.com/pkeuter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 228d215c8fed5102a8b7769eb8584b65c4e2e79e Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Tue, 29 May 2018 12:19:47 +0200
Subject: [PATCH 0763/1124] imperium: Fix tslint errors

---
 types/imperium/imperium-tests.ts |  24 +++--
 types/imperium/index.d.ts        | 158 ++++++++++++++-----------------
 2 files changed, 83 insertions(+), 99 deletions(-)

diff --git a/types/imperium/imperium-tests.ts b/types/imperium/imperium-tests.ts
index 72fda8f52a..f7380c25cc 100644
--- a/types/imperium/imperium-tests.ts
+++ b/types/imperium/imperium-tests.ts
@@ -1,21 +1,19 @@
-import imperium from 'imperium'
-
-import { Imperium, UnauthorizedError } from 'imperium'
+import imperium from 'imperium';
 
 imperium.role('admin', async (req) => {
-    return true
-})
+    return true;
+});
 
 imperium.role('user')
     .can('seeUser', { user: '@' })
-    .can('manageUser', { user: '@' })
+    .can('manageUser', { user: '@' });
 
 imperium.role('admin')
-    .is('user', { user: '*' })
+    .is('user', { user: '*' });
 
-imperium.can('seeUser')
-imperium.can(['seeUser', 'manageUser'])
-imperium.can({ action: 'seeUser', user: ':userId' })
-imperium.can([{ action: 'manageUser', user: ':userId' }])
-imperium.is('admin')
-imperium.is(['admin', 'user'])
+imperium.can('seeUser');
+imperium.can(['seeUser', 'manageUser']);
+imperium.can({ action: 'seeUser', user: ':userId' });
+imperium.can([{ action: 'manageUser', user: ':userId' }]);
+imperium.is('admin');
+imperium.is(['admin', 'user']);
diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index cdfbf3da39..9ec2ca9c09 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -1,95 +1,81 @@
-// Type definitions for imperium v2.0.2
+// Type definitions for imperium 2.0
 // Project: https://www.npmjs.org/package/imperium
 // Definitions by: Gaetan SENN <https://github.com/gaetansenn>
 // Definitions: https://github.com/psnider/DefinitelyTyped/imperium
 // TypeScript Version: 2.7
 
 /// <reference types="node" />
-/// <reference types="express" />
 
-declare module 'imperium' {
-    import express = require('express')
+import express = require('express');
 
-    type Middleware = (req: express.Request, res: express.Response, next: Function) => Promise<void>
-    type GetAcl = (req: express.Request) => Promise<Boolean> | Promise<Object>
-    type Actions = Array<String> | String
-    type Context = Array<'params' | 'query' | 'headers' | 'body'>
-    // Can contain when key that is evaluated during route action
-    type RoleParams = { [key: string]: String }
-
-    export class Imperium {
-        constructor()
-
-        context: Array<String>
-        roles: Roles
-
-        // Add new role with specific ImperiumGetAcl
-        role(roleName: String, getAcl: GetAcl): Role
-
-        // Return specific imperium role instance
-        role(roleName: String): Role
-
-        // Check if user has role
-        is(roleName: String): Middleware
-
-        // Check if user has on of listed roles act like an OR
-        is(roleNames: Array<String>): Middleware
-
-        // Check if current user can do action
-        can(action: String): Middleware
-
-        can(actions: Array<String>): Middleware
-
-        can(action: Action): Middleware
-
-        can(actions: Array<Action>): Middleware
-
-        private addRole(roleName: String, getAcl: GetAcl): void
-
-        private evaluateRouteActions(req: express.Request, action: Array<Action>, context: Context): Actions
-
-        private evaluateRouteAction(req: express.Request, expr: String, key: String, context: Context): String
-
-        private evaluateUserActions(req: express.Request, roles: Array<Role>): Promise<Array<Action>>
-
-        private evaluateUserAction(action: RoleParams, context: { [key: string]: Array<String> }): { [key: string]: Array<String> }
-    }
-
-    interface Roles {
-        [key: string]: RoleActions
-    }
-
-    interface RoleActions {
-        actions: Array<Action>
-        getAcl?: GetAcl
-    }
-
-    interface Action {
-        action: String
-        [key: string]: String
-    }
-
-    export class Role {
-        constructor(imperium: Imperium, roleName: String)
-
-        // Imperium instance to retreive child role
-        imperium: Imperium
-        // Role name
-        roleName: String
-        // Contain all the actions for this specific role
-        role: RoleActions
-
-        /* Add action with specific params */
-        can(action: String, params: RoleParams): Role
-
-        /* Get actions of childRoleName and replace params */
-        is(childRoleName: String, params: RoleParams): Role
-    }
-
-    export class UnauthorizedError extends Error {
-        constructor(message: String, status: number, context: any)
-    }
-
-    const out: Imperium
-    export default out
+type GetAcl = (req: express.Request) => Promise<boolean> | Promise<object>;
+type Actions = string[] | string;
+type Context = Array<'params' | 'query' | 'headers' | 'body'>;
+// Can contain when key that is evaluated during route action
+interface RoleParams {
+    [key: string]: string;
 }
+
+export class Imperium {
+    constructor()
+
+    context: string[];
+    roles: Roles;
+
+    // Add new role with specific ImperiumGetAcl
+    role(roleName: string, getAcl?: GetAcl): Role;
+
+    // Check if user has role(s) act like as an OR
+    is(roleNames: string | string[]): Promise<express.RequestHandler>;
+
+    // Check if current user can do action(s)
+    can(actionS: string | string[] | Action | Action[]): Promise<express.RequestHandler>;
+
+    private addRole(roleName: string, getAcl: GetAcl): void;
+
+    private evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
+
+    private evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
+
+    private evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
+
+    private evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
+}
+
+interface Roles {
+    [key: string]: RoleActions;
+}
+
+interface RoleActions {
+    actions: Action[];
+    getAcl?: GetAcl;
+}
+
+interface Action {
+    action: string;
+    [key: string]: string;
+}
+
+export class Role {
+    constructor(imperium: Imperium, roleName: string)
+
+    // Imperium instance to retreive child role
+    imperium: Imperium;
+    // Role name
+    roleName: string;
+    // Contain all the actions for this specific role
+    role: RoleActions;
+
+    /* Add action with specific params */
+    can(action: string, params: RoleParams): Role;
+
+    /* Get actions of childRoleName and replace params */
+    is(childRoleName: string, params: RoleParams): Role;
+}
+
+export class UnauthorizedError extends Error {
+    constructor(message: string, status: number, context: any)
+}
+
+declare const init: Imperium;
+export default init;

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 0764/1124] 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 0765/1124] 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 df6cd13a68b1e46e96d3b5847ab237c239042ef4 Mon Sep 17 00:00:00 2001
From: John Conley <jcjunction@gmail.com>
Date: Tue, 29 May 2018 09:19:55 -0500
Subject: [PATCH 0766/1124] Make schema example property spec compliant

According to the official specification (https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md), the example property of the Schema object should not have any type requirements and should therefore be any.
---
 types/swagger-schema-official/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/swagger-schema-official/index.d.ts b/types/swagger-schema-official/index.d.ts
index dc184d3e91..190e1ead7d 100644
--- a/types/swagger-schema-official/index.d.ts
+++ b/types/swagger-schema-official/index.d.ts
@@ -147,7 +147,7 @@ export interface Schema extends BaseSchema {
   readOnly?: boolean;
   xml?: XML;
   externalDocs?: ExternalDocs;
-  example?: {[exampleName: string]: {}};
+  example?: any;
   required?: string[];
 }
 

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 0767/1124] 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 3de4dc5848dc00c1c23e9df84af65a5cab51e8a8 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 29 May 2018 12:06:18 -0400
Subject: [PATCH 0768/1124] Add sameSite property to SessionOptions

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

diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index 29d2b4fbbc..0728ff7624 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -64,6 +64,7 @@ declare namespace session {
     proxy?: boolean;
     saveUninitialized?: boolean;
     unset?: string;
+    sameSite?: boolean | string;
   }
 
   interface BaseMemoryStore {

From 3c1900606e34e738a83370434544a2451dd26ff3 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 29 May 2018 12:07:48 -0400
Subject: [PATCH 0769/1124] Add sameSite property to tests

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

diff --git a/types/express-session/express-session-tests.ts b/types/express-session/express-session-tests.ts
index dc57e88f0d..37718f7f69 100644
--- a/types/express-session/express-session-tests.ts
+++ b/types/express-session/express-session-tests.ts
@@ -17,7 +17,8 @@ app.use(session({
   resave: true,
   proxy: true,
   saveUninitialized: true,
-  unset: 'keep'
+  unset: 'keep',
+  sameSite: true
 }));
 
 interface MySession extends Express.Session {

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 0770/1124] 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 0771/1124] [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 0772/1124] 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 0773/1124] 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 0774/1124] [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 0775/1124] 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 0776/1124] 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 0777/1124] 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 0778/1124] 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 0779/1124] 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 0780/1124] 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 5de7fb22740c2a0e320239a5adfc93cc65a8f0d6 Mon Sep 17 00:00:00 2001
From: Mitchell Bundy <mitchell.bundy@ssense.com>
Date: Tue, 29 May 2018 17:43:51 -0400
Subject: [PATCH 0781/1124] update types for restify 7.2

---
 types/restify/index.d.ts       | 474 +++++++++++++++++++++++++--------
 types/restify/restify-tests.ts |  18 +-
 2 files changed, 373 insertions(+), 119 deletions(-)

diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index bacea67cab..aa6cc218aa 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for restify 5.0
+// Type definitions for restify 7.2
 // 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 by: Bret Little <https://github.com/blittle>, Steve Hipwell <https://github.com/stevehipwell>, Leandro Almeida <https://github.com/leanazulyoro>, Mitchell Bundy <https://github.com/mgebundy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -8,16 +8,21 @@
 
 import http = require('http');
 import https = require('https');
+import http2 = require('http2');
 import Logger = require('bunyan');
 import url = require('url');
 import spdy = require('spdy');
 import stream = require('stream');
+import { Certificate } from 'crypto';
+import { ZlibOptions } from 'zlib';
 
 export interface ServerOptions {
     ca?: string | Buffer | ReadonlyArray<string | Buffer>;
 
     certificate?: string | Buffer | ReadonlyArray<string | Buffer>;
 
+    cert?: string | Buffer | ReadonlyArray<string | Buffer>;
+
     key?: string | Buffer | ReadonlyArray<string | Buffer>;
 
     passphrase?: string;
@@ -51,6 +56,18 @@ export interface ServerOptions {
     noWriteContinue?: boolean;
 
     rejectUnauthorized?: boolean;
+
+    secureOptions?: number;
+
+    http2?: http2.SecureServerOptions;
+
+    dtrace?: boolean;
+
+    onceNext?: boolean;
+
+    strictNext?: boolean;
+
+    ignoreTrailingSlash?: boolean;
 }
 
 export interface AddressInterface {
@@ -85,7 +102,7 @@ export interface Server extends http.Server {
      * Wraps node's close().
      * @param     callback optional callback to invoke when done.
      */
-    close(...args: any[]): any;
+    close(callback?: Function): any;
 
     /**
      * Returns the number of currently inflight requests.
@@ -175,26 +192,6 @@ export interface Server extends http.Server {
      */
     param(name: string, fn: RequestHandler): Server;
 
-    /**
-     * Piggy-backs on the `server.use` method. It attaches a new middleware
-     * function that only fires if the specified version matches the request.
-     *
-     * Note that if the client does not request a specific version, the middleware
-     * function always fires. If you don't want this set a default version with a
-     * pre handler on requests where the client omits one.
-     *
-     * Exposes an API:
-     *   server.versionedUse("version", function (req, res, next, ver) {
-     *     // do stuff that only applies to routes of this API version
-     *   });
-     *
-     * @param    versions the version(s) the URL to respond to
-     * @param        fn       the middleware function to execute, the
-     *                                   fourth parameter will be the selected
-     *                                   version
-     */
-    versionedUse(versions: string | string[], fn: RequestHandler): Server;
-
     /**
      * Removes a route from the server.
      * You pass in the route 'blob' you got from a mount call.
@@ -247,39 +244,130 @@ export interface Server extends http.Server {
     url: string;
 
     /** Node server instance */
-    server: http.Server;
+    server: http.Server | https.Server | spdy.Server | http2.Http2SecureServer;
 
     /** Router instance */
     router: Router;
+
+    /** Handle uncaught exceptions */
+    handleUncaughtExceptions: boolean;
+
+    /** enable DTrace support */
+    dtrace: boolean;
+    
+    /** Custom response formatters */
+    formatters: Formatters;
+    
+    /** Prevents calling next multiple times */
+    onceNext: boolean;
+
+    /** Throws error when next() is called more than once, enabled onceNext option */
+    strictNext: boolean;
+
+    /** Pre handlers */
+    preChain: Chain;
+
+    useChain: Chain;
+
+    spdy?: boolean;
+
+    http2?: boolean;
+
+    ca: ServerOptions['ca']
+
+    certificate: ServerOptions['certificate']
+    
+    key: ServerOptions['key'];
+
+    passphrase: ServerOptions['passphrase'] | null;
+
+    secure?: boolean;
+}
+
+export interface ChainOptions {
+    onceNext?: boolean;
+
+    strictNext?: boolean;
+}
+
+export interface Chain {
+    /** Get handlers of a chain instance */
+    getHandlers(): Function[];
+
+    /** Utilize the given middleware `handler` */
+    add(handler: Function): void;
+
+    /** Returns the number of handlers */
+    count(): number;
+
+    /** Handle server requests, punting them down the middleware stack. */
+    run(req: Request, res: Response, done: Function): void;
+
+    /** Prevents calling next multiple times */
+    onceNext: boolean;
+
+    /** Throws error when next() is called more than once, enables onceNext option */
+    strictNext: boolean;
+}
+
+export interface RouterRegistryRadix {
+    /**
+     * Adds a route.
+     */
+    add(route: Route): boolean;
+
+    /**
+     * Removes a route.
+     */
+    remove(name: string): Route | undefined;
+
+    /**
+     * Registry for route.
+     */
+    lookup(method: string, pathname: string): Chain | undefined;
+
+    /**
+     * Get registry.
+     */
+    get(): Route[];
+
+    /**
+     * toString() serialization.
+     */
+    toString(): string;
 }
 
 export interface RouterOptions {
-    contentType?: string | string[];
-
-    strictRouting?: boolean;
-
     log?: Logger;
 
-    version?: string;
+    onceNext?: boolean;
 
-    versions?: string[];
+    strictNext?: boolean;
+
+    ignoreTrailingSlash?: boolean;
+
+    registry?: RouterRegistryRadix; 
 }
 
 export interface Router {
+    constructor(options: RouterOptions): void;
+
     /**
-     * takes an object of route params and query params, and 'renders' a URL.
-     * @param    routeName the route name
-     * @param    params    an object of route params
-     * @param    query     an object of query params
+     * Lookup for route
      */
-    render(routeName: string, params: any, query?: any): string;
+    lookup(req: Request, res: Response): Chain | undefined;
+
+    /**
+     * Lookup by name
+     */
+    lookupByName(name: string, req: Request, res: Response): Chain | undefined;
 
     /**
      * adds a route.
      * @param    options an options object
      * @returns  returns the route name if creation is successful.
      */
-    mount(options: RouteOptions): string | boolean;
+    mount(options: RouteOptions, ...handlers: RequestHandlerType[]): string;
 
     /**
      * unmounts a route.
@@ -289,30 +377,14 @@ export interface Router {
     unmount(name: string): string;
 
     /**
-     * get a route from the router.
-     * @param       name the name of the route to retrieve
-     * @param       req  the request object
-     * @param     cb   callback function
+     * Return mounted routes.
      */
-    get(name: string, req: Request, cb: FindRouteCallback): void;
+    getRoutes(): Route[];
 
     /**
-     * find a route from inside the router, handles versioned routes.
-     * @param      req      the request object
-     * @param      res      the response object
-     * @param    callback callback function
+     * Default route, when no route found
      */
-    find(req: Request, res: Response, callback: FindRouteCallback): void;
-
-    /**
-     * Find a route by path. Scans the route list for a route with the same RegEx.
-     * i.e. /foo/:param1/:param2 would match an existing route with different
-     * parameter names /foo/:id/:name since the compiled RegExs match.
-     * @param       path      a path to find a route for.
-     * @param                options   an options object
-     * @returns              returns the route if a match is found
-     */
-    findByPath(path: string | RegExp): Route;
+    defaultRoute(req: Request, res: Response, next: Function): void;
 
     /**
      * toString() serialization.
@@ -327,23 +399,11 @@ export interface Router {
 
     name: string;
 
-    mounts: { [routeName: string]: Route };
-
-    versions: string[];
-
-    contentType: string[];
-
-    routes: {
-        DELETE: Route[];
-        GET: Route[];
-        HEAD: Route[];
-        OPTIONS: Route[];
-        PATCH: Route[];
-        POST: Route[];
-        PUT: Route[];
-    };
-
     log?: Logger;
+
+    onceNext: boolean;
+
+    strictNext: boolean;
 }
 
 export interface RequestFileInterface {
@@ -361,6 +421,11 @@ export interface RequestAuthorization {
 }
 
 export interface Request extends http.IncomingMessage {
+    /**
+     * Builds an absolute URI for the request.
+     */
+    absoluteUri(path: string): string;
+
     /**
      * checks if the accept header is present and has the value requested.
      * e.g., req.accepts('html');
@@ -464,20 +529,22 @@ export interface Request extends http.IncomingMessage {
     matchedVersion(): string;
 
     /**
-     * returns any header off the request. also, 'correct' any
+     * Get the case-insensitive request header key,
+     * and optionally provide a default value (express-compliant).
+     * Returns any header off the request. also, 'correct' any
      * correctly spelled 'referrer' header to the actual spelling used.
-     * @param    name  the name of the header
-     * @param    value default value if header isn't found on the req
+     * @param key - the key of the header
+     * @param defaultValue - default value if header isn't found on the req
      */
-    header(name: string, value?: string): string;
+    header(key: string, defaultValue?: string): string;
 
     /**
      * returns any trailer header off the request. also, 'correct' any
      * correctly spelled 'referrer' header to the actual spelling used.
      * @param    name  the name of the header
-     * @param    value default value if header isn't found on the req
+     * @param    defaultValue default value if header isn't found on the req
      */
-    trailer(name: string, value?: string): string;
+    trailer(name: string, defaultValue?: string): string;
 
     /**
      * Check if the incoming request contains the Content-Type header field, and
@@ -629,37 +696,37 @@ export interface Response extends http.ServerResponse {
 
     /**
      * sets headers on the response.
-     * @param    name  the name of the header
+     * @param    key  the name of the header
      * @param    value the value of the header
      */
-    header(name: string, value?: any): any;
+    header(key: string, value?: any): any;
 
     /**
      * short hand method for:
      *     res.contentType = 'json';
      *     res.send({hello: 'world'});
      * @param    code    http status code
-     * @param    object    value to json.stringify
+     * @param    body    value to json.stringify
      * @param    [headers] headers to set on the response
      */
-    json(code: number, object: any, headers?: { [header: string]: string }): any;
+    json(code: number, body: any, headers?: { [header: string]: string }): any;
 
     /**
      * short hand method for:
      *     res.contentType = 'json';
      *     res.send({hello: 'world'});
-     * @param    object    value to json.stringify
+     * @param    body    value to json.stringify
      * @param    [headers] headers to set on the response
      */
-    json(object: any, headers?: { [header: string]: string }): any;
+    json(body: any, headers?: { [header: string]: string }): any;
 
     /**
      * sets the link heaader.
-     * @param    l   the link key
-     * @param    rel the link value
+     * @param    key   the link key
+     * @param    value the link value
      * @returns      the header value set to res
      */
-    link(l: string, rel: string): string;
+    link(key: string, value: string): string;
 
     /**
      * sends the response object. pass through to internal __send that uses a
@@ -669,7 +736,16 @@ export interface Response extends http.ServerResponse {
      * @param    [headers]  any add'l headers to set
      * @returns  the response object
      */
-    send(code?: any, body?: any, headers?: { [header: string]: string }): any;
+    send(code?: number, body?: any, headers?: { [header: string]: string }): any;
+
+    /**
+     * sends the response object. pass through to internal __send that uses a
+     * formatter based on the content-type header.
+     * @param    [body] the content to send
+     * @param    [headers]  any add'l headers to set
+     * @returns  the response object
+     */
+    send(body?: any, headers?: { [header: string]: string }): any;
 
     /**
      * sends the response object. pass through to internal __send that skips
@@ -679,7 +755,16 @@ export interface Response extends http.ServerResponse {
      * @param    [headers]  any add'l headers to set
      * @returns  the response object
      */
-    sendRaw(code?: any, body?: any, headers?: { [header: string]: string }): any;
+    sendRaw(code?: number, body?: any, headers?: { [header: string]: string }): any;
+
+    /**
+     * sends the response object. pass through to internal __send that skips
+     * formatters entirely and sends the content as is.
+     * @param    [body] the content to send
+     * @param    [headers]  any add'l headers to set
+     * @returns  the response object
+     */
+    sendRaw(body?: any, headers?: { [header: string]: string }): any;
 
     /**
      * sets a header on the response.
@@ -689,6 +774,13 @@ export interface Response extends http.ServerResponse {
      */
     set(name: string, val: string): Response;
 
+    /**
+     * sets a header on the response.
+     * @param    val  object of headers
+     * @returns       self, the response object
+     */
+    set(headers?: { [header: string]: string }): Response;
+
     /**
      * sets the http status code on the response.
      * @param    code http status code
@@ -705,9 +797,9 @@ export interface Response extends http.ServerResponse {
      * redirect is sugar method for redirecting.
      * res.redirect(301, 'www.foo.com', next);
      * `next` is mandatory, to complete the response and trigger audit logger.
-     * @param      code the status code
-     * @param      url to redirect to
-     * @param    next fn
+     * @param    code the status code
+     * @param    url to redirect to
+     * @param    next - mandatory, to complete the response and trigger audit logger
      * @emits    redirect
      */
     redirect(code: number, url: string, next: Next): void;
@@ -716,11 +808,21 @@ export interface Response extends http.ServerResponse {
      * redirect is sugar method for redirecting.
      * res.redirect({...}, next);
      * `next` is mandatory, to complete the response and trigger audit logger.
-     * @param      options the options or url to redirect to
-     * @param    next fn
+     * @param    url to redirect to
+     * @param    next - mandatory, to complete the response and trigger audit logger
      * @emits    redirect
      */
-    redirect(options: object | string, next: Next): void;
+    redirect(url: string, next: Next): void;
+
+    /**
+     * redirect is sugar method for redirecting.
+     * res.redirect({...}, next);
+     * `next` is mandatory, to complete the response and trigger audit logger.
+     * @param    opts - options object to configure a redirect
+     * @param    next - mandatory, to complete the response and trigger audit logger
+     * @emits    redirect
+     */
+    redirect(opts: RedirectOptions, next: Next): void;
 
     /** HTTP status code. */
     code: number;
@@ -735,30 +837,65 @@ export interface Response extends http.ServerResponse {
     id: string;
 }
 
+export interface RedirectOptions {
+    /**
+     * whether to redirect to http or https
+     */
+    secure?: boolean;
+
+    /**
+     * redirect location's hostname
+     */
+    hostname?: string;
+
+    /**
+     * redirect location's pathname
+     */
+    pathname?: string;
+
+    /**
+     * redirect location's port number
+     */
+    port?: string;
+
+    /**
+     * redirect location's query string parameters
+     */
+    query?: string;
+
+    /**
+     * if true, `options.query`
+     * stomps over any existing query
+     * parameters on current URL.
+     * by default, will merge the two.
+     */
+    overrideQuery?: boolean;
+    
+    /**
+     * if true, sets 301. defaults to 302.
+     */
+    permanent?: boolean;
+}
+
 export interface Next {
     (err?: any): void;
 
     ifError(err?: any): void;
 }
 
-export interface RoutePathRegex extends RegExp {
-    restifyParams: string[];
-}
-
 export interface RouteSpec {
     method: string;
-    name: string;
+    name?: string;
     path: string | RegExp;
-    versions: string[];
+    versions?: string[];
 }
 
 export interface Route {
     name: string;
     method: string;
-    path: RoutePathRegex;
+    path: string | RegExp;
     spec: RouteSpec;
-    types: string[];
-    versions: string[];
+    chain: Chain;
 }
 
 export interface RouteOptions {
@@ -800,6 +937,49 @@ export type FindRouteCallback = (err: Error, route?: Route, params?: any) => voi
 export type RequestHandler = (req: Request, res: Response, next: Next) => any;
 export type RequestHandlerType = RequestHandler | RequestHandler[];
 
+export interface ServerUpgradeResponse {
+    /**
+     * Set the status code of the response.
+     * @param code - the http status code
+     */
+    status(code: number): number;
+
+    /**
+     * Sends the response.
+     * @param code - the http status code
+     * @param body - the response to send out
+     */
+    send(code: number, body: any): any;
+
+    /**
+     * Sends the response.
+     * @param body - the response to send out
+     */
+    send(body: any): boolean;
+
+    /**
+     * Ends the response
+     */
+    end(): boolean;
+    
+    /**
+     * Write to the response.
+     */
+    write(): boolean;
+
+    /**
+     * Write to the head of the response.
+     * @param statusCode - the http status code
+     * @param reason -  a message
+     */
+    writeHead(statusCode: number, reason?: string): void;
+
+    /**
+     * Attempt to upgrade.
+     */
+    claimUpgrade(): any;
+}
+
 export namespace bunyan {
     interface RequestCaptureOptions {
         /** The stream to which to write when dumping captured records. */
@@ -857,7 +1037,7 @@ export namespace bunyan {
 
 export function createServer(options?: ServerOptions): Server;
 
-export type Formatter = (req: Request, res: Response, body: any) => string | null;
+export type Formatter = (req: Request, res: Response, body: any) => string | Buffer | null;
 
 export interface Formatters {
     [contentType: string]: Formatter;
@@ -907,6 +1087,8 @@ export namespace plugins {
      */
     function acceptParser(accepts: string[]): RequestHandler;
 
+    type AuditLoggerContext = (req: Request, res: Response, route: any, error: any) => any;
+
     interface AuditLoggerOptions {
         /**
          * Bunyan logger
@@ -918,11 +1100,21 @@ export namespace plugins {
          * log, one of 'pre', 'routed', or 'after'
          */
         event: 'pre' | 'routed' | 'after';
+
         /**
          * Restify server. If passed in, causes server to emit 'auditlog' event after audit logs are flushed
          */
         server?: Server;
 
+        /**
+         * The optional context function of signature
+         * f(req, res, route, err).  Invoked each time an audit log is generated. This
+         * function can return an object that customizes the format of anything off the
+         * req, res, route, and err objects. The output of this function will be
+         * available on the `context` key in the audit object.
+         */
+        context?: AuditLoggerContext;
+
         /**
          * Ringbuffer which is written to if passed in
          */
@@ -962,6 +1154,18 @@ export namespace plugins {
      */
     function conditionalRequest(): RequestHandler[];
 
+    interface CpuUsageThrottleOptions {
+        limit?: number;
+        max?: number;
+        interval?: number;
+        halfLife?: number;
+    }
+
+    /**
+     * Cpu Throttle middleware
+     */
+    function cpuUsageThrottle(opts?: CpuUsageThrottleOptions): RequestHandler;
+
     /**
      * Handles disappeared CORS headers
      */
@@ -1048,9 +1252,10 @@ export namespace plugins {
      */
     function bodyReader(options?: { maxBodySize?: number }): RequestHandler;
 
-    interface UrlEncodedBodyParser {
+    interface UrlEncodedBodyParserOptions {
         mapParams?: boolean;
         overrideParams?: boolean;
+        bodyReader?: boolean;
     }
 
     /**
@@ -1059,12 +1264,19 @@ export namespace plugins {
      * If req.params already contains a given key, that key is skipped and an
      * error is logged.
      */
-    function urlEncodedBodyParser(options?: UrlEncodedBodyParser): RequestHandler[];
+    function urlEncodedBodyParser(options?: UrlEncodedBodyParserOptions): RequestHandler[];
+
+    interface JsonBodyParserOptions {
+        mapParams?: boolean;
+        overrideParams?: boolean;
+        reviver?: (key: any, value: any) => any;
+        bodyReader?: boolean;
+    }
 
     /**
      * Parses JSON POST bodies
      */
-    function jsonBodyParser(options?: { mapParams?: boolean, reviver?: any, overrideParams?: boolean }): RequestHandler[];
+    function jsonBodyParser(options?: JsonBodyParserOptions): RequestHandler[];
 
     /**
      * Parses JSONP callback
@@ -1168,7 +1380,15 @@ export namespace plugins {
      * gzips the response if client send `accept-encoding: gzip`
      * @param options options to pass to gzlib
      */
-    function gzipResponse(options?: any): RequestHandler;
+    function gzipResponse(options?: ZlibOptions): RequestHandler;
+
+    interface InflightRequestThrottleOptions {
+        limit: number;
+        server: Server;
+        err: any;
+    }
+
+    function inflightRequestThrottle(opts: InflightRequestThrottleOptions): RequestHandler;
 
     interface ServeStatic {
         appendRequestPath?: boolean;
@@ -1190,6 +1410,7 @@ export namespace plugins {
     interface ThrottleOptions {
         burst?: number;
         rate?: number;
+        setHeaders?: boolean;
         ip?: boolean;
         username?: boolean;
         xff?: boolean;
@@ -1198,6 +1419,11 @@ export namespace plugins {
         overrides?: any; // any
     }
 
+    /**
+     *  throttles responses
+     */
+    function throttle(options?: ThrottleOptions): RequestHandler;
+
     interface MetricsCallback {
         /**
          *  An error if the request had an error
@@ -1229,16 +1455,41 @@ export namespace plugins {
          */
         method: string;
 
+        /**
+         * latency includes both request is flushed and all handlers finished
+         */
+        totalLatency: number;
+
         /**
          * Request latency
          */
         latency: number;
 
+        /**
+         * pre handlers latency
+         */
+        preLatency: number | null;
+
+        /**
+         * use handlers latency
+         */
+        useLatency: number | null;
+
         /**
          * req.path() value
          */
         path: string;
 
+        /**
+         * Number of inflight requests pending in restify
+         */
+        inflightRequests: number;
+
+        /**
+         * Same as `inflightRequests`
+         */
+        unfinishedRequests: number;
+
         /**
          * If this value is set, err will be a corresponding `RequestCloseError` or `RequestAbortedError`.
          *
@@ -1271,11 +1522,6 @@ export namespace plugins {
      */
     function oauth2TokenParser(): RequestHandler;
 
-    /**
-     *  throttles responses
-     */
-    function throttle(options?: ThrottleOptions): RequestHandler;
-
     interface RequestExpiryOptions {
         /**
          * Header name of the absolute time for request expiration
diff --git a/types/restify/restify-tests.ts b/types/restify/restify-tests.ts
index 8601d912ac..9b2736b98b 100644
--- a/types/restify/restify-tests.ts
+++ b/types/restify/restify-tests.ts
@@ -3,6 +3,7 @@ import * as url from "url";
 import * as Logger from "bunyan";
 import * as http from "http";
 import * as stream from "stream";
+import { resolveSoa } from "dns";
 
 let server: restify.Server;
 
@@ -50,6 +51,7 @@ function send(req: restify.Request, res: restify.Response, next: restify.Next) {
     req.userAgent() === 'test';
     req.startHandlerTimer('test');
     req.endHandlerTimer('test');
+    req.absoluteUri('test');
 
     const log = req.log;
     log.debug({ params: req.params }, 'Hello there %s', 'foo');
@@ -85,6 +87,11 @@ function send(req: restify.Request, res: restify.Response, next: restify.Next) {
     res.send(201, { hello: 'world' });
     res.send(new Error('meh'));
 
+    res.set('header', 'value');
+    res.set({
+        headerName: 'value'
+    });
+
     res.json(201, { hello: 'world' });
     res.json({ hello: 'world' });
 
@@ -162,11 +169,10 @@ const logger = Logger.createLogger({ name: "test" });
 server.on('after', restify.plugins.auditLogger({ event: 'after', log: logger }));
 
 server.on('after', (req: restify.Request, res: restify.Response, route: restify.Route, err: any) => {
-    route.spec.method === 'GET';
-    route.spec.name === 'routeName';
-    route.spec.path === '/some/path';
-    route.spec.path === /\/some\/path\/.*/;
-    route.spec.versions === ['v1'];
+    route.method === 'GET';
+    route.name === 'routeName';
+    route.path === '/some/path';
+    route.path === /\/some\/path\/.*/;
     restify.plugins.auditLogger({ event: 'after', log: logger })(req, res, route, err);
 });
 
@@ -186,6 +192,8 @@ requestCaptureOptions.maxRequestIds = 500;
 requestCaptureOptions.dumpDefault = true;
 
 const requestCaptureStream = new restify.bunyan.RequestCaptureStream(requestCaptureOptions);
+requestCaptureStream.write(loggerStream);
+requestCaptureStream.toString();
 const asStream: stream.Stream = requestCaptureStream;
 
 const logger2: Logger = restify.bunyan.createLogger("horse");

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 0782/1124] 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 0783/1124] 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 0784/1124] 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 0785/1124] 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 0786/1124] 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 0787/1124] 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 0788/1124] 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 0789/1124] 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 0790/1124] 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 0791/1124] 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 0792/1124] 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 0793/1124] 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 0794/1124] [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 0795/1124] [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 0796/1124] 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 0797/1124] 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 0798/1124] 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 0799/1124] 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 0800/1124] 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 0801/1124] [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 0802/1124] [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 0803/1124] 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 0804/1124] 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 0805/1124] 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 0806/1124] 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 0807/1124] 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 0808/1124] 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 0809/1124] [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 0810/1124] 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 0811/1124] 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 0812/1124] 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 0813/1124] 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 0814/1124] 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 0815/1124] 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 0816/1124] 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 0817/1124] 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 7aec3d3cdf331a64a3d0fbbd93fa8aed84e378bd Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 16:42:02 -0700
Subject: [PATCH 0818/1124] Add types for newman

---
 types/newman/index.d.ts      | 26 ++++++++++++++++++++++++++
 types/newman/newman-tests.ts | 11 +++++++++++
 types/newman/tsconfig.json   | 16 ++++++++++++++++
 types/newman/tslint.json     |  1 +
 4 files changed, 54 insertions(+)
 create mode 100644 types/newman/index.d.ts
 create mode 100644 types/newman/newman-tests.ts
 create mode 100644 types/newman/tsconfig.json
 create mode 100644 types/newman/tslint.json

diff --git a/types/newman/index.d.ts b/types/newman/index.d.ts
new file mode 100644
index 0000000000..8f566b275c
--- /dev/null
+++ b/types/newman/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for newman 3.9
+// Project: https://github.com/postmanlabs/newman
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface NewmanRunSummary {
+    run: NewmanRun;
+}
+export interface NewmanRun {
+    executions: NewmanRunExecution[];
+}
+export interface NewmanRunExecution {
+    item: NewmanRunExecutionItem;
+    assertions: NewmanRunExecutionAssertion[];
+}
+export interface NewmanRunExecutionItem {
+    name: string;
+}
+export interface NewmanRunExecutionAssertion {
+    assertion: string;
+    error: NewmanRunExecutionAssertionError;
+}
+export interface NewmanRunExecutionAssertionError {
+    message: string;
+}
+export function run(options: any, callback?: (err: Error | null, summary: NewmanRunSummary) => void): void;
diff --git a/types/newman/newman-tests.ts b/types/newman/newman-tests.ts
new file mode 100644
index 0000000000..82ba6002e7
--- /dev/null
+++ b/types/newman/newman-tests.ts
@@ -0,0 +1,11 @@
+import {
+    run,
+    NewmanRun,
+    NewmanRunExecution,
+    NewmanRunExecutionAssertion,
+    NewmanRunExecutionAssertionError,
+    NewmanRunExecutionItem,
+    NewmanRunSummary,
+} from 'newman';
+
+run({});
diff --git a/types/newman/tsconfig.json b/types/newman/tsconfig.json
new file mode 100644
index 0000000000..a4fcd1bf48
--- /dev/null
+++ b/types/newman/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", "newman-tests.ts"]
+}
diff --git a/types/newman/tslint.json b/types/newman/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/newman/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 0819/1124] 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 6ef11f7677759c1034acdee6d5e38ec8b1f35ea7 Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Fri, 18 May 2018 01:15:32 +0100
Subject: [PATCH 0820/1124] Initial re-base@3.x type definitions

---
 types/re-base/index.d.ts       | 567 +++++++++++++++++++++++++++++++++
 types/re-base/re-base-tests.ts |   9 +
 types/re-base/tsconfig.json    |  22 ++
 types/re-base/tslint.json      |   1 +
 4 files changed, 599 insertions(+)
 create mode 100644 types/re-base/index.d.ts
 create mode 100644 types/re-base/re-base-tests.ts
 create mode 100644 types/re-base/tsconfig.json
 create mode 100644 types/re-base/tslint.json

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
new file mode 100644
index 0000000000..928bca7c47
--- /dev/null
+++ b/types/re-base/index.d.ts
@@ -0,0 +1,567 @@
+// Type definitions for re-base 3.2
+// Project: https://github.com/tylermcginnis/re-base#readme
+// Definitions by: jordandrako <https://github.com/jordandrako>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface QueryOptions {}
+
+interface RebaseBinding {}
+
+declare namespace firebase {
+
+}
+
+declare namespace firebase.app {
+    interface App {}
+}
+
+declare namespace firebase.database {
+    interface Database {}
+}
+
+declare namespace firebase.firestore {
+    class Firestore {}
+}
+
+declare namespace rebase {
+    interface SyncStateOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar`.
+         */
+        state: string;
+
+        /**
+         * A default value to set when the Firebase endpoint has no value (i.e., on init) (use this if you want a value other than an empty object or empty array)
+         */
+        defaultValue?: string | boolean | number | {};
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * Will keep any firebase generated keys intact when manipulating data using the asArray option.
+         */
+        keepKeys?: boolean;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+
+        /**
+         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with syncState) to change this.state.loading to false.
+         */
+        then?: () => void;
+
+        /**
+         * A callback function that will be invoked if the current user does not have read or write permissions at the location.
+         */
+        onFailure?: () => void;
+    }
+
+    interface BindToStateOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar` (no arrays).
+         */
+        state: string;
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+
+        /**
+         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with bindToState) to change this.state.loading to false.
+         */
+        then?: () => void;
+
+        /**
+         * A callback function that will be invoked if the current user does not have read permissions at the location.
+         */
+        onFailure?: () => void;
+    }
+
+    interface ListenToOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
+         */
+        then: (result: any) => void;
+
+        /**
+         * The callback function that will be invoked if the current user does not have read permissions at the location.
+         */
+        onFailure?: (error: any) => void;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+    }
+
+    interface FetchOptions {
+        /**
+         * The context of your component.
+         */
+        context: {};
+
+        /**
+         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
+         */
+        asArray?: boolean;
+
+        /**
+         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
+         */
+        then?: (result: any) => void;
+
+        /**
+         * The callback function that will be invoked with an error that occurs reading data from the specified endpoint.
+         */
+        onFailure?: () => void;
+
+        /**
+         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
+         */
+        queries?: QueryOptions;
+    }
+
+    interface PostOptions {
+        /**
+         * The data you're wanting to persist to Firebase.
+         */
+        data: any;
+
+        /**
+         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
+         */
+        then?: (result: any) => void;
+    }
+
+    interface PushOptions {
+        /**
+         * The data you're wanting to persist to Firebase.
+         */
+        data: any;
+
+        /**
+         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
+         */
+        then?: (result: any) => void;
+    }
+
+    interface UpdateOptions {
+        /**
+         * The data you're wanting to persist to Firebase.
+         */
+        data: any;
+
+        /**
+         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
+         */
+        then?: (result: any) => void;
+    }
+
+    interface DocumentReference {}
+
+    interface CollectionReference {}
+
+    interface bindDocOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * A property name on your state to bind your document to, if omitted the document will be merged into your existing state.
+         */
+        state?: string;
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface listenToDocOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface bindCollectionOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * The state property to bind the collection to.
+         */
+        state?: string;
+
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+
+        /**
+         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
+         */
+        withIds?: boolean;
+
+        /**
+         * will embed the DocumentReference inside each document in your collection on the `ref` property.
+         */
+        withRefs?: boolean;
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface listenToCollectionOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * A callback that will be called with the data.
+         */
+        then: () => void;
+
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+
+        /**
+         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
+         */
+        withIds?: boolean;
+
+        /**
+         * will embed the DocumentReference inside each document in your collection on the `ref` property.
+         */
+        withRefs?: boolean;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface getOptions {
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+
+        /**
+         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
+         */
+        withIds?: boolean;
+
+        /**
+         * will embed the DocumentReference inside each document in your collection on the `ref` property.
+         */
+        withRefs?: boolean;
+    }
+
+    interface removeFromCollectionOptions {
+        /**
+         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+         */
+        query?: () => void;
+    }
+
+    interface syncDocOptions {
+        /**
+         * Your react component.
+         */
+        context: {};
+
+        /**
+         * The state property to sync.
+         */
+        state: string;
+
+        /**
+         * A callback that will be called when the listener is set, use for loading indicators.
+         */
+        then?: () => void;
+
+        /**
+         * A callback that will be called with any errors such as permissions errors.
+         */
+        onFailure?: () => void;
+    }
+
+    interface Rebase {
+        /**
+         * This property contains the initialized firebase app that was passed into re-base. You can access any of the firebase services that you are using off this object. For instance, if you want to use some firebase database methods that re-base doesn't have helpers for or if you are using the auth service and want to quickly access it off of re-base.
+         */
+        initializedApp: firebase.app.App;
+
+        /**
+         * This property contains an object that you can use when adding data that will be converted to a timestamp by Firebase. See [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue) for more info.
+         */
+        timestamp: {};
+
+        /**
+         * Allows you to set up two way data binding between your component's state and your Firebase. Whenever your Firebase changes, your component's state will change. Whenever your component's state changes, Firebase will change.
+         * @param endpoint The relative Firebase endpoint to which you'd like to bind your component's state.
+         * @param options syncState Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        syncState(endpoint: string, options: SyncStateOptions): RebaseBinding;
+
+        /**
+         * One way data binding from Firebase to your component's state. Allows you to bind a component's state property to a Firebase endpoint so whenever that Firebase endpoint changes, your component's state will be updated with that change.
+         * @param endpoint The relative Firebase endpoint that you'd like to bind to your component's state.
+         * @param options bindToState Options.
+         * @returns An object which you can pass to removeBinding if you want to remove the listener while the component is still mounted.
+         */
+        bindToState(
+            endpoint: string,
+            options: BindToStateOptions
+        ): RebaseBinding;
+
+        /**
+         * Allows you to listen to Firebase endpoints without binding those changes to a state property. Instead, a callback will be invoked with the newly updated data.
+         * @param endpoint The relative Firebase endpoint which contains the data with which you'd like to invoke your callback function.
+         * @param options listenTo Options.
+         * @returns An object which you can pass to removeBinding when your component unmounts to remove the Firebase listeners.
+         */
+        listenTo(endpoint: string, options: ListenToOptions): RebaseBinding;
+
+        /**
+         * Allows you to retrieve the data from a Firebase endpoint just once without subscribing or listening for data changes.
+         * @param endpoint The relative Firebase endpoint which contains the data you're wanting to fetch.
+         * @param options fetch Options.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        fetch(endpoint: string, options: FetchOptions): Promise<any>;
+
+        /**
+         * Allows you to update a Firebase endpoint with new data. *Replace all the data at this endpoint with the new data*.
+         * @param endpoint The relative Firebase endpoint that you'd like to update with the new data.
+         * @param options post Options.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        post(endpoint: string, options: PostOptions): Promise<any>;
+
+        /**
+         * Allows you to add data to a Firebase endpoint. *Adds data to a child of the endpoint with a new Firebase push key*.
+         * @param endpoint The relative Firebase endpoint that you'd like to push the new data to.
+         * @param options push Options.
+         * @returns A Firebase [ThenableReference](https://firebase.google.com/docs/reference/js/firebase.database.ThenableReference) which is defined by Firebase as a "Combined Promise and reference; resolves when write is complete, but can be used immediately as the reference to the child location."
+         */
+        push(endpoint: string, options: PushOptions): Promise<any>;
+
+        /**
+         * Allows you to update data at a Firebase endpoint changing only the properties you pass to it. **Warning: calling update with `options.data` being null will remove all the data at that endpoint**.
+         * @param endpoint The relative Firebase endpoint that you'd like to update.
+         * @param options update Options.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        update(endpoint: string, options: UpdateOptions): Promise<any>;
+
+        /**
+         * Allows you to delete all data at the endpoint location.
+         * @param endpoint The relative Firebase endpoint that you'd like to delete data from.
+         * @param callback A callback that will get invoked once the data is successfully removed Firebase. If there is an error, it will be the only argument to this function.
+         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
+         */
+        remove(
+            endpoint: string,
+            callback?: (result: Promise<any>) => void
+        ): Promise<any>;
+
+        /**
+         * Bind a document to your component. When then document changes in firestore, your component will re-render with the latest data.
+         * @param refOrPath DocumentReference or path.
+         * @param options bindDoc Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        bindDoc(
+            refOrPath: DocumentReference | string,
+            options: bindDocOptions
+        ): RebaseBinding;
+
+        /**
+         * Listen to a document, when the data changes it will invoke a callback passing it the new data from Firestore.
+         * @param refOrPath DocumentReference or path.
+         * @param options listenToDoc Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        listenToDoc(
+            refOrPath: DocumentReference | string,
+            options: listenToDocOptions
+        ): RebaseBinding;
+
+        /**
+         * Bind a collection to a state property in your component. When then collection changes in firestore, your component will re-render with the latest data.
+         * @param refOrPath CollectionReference or path.
+         * @param options bindCollection Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        bindCollection(
+            refOrPath: CollectionReference | string,
+            options: bindCollectionOptions
+        ): RebaseBinding;
+
+        /**
+         * Listen to a collection, when the data changes it will invoke a callback passing it the new data from Firestore.
+         * @param refOrPath CollectionReference or path.
+         * @param options listenToCollection Options.
+         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
+         */
+        listenToCollection(
+            refOrPath: CollectionReference | string,
+            options: listenToCollectionOptions
+        ): RebaseBinding;
+
+        /**
+         * Fetch either a Collection or Document.
+         * @param refOrPath CollectionReference, DocumentReference or path.
+         * @param options get Options.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        get(
+            refOrPath: CollectionReference | DocumentReference | string,
+            options: listenToCollectionOptions
+        ): Promise<any>;
+
+        /**
+         * Add a new Document to a Collection.
+         * @param refOrPath CollectionReference or path.
+         * @param data The document data.
+         * @param id The id for the document. If omitted, the Firestore will generate an id for you.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        addToCollection(
+            refOrPath: CollectionReference | string,
+            data: {},
+            id?: string
+        ): Promise<any>;
+
+        /**
+         * Update an existing document.
+         * @param refOrPath DocumentReference or path.
+         * @param data The document data.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        updateDoc(
+            refOrPath: DocumentReference | string,
+            data: {}
+        ): Promise<any>;
+
+        /**
+         * Deletes a document.
+         * @param refOrPath DocumentReference or path.
+         * @param data The document data.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        removeDoc(
+            refOrPath: DocumentReference | string,
+            data: {}
+        ): Promise<any>;
+
+        /**
+         * Removes documents from a collection. If no query is supplied, it will remove all the documents. If a query is supplied, it will only remove documents that match the query.
+         * @param refOrPath CollectionReference or path.
+         * @param options removeFromCollection Options.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        removeFromCollection(
+            refOrPath: CollectionReference | string,
+            options: removeFromCollectionOptions
+        ): Promise<any>;
+
+        /**
+         * Syncs a component's local state with a document in Firestore.
+         * @param refOrPath DocumentReference or path.
+         * @param options removeFromCollection Options.
+         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
+         */
+        syncDoc(
+            refOrPath: DocumentReference | string,
+            options: syncDocOptions
+        ): RebaseBinding;
+
+        /**
+         * Clean up a listener. Listeners are automatically cleaned up when components unmount, however if you wish to remove a listener while the component is still mounted this will allow you to do that. An example would be if you want to start listening to a new document or change a query on all collection in response to a prop change.
+         * @param ref The return value of syncState`, `bindToState`, `listenTo`, `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or `syncDoc`.
+         */
+        removeBinding(ref: RebaseBinding): void;
+
+        /**
+         * Removes every Firebase/Firestore listener.
+         */
+        reset(): void;
+    }
+}
+
+declare module "re-base" {
+    /**
+     * Accepts an initialized firebase database or firestore database object.
+     * @param {object} firebaseDatabase Initialized firebase or firestore
+     * database.
+     * @return {Rebase} An instance of re-base.
+     */
+    export function createClass(
+        firebaseDatabase:
+            | firebase.database.Database
+            | firebase.firestore.Firestore
+    ): rebase.Rebase;
+}
diff --git a/types/re-base/re-base-tests.ts b/types/re-base/re-base-tests.ts
new file mode 100644
index 0000000000..702a6ab2dd
--- /dev/null
+++ b/types/re-base/re-base-tests.ts
@@ -0,0 +1,9 @@
+import * as rebase from "re-base";
+
+const database = {};
+const base = rebase.createClass(database);
+
+const _ref = base.syncState("foo", {
+    context: "bar",
+    state: "baz"
+});
diff --git a/types/re-base/tsconfig.json b/types/re-base/tsconfig.json
new file mode 100644
index 0000000000..eb916d27f6
--- /dev/null
+++ b/types/re-base/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",
+        "re-base-tests.ts"
+    ]
+}
diff --git a/types/re-base/tslint.json b/types/re-base/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/re-base/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0821/1124] 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 5b51b45acec73d734905354ce064dc5e9231dc77 Mon Sep 17 00:00:00 2001
From: Andrew Scott <ascott18@gmail.com>
Date: Tue, 29 May 2018 17:03:12 -0700
Subject: [PATCH 0822/1124] Enabled linters and fixed errors.

Couldn't enable `unified-signatures` because of some overloads that take `any` as a substitute for node-canvas.
---
 types/qrcode/index.d.ts      | 58 ++++++----------------------
 types/qrcode/qrcode-tests.ts | 20 +++++-----
 types/qrcode/tslint.json     | 75 +-----------------------------------
 3 files changed, 23 insertions(+), 130 deletions(-)

diff --git a/types/qrcode/index.d.ts b/types/qrcode/index.d.ts
index 1bf0a13454..5d607b2908 100644
--- a/types/qrcode/index.d.ts
+++ b/types/qrcode/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for qrcode 1.2.0
+// Type definitions for qrcode 1.2
 // Project: https://github.com/soldair/node-qrcode
-// Definitions by: York Yao <https://github.com/plantain-00/>
+// Definitions by: York Yao <https://github.com/plantain-00>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -22,7 +22,7 @@ export interface QRCodeOptions {
      * Helper function used internally to convert a kanji to its Shift JIS value.
      * Provide this function if you need support for Kanji mode.
      */
-    toSJISFunc?: Function;
+    toSJISFunc?: (codePoint: string) => number;
 }
 
 export interface QRCodeToDataURLOptions extends QRCodeRenderersOptions {
@@ -127,10 +127,6 @@ export interface QRCode {
  */
 export function create(text: string | QRCodeSegment[], options: QRCodeOptions): QRCode;
 
-/**
- * Draws qr code symbol to canvas.
- */
-export function toCanvas(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[]): Promise<any>;
 /**
  * Draws qr code symbol to canvas.
  */
@@ -138,15 +134,11 @@ export function toCanvas(canvasElement: HTMLCanvasElement, text: string | QRCode
 /**
  * Draws qr code symbol to canvas.
  */
-export function toCanvas(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options: QRCodeOptions): Promise<any>;
+export function toCanvas(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options?: QRCodeOptions): Promise<any>;
 /**
  * Draws qr code symbol to canvas.
  */
 export function toCanvas(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options: QRCodeOptions, callback: (error: Error) => void): void;
-/**
- * Draws qr code symbol to canvas.
- */
-export function toCanvas(text: string | QRCodeSegment[]): Promise<any>;
 /**
  * Draws qr code symbol to canvas.
  */
@@ -154,15 +146,11 @@ export function toCanvas(text: string | QRCodeSegment[], callback: (error: Error
 /**
  * Draws qr code symbol to canvas.
  */
-export function toCanvas(text: string | QRCodeSegment[], options: QRCodeOptions): Promise<any>;
+export function toCanvas(text: string | QRCodeSegment[], options?: QRCodeOptions): Promise<any>;
 /**
  * Draws qr code symbol to canvas.
  */
 export function toCanvas(text: string | QRCodeSegment[], options: QRCodeOptions, callback: (error: Error, canvas: HTMLCanvasElement) => void): void;
-/**
- * Draws qr code symbol to node canvas.
- */
-export function toCanvas(canvas: any, text: string | QRCodeSegment[]): Promise<any>;
 /**
  * Draws qr code symbol to node canvas.
  */
@@ -170,16 +158,12 @@ export function toCanvas(canvas: any, text: string | QRCodeSegment[], callback:
 /**
  * Draws qr code symbol to node canvas.
  */
-export function toCanvas(canvas: any, text: string | QRCodeSegment[], options: QRCodeOptions): Promise<any>;
+export function toCanvas(canvas: any, text: string | QRCodeSegment[], options?: QRCodeOptions): Promise<any>;
 /**
  * Draws qr code symbol to node canvas.
  */
 export function toCanvas(canvas: any, text: string | QRCodeSegment[], options: QRCodeOptions, callback: (error: Error) => void): void;
 
-/**
- * Returns a Data URI containing a representation of the QR Code image.
- */
-export function toDataURL(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[]): Promise<any>;
 /**
  * Returns a Data URI containing a representation of the QR Code image.
  */
@@ -187,15 +171,12 @@ export function toDataURL(canvasElement: HTMLCanvasElement, text: string | QRCod
 /**
  * Returns a Data URI containing a representation of the QR Code image.
  */
-export function toDataURL(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options: QRCodeToDataURLOptions): Promise<any>;
+export function toDataURL(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options?: QRCodeToDataURLOptions): Promise<any>;
 /**
  * Returns a Data URI containing a representation of the QR Code image.
  */
 export function toDataURL(canvasElement: HTMLCanvasElement, text: string | QRCodeSegment[], options: QRCodeToDataURLOptions, callback: (error: Error, url: string) => void): void;
-/**
- * Returns a Data URI containing a representation of the QR Code image.
- */
-export function toDataURL(text: string | QRCodeSegment[]): Promise<any>;
+
 /**
  * Returns a Data URI containing a representation of the QR Code image.
  */
@@ -203,17 +184,12 @@ export function toDataURL(text: string | QRCodeSegment[], callback: (error: Erro
 /**
  * Returns a Data URI containing a representation of the QR Code image.
  */
-export function toDataURL(text: string | QRCodeSegment[], options: QRCodeToDataURLOptions): Promise<any>;
+export function toDataURL(text: string | QRCodeSegment[], options?: QRCodeToDataURLOptions): Promise<any>;
 /**
  * Returns a Data URI containing a representation of the QR Code image.
  */
 export function toDataURL(text: string | QRCodeSegment[], options: QRCodeToDataURLOptions, callback: (error: Error, url: string) => void): void;
 
-/**
- * Returns a string representation of the QR Code.
- * If choosen output format is svg it will returns a string containing xml code.
- */
-export function toString(text: string | QRCodeSegment[]): Promise<any>;
 /**
  * Returns a string representation of the QR Code.
  * If choosen output format is svg it will returns a string containing xml code.
@@ -223,19 +199,13 @@ export function toString(text: string | QRCodeSegment[], callback: (error: Error
  * Returns a string representation of the QR Code.
  * If choosen output format is svg it will returns a string containing xml code.
  */
-export function toString(text: string | QRCodeSegment[], options: QRCodeToStringOptions): Promise<any>;
+export function toString(text: string | QRCodeSegment[], options?: QRCodeToStringOptions): Promise<any>;
 /**
  * Returns a string representation of the QR Code.
  * If choosen output format is svg it will returns a string containing xml code.
  */
 export function toString(text: string | QRCodeSegment[], options: QRCodeToStringOptions, callback: (error: Error, string: string) => void): void;
 
-/**
- * Saves QR Code to image file.
- * If options.type is not specified, the format will be guessed from file extension.
- * Recognized extensions are png, svg, txt.
- */
-export function toFile(path: string, text: string | QRCodeSegment[]): Promise<any>;
 /**
  * Saves QR Code to image file.
  * If options.type is not specified, the format will be guessed from file extension.
@@ -247,7 +217,7 @@ export function toFile(path: string, text: string | QRCodeSegment[], callback: (
  * If options.type is not specified, the format will be guessed from file extension.
  * Recognized extensions are png, svg, txt.
  */
-export function toFile(path: string, text: string | QRCodeSegment[], options: QRCodeToFileOptions): Promise<any>;
+export function toFile(path: string, text: string | QRCodeSegment[], options?: QRCodeToFileOptions): Promise<any>;
 /**
  * Saves QR Code to image file.
  * If options.type is not specified, the format will be guessed from file extension.
@@ -255,10 +225,6 @@ export function toFile(path: string, text: string | QRCodeSegment[], options: QR
  */
 export function toFile(path: string, text: string | QRCodeSegment[], options: QRCodeToFileOptions, callback: (error: Error) => void): void;
 
-/**
- * Writes QR Code image to stream. Only works with png format for now.
- */
-export function toFileStream(stream: stream.Writable, text: string | QRCodeSegment[]): Promise<any>;
 /**
  * Writes QR Code image to stream. Only works with png format for now.
  */
@@ -266,7 +232,7 @@ export function toFileStream(stream: stream.Writable, text: string | QRCodeSegme
 /**
  * Writes QR Code image to stream. Only works with png format for now.
  */
-export function toFileStream(stream: stream.Writable, text: string | QRCodeSegment[], options: QRCodeOptions): Promise<any>;
+export function toFileStream(stream: stream.Writable, text: string | QRCodeSegment[], options?: QRCodeOptions): Promise<any>;
 /**
  * Writes QR Code image to stream. Only works with png format for now.
  */
diff --git a/types/qrcode/qrcode-tests.ts b/types/qrcode/qrcode-tests.ts
index 6a94a5f580..363367cc28 100644
--- a/types/qrcode/qrcode-tests.ts
+++ b/types/qrcode/qrcode-tests.ts
@@ -2,31 +2,31 @@ import * as QRCode from 'qrcode';
 
 const canvas = document.getElementById('canvas') as HTMLCanvasElement;
 
-QRCode.toCanvas(canvas, 'sample text', function (error) {
-    if (error) console.error(error)
+QRCode.toCanvas(canvas, 'sample text', (error) => {
+    if (error) console.error(error);
     console.log('success!');
 });
 
-QRCode.toDataURL('I am a pony!', function (err, url) {
+QRCode.toDataURL('I am a pony!', (err, url) => {
     console.log(url);
 });
 
-QRCode.toDataURL('some text', { errorCorrectionLevel: 'H' }, function (err, url) {
+QRCode.toDataURL('some text', { errorCorrectionLevel: 'H' }, (err, url) => {
     console.log(url);
 });
 
-QRCode.toDataURL('some text', { version: 2 }, function (err, url) {
+QRCode.toDataURL('some text', { version: 2 }, (err, url) => {
     console.log(url);
 });
 
 QRCode.toDataURL([
     { data: 'ABCDEFG', mode: 'alphanumeric' },
     { data: '0123456', mode: 'numeric' }
-], function (err, url) {
+], (err, url) => {
     console.log(url);
 });
 
-QRCode.toCanvas('text', { errorCorrectionLevel: 'H' }, function (err, canvas) {
+QRCode.toCanvas('text', { errorCorrectionLevel: 'H' }, (err, canvas) => {
     if (err) throw err;
 });
 
@@ -36,11 +36,11 @@ QRCode.toDataURL('text', {
     rendererOpts: {
         quality: 0.3
     }
-}, function (err, url) {
+}, (err, url) => {
     if (err) throw err;
 });
 
-QRCode.toString('http://www.google.com', function (err, string) {
+QRCode.toString('http://www.google.com', (err, string) => {
     if (err) throw err;
     console.log(string);
 });
@@ -50,7 +50,7 @@ QRCode.toFile('path/to/filename.png', 'Some text', {
         dark: '#00F',  // Blue dots
         light: '#0000' // Transparent background
     }
-}, function (err) {
+}, (err) => {
     if (err) throw err;
     console.log('done');
 });
diff --git a/types/qrcode/tslint.json b/types/qrcode/tslint.json
index a41bf5d19a..08b1465cd6 100644
--- a/types/qrcode/tslint.json
+++ b/types/qrcode/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "unified-signatures": false
     }
 }

From d065c5666ee2d2bf31e2d89bfa32b863c6d493ef Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Thu, 17 May 2018 17:51:13 -0700
Subject: [PATCH 0823/1124] Fix linting errors.

---
 types/re-base/index.d.ts    | 96 ++++++++++---------------------------
 types/re-base/tsconfig.json | 14 ++----
 types/re-base/tslint.json   |  8 +++-
 3 files changed, 36 insertions(+), 82 deletions(-)

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
index 928bca7c47..5934b67295 100644
--- a/types/re-base/index.d.ts
+++ b/types/re-base/index.d.ts
@@ -3,27 +3,7 @@
 // Definitions by: jordandrako <https://github.com/jordandrako>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface QueryOptions {}
-
-interface RebaseBinding {}
-
-declare namespace firebase {
-
-}
-
-declare namespace firebase.app {
-    interface App {}
-}
-
-declare namespace firebase.database {
-    interface Database {}
-}
-
-declare namespace firebase.firestore {
-    class Firestore {}
-}
-
-declare namespace rebase {
+export namespace rebase {
     interface SyncStateOptions {
         /**
          * The context of your component.
@@ -53,7 +33,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
 
         /**
          * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with syncState) to change this.state.loading to false.
@@ -85,7 +65,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
 
         /**
          * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with bindToState) to change this.state.loading to false.
@@ -122,7 +102,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
     }
 
     interface FetchOptions {
@@ -149,7 +129,7 @@ declare namespace rebase {
         /**
          * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
          */
-        queries?: QueryOptions;
+        queries?: {};
     }
 
     interface PostOptions {
@@ -188,10 +168,6 @@ declare namespace rebase {
         then?: (result: any) => void;
     }
 
-    interface DocumentReference {}
-
-    interface CollectionReference {}
-
     interface bindDocOptions {
         /**
          * Your react component.
@@ -350,7 +326,7 @@ declare namespace rebase {
         /**
          * This property contains the initialized firebase app that was passed into re-base. You can access any of the firebase services that you are using off this object. For instance, if you want to use some firebase database methods that re-base doesn't have helpers for or if you are using the auth service and want to quickly access it off of re-base.
          */
-        initializedApp: firebase.app.App;
+        initializedApp: {};
 
         /**
          * This property contains an object that you can use when adding data that will be converted to a timestamp by Firebase. See [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue) for more info.
@@ -363,7 +339,7 @@ declare namespace rebase {
          * @param options syncState Options.
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
-        syncState(endpoint: string, options: SyncStateOptions): RebaseBinding;
+        syncState(endpoint: string, options: SyncStateOptions): {};
 
         /**
          * One way data binding from Firebase to your component's state. Allows you to bind a component's state property to a Firebase endpoint so whenever that Firebase endpoint changes, your component's state will be updated with that change.
@@ -371,10 +347,7 @@ declare namespace rebase {
          * @param options bindToState Options.
          * @returns An object which you can pass to removeBinding if you want to remove the listener while the component is still mounted.
          */
-        bindToState(
-            endpoint: string,
-            options: BindToStateOptions
-        ): RebaseBinding;
+        bindToState(endpoint: string, options: BindToStateOptions): {};
 
         /**
          * Allows you to listen to Firebase endpoints without binding those changes to a state property. Instead, a callback will be invoked with the newly updated data.
@@ -382,7 +355,7 @@ declare namespace rebase {
          * @param options listenTo Options.
          * @returns An object which you can pass to removeBinding when your component unmounts to remove the Firebase listeners.
          */
-        listenTo(endpoint: string, options: ListenToOptions): RebaseBinding;
+        listenTo(endpoint: string, options: ListenToOptions): {};
 
         /**
          * Allows you to retrieve the data from a Firebase endpoint just once without subscribing or listening for data changes.
@@ -433,10 +406,7 @@ declare namespace rebase {
          * @param options bindDoc Options.
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
-        bindDoc(
-            refOrPath: DocumentReference | string,
-            options: bindDocOptions
-        ): RebaseBinding;
+        bindDoc(refOrPath: {} | string, options: bindDocOptions): {};
 
         /**
          * Listen to a document, when the data changes it will invoke a callback passing it the new data from Firestore.
@@ -444,10 +414,7 @@ declare namespace rebase {
          * @param options listenToDoc Options.
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
-        listenToDoc(
-            refOrPath: DocumentReference | string,
-            options: listenToDocOptions
-        ): RebaseBinding;
+        listenToDoc(refOrPath: {} | string, options: listenToDocOptions): {};
 
         /**
          * Bind a collection to a state property in your component. When then collection changes in firestore, your component will re-render with the latest data.
@@ -456,9 +423,9 @@ declare namespace rebase {
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
         bindCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             options: bindCollectionOptions
-        ): RebaseBinding;
+        ): {};
 
         /**
          * Listen to a collection, when the data changes it will invoke a callback passing it the new data from Firestore.
@@ -467,9 +434,9 @@ declare namespace rebase {
          * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
          */
         listenToCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             options: listenToCollectionOptions
-        ): RebaseBinding;
+        ): {};
 
         /**
          * Fetch either a Collection or Document.
@@ -478,7 +445,7 @@ declare namespace rebase {
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
         get(
-            refOrPath: CollectionReference | DocumentReference | string,
+            refOrPath: {} | {} | string,
             options: listenToCollectionOptions
         ): Promise<any>;
 
@@ -490,7 +457,7 @@ declare namespace rebase {
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
         addToCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             data: {},
             id?: string
         ): Promise<any>;
@@ -501,10 +468,7 @@ declare namespace rebase {
          * @param data The document data.
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
-        updateDoc(
-            refOrPath: DocumentReference | string,
-            data: {}
-        ): Promise<any>;
+        updateDoc(refOrPath: {} | string, data: {}): Promise<any>;
 
         /**
          * Deletes a document.
@@ -512,10 +476,7 @@ declare namespace rebase {
          * @param data The document data.
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
-        removeDoc(
-            refOrPath: DocumentReference | string,
-            data: {}
-        ): Promise<any>;
+        removeDoc(refOrPath: {} | string, data: {}): Promise<any>;
 
         /**
          * Removes documents from a collection. If no query is supplied, it will remove all the documents. If a query is supplied, it will only remove documents that match the query.
@@ -524,7 +485,7 @@ declare namespace rebase {
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
         removeFromCollection(
-            refOrPath: CollectionReference | string,
+            refOrPath: {} | string,
             options: removeFromCollectionOptions
         ): Promise<any>;
 
@@ -534,16 +495,13 @@ declare namespace rebase {
          * @param options removeFromCollection Options.
          * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
          */
-        syncDoc(
-            refOrPath: DocumentReference | string,
-            options: syncDocOptions
-        ): RebaseBinding;
+        syncDoc(refOrPath: {} | string, options: syncDocOptions): {};
 
         /**
          * Clean up a listener. Listeners are automatically cleaned up when components unmount, however if you wish to remove a listener while the component is still mounted this will allow you to do that. An example would be if you want to start listening to a new document or change a query on all collection in response to a prop change.
          * @param ref The return value of syncState`, `bindToState`, `listenTo`, `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or `syncDoc`.
          */
-        removeBinding(ref: RebaseBinding): void;
+        removeBinding(ref: {}): void;
 
         /**
          * Removes every Firebase/Firestore listener.
@@ -555,13 +513,9 @@ declare namespace rebase {
 declare module "re-base" {
     /**
      * Accepts an initialized firebase database or firestore database object.
-     * @param {object} firebaseDatabase Initialized firebase or firestore
+     * @param firebaseDatabase Initialized firebase or firestore
      * database.
-     * @return {Rebase} An instance of re-base.
+     * @return An instance of re-base.
      */
-    export function createClass(
-        firebaseDatabase:
-            | firebase.database.Database
-            | firebase.firestore.Firestore
-    ): rebase.Rebase;
+    function createClass(firebaseDatabase: {}): rebase.Rebase;
 }
diff --git a/types/re-base/tsconfig.json b/types/re-base/tsconfig.json
index eb916d27f6..ff88a407d4 100644
--- a/types/re-base/tsconfig.json
+++ b/types/re-base/tsconfig.json
@@ -1,22 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "re-base-tests.ts"
-    ]
+    "files": ["index.d.ts", "re-base-tests.ts"]
 }
diff --git a/types/re-base/tslint.json b/types/re-base/tslint.json
index 3db14f85ea..c077883976 100644
--- a/types/re-base/tslint.json
+++ b/types/re-base/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false,
+        "no-declare-current-package": false
+    }
+}

From e5af6babf3691a7e80dee85f7d699b275f17510a Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Thu, 17 May 2018 19:38:18 -0700
Subject: [PATCH 0824/1124] Stricter linting rules

---
 types/re-base/tslint.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/types/re-base/tslint.json b/types/re-base/tslint.json
index c077883976..3db14f85ea 100644
--- a/types/re-base/tslint.json
+++ b/types/re-base/tslint.json
@@ -1,7 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "max-line-length": false,
-        "no-declare-current-package": false
-    }
-}
+{ "extends": "dtslint/dt.json" }

From 8fc58a68c35469a9796cd0e9dc5f76e982515fd2 Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Thu, 17 May 2018 19:40:03 -0700
Subject: [PATCH 0825/1124] - JSdoc line lengths - remove needless namespace -
 remove declare namesake module

---
 types/re-base/index.d.ts | 1155 +++++++++++++++++++++-----------------
 1 file changed, 642 insertions(+), 513 deletions(-)

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
index 5934b67295..ba838df0aa 100644
--- a/types/re-base/index.d.ts
+++ b/types/re-base/index.d.ts
@@ -3,519 +3,648 @@
 // Definitions by: jordandrako <https://github.com/jordandrako>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export namespace rebase {
-    interface SyncStateOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar`.
-         */
-        state: string;
-
-        /**
-         * A default value to set when the Firebase endpoint has no value (i.e., on init) (use this if you want a value other than an empty object or empty array)
-         */
-        defaultValue?: string | boolean | number | {};
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * Will keep any firebase generated keys intact when manipulating data using the asArray option.
-         */
-        keepKeys?: boolean;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-
-        /**
-         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with syncState) to change this.state.loading to false.
-         */
-        then?: () => void;
-
-        /**
-         * A callback function that will be invoked if the current user does not have read or write permissions at the location.
-         */
-        onFailure?: () => void;
-    }
-
-    interface BindToStateOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * The state property you want to sync with Firebase; can be an arbitrarily nested property a là `foo.bar` (no arrays).
-         */
-        state: string;
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-
-        /**
-         * The callback function that will be invoked when the initial listener is established with Firebase. Typically used (with bindToState) to change this.state.loading to false.
-         */
-        then?: () => void;
-
-        /**
-         * A callback function that will be invoked if the current user does not have read permissions at the location.
-         */
-        onFailure?: () => void;
-    }
-
-    interface ListenToOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
-         */
-        then: (result: any) => void;
-
-        /**
-         * The callback function that will be invoked if the current user does not have read permissions at the location.
-         */
-        onFailure?: (error: any) => void;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-    }
-
-    interface FetchOptions {
-        /**
-         * The context of your component.
-         */
-        context: {};
-
-        /**
-         * Returns the Firebase data at the specified endpoint as an Array instead of an Object.
-         */
-        asArray?: boolean;
-
-        /**
-         * The callback function that will be invoked with the data from the specified endpoint when the endpoint changes.
-         */
-        then?: (result: any) => void;
-
-        /**
-         * The callback function that will be invoked with an error that occurs reading data from the specified endpoint.
-         */
-        onFailure?: () => void;
-
-        /**
-         * Queries to be used with your read operations. See [Query Options](https://github.com/tylermcginnis/re-base#queries) for more details.
-         */
-        queries?: {};
-    }
-
-    interface PostOptions {
-        /**
-         * The data you're wanting to persist to Firebase.
-         */
-        data: any;
-
-        /**
-         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
-         */
-        then?: (result: any) => void;
-    }
-
-    interface PushOptions {
-        /**
-         * The data you're wanting to persist to Firebase.
-         */
-        data: any;
-
-        /**
-         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
-         */
-        then?: (result: any) => void;
-    }
-
-    interface UpdateOptions {
-        /**
-         * The data you're wanting to persist to Firebase.
-         */
-        data: any;
-
-        /**
-         * A callback that will get invoked once the new data has been saved to Firebase. If there is an error, it will be the only argument to this function.
-         */
-        then?: (result: any) => void;
-    }
-
-    interface bindDocOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * A property name on your state to bind your document to, if omitted the document will be merged into your existing state.
-         */
-        state?: string;
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface listenToDocOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface bindCollectionOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * The state property to bind the collection to.
-         */
-        state?: string;
-
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-
-        /**
-         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
-         */
-        withIds?: boolean;
-
-        /**
-         * will embed the DocumentReference inside each document in your collection on the `ref` property.
-         */
-        withRefs?: boolean;
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface listenToCollectionOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * A callback that will be called with the data.
-         */
-        then: () => void;
-
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-
-        /**
-         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
-         */
-        withIds?: boolean;
-
-        /**
-         * will embed the DocumentReference inside each document in your collection on the `ref` property.
-         */
-        withRefs?: boolean;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface getOptions {
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-
-        /**
-         * Will embed firestore generated document ids inside each document in your collections on the `id` property.
-         */
-        withIds?: boolean;
-
-        /**
-         * will embed the DocumentReference inside each document in your collection on the `ref` property.
-         */
-        withRefs?: boolean;
-    }
-
-    interface removeFromCollectionOptions {
-        /**
-         * A function that receives the created ref as its only argument. You can chain any Firestore queries you want to perform. See [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
-         */
-        query?: () => void;
-    }
-
-    interface syncDocOptions {
-        /**
-         * Your react component.
-         */
-        context: {};
-
-        /**
-         * The state property to sync.
-         */
-        state: string;
-
-        /**
-         * A callback that will be called when the listener is set, use for loading indicators.
-         */
-        then?: () => void;
-
-        /**
-         * A callback that will be called with any errors such as permissions errors.
-         */
-        onFailure?: () => void;
-    }
-
-    interface Rebase {
-        /**
-         * This property contains the initialized firebase app that was passed into re-base. You can access any of the firebase services that you are using off this object. For instance, if you want to use some firebase database methods that re-base doesn't have helpers for or if you are using the auth service and want to quickly access it off of re-base.
-         */
-        initializedApp: {};
-
-        /**
-         * This property contains an object that you can use when adding data that will be converted to a timestamp by Firebase. See [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue) for more info.
-         */
-        timestamp: {};
-
-        /**
-         * Allows you to set up two way data binding between your component's state and your Firebase. Whenever your Firebase changes, your component's state will change. Whenever your component's state changes, Firebase will change.
-         * @param endpoint The relative Firebase endpoint to which you'd like to bind your component's state.
-         * @param options syncState Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        syncState(endpoint: string, options: SyncStateOptions): {};
-
-        /**
-         * One way data binding from Firebase to your component's state. Allows you to bind a component's state property to a Firebase endpoint so whenever that Firebase endpoint changes, your component's state will be updated with that change.
-         * @param endpoint The relative Firebase endpoint that you'd like to bind to your component's state.
-         * @param options bindToState Options.
-         * @returns An object which you can pass to removeBinding if you want to remove the listener while the component is still mounted.
-         */
-        bindToState(endpoint: string, options: BindToStateOptions): {};
-
-        /**
-         * Allows you to listen to Firebase endpoints without binding those changes to a state property. Instead, a callback will be invoked with the newly updated data.
-         * @param endpoint The relative Firebase endpoint which contains the data with which you'd like to invoke your callback function.
-         * @param options listenTo Options.
-         * @returns An object which you can pass to removeBinding when your component unmounts to remove the Firebase listeners.
-         */
-        listenTo(endpoint: string, options: ListenToOptions): {};
-
-        /**
-         * Allows you to retrieve the data from a Firebase endpoint just once without subscribing or listening for data changes.
-         * @param endpoint The relative Firebase endpoint which contains the data you're wanting to fetch.
-         * @param options fetch Options.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        fetch(endpoint: string, options: FetchOptions): Promise<any>;
-
-        /**
-         * Allows you to update a Firebase endpoint with new data. *Replace all the data at this endpoint with the new data*.
-         * @param endpoint The relative Firebase endpoint that you'd like to update with the new data.
-         * @param options post Options.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        post(endpoint: string, options: PostOptions): Promise<any>;
-
-        /**
-         * Allows you to add data to a Firebase endpoint. *Adds data to a child of the endpoint with a new Firebase push key*.
-         * @param endpoint The relative Firebase endpoint that you'd like to push the new data to.
-         * @param options push Options.
-         * @returns A Firebase [ThenableReference](https://firebase.google.com/docs/reference/js/firebase.database.ThenableReference) which is defined by Firebase as a "Combined Promise and reference; resolves when write is complete, but can be used immediately as the reference to the child location."
-         */
-        push(endpoint: string, options: PushOptions): Promise<any>;
-
-        /**
-         * Allows you to update data at a Firebase endpoint changing only the properties you pass to it. **Warning: calling update with `options.data` being null will remove all the data at that endpoint**.
-         * @param endpoint The relative Firebase endpoint that you'd like to update.
-         * @param options update Options.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        update(endpoint: string, options: UpdateOptions): Promise<any>;
-
-        /**
-         * Allows you to delete all data at the endpoint location.
-         * @param endpoint The relative Firebase endpoint that you'd like to delete data from.
-         * @param callback A callback that will get invoked once the data is successfully removed Firebase. If there is an error, it will be the only argument to this function.
-         * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise) which resolves when the write is complete and rejects if there is an error.
-         */
-        remove(
-            endpoint: string,
-            callback?: (result: Promise<any>) => void
-        ): Promise<any>;
-
-        /**
-         * Bind a document to your component. When then document changes in firestore, your component will re-render with the latest data.
-         * @param refOrPath DocumentReference or path.
-         * @param options bindDoc Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        bindDoc(refOrPath: {} | string, options: bindDocOptions): {};
-
-        /**
-         * Listen to a document, when the data changes it will invoke a callback passing it the new data from Firestore.
-         * @param refOrPath DocumentReference or path.
-         * @param options listenToDoc Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        listenToDoc(refOrPath: {} | string, options: listenToDocOptions): {};
-
-        /**
-         * Bind a collection to a state property in your component. When then collection changes in firestore, your component will re-render with the latest data.
-         * @param refOrPath CollectionReference or path.
-         * @param options bindCollection Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        bindCollection(
-            refOrPath: {} | string,
-            options: bindCollectionOptions
-        ): {};
-
-        /**
-         * Listen to a collection, when the data changes it will invoke a callback passing it the new data from Firestore.
-         * @param refOrPath CollectionReference or path.
-         * @param options listenToCollection Options.
-         * @returns An object which you can pass to `removeBinding` if you want to remove the listener while the component is still mounted.
-         */
-        listenToCollection(
-            refOrPath: {} | string,
-            options: listenToCollectionOptions
-        ): {};
-
-        /**
-         * Fetch either a Collection or Document.
-         * @param refOrPath CollectionReference, DocumentReference or path.
-         * @param options get Options.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        get(
-            refOrPath: {} | {} | string,
-            options: listenToCollectionOptions
-        ): Promise<any>;
-
-        /**
-         * Add a new Document to a Collection.
-         * @param refOrPath CollectionReference or path.
-         * @param data The document data.
-         * @param id The id for the document. If omitted, the Firestore will generate an id for you.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        addToCollection(
-            refOrPath: {} | string,
-            data: {},
-            id?: string
-        ): Promise<any>;
-
-        /**
-         * Update an existing document.
-         * @param refOrPath DocumentReference or path.
-         * @param data The document data.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        updateDoc(refOrPath: {} | string, data: {}): Promise<any>;
-
-        /**
-         * Deletes a document.
-         * @param refOrPath DocumentReference or path.
-         * @param data The document data.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        removeDoc(refOrPath: {} | string, data: {}): Promise<any>;
-
-        /**
-         * Removes documents from a collection. If no query is supplied, it will remove all the documents. If a query is supplied, it will only remove documents that match the query.
-         * @param refOrPath CollectionReference or path.
-         * @param options removeFromCollection Options.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        removeFromCollection(
-            refOrPath: {} | string,
-            options: removeFromCollectionOptions
-        ): Promise<any>;
-
-        /**
-         * Syncs a component's local state with a document in Firestore.
-         * @param refOrPath DocumentReference or path.
-         * @param options removeFromCollection Options.
-         * @returns A Promise thats resolve with the resulting data or rejects if the document/collection does not exist or there are any read errors.
-         */
-        syncDoc(refOrPath: {} | string, options: syncDocOptions): {};
-
-        /**
-         * Clean up a listener. Listeners are automatically cleaned up when components unmount, however if you wish to remove a listener while the component is still mounted this will allow you to do that. An example would be if you want to start listening to a new document or change a query on all collection in response to a prop change.
-         * @param ref The return value of syncState`, `bindToState`, `listenTo`, `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or `syncDoc`.
-         */
-        removeBinding(ref: {}): void;
-
-        /**
-         * Removes every Firebase/Firestore listener.
-         */
-        reset(): void;
-    }
-}
-
-declare module "re-base" {
+export interface SyncStateOptions {
     /**
-     * Accepts an initialized firebase database or firestore database object.
-     * @param firebaseDatabase Initialized firebase or firestore
-     * database.
-     * @return An instance of re-base.
+     * The context of your component.
      */
-    function createClass(firebaseDatabase: {}): rebase.Rebase;
+    context: {};
+
+    /**
+     * The state property you want to sync with Firebase; can be an
+     * arbitrarily nested property a là `foo.bar`.
+     */
+    state: string;
+
+    /**
+     * A default value to set when the Firebase endpoint has no value (i.e.,
+     * on init) (use this if you want a value other than an empty object or
+     * empty array)
+     */
+    defaultValue?: string | boolean | number | {};
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * Will keep any firebase generated keys intact when manipulating data
+     * using the asArray option.
+     */
+    keepKeys?: boolean;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+
+    /**
+     * The callback function that will be invoked when the initial listener
+     * is established with Firebase. Typically used (with syncState) to
+     * change this.state.loading to false.
+     */
+    then?: () => void;
+
+    /**
+     * A callback function that will be invoked if the current user does
+     * not have read or write permissions at the location.
+     */
+    onFailure?: () => void;
 }
+
+export interface BindToStateOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * The state property you want to sync with Firebase; can be an
+     * arbitrarily nested property a là `foo.bar` (no arrays).
+     */
+    state: string;
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+
+    /**
+     * The callback function that will be invoked when the initial listener
+     * is established with Firebase. Typically used (with bindToState) to
+     * change this.state.loading to false.
+     */
+    then?: () => void;
+
+    /**
+     * A callback function that will be invoked if the current user does
+     * not have read permissions at the location.
+     */
+    onFailure?: () => void;
+}
+
+export interface ListenToOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * The callback function that will be invoked with the data from the
+     * specified endpoint when the endpoint changes.
+     */
+    then: (result: any) => void;
+
+    /**
+     * The callback function that will be invoked if the current user does
+     * not have read permissions at the location.
+     */
+    onFailure?: (error: any) => void;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+}
+
+export interface FetchOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * Returns the Firebase data at the specified endpoint as an Array
+     * instead of an Object.
+     */
+    asArray?: boolean;
+
+    /**
+     * The callback function that will be invoked with the data from the
+     * specified endpoint when the endpoint changes.
+     */
+    then?: (result: any) => void;
+
+    /**
+     * The callback function that will be invoked with an error that occurs
+     * reading data from the specified endpoint.
+     */
+    onFailure?: () => void;
+
+    /**
+     * Queries to be used with your read operations. See
+     * [Query Options](https://github.com/tylermcginnis/re-base#queries)
+     * for more details.
+     */
+    queries?: {};
+}
+
+export interface PostOptions {
+    /**
+     * The data you're wanting to persist to Firebase.
+     */
+    data: any;
+
+    /**
+     * A callback that will get invoked once the new data has been saved to
+     * Firebase. If there is an error, it will be the only argument to this
+     * function.
+     */
+    then?: (result: any) => void;
+}
+
+export interface PushOptions {
+    /**
+     * The data you're wanting to persist to Firebase.
+     */
+    data: any;
+
+    /**
+     * A callback that will get invoked once the new data has been saved to
+     * Firebase. If there is an error, it will be the only argument to this
+     * function.
+     */
+    then?: (result: any) => void;
+}
+
+export interface UpdateOptions {
+    /**
+     * The data you're wanting to persist to Firebase.
+     */
+    data: any;
+
+    /**
+     * A callback that will get invoked once the new data has been saved to
+     * Firebase. If there is an error, it will be the only argument to this
+     * function.
+     */
+    then?: (result: any) => void;
+}
+
+export interface bindDocOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * A property name on your state to bind your document to, if omitted
+     * the document will be merged into your existing state.
+     */
+    state?: string;
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface listenToDocOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface bindCollectionOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * The state property to bind the collection to.
+     */
+    state?: string;
+
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+
+    /**
+     * Will embed firestore generated document ids inside each document in
+     * your collections on the `id` property.
+     */
+    withIds?: boolean;
+
+    /**
+     * will embed the DocumentReference inside each document in your
+     * collection on the `ref` property.
+     */
+    withRefs?: boolean;
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface listenToCollectionOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * A callback that will be called with the data.
+     */
+    then: () => void;
+
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+
+    /**
+     * Will embed firestore generated document ids inside each document in
+     * your collections on the `id` property.
+     */
+    withIds?: boolean;
+
+    /**
+     * will embed the DocumentReference inside each document in your
+     * collection on the `ref` property.
+     */
+    withRefs?: boolean;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface getOptions {
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+
+    /**
+     * Will embed firestore generated document ids inside each document in
+     * your collections on the `id` property.
+     */
+    withIds?: boolean;
+
+    /**
+     * will embed the DocumentReference inside each document in your
+     * collection on the `ref` property.
+     */
+    withRefs?: boolean;
+}
+
+export interface removeFromCollectionOptions {
+    /**
+     * A function that receives the created ref as its only argument. You
+     * can chain any Firestore queries you want to perform. See
+     * [Using Firestore Queries](https://github.com/tylermcginnis/re-base#firestorequeries).
+     */
+    query?: () => void;
+}
+
+export interface syncDocOptions {
+    /**
+     * The context of your component.
+     */
+    context: {};
+
+    /**
+     * The state property to sync.
+     */
+    state: string;
+
+    /**
+     * A callback that will be called when the listener is set, use for
+     * loading indicators.
+     */
+    then?: () => void;
+
+    /**
+     * A callback that will be called with any errors such as permissions
+     * errors.
+     */
+    onFailure?: () => void;
+}
+
+export interface Rebase {
+    /**
+     * This property contains the initialized firebase app that was passed
+     * into re-base. You can access any of the firebase services that you
+     * are using off this object. For instance, if you want to use some
+     * firebase database methods that re-base doesn't have helpers for or
+     * if you are using the auth service and want to quickly access it off
+     * of re-base.
+     */
+    initializedApp: {};
+
+    /**
+     * This property contains an object that you can use when adding data
+     * that will be converted to a timestamp by Firebase. See
+     * [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue)
+     * for more info.
+     */
+    timestamp: {};
+
+    /**
+     * Allows you to set up two way data binding between your component's
+     * state and your Firebase. Whenever your Firebase changes, your
+     * component's state will change. Whenever your component's state
+     * changes, Firebase will change.
+     * @param endpoint The relative Firebase endpoint to which you'd like
+     * to bind your component's state.
+     * @param options syncState Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    syncState(endpoint: string, options: SyncStateOptions): {};
+
+    /**
+     * One way data binding from Firebase to your component's state. Allows
+     * you to bind a component's state property to a Firebase endpoint so
+     * whenever that Firebase endpoint changes, your component's state will
+     * be updated with that change.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * bind to your component's state.
+     * @param options bindToState Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    bindToState(endpoint: string, options: BindToStateOptions): {};
+
+    /**
+     * Allows you to listen to Firebase endpoints without binding those
+     * changes to a state property. Instead, a callback will be invoked
+     * with the newly updated data.
+     * @param endpoint The relative Firebase endpoint which contains the
+     * data with which you'd like to invoke your callback function.
+     * @param options listenTo Options.
+     * @returns An object which you can pass to `removeBinding` when your
+     * component unmounts to remove the Firebase listeners.
+     */
+    listenTo(endpoint: string, options: ListenToOptions): {};
+
+    /**
+     * Allows you to retrieve the data from a Firebase endpoint just once
+     * without subscribing or listening for data changes.
+     * @param endpoint The relative Firebase endpoint which contains the
+     * data you're wanting to fetch.
+     * @param options fetch Options.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    fetch(endpoint: string, options: FetchOptions): Promise<any>;
+
+    /**
+     * Allows you to update a Firebase endpoint with new data. *Replace all
+     * the data at this endpoint with the new data*.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * update with the new data.
+     * @param options post Options.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    post(endpoint: string, options: PostOptions): Promise<any>;
+
+    /**
+     * Allows you to add data to a Firebase endpoint. *Adds data to a child
+     * of the endpoint with a new Firebase push key*.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * push the new data to.
+     * @param options push Options.
+     * @returns A Firebase [ThenableReference](https://firebase.google.com/docs/reference/js/firebase.database.ThenableReference)
+     * which is defined by Firebase as a "Combined Promise and reference;
+     * resolves when write is complete, but can be used immediately as the
+     * reference to the child location."
+     */
+    push(endpoint: string, options: PushOptions): Promise<any>;
+
+    /**
+     * Allows you to update data at a Firebase endpoint changing only the
+     * properties you pass to it. **Warning: calling update with
+     * `options.data` being null will remove all the data at that
+     * endpoint**.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * update.
+     * @param options update Options.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    update(endpoint: string, options: UpdateOptions): Promise<any>;
+
+    /**
+     * Allows you to delete all data at the endpoint location.
+     * @param endpoint The relative Firebase endpoint that you'd like to
+     * delete data from.
+     * @param callback A callback that will get invoked once the data is
+     * successfully removed Firebase. If there is an error, it will be the
+     * only argument to this function.
+     * @returns A Firebase [Promise](https://firebase.google.com/docs/reference/js/firebase.Promise)
+     * which resolves when the write is complete and rejects if there is an
+     * error.
+     */
+    remove(
+        endpoint: string,
+        callback?: (result: Promise<any>) => void
+    ): Promise<any>;
+
+    /**
+     * Bind a document to your component. When then document changes in
+     * firestore, your component will re-render with the latest data.
+     * @param refOrPath DocumentReference or path.
+     * @param options bindDoc Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    bindDoc(refOrPath: {} | string, options: bindDocOptions): {};
+
+    /**
+     * Listen to a document, when the data changes it will invoke a
+     * callback passing it the new data from Firestore.
+     * @param refOrPath DocumentReference or path.
+     * @param options listenToDoc Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    listenToDoc(refOrPath: {} | string, options: listenToDocOptions): {};
+
+    /**
+     * Bind a collection to a state property in your component. When then
+     * collection changes in firestore, your component will re-render with
+     * the latest data.
+     * @param refOrPath CollectionReference or path.
+     * @param options bindCollection Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    bindCollection(
+        refOrPath: {} | string,
+        options: bindCollectionOptions
+    ): {};
+
+    /**
+     * Listen to a collection, when the data changes it will invoke a
+     * callback passing it the new data from Firestore.
+     * @param refOrPath CollectionReference or path.
+     * @param options listenToCollection Options.
+     * @returns An object which you can pass to `removeBinding` if you want
+     * to remove the listener while the component is still mounted.
+     */
+    listenToCollection(
+        refOrPath: {} | string,
+        options: listenToCollectionOptions
+    ): {};
+
+    /**
+     * Fetch either a Collection or Document.
+     * @param refOrPath CollectionReference, DocumentReference or path.
+     * @param options get Options.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    get(
+        refOrPath: {} | {} | string,
+        options: listenToCollectionOptions
+    ): Promise<any>;
+
+    /**
+     * Add a new Document to a Collection.
+     * @param refOrPath CollectionReference or path.
+     * @param data The document data.
+     * @param id The id for the document. If omitted, the Firestore will
+     * generate an id for you.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    addToCollection(
+        refOrPath: {} | string,
+        data: {},
+        id?: string
+    ): Promise<any>;
+
+    /**
+     * Update an existing document.
+     * @param refOrPath DocumentReference or path.
+     * @param data The document data.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    updateDoc(refOrPath: {} | string, data: {}): Promise<any>;
+
+    /**
+     * Deletes a document.
+     * @param refOrPath DocumentReference or path.
+     * @param data The document data.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    removeDoc(refOrPath: {} | string, data: {}): Promise<any>;
+
+    /**
+     * Removes documents from a collection. If no query is supplied, it
+     * will remove all the documents. If a query is supplied, it will only
+     * remove documents that match the query.
+     * @param refOrPath CollectionReference or path.
+     * @param options removeFromCollection Options.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    removeFromCollection(
+        refOrPath: {} | string,
+        options: removeFromCollectionOptions
+    ): Promise<any>;
+
+    /**
+     * Syncs a component's local state with a document in Firestore.
+     * @param refOrPath DocumentReference or path.
+     * @param options removeFromCollection Options.
+     * @returns A Promise thats resolve with the resulting data or rejects
+     * if the document/collection does not exist or there are any read
+     * errors.
+     */
+    syncDoc(refOrPath: {} | string, options: syncDocOptions): {};
+
+    /**
+     * Clean up a listener. Listeners are automatically cleaned up when
+     * components unmount, however if you wish to remove a listener while
+     * the component is still mounted this will allow you to do that. An
+     * example would be if you want to start listening to a new document or
+     * change a query on all collection in response to a prop change.
+     * @param ref The return value of syncState`, `bindToState`, `listenTo`,
+     * `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or
+     * `syncDoc`.
+     */
+    removeBinding(ref: {}): void;
+
+    /**
+     * Removes every Firebase/Firestore listener.
+     */
+    reset(): void;
+}
+
+/**
+ * Accepts an initialized firebase/firestore database object.
+ * @param database Initialized firebase/firestore
+ * database.
+ * @return An instance of re-base.
+ */
+export function createClass(database: {}): Rebase;

From 120f16f2445f25ab8ebe7cf310c0bc6b9c643ccc Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Tue, 29 May 2018 16:37:34 -0700
Subject: [PATCH 0826/1124] Replace `{}` with `object`, add RebaseBinding
 interface.

---
 types/re-base/index.d.ts | 75 ++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
index ba838df0aa..235ba513dc 100644
--- a/types/re-base/index.d.ts
+++ b/types/re-base/index.d.ts
@@ -3,11 +3,18 @@
 // Definitions by: jordandrako <https://github.com/jordandrako>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export interface RebaseBinding {
+    context: object;
+    endpoint: string;
+    id: number;
+    method: string;
+}
+
 export interface SyncStateOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * The state property you want to sync with Firebase; can be an
@@ -20,7 +27,7 @@ export interface SyncStateOptions {
      * on init) (use this if you want a value other than an empty object or
      * empty array)
      */
-    defaultValue?: string | boolean | number | {};
+    defaultValue?: string | boolean | number | object;
 
     /**
      * Returns the Firebase data at the specified endpoint as an Array
@@ -39,7 +46,7 @@ export interface SyncStateOptions {
      * [Query Options](https://github.com/tylermcginnis/re-base#queries)
      * for more details.
      */
-    queries?: {};
+    queries?: object;
 
     /**
      * The callback function that will be invoked when the initial listener
@@ -59,7 +66,7 @@ export interface BindToStateOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * The state property you want to sync with Firebase; can be an
@@ -78,7 +85,7 @@ export interface BindToStateOptions {
      * [Query Options](https://github.com/tylermcginnis/re-base#queries)
      * for more details.
      */
-    queries?: {};
+    queries?: object;
 
     /**
      * The callback function that will be invoked when the initial listener
@@ -98,7 +105,7 @@ export interface ListenToOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * Returns the Firebase data at the specified endpoint as an Array
@@ -123,14 +130,14 @@ export interface ListenToOptions {
      * [Query Options](https://github.com/tylermcginnis/re-base#queries)
      * for more details.
      */
-    queries?: {};
+    queries?: object;
 }
 
 export interface FetchOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * Returns the Firebase data at the specified endpoint as an Array
@@ -155,7 +162,7 @@ export interface FetchOptions {
      * [Query Options](https://github.com/tylermcginnis/re-base#queries)
      * for more details.
      */
-    queries?: {};
+    queries?: object;
 }
 
 export interface PostOptions {
@@ -204,7 +211,7 @@ export interface bindDocOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * A property name on your state to bind your document to, if omitted
@@ -229,7 +236,7 @@ export interface listenToDocOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * A callback that will be called when the listener is set, use for
@@ -248,7 +255,7 @@ export interface bindCollectionOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * The state property to bind the collection to.
@@ -291,7 +298,7 @@ export interface listenToCollectionOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * A callback that will be called with the data.
@@ -358,7 +365,7 @@ export interface syncDocOptions {
     /**
      * The context of your component.
      */
-    context: {};
+    context: object;
 
     /**
      * The state property to sync.
@@ -387,7 +394,7 @@ export interface Rebase {
      * if you are using the auth service and want to quickly access it off
      * of re-base.
      */
-    initializedApp: {};
+    initializedApp: object;
 
     /**
      * This property contains an object that you can use when adding data
@@ -395,7 +402,7 @@ export interface Rebase {
      * [the docs](https://firebase.google.com/docs/reference/js/firebase.database.ServerValue)
      * for more info.
      */
-    timestamp: {};
+    timestamp: object;
 
     /**
      * Allows you to set up two way data binding between your component's
@@ -408,7 +415,7 @@ export interface Rebase {
      * @returns An object which you can pass to `removeBinding` if you want
      * to remove the listener while the component is still mounted.
      */
-    syncState(endpoint: string, options: SyncStateOptions): {};
+    syncState(endpoint: string, options: SyncStateOptions): RebaseBinding;
 
     /**
      * One way data binding from Firebase to your component's state. Allows
@@ -421,7 +428,7 @@ export interface Rebase {
      * @returns An object which you can pass to `removeBinding` if you want
      * to remove the listener while the component is still mounted.
      */
-    bindToState(endpoint: string, options: BindToStateOptions): {};
+    bindToState(endpoint: string, options: BindToStateOptions): RebaseBinding;
 
     /**
      * Allows you to listen to Firebase endpoints without binding those
@@ -433,7 +440,7 @@ export interface Rebase {
      * @returns An object which you can pass to `removeBinding` when your
      * component unmounts to remove the Firebase listeners.
      */
-    listenTo(endpoint: string, options: ListenToOptions): {};
+    listenTo(endpoint: string, options: ListenToOptions): RebaseBinding;
 
     /**
      * Allows you to retrieve the data from a Firebase endpoint just once
@@ -510,7 +517,7 @@ export interface Rebase {
      * @returns An object which you can pass to `removeBinding` if you want
      * to remove the listener while the component is still mounted.
      */
-    bindDoc(refOrPath: {} | string, options: bindDocOptions): {};
+    bindDoc(refOrPath: object | string, options: bindDocOptions): object;
 
     /**
      * Listen to a document, when the data changes it will invoke a
@@ -520,7 +527,7 @@ export interface Rebase {
      * @returns An object which you can pass to `removeBinding` if you want
      * to remove the listener while the component is still mounted.
      */
-    listenToDoc(refOrPath: {} | string, options: listenToDocOptions): {};
+    listenToDoc(refOrPath: object | string, options: listenToDocOptions): object;
 
     /**
      * Bind a collection to a state property in your component. When then
@@ -532,9 +539,9 @@ export interface Rebase {
      * to remove the listener while the component is still mounted.
      */
     bindCollection(
-        refOrPath: {} | string,
+        refOrPath: object | string,
         options: bindCollectionOptions
-    ): {};
+    ): RebaseBinding;
 
     /**
      * Listen to a collection, when the data changes it will invoke a
@@ -545,9 +552,9 @@ export interface Rebase {
      * to remove the listener while the component is still mounted.
      */
     listenToCollection(
-        refOrPath: {} | string,
+        refOrPath: object | string,
         options: listenToCollectionOptions
-    ): {};
+    ): RebaseBinding;
 
     /**
      * Fetch either a Collection or Document.
@@ -558,7 +565,7 @@ export interface Rebase {
      * errors.
      */
     get(
-        refOrPath: {} | {} | string,
+        refOrPath: object | object | string,
         options: listenToCollectionOptions
     ): Promise<any>;
 
@@ -573,8 +580,8 @@ export interface Rebase {
      * errors.
      */
     addToCollection(
-        refOrPath: {} | string,
-        data: {},
+        refOrPath: object | string,
+        data: object,
         id?: string
     ): Promise<any>;
 
@@ -586,7 +593,7 @@ export interface Rebase {
      * if the document/collection does not exist or there are any read
      * errors.
      */
-    updateDoc(refOrPath: {} | string, data: {}): Promise<any>;
+    updateDoc(refOrPath: object | string, data: object): Promise<any>;
 
     /**
      * Deletes a document.
@@ -596,7 +603,7 @@ export interface Rebase {
      * if the document/collection does not exist or there are any read
      * errors.
      */
-    removeDoc(refOrPath: {} | string, data: {}): Promise<any>;
+    removeDoc(refOrPath: object | string, data: object): Promise<any>;
 
     /**
      * Removes documents from a collection. If no query is supplied, it
@@ -609,7 +616,7 @@ export interface Rebase {
      * errors.
      */
     removeFromCollection(
-        refOrPath: {} | string,
+        refOrPath: object | string,
         options: removeFromCollectionOptions
     ): Promise<any>;
 
@@ -621,7 +628,7 @@ export interface Rebase {
      * if the document/collection does not exist or there are any read
      * errors.
      */
-    syncDoc(refOrPath: {} | string, options: syncDocOptions): {};
+    syncDoc(refOrPath: object | string, options: syncDocOptions): object;
 
     /**
      * Clean up a listener. Listeners are automatically cleaned up when
@@ -633,7 +640,7 @@ export interface Rebase {
      * `listenToCollection`, `bindCollection`, `listenToDoc`, `bindDoc` or
      * `syncDoc`.
      */
-    removeBinding(ref: {}): void;
+    removeBinding(ref: object): void;
 
     /**
      * Removes every Firebase/Firestore listener.
@@ -647,4 +654,4 @@ export interface Rebase {
  * database.
  * @return An instance of re-base.
  */
-export function createClass(database: {}): Rebase;
+export function createClass(database: object): Rebase;

From 98fcd1ae6e250c401f71342aa3c040e1cbb902f2 Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Tue, 29 May 2018 17:24:53 -0700
Subject: [PATCH 0827/1124] Require ts v2.2

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

diff --git a/types/re-base/index.d.ts b/types/re-base/index.d.ts
index 26d8622a0e..4367476b9b 100644
--- a/types/re-base/index.d.ts
+++ b/types/re-base/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/tylermcginnis/re-base#readme
 // Definitions by: jordandrako <https://github.com/jordandrako>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 export interface RebaseBinding {
     context: object;

From 8b3949c37489cc5e67451a94cdbd1f7ff06e7b4b Mon Sep 17 00:00:00 2001
From: Jordan Janzen <jordancjanzen@gmail.com>
Date: Tue, 29 May 2018 17:25:02 -0700
Subject: [PATCH 0828/1124] Fix test.

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

diff --git a/types/re-base/re-base-tests.ts b/types/re-base/re-base-tests.ts
index 702a6ab2dd..0edc9ea542 100644
--- a/types/re-base/re-base-tests.ts
+++ b/types/re-base/re-base-tests.ts
@@ -2,8 +2,9 @@ import * as rebase from "re-base";
 
 const database = {};
 const base = rebase.createClass(database);
+const bar = {};
 
 const _ref = base.syncState("foo", {
-    context: "bar",
-    state: "baz"
+    context: bar,
+    state: "foo"
 });

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 0829/1124] 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 0830/1124] 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 0831/1124] 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 0832/1124] 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 0833/1124] 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 0834/1124] 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 79f09921072effd71b3c33d3bc70c252589ceebe Mon Sep 17 00:00:00 2001
From: Huan LI <zixia@zixia.net>
Date: Wed, 30 May 2018 11:52:25 +0800
Subject: [PATCH 0835/1124] add the missing `key` arg for `length()`

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

diff --git a/types/lru-cache/index.d.ts b/types/lru-cache/index.d.ts
index 5a6c9c9e4f..ed40619b11 100644
--- a/types/lru-cache/index.d.ts
+++ b/types/lru-cache/index.d.ts
@@ -40,7 +40,7 @@ declare namespace LRU {
          * `max` like-sized things. The item is passed as the first argument,
          * and the key is passed as the second argument.
          */
-        length?(value: V): number;
+        length?(value: V, key?: K): number;
 
         /**
          * Function that is called on items when they are dropped from the cache.

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 0836/1124] 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 0837/1124] 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 2a5507a7297cd30cd0d7943cae84fea6f34a9811 Mon Sep 17 00:00:00 2001
From: Levin Keller <post@levinkeller.de>
Date: Fri, 25 May 2018 13:01:38 +0200
Subject: [PATCH 0838/1124] Add web3 type definitions.

---
 types/web3/eth/abi.d.ts      |  40 ++++++++
 types/web3/eth/accounts.d.ts |  71 ++++++++++++++
 types/web3/eth/contract.d.ts |  68 +++++++++++++
 types/web3/eth/index.d.ts    | 185 +++++++++++++++++++++++++++++++++++
 types/web3/eth/types.d.ts    | 100 +++++++++++++++++++
 types/web3/index.d.ts        |  50 ++++++++++
 types/web3/promiEvent.d.ts   |  40 ++++++++
 types/web3/providers.d.ts    |  64 ++++++++++++
 types/web3/tsconfig.json     |  28 ++++++
 types/web3/tslint.json       |   5 +
 types/web3/types.d.ts        |  89 +++++++++++++++++
 types/web3/utils.d.ts        |  71 ++++++++++++++
 types/web3/web3-tests.ts     |  18 ++++
 13 files changed, 829 insertions(+)
 create mode 100644 types/web3/eth/abi.d.ts
 create mode 100644 types/web3/eth/accounts.d.ts
 create mode 100644 types/web3/eth/contract.d.ts
 create mode 100644 types/web3/eth/index.d.ts
 create mode 100644 types/web3/eth/types.d.ts
 create mode 100644 types/web3/index.d.ts
 create mode 100644 types/web3/promiEvent.d.ts
 create mode 100644 types/web3/providers.d.ts
 create mode 100644 types/web3/tsconfig.json
 create mode 100644 types/web3/tslint.json
 create mode 100644 types/web3/types.d.ts
 create mode 100644 types/web3/utils.d.ts
 create mode 100644 types/web3/web3-tests.ts

diff --git a/types/web3/eth/abi.d.ts b/types/web3/eth/abi.d.ts
new file mode 100644
index 0000000000..b103c9e4ce
--- /dev/null
+++ b/types/web3/eth/abi.d.ts
@@ -0,0 +1,40 @@
+export interface ABIDefinition {
+    constant?: boolean;
+    payable?: boolean;
+    anonymous?: boolean;
+    inputs?: Array<{ name: string; type: ABIDataTypes; indexed?: boolean }>;
+    name?: string;
+    outputs?: Array<{ name: string; type: ABIDataTypes }>;
+    type: "function" | "constructor" | "event" | "fallback";
+}
+
+type ABIDataTypes = "uint256" | "boolean" | "string" | "bytes" | string; // TODO complete list
+
+export default interface ABI {
+    decodeLog(inputs: object, hexString: string, topics: string[]): object;
+    encodeParameter(type: string, parameter: any): string;
+    encodeParameters(types: string[], paramaters: any[]): string;
+    encodeEventSignature(name: string | object): string;
+    encodeFunctionCall(jsonInterface: object, parameters: any[]): string;
+    encodeFunctionSignature(name: string | object): string;
+    decodeParameter(type: string, hex: string): any;
+    decodeParameters(
+        types: string[],
+        hex: string
+    ): EthAbiDecodeParametersResultArray;
+    decodeParameters(
+        types: EthAbiDecodeParametersType[],
+        hex: string
+    ): EthAbiDecodeParametersResultObject;
+}
+
+interface EthAbiDecodeParametersType {
+    name: string;
+    type: string;
+}
+interface EthAbiDecodeParametersResultArray {
+    [index: number]: any;
+}
+type EthAbiDecodeParametersResultObject = EthAbiDecodeParametersResultArray & {
+    [key: string]: any;
+};
diff --git a/types/web3/eth/accounts.d.ts b/types/web3/eth/accounts.d.ts
new file mode 100644
index 0000000000..cd91e22183
--- /dev/null
+++ b/types/web3/eth/accounts.d.ts
@@ -0,0 +1,71 @@
+import { Tx } from "./types";
+
+export interface Account {
+	address: string;
+	privateKey: string;
+	publicKey: string;
+}
+
+export interface Signature {
+	message: string;
+	hash: string;
+	r: string;
+	s: string;
+	v: string;
+}
+
+export interface PrivateKey {
+	address: string;
+	Crypto: {
+		cipher: string;
+		ciphertext: string;
+		cipherparams: {
+			iv: string;
+		};
+		kdf: string;
+		kdfparams: {
+			dklen: number;
+			n: number;
+			p: number;
+			r: number;
+			salt: string;
+		};
+		mac: string;
+	};
+	id: string;
+	version: number;
+}
+
+export default interface Accounts {
+	create(entropy?: string): Account;
+	privateKeyToAccount(privKey: string): Account;
+	publicToAddress(key: string): string;
+	signTransaction(
+		tx: Tx,
+		privateKey: string,
+		returnSignature?: boolean,
+		cb?: (err: Error, result: string | Signature) => void
+	): Promise<string> | Signature;
+	recoverTransaction(signature: string | Signature): string;
+	sign(
+		data: string,
+		privateKey: string,
+		returnSignature?: boolean
+	): string | Signature;
+	recover(
+		sigOrHash: string | Signature,
+		sigOrV?: string,
+		r?: string,
+		s?: string
+	): string;
+	encrypt(privateKey: string, password: string): PrivateKey;
+	decrypt(privateKey: PrivateKey, password: string): Account;
+	wallet: {
+		create(numberOfAccounts: number, entropy: string): Account[];
+		add(account: string | Account): any;
+		remove(account: string | number): any;
+		save(password: string, keyname?: string): string;
+		load(password: string, keyname: string): any;
+		clear(): any;
+	};
+}
diff --git a/types/web3/eth/contract.d.ts b/types/web3/eth/contract.d.ts
new file mode 100644
index 0000000000..5f3f83406f
--- /dev/null
+++ b/types/web3/eth/contract.d.ts
@@ -0,0 +1,68 @@
+import { Callback, EventLog, EventEmitter } from "../types";
+import { TransactionObject, BlockType } from "./types";
+import { ABIDefinition } from "./abi";
+import BigNumber = require("bn.js");
+import { Provider } from "../providers";
+
+interface CustomOptions {
+    address?: string;
+    jsonInterface?: ABIDefinition[];
+    data?: string;
+    from?: string;
+    gasPrice?: string;
+    gas?: number;
+}
+
+interface contractOptions {
+    address: string;
+    jsonInterface: ABIDefinition[];
+    data: string;
+    from: string;
+    gasPrice: string;
+    gas: number;
+}
+
+export default class Contract {
+    constructor(
+        jsonInterface: any[],
+        address?: string,
+        options?: CustomOptions
+    );
+    options: contractOptions;
+    methods: {
+        [fnName: string]: (...args: any[]) => TransactionObject<any>;
+    };
+    deploy(options: {
+        data: string;
+        arguments: any[];
+    }): TransactionObject<Contract>;
+    events: {
+        [eventName: string]: (
+            options?: {
+                filter?: object;
+                fromBlock?: BlockType;
+                topics?: string[];
+            },
+            cb?: Callback<EventLog>
+        ) => EventEmitter;
+        allEvents: (
+            options?: {
+                filter?: object;
+                fromBlock?: BlockType;
+                topics?: string[];
+            },
+            cb?: Callback<EventLog>
+        ) => EventEmitter;
+    };
+    getPastEvents(
+        event: string,
+        options?: {
+            filter?: object;
+            fromBlock?: BlockType;
+            toBlock?: BlockType;
+            topics?: string[];
+        },
+        cb?: Callback<EventLog[]>
+    ): Promise<EventLog[]>;
+    setProvider(provider: Provider): void;
+}
diff --git a/types/web3/eth/index.d.ts b/types/web3/eth/index.d.ts
new file mode 100644
index 0000000000..14e8c2d26a
--- /dev/null
+++ b/types/web3/eth/index.d.ts
@@ -0,0 +1,185 @@
+import BigNumber = require("bn.js");
+import { Provider } from "../providers";
+import Contract, { CustomOptions as CustomContractOptions } from "./contract";
+import PromiEvent from "../promiEvent";
+import ABI from "./abi";
+import Accounts from "./accounts";
+import {
+    BatchRequest,
+    Iban,
+    BlockHeader,
+    CompileResult,
+    Block,
+    Transaction,
+    Tx,
+    BlockType,
+    Net,
+    Personal
+} from "./types";
+import {
+    Callback,
+    TransactionReceipt,
+    Logs,
+    Log,
+    Subscribe,
+    EncodedTransaction
+} from "../types";
+
+export default interface Eth {
+    defaultAccount: string;
+    defaultBlock: BlockType;
+    BatchRequest: new () => BatchRequest;
+    Iban: Iban;
+    Contract: new (
+        jsonInterface: any[],
+        address?: string,
+        options?: CustomContractOptions
+    ) => Contract;
+    abi: ABI;
+    setProvider: (provider: Provider) => void;
+    accounts: Accounts;
+    call(
+        callObject: Tx,
+        defaultBloc?: BlockType,
+        callBack?: Callback<string>
+    ): Promise<string>;
+    clearSubscriptions(): boolean;
+    subscribe(
+        type: "logs",
+        options?: Logs,
+        callback?: Callback<Subscribe<Log>>
+    ): Promise<Subscribe<Log>>;
+    subscribe(
+        type: "syncing",
+        callback?: Callback<Subscribe<any>>
+    ): Promise<Subscribe<any>>;
+    subscribe(
+        type: "newBlockHeaders",
+        callback?: Callback<Subscribe<BlockHeader>>
+    ): Promise<Subscribe<BlockHeader>>;
+    subscribe(
+        type: "pendingTransactions",
+        callback?: Callback<Subscribe<Transaction>>
+    ): Promise<Subscribe<Transaction>>;
+    subscribe(
+        type: "pendingTransactions" | "newBlockHeaders" | "syncing" | "logs",
+        options?: Logs,
+        callback?: Callback<Subscribe<any>>
+    ): Promise<Subscribe<any>>;
+
+    unsubscribe(callBack: Callback<boolean>): void | boolean;
+    compile: {
+        solidity(
+            source: string,
+            callback?: Callback<CompileResult>
+        ): Promise<CompileResult>;
+        lll(
+            source: string,
+            callback?: Callback<CompileResult>
+        ): Promise<CompileResult>;
+        serpent(
+            source: string,
+            callback?: Callback<CompileResult>
+        ): Promise<CompileResult>;
+    };
+    currentProvider: Provider;
+    estimateGas(tx: Tx, callback?: Callback<number>): Promise<number>;
+    getAccounts(cb?: Callback<string[]>): Promise<string[]>;
+    getBalance(
+        address: string,
+        defaultBlock?: BlockType,
+        cb?: Callback<number>
+    ): Promise<number>;
+    getBlock(
+        number: BlockType,
+        returnTransactionObjects?: boolean,
+        cb?: Callback<Block>
+    ): Promise<Block>;
+    getBlockNumber(callback?: Callback<number>): Promise<number>;
+    getBlockTransactionCount(
+        number: BlockType | string,
+        cb?: Callback<number>
+    ): Promise<number>;
+    getBlockUncleCount(
+        number: BlockType | string,
+        cb?: Callback<number>
+    ): Promise<number>;
+    getCode(
+        address: string,
+        defaultBlock?: BlockType,
+        cb?: Callback<string>
+    ): Promise<string>;
+    getCoinbase(cb?: Callback<string>): Promise<string>;
+    getCompilers(cb?: Callback<string[]>): Promise<string[]>;
+    getGasPrice(cb?: Callback<number>): Promise<number>;
+    getHashrate(cb?: Callback<number>): Promise<number>;
+    getPastLogs(
+        options: {
+            fromBlock?: BlockType;
+            toBlock?: BlockType;
+            address: string;
+            topics?: Array<string | string[]>;
+        },
+        cb?: Callback<Log[]>
+    ): Promise<Log[]>;
+    getProtocolVersion(cb?: Callback<string>): Promise<string>;
+    getStorageAt(
+        address: string,
+        defaultBlock?: BlockType,
+        cb?: Callback<string>
+    ): Promise<string>;
+    getTransactionReceipt(
+        hash: string,
+        cb?: Callback<TransactionReceipt>
+    ): Promise<TransactionReceipt>;
+    getTransaction(
+        hash: string,
+        cb?: Callback<Transaction>
+    ): Promise<Transaction>;
+    getTransactionCount(
+        address: string,
+        defaultBlock?: BlockType,
+        cb?: Callback<number>
+    ): Promise<number>;
+    getTransactionFromBlock(
+        block: BlockType,
+        index: number,
+        cb?: Callback<Transaction>
+    ): Promise<Transaction>;
+    getUncle(
+        blockHashOrBlockNumber: BlockType | string,
+        uncleIndex: number,
+        returnTransactionObjects?: boolean,
+        cb?: Callback<Block>
+    ): Promise<Block>;
+    getWork(cb?: Callback<string[]>): Promise<string[]>;
+    givenProvider: Provider;
+    isMining(cb?: Callback<boolean>): Promise<boolean>;
+    isSyncing(cb?: Callback<boolean>): Promise<boolean>;
+    net: Net;
+    personal: Personal;
+    signTransaction(
+        tx: Tx,
+        address?: string,
+        cb?: Callback<string>
+    ): Promise<EncodedTransaction>;
+    sendSignedTransaction(
+        data: string,
+        cb?: Callback<string>
+    ): PromiEvent<TransactionReceipt>;
+    sendTransaction(
+        tx: Tx,
+        cb?: Callback<string>
+    ): PromiEvent<TransactionReceipt>;
+    submitWork(
+        nonce: string,
+        powHash: string,
+        digest: string,
+        cb?: Callback<boolean>
+    ): Promise<boolean>;
+    sign(
+        address: string,
+        dataToSign: string,
+        cb?: Callback<string>
+    ): Promise<string>;
+}
diff --git a/types/web3/eth/types.d.ts b/types/web3/eth/types.d.ts
new file mode 100644
index 0000000000..ca374d8a51
--- /dev/null
+++ b/types/web3/eth/types.d.ts
@@ -0,0 +1,100 @@
+import { Callback, EventLog } from "../types";
+import PromiEvent from "../promiEvent";
+import { ABIDefinition } from "./abi";
+export interface Tx {
+	nonce?: string | number;
+	chainId?: string | number;
+	from?: string;
+	to?: string;
+	data?: string;
+	value?: string | number;
+	gas?: string | number;
+	gasPrice?: string | number;
+}
+
+export class BatchRequest {
+	constructor();
+	add(request: object): void; //
+	execute(): void;
+}
+export class Iban {
+	constructor(address: string);
+	static toAddress(iban: Iban): string;
+	isValid(): boolean;
+}
+export type BlockType = "latest" | "pending" | "genesis" | number;
+
+export interface BlockHeader {
+	number: number;
+	hash: string;
+	parentHash: string;
+	nonce: string;
+	sha3Uncles: string;
+	logsBloom: string;
+	transactionRoot: string;
+	stateRoot: string;
+	receiptRoot: string;
+	miner: string;
+	extraData: string;
+	gasLimit: number;
+	gasUsed: number;
+	timestamp: number;
+}
+export interface Block extends BlockHeader {
+	transactions: Transaction[];
+	size: number;
+	difficulty: number;
+	totalDifficulty: number;
+	uncles: string[];
+}
+
+export class Net {
+	getId(cb?: Callback<number>): Promise<number>;
+	isListening(cb?: Callback<boolean>): Promise<boolean>;
+	getPeerCount(cb?: Callback<number>): Promise<number>;
+}
+export class Personal {
+	newAccount(password: string, cb?: Callback<boolean>): Promise<string>;
+	importRawKey(): Promise<string>;
+	lockAccount(): Promise<boolean>;
+	unlockAccount(): void;
+	sign(): Promise<string>;
+	ecRecover(message: string, sig: string): void;
+	sendTransaction(tx: Tx, passphrase: string): Promise<string>;
+}
+
+export interface Transaction {
+	hash: string;
+	nonce: number;
+	blockHash: string;
+	blockNumber: number;
+	transactionIndex: number;
+	from: string;
+	to: string;
+	value: string;
+	gasPrice: string;
+	gas: number;
+	input: string;
+	v?: string;
+	r?: string;
+	s?: string;
+}
+export interface TransactionObject<T> {
+	arguments: any[];
+	call(tx?: Tx): Promise<T>;
+	send(tx?: Tx): PromiEvent<T>;
+	estimateGas(tx?: Tx): Promise<number>;
+	encodeABI(): string;
+}
+export interface CompileResult {
+	code: string;
+	info: {
+		source: string;
+		language: string;
+		languageVersion: string;
+		compilerVersion: string;
+		abiDefinition: ABIDefinition[];
+	};
+	userDoc: { methods: object };
+	developerDoc: { methods: object };
+}
diff --git a/types/web3/index.d.ts b/types/web3/index.d.ts
new file mode 100644
index 0000000000..7d3797873e
--- /dev/null
+++ b/types/web3/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for web3 1.0
+// Project: https://github.com/ethereum/web3.js
+// Definitions by: Simon Jentzsch <https://github.com/simon-jentzsch>
+//                 Nitzan Tomer <https://github.com/nitzantomer>
+//                 Zurbo <https://github.com/zurbo>
+//                 Xiao Liang <https://github.com/yxliang01>
+//                 Francesco Soncina <https://github.com/phra>
+//                 Nick Addison <https://github.com/naddison36>
+//                 Ícaro Harry <https://github.com/icaroharry>
+//                 Linus Norton <https://github.com/linusnorton>
+//                 Javier Peletier <https://github.com/jpeletier>
+//                 HIKARU KOBORI <https://github.com/anneau>
+//                 Baris Gumustas <https://github.com/matrushka>
+//                 André Vitor de Lima Matos <https://github.com/andrevmatos>
+//                 Levin Keller <https://github.com/levino>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+import BigNumber = require("bn.js");
+import Providers, { Provider } from "./providers";
+import Contract from "./eth/contract";
+import { Callback, Bzz, Shh } from "./types";
+import { BatchRequest, Net, Personal } from "./eth/types";
+import Utils from "./utils";
+import Eth from "./eth/index";
+
+declare class Web3 {
+    static providers: Providers;
+    static givenProvider: Provider;
+    static modules: {
+        Eth: new (provider: Provider) => Eth;
+        Net: new (provider: Provider) => Net;
+        Personal: new (provider: Provider) => Personal;
+        Shh: new (provider: Provider) => Shh;
+        Bzz: new (provider: Provider) => Bzz;
+    };
+    constructor(provider?: Provider | string);
+    version: string;
+    BatchRequest: new () => BatchRequest;
+    extend(methods: any): any; // TODO
+    bzz: Bzz;
+    currentProvider: Provider;
+    eth: Eth;
+    ssh: Shh;
+    givenProvider: Provider;
+    providers: Providers;
+    setProvider(provider: Provider): void;
+    utils: Utils;
+}
+
+export = Web3;
diff --git a/types/web3/promiEvent.d.ts b/types/web3/promiEvent.d.ts
new file mode 100644
index 0000000000..74e874aae6
--- /dev/null
+++ b/types/web3/promiEvent.d.ts
@@ -0,0 +1,40 @@
+import { TransactionReceipt } from "./types";
+
+type PromiEventType = "transactionHash" | "receipt" | "confirmation" | "error";
+
+export default interface PromiEvent<T> extends Promise<T> {
+    once(
+        type: "transactionHash",
+        handler: (receipt: string) => void
+    ): PromiEvent<T>;
+    once(
+        type: "receipt",
+        handler: (receipt: TransactionReceipt) => void
+    ): PromiEvent<T>;
+    once(
+        type: "confirmation",
+        handler: (confNumber: number, receipt: TransactionReceipt) => void
+    ): PromiEvent<T>;
+    once(type: "error", handler: (error: Error) => void): PromiEvent<T>;
+    once(
+        type: PromiEventType,
+        handler: (error: Error | TransactionReceipt | string) => void
+    ): PromiEvent<T>;
+    on(
+        type: "transactionHash",
+        handler: (receipt: string) => void
+    ): PromiEvent<T>;
+    on(
+        type: "receipt",
+        handler: (receipt: TransactionReceipt) => void
+    ): PromiEvent<T>;
+    on(
+        type: "confirmation",
+        handler: (confNumber: number, receipt: TransactionReceipt) => void
+    ): PromiEvent<T>;
+    on(type: "error", handler: (error: Error) => void): PromiEvent<T>;
+    on(
+        type: "error" | "confirmation" | "receipt" | "transactionHash",
+        handler: (error: Error | TransactionReceipt | string) => void
+    ): PromiEvent<T>;
+}
diff --git a/types/web3/providers.d.ts b/types/web3/providers.d.ts
new file mode 100644
index 0000000000..729ea09278
--- /dev/null
+++ b/types/web3/providers.d.ts
@@ -0,0 +1,64 @@
+interface JsonRPCRequest {
+    jsonrpc: string;
+    method: string;
+    params: any[];
+    id: number;
+}
+
+interface JsonRPCResponse {
+    jsonrpc: string;
+    id: number;
+    result?: any;
+    error?: string;
+}
+
+export class Provider {
+    send(
+        payload: JsonRPCRequest,
+        callback: (e: Error, val: JsonRPCResponse) => void
+    ): any;
+}
+
+export class WebsocketProvider extends Provider {
+    responseCallbacks: object;
+    notificationCallbacks: [() => any];
+    connection: {
+        onclose(e: any): void;
+        onmessage(e: any): void;
+        onerror(e?: any): void;
+    };
+    addDefaultEvents: () => void;
+    on(type: string, callback: () => any): void;
+    removeListener(type: string, callback: () => any): void;
+    removeAllListeners(type: string): void;
+    reset(): void;
+}
+export class HttpProvider extends Provider {
+    responseCallbacks: undefined;
+    notificationCallbacks: undefined;
+    connection: undefined;
+    addDefaultEvents: undefined;
+    on(type: string, callback: () => any): undefined;
+    removeListener(type: string, callback: () => any): undefined;
+    removeAllListeners(type: string): undefined;
+    reset(): undefined;
+}
+export class IpcProvider extends Provider {
+    responseCallbacks: undefined;
+    notificationCallbacks: undefined;
+    connection: undefined;
+    addDefaultEvents: undefined;
+    on(type: string, callback: () => any): undefined;
+    removeListener(type: string, callback: () => any): undefined;
+    removeAllListeners(type: string): undefined;
+    reset(): undefined;
+}
+
+export default interface Providers {
+    WebsocketProvider: new (
+        host: string,
+        timeout?: number
+    ) => WebsocketProvider;
+    HttpProvider: new (host: string, timeout?: number) => HttpProvider;
+    IpcProvider: new (path: string, net: any) => IpcProvider;
+}
diff --git a/types/web3/tsconfig.json b/types/web3/tsconfig.json
new file mode 100644
index 0000000000..42b54fc8c5
--- /dev/null
+++ b/types/web3/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "promiEvent.d.ts",
+        "providers.d.ts",
+        "types.d.ts",
+        "utils.d.ts",
+        "web3-tests.ts",
+        "eth/abi.d.ts",
+        "eth/accounts.d.ts",
+        "eth/contract.d.ts",
+        "eth/index.d.ts",
+        "eth/types.d.ts"
+    ]
+}
diff --git a/types/web3/tslint.json b/types/web3/tslint.json
new file mode 100644
index 0000000000..dc6622bc53
--- /dev/null
+++ b/types/web3/tslint.json
@@ -0,0 +1,5 @@
+{ "extends": "dtslint/dt.json",
+"rules": {
+	"strict-export-declare-modifiers": false
+ }
+}
diff --git a/types/web3/types.d.ts b/types/web3/types.d.ts
new file mode 100644
index 0000000000..4690b37e2b
--- /dev/null
+++ b/types/web3/types.d.ts
@@ -0,0 +1,89 @@
+import BigNumber = require("bn.js");
+import * as us from "underscore";
+import PromiEvent from "./promiEvent";
+import { ABIDefinition } from "./eth/abi";
+export type Callback<T> = (error: Error, result: T) => void;
+
+export interface EventEmitter {
+    on(type: "data", handler: (event: EventLog) => void): EventEmitter;
+    on(type: "changed", handler: (receipt: EventLog) => void): EventEmitter;
+    on(type: "error", handler: (error: Error) => void): EventEmitter;
+    on(
+        type: "error" | "data" | "changed",
+        handler: (error: Error | TransactionReceipt | string) => void
+    ): EventEmitter;
+}
+
+export interface EventLog {
+    event: string;
+    address: string;
+    returnValues: any;
+    logIndex: number;
+    transactionIndex: number;
+    transactionHash: string;
+    blockHash: string;
+    blockNumber: number;
+    raw?: { data: string; topics: string[] };
+}
+
+export interface TransactionReceipt {
+    transactionHash: string;
+    transactionIndex: number;
+    blockHash: string;
+    blockNumber: number;
+    from: string;
+    to: string;
+    contractAddress: string;
+    cumulativeGasUsed: number;
+    gasUsed: number;
+    logs?: Log[];
+    events?: {
+        [eventName: string]: EventLog;
+    };
+    status: string;
+}
+
+export interface EncodedTransaction {
+    raw: string;
+    tx: {
+        nonce: string;
+        gasPrice: string;
+        gas: string;
+        to: string;
+        value: string;
+        input: string;
+        v: string;
+        r: string;
+        s: string;
+        hash: string;
+    };
+}
+
+export interface Logs {
+    fromBlock?: number;
+    address?: string;
+    topics?: Array<string | string[]>;
+}
+export interface Log {
+    address: string;
+    data: string;
+    topics: string[];
+    logIndex: number;
+    transactionHash: string;
+    transactionIndex: number;
+    blockHash: string;
+    blockNumber: number;
+}
+export interface Subscribe<T> {
+    subscription: {
+        id: string;
+        subscribe(callback?: Callback<Subscribe<T>>): Subscribe<T>;
+        unsubscribe(callback?: Callback<boolean>): void | boolean;
+        arguments: object;
+    };
+    on(type: "data" | "changed", handler: (data: T) => void): void;
+    on(type: "error", handler: (data: Error) => void): void;
+}
+
+export class Shh {} // TODO: Type
+export class Bzz {} // TODO: Type
diff --git a/types/web3/utils.d.ts b/types/web3/utils.d.ts
new file mode 100644
index 0000000000..61869e327a
--- /dev/null
+++ b/types/web3/utils.d.ts
@@ -0,0 +1,71 @@
+import BigNumber = require("bn.js");
+import * as us from "underscore";
+
+type Unit =
+    | "kwei"
+    | "femtoether"
+    | "babbage"
+    | "mwei"
+    | "picoether"
+    | "lovelace"
+    | "qwei"
+    | "nanoether"
+    | "shannon"
+    | "microether"
+    | "szabo"
+    | "nano"
+    | "micro"
+    | "milliether"
+    | "finney"
+    | "milli"
+    | "ether"
+    | "kether"
+    | "grand"
+    | "mether"
+    | "gether"
+    | "tether";
+export default interface Utils {
+    BN: BigNumber; // TODO only static-definition
+    isBN(any: any): boolean;
+    isBigNumber(any: any): boolean;
+    isAddress(any: any): boolean;
+    isHex(any: any): boolean;
+    _: us.UnderscoreStatic;
+    asciiToHex(val: string): string;
+    hexToAscii(val: string): string;
+    bytesToHex(val: number[]): string;
+    numberToHex(val: number | BigNumber): string;
+    checkAddressChecksum(address: string): boolean;
+    fromAscii(val: string): string;
+    fromDecimal(val: string | number | BigNumber): string;
+    fromUtf8(val: string): string;
+    fromWei(val: string | number | BigNumber, unit: Unit): string | BigNumber;
+    hexToBytes(val: string): number[];
+    hexToNumber(val: string | number | BigNumber): number;
+    hexToNumberString(val: string | number | BigNumber): string;
+    hexToString(val: string): string;
+    hexToUtf8(val: string): string;
+    keccak256(val: string): string;
+    leftPad(string: string, chars: number, sign: string): string;
+    padLeft(string: string, chars: number, sign: string): string;
+    rightPad(string: string, chars: number, sign: string): string;
+    padRight(string: string, chars: number, sign: string): string;
+    sha3(
+        val: string,
+        val2?: string,
+        val3?: string,
+        val4?: string,
+        val5?: string
+    ): string;
+    soliditySha3(val: string): string;
+    randomHex(bytes: number): string;
+    stringToHex(val: string): string;
+    toAscii(hex: string): string;
+    toBN(any: any): BigNumber;
+    toChecksumAddress(val: string): string;
+    toDecimal(val: any): number;
+    toHex(val: any): string;
+    toUtf8(val: any): string;
+    toWei(val: string | number | BigNumber, unit: Unit): string | BigNumber;
+    unitMap: any;
+}
diff --git a/types/web3/web3-tests.ts b/types/web3/web3-tests.ts
new file mode 100644
index 0000000000..88e05028dd
--- /dev/null
+++ b/types/web3/web3-tests.ts
@@ -0,0 +1,18 @@
+import Web3 = require("web3");
+const web3 = new Web3();
+const myProvider = new web3.providers.HttpProvider("http://localhost:5454");
+web3.setProvider(myProvider);
+web3.eth.setProvider(myProvider);
+
+const myContract = new web3.eth.Contract(
+	[],
+	"0xde0B295669a9FD93d5F28D9Ec85E40f4cb697BAe",
+	{
+		from: "0x1234567890123456789012345678901234567891",
+		gasPrice: "20000000000"
+	}
+);
+
+myContract.options.from = "0x1234567890123456789012345678901234567891";
+myContract.options.gasPrice = "20000000000000";
+myContract.options.gas = 5000000;

From 7c89dff42e736951696717b81697ad70b5d8a813 Mon Sep 17 00:00:00 2001
From: Afshawn Lotfi <afshawn.audatica292@gmail.com>
Date: Wed, 30 May 2018 04:04:22 -0400
Subject: [PATCH 0839/1124] Tested, Checkstyled, and ready to export

---
 types/ajv-errors/ajv-errors-tests.ts |  5 +++++
 types/ajv-errors/index.d.ts          | 18 ++++++++++++++++++
 types/ajv-errors/tsconfig.json       | 23 +++++++++++++++++++++++
 types/ajv-errors/tslint.json         |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/ajv-errors/ajv-errors-tests.ts
 create mode 100644 types/ajv-errors/index.d.ts
 create mode 100644 types/ajv-errors/tsconfig.json
 create mode 100644 types/ajv-errors/tslint.json

diff --git a/types/ajv-errors/ajv-errors-tests.ts b/types/ajv-errors/ajv-errors-tests.ts
new file mode 100644
index 0000000000..d06c80b152
--- /dev/null
+++ b/types/ajv-errors/ajv-errors-tests.ts
@@ -0,0 +1,5 @@
+import * as Ajv from "ajv";
+import AjvErrors = require("ajv-errors");
+
+const ajv = new Ajv({allErrors: true, jsonPointers: true});
+AjvErrors(ajv);
diff --git a/types/ajv-errors/index.d.ts b/types/ajv-errors/index.d.ts
new file mode 100644
index 0000000000..a8a9db4a2a
--- /dev/null
+++ b/types/ajv-errors/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for ajv-errors 1.0
+// Project: https://github.com/afshawnlotfi/types-ajv-errors
+// Definitions by: Afshawn Lotfi <https://github.com/afshawnlotfi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Ajv } from "ajv";
+
+/**
+ *
+ * @param ajv Ajv Main Class
+ * https://github.com/epoberezkin/ajv
+ * @param options Optional options for Ajv Errors
+ * https://github.com/epoberezkin/ajv-errors#options
+ *
+ */
+
+export = AjvErrors;
+declare function AjvErrors(ajv: Ajv, options?: {}): Ajv;
diff --git a/types/ajv-errors/tsconfig.json b/types/ajv-errors/tsconfig.json
new file mode 100644
index 0000000000..c78a24c8c9
--- /dev/null
+++ b/types/ajv-errors/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",
+        "ajv-errors-tests.ts"
+    ]
+}
diff --git a/types/ajv-errors/tslint.json b/types/ajv-errors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ajv-errors/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

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 0840/1124] 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 f33a9352395f79e968e1c5a1b27640fa6ed73b58 Mon Sep 17 00:00:00 2001
From: inikulin <ifaaan@gmail.com>
Date: Wed, 2 May 2018 11:49:57 +0100
Subject: [PATCH 0841/1124] Add type definition for parse5

---
 notNeededPackages.json                        |   6 -
 types/jsdom/index.d.ts                        |   4 +-
 .../index.d.ts                                | 210 ++++++
 .../parse5-htmlparser2-tree-adapter-tests.ts  |  70 ++
 .../tsconfig.json                             |  23 +
 .../tslint.json                               |   1 +
 types/parse5-parser-stream/index.d.ts         |  92 +++
 .../parse5-parser-stream-tests.ts             |  32 +
 types/parse5-parser-stream/tsconfig.json      |  23 +
 types/parse5-parser-stream/tslint.json        |   1 +
 .../index.d.ts                                |  33 +
 ...rse5-plain-text-conversion-stream-tests.ts |  27 +
 .../tsconfig.json                             |  23 +
 .../tslint.json                               |   1 +
 types/parse5-sax-parser/index.d.ts            | 192 ++++++
 .../parse5-sax-parser-tests.ts                |  45 ++
 types/parse5-sax-parser/tsconfig.json         |  23 +
 types/parse5-sax-parser/tslint.json           |   1 +
 types/parse5-serializer-stream/index.d.ts     |  41 ++
 .../parse5-serializer-stream-tests.ts         |  16 +
 types/parse5-serializer-stream/tsconfig.json  |  23 +
 types/parse5-serializer-stream/tslint.json    |   1 +
 types/parse5/index.d.ts                       | 601 ++++++++++++++++++
 types/parse5/parse5-tests.ts                  | 191 ++++++
 types/parse5/tsconfig.json                    |  23 +
 types/parse5/tslint.json                      |   1 +
 26 files changed, 1696 insertions(+), 8 deletions(-)
 create mode 100644 types/parse5-htmlparser2-tree-adapter/index.d.ts
 create mode 100644 types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts
 create mode 100644 types/parse5-htmlparser2-tree-adapter/tsconfig.json
 create mode 100644 types/parse5-htmlparser2-tree-adapter/tslint.json
 create mode 100644 types/parse5-parser-stream/index.d.ts
 create mode 100644 types/parse5-parser-stream/parse5-parser-stream-tests.ts
 create mode 100644 types/parse5-parser-stream/tsconfig.json
 create mode 100644 types/parse5-parser-stream/tslint.json
 create mode 100644 types/parse5-plain-text-conversion-stream/index.d.ts
 create mode 100644 types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts
 create mode 100644 types/parse5-plain-text-conversion-stream/tsconfig.json
 create mode 100644 types/parse5-plain-text-conversion-stream/tslint.json
 create mode 100644 types/parse5-sax-parser/index.d.ts
 create mode 100644 types/parse5-sax-parser/parse5-sax-parser-tests.ts
 create mode 100644 types/parse5-sax-parser/tsconfig.json
 create mode 100644 types/parse5-sax-parser/tslint.json
 create mode 100644 types/parse5-serializer-stream/index.d.ts
 create mode 100644 types/parse5-serializer-stream/parse5-serializer-stream-tests.ts
 create mode 100644 types/parse5-serializer-stream/tsconfig.json
 create mode 100644 types/parse5-serializer-stream/tslint.json
 create mode 100644 types/parse5/index.d.ts
 create mode 100644 types/parse5/parse5-tests.ts
 create mode 100644 types/parse5/tsconfig.json
 create mode 100644 types/parse5/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 6f3e4fe093..897648af02 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1002,12 +1002,6 @@
             "sourceRepoURL": "https://github.com/blakeembrey/param-case",
             "asOfVersion": "1.1.2"
         },
-        {
-            "libraryName": "parse5",
-            "typingsPackageName": "parse5",
-            "sourceRepoURL": "https://github.com/inikulin/parse5",
-            "asOfVersion": "3.0.0"
-        },
         {
             "libraryName": "pascal-case",
             "typingsPackageName": "pascal-case",
diff --git a/types/jsdom/index.d.ts b/types/jsdom/index.d.ts
index cfb54fa25f..5ccdd33a65 100644
--- a/types/jsdom/index.d.ts
+++ b/types/jsdom/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="node" />
 
 import { EventEmitter } from 'events';
-import { MarkupData } from 'parse5';
+import { ElementLocation } from 'parse5';
 import * as tough from 'tough-cookie';
 import { Script } from 'vm';
 
@@ -32,7 +32,7 @@ export class JSDOM {
     /**
      * The nodeLocation() method will find where a DOM node is within the source document, returning the parse5 location info for the node.
      */
-    nodeLocation(node: Node): MarkupData.ElementLocation | null;
+    nodeLocation(node: Node): ElementLocation | null;
 
     /**
      * The built-in vm module of Node.js allows you to create Script instances,
diff --git a/types/parse5-htmlparser2-tree-adapter/index.d.ts b/types/parse5-htmlparser2-tree-adapter/index.d.ts
new file mode 100644
index 0000000000..12aa70219b
--- /dev/null
+++ b/types/parse5-htmlparser2-tree-adapter/index.d.ts
@@ -0,0 +1,210 @@
+// Type definitions for parse5-htmlparser2-tree-adapter 5.0
+// Project: https://github.com/inikulin/parse5
+// Definitions by: Ivan Nikulin <https://github.com/inikulin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as parse5 from "parse5";
+
+/**
+ * htmlparser2 tree adapter Node interface.
+ */
+export interface Node {
+    /**
+     * The type of the node. E.g. {@link Document} will have `type` equal to 'root'`.
+     */
+    type: string;
+    /**
+     * [DOM spec](https://dom.spec.whatwg.org/#dom-node-nodetype)-compatible node {@link type}.
+     */
+    nodeType: number;
+    /**
+     * Parent node.
+     */
+    parent: ParentNode;
+    /**
+     * Same as {@link parent}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+     */
+    parentNode: ParentNode;
+    /**
+     * Previous sibling.
+     */
+    prev: Node;
+    /**
+     * Same as {@link prev}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+     */
+    previousSibling: Node;
+    /**
+     * Next sibling.
+     */
+    next: Node;
+    /**
+     * Same as {@link next}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+     */
+    nextSibling: Node;
+}
+
+/**
+ * htmlparser2 tree adapter ParentNode interface.
+ */
+export interface ParentNode extends Node {
+    /**
+     * Child nodes.
+     */
+    children: Node[];
+    /**
+     * Same as {@link children}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+     */
+    childNodes: Node[];
+    /**
+     * First child of the node.
+     */
+    firstChild: Node;
+    /**
+     * Last child of the node.
+     */
+    lastChild: Node;
+}
+
+/**
+ * htmlparser2 tree adapter DocumentType interface.
+ */
+export interface DocumentType extends Node {
+    /**
+     * The type of the node.
+     */
+    type: "directive";
+    /**
+     * Node name.
+     */
+    name: "!doctype";
+    /**
+     * Serialized doctype {@link name}, {@link publicId} and {@link systemId}.
+     */
+    data: string;
+    /**
+     * Document type name.
+     */
+    "x-name": string;
+    /**
+     * Document type public identifier.
+     */
+    "x-publicId": string;
+    /**
+     * Document type system identifier.
+     */
+    "x-systemId": string;
+}
+
+/**
+ * htmlparser2 tree adapter Document interface.
+ */
+export interface Document extends ParentNode {
+    /**
+     * The type of the node.
+     */
+    type: "root";
+    /**
+     * The name of the node.
+     */
+    name: "root";
+    /**
+     * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+     */
+    "x-mode": parse5.DocumentMode;
+}
+
+/**
+ * htmlparser2 tree adapter DocumentFragment interface.
+ */
+export interface DocumentFragment extends ParentNode {
+    /**
+     * The type of the node.
+     */
+    type: "root";
+    /**
+     * The name of the node.
+     */
+    name: "root";
+}
+
+/**
+ * htmlparser2 tree adapter Element interface.
+ */
+export interface Element extends ParentNode {
+    /**
+     * The name of the node. Equals to element {@link tagName}.
+     */
+    name: string;
+    /**
+     * Element tag name.
+     */
+    tagName: string;
+    /**
+     * Element namespace.
+     */
+    namespace: string;
+    /**
+     * Element attributes.
+     */
+    attribs: { [name: string]: string };
+    /**
+     * Element attribute namespaces.
+     */
+    "x-attribsNamespace": { [name: string]: string };
+    /**
+     * Element attribute namespace-related prefixes.
+     */
+    "x-attribsPrefix": { [name: string]: string };
+    /**
+     * Element source code location info. Available if location info is enabled via ParserOptions.
+     */
+    sourceCodeLocation?: parse5.ElementLocation;
+}
+
+/**
+ * htmlparser2 tree adapter CommentNode interface.
+ */
+export interface CommentNode extends Node {
+    /**
+     * The name of the node.
+     */
+    name: "comment";
+    /**
+     * Comment text.
+     */
+    data: string;
+    /**
+     * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+     */
+    nodeValue: string;
+    /**
+     * Comment source code location info. Available if location info is enabled via ParserOptions.
+     */
+    sourceCodeLocation?: parse5.Location;
+}
+
+/**
+ * htmlparser2 tree adapter TextNode interface.
+ */
+export interface TextNode extends Node {
+    /**
+     * The name of the node.
+     */
+    name: "text";
+    /**
+     * Text content.
+     */
+    data: string;
+    /**
+     * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+     */
+    nodeValue: string;
+    /**
+     * Comment source code location info. Available if location info is enabled via ParserOptions.
+     */
+    sourceCodeLocation?: parse5.Location;
+}
+
+declare const treeAdapter: parse5.TreeAdapter;
+export default treeAdapter;
diff --git a/types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts b/types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts
new file mode 100644
index 0000000000..e14ad9da3b
--- /dev/null
+++ b/types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts
@@ -0,0 +1,70 @@
+import { parse } from "parse5";
+import treeAdapter, {
+    Node,
+    ParentNode,
+    Document,
+    DocumentType,
+    Element,
+    TextNode,
+    CommentNode
+} from "parse5-htmlparser2-tree-adapter";
+
+// htmlparser2 AST
+const htmlparser2Document = parse("<html>", {
+    treeAdapter
+}) as Document;
+
+htmlparser2Document; // $ExpectType Document
+htmlparser2Document.name; // $ExpectType "root"
+htmlparser2Document.type; // $ExpectType "root"
+htmlparser2Document["x-mode"]; // $ExpectType DocumentMode
+
+const htmlparser2Node = htmlparser2Document as Node;
+
+htmlparser2Node.next; // $ExpectType Node
+htmlparser2Node.nextSibling; // $ExpectType Node
+htmlparser2Node.nodeType; // $ExpectType number
+htmlparser2Node.parent; // $ExpectType ParentNode
+htmlparser2Node.parentNode; // $ExpectType ParentNode
+htmlparser2Node.prev; // $ExpectType Node
+htmlparser2Node.previousSibling; // $ExpectType Node
+htmlparser2Node.type; // $ExpectType string
+
+const htmlparser2ParentNode = htmlparser2Document as ParentNode;
+
+htmlparser2ParentNode; // $ExpectType ParentNode
+htmlparser2ParentNode.childNodes[0]; // $ExpectType Node
+htmlparser2ParentNode.children[0]; // $ExpectType Node
+htmlparser2ParentNode.firstChild; // $ExpectType Node
+htmlparser2ParentNode.lastChild; // $ExpectType Node
+
+const htmlparser2Doctype = htmlparser2Document.childNodes[0] as DocumentType;
+
+htmlparser2Doctype; // $ExpectType DocumentType
+htmlparser2Doctype.data; // $ExpectType string
+htmlparser2Doctype.name; // $ExpectType "!doctype"
+htmlparser2Doctype["x-name"]; // $ExpectType string
+htmlparser2Doctype["x-publicId"]; // $ExpectType string
+htmlparser2Doctype["x-systemId"]; // $ExpectType string
+
+const htmlparser2Element = htmlparser2Document.childNodes[0] as Element;
+
+htmlparser2Element; // $ExpectType Element
+htmlparser2Element.attribs["someAttr"]; // $ExpectType string
+htmlparser2Element["x-attribsNamespace"]["someAttr"]; // $ExpectType string
+htmlparser2Element["x-attribsPrefix"]["someAttr"]; // $ExpectType string
+htmlparser2Element.namespace; // $ExpectType string
+htmlparser2Element.tagName; // $ExpectType string
+htmlparser2Element.sourceCodeLocation!; // $ExpectType ElementLocation
+
+const htmlparser2TextNode = htmlparser2Document.childNodes[0] as TextNode;
+
+htmlparser2TextNode.data; // $ExpectType string
+htmlparser2TextNode.nodeValue; // $ExpectType string
+htmlparser2TextNode.sourceCodeLocation!; // $ExpectType Location
+
+const htmlparser2CommentNode = htmlparser2Document.childNodes[0] as CommentNode;
+
+htmlparser2CommentNode.data; // $ExpectType string
+htmlparser2CommentNode.nodeValue; // $ExpectType string
+htmlparser2CommentNode.sourceCodeLocation!; // $ExpectType Location
diff --git a/types/parse5-htmlparser2-tree-adapter/tsconfig.json b/types/parse5-htmlparser2-tree-adapter/tsconfig.json
new file mode 100644
index 0000000000..c7655de33c
--- /dev/null
+++ b/types/parse5-htmlparser2-tree-adapter/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",
+        "parse5-htmlparser2-tree-adapter-tests.ts"
+    ]
+}
diff --git a/types/parse5-htmlparser2-tree-adapter/tslint.json b/types/parse5-htmlparser2-tree-adapter/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse5-htmlparser2-tree-adapter/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse5-parser-stream/index.d.ts b/types/parse5-parser-stream/index.d.ts
new file mode 100644
index 0000000000..ac10af57af
--- /dev/null
+++ b/types/parse5-parser-stream/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for parse5-parser-stream 5.0
+// Project: https://github.com/inikulin/parse5
+// Definitions by: Ivan Nikulin <https://github.com/inikulin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+import * as parse5 from "parse5";
+
+/**
+ * Streaming HTML parser with scripting support.
+ * A [writable stream](https://nodejs.org/api/stream.html#stream_class_stream_writable).
+ *
+ * ** NOTE:** This API is available only for Node.js.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const http = require('http');
+ *
+ * // Fetch the page content and obtain it's <head> node
+ * http.get('http://inikulin.github.io/parse5/', res => {
+ *    const parser = new parse5.ParserStream();
+ *
+ *    parser.once('finish', () => {
+ *        console.log(parser.document.childNodes[1].childNodes[0].tagName); //> 'head'
+ *    });
+ *
+ *    res.pipe(parser);
+ * });
+ * ```
+ */
+export default class ParserStream<TDocument> extends stream.Writable {
+    /**
+     * @param options - Parsing options.
+     */
+    constructor(options?: parse5.ParserOptions);
+
+    /**
+     * The resulting document node.
+     */
+    document: TDocument;
+
+    /**
+     * Raised when parser encounters a `<script>` element.
+     * If this event has listeners, parsing will be suspended once it is emitted.
+     * So, if `<script>` has the `src` attribute, you can fetch it, execute and then resume parsing just like browsers do.
+     *
+     * @param listener.scriptElement - The script element that caused the event.
+     * @param listener.documentWrite - Write additional `html` at the current parsing position. Suitable for implementing the DOM `document.write` and `document.writeln` methods.
+     * @param listener.documentWrite.html - HTML to write.
+     * @param listener.resume - Resumes parsing.
+     *
+     * @example
+     * ```js
+     *
+     * const parse = require('parse5');
+     * const http = require('http');
+     *
+     * const parser = new parse5.ParserStream();
+     *
+     * parser.on('script', (scriptElement, documentWrite, resume) => {
+     *     const src = parse5.treeAdapters.default.getAttrList(scriptElement)[0].value;
+     *
+     *     http.get(src, res => {
+     *        // Fetch the script content, execute it with DOM built around `parser.document` and
+     *        // `document.write` implemented using `documentWrite`.
+     *        ...
+     *        // Then resume parsing.
+     *        resume();
+     *     });
+     * });
+     *
+     * parser.end('<script src="example.com/script.js"></script>');
+     * ```
+     */
+    on(
+        event: "script",
+        listener: (
+            scriptElement: parse5.Element,
+            documentWrite: (html: string) => void,
+            resume: () => void
+        ) => void
+    ): this;
+    /**
+     * WritableStream events
+     */
+    on(event: string, listener: (...params: any[]) => any): this;
+}
diff --git a/types/parse5-parser-stream/parse5-parser-stream-tests.ts b/types/parse5-parser-stream/parse5-parser-stream-tests.ts
new file mode 100644
index 0000000000..6793ce7fa9
--- /dev/null
+++ b/types/parse5-parser-stream/parse5-parser-stream-tests.ts
@@ -0,0 +1,32 @@
+import * as parse5 from "parse5";
+import ParserStream from "parse5-parser-stream";
+import { createReadStream } from "fs";
+
+const defaultAdapter = new Object() as parse5.TreeAdapter;
+let parser = new ParserStream<parse5.DefaultTreeDocument>();
+
+parser = new ParserStream<parse5.DefaultTreeDocument>({ sourceCodeLocationInfo: true });
+parser = new ParserStream<parse5.DefaultTreeDocument>({ treeAdapter: defaultAdapter });
+parser = new ParserStream<parse5.DefaultTreeDocument>({
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+parser = new ParserStream<parse5.DefaultTreeDocument>({
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+
+parser.document; // $ExpectType DefaultTreeDocument
+
+parser
+    .on(
+        "script",
+        (
+            element: parse5.Element,
+            documentWrite: (html: string) => void,
+            resume: () => {}
+        ) => {}
+    )
+    .on("finish", () => {});
+
+createReadStream("file").pipe(parser);
diff --git a/types/parse5-parser-stream/tsconfig.json b/types/parse5-parser-stream/tsconfig.json
new file mode 100644
index 0000000000..6b52a77de9
--- /dev/null
+++ b/types/parse5-parser-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",
+        "parse5-parser-stream-tests.ts"
+    ]
+}
diff --git a/types/parse5-parser-stream/tslint.json b/types/parse5-parser-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse5-parser-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse5-plain-text-conversion-stream/index.d.ts b/types/parse5-plain-text-conversion-stream/index.d.ts
new file mode 100644
index 0000000000..d5ac51ba18
--- /dev/null
+++ b/types/parse5-plain-text-conversion-stream/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for parse5-plain-text-conversion-stream 5.0
+// Project: https://github.com/inikulin/parse5
+// Definitions by: Ivan Nikulin <https://github.com/inikulin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import ParserStream from "parse5-parser-stream";
+
+/**
+ * Converts plain text files into HTML document as required by [HTML specification](https://html.spec.whatwg.org/#read-text).
+ * A [writable stream](https://nodejs.org/api/stream.html#stream_class_stream_writable).
+ *
+ * ** NOTE:** This API is available only for Node.js.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const fs = require('fs');
+ *
+ * const file = fs.createReadStream('war_and_peace.txt');
+ * const converter = new parse5.PlainTextConversionStream();
+ *
+ * converter.once('finish', () => {
+ *     console.log(converter.document.childNodes[1].childNodes[0].tagName); //> 'head'
+ * });
+ *
+ * file.pipe(converter);
+ * ```
+ */
+export default class PlainTextConversionStream<TDocument> extends ParserStream<
+    TDocument
+> {}
diff --git a/types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts b/types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts
new file mode 100644
index 0000000000..00f6728dc2
--- /dev/null
+++ b/types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts
@@ -0,0 +1,27 @@
+import * as parse5 from "parse5";
+import PlainTextConversionStream from "parse5-plain-text-conversion-stream";
+import { createReadStream } from "fs";
+
+const defaultAdapter = new Object() as parse5.TreeAdapter;
+let converter = new PlainTextConversionStream<parse5.DefaultTreeDocument>();
+
+converter = new PlainTextConversionStream<parse5.DefaultTreeDocument>({
+    sourceCodeLocationInfo: true
+});
+converter = new PlainTextConversionStream<parse5.DefaultTreeDocument>({
+    treeAdapter: defaultAdapter
+});
+converter = new PlainTextConversionStream<parse5.DefaultTreeDocument>({
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+converter = new PlainTextConversionStream<parse5.DefaultTreeDocument>({
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+
+converter.document; // $ExpectType DefaultTreeDocument
+
+converter.on("finish", () => {});
+
+createReadStream("file").pipe(converter);
diff --git a/types/parse5-plain-text-conversion-stream/tsconfig.json b/types/parse5-plain-text-conversion-stream/tsconfig.json
new file mode 100644
index 0000000000..47698adf67
--- /dev/null
+++ b/types/parse5-plain-text-conversion-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",
+        "parse5-plain-text-conversion-stream-tests.ts"
+    ]
+}
diff --git a/types/parse5-plain-text-conversion-stream/tslint.json b/types/parse5-plain-text-conversion-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse5-plain-text-conversion-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse5-sax-parser/index.d.ts b/types/parse5-sax-parser/index.d.ts
new file mode 100644
index 0000000000..0d98fb51e2
--- /dev/null
+++ b/types/parse5-sax-parser/index.d.ts
@@ -0,0 +1,192 @@
+// Type definitions for parse5-sax-parser 5.0
+// Project: https://github.com/inikulin/parse5
+// Definitions by: Ivan Nikulin <https://github.com/inikulin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+import * as parse5 from "parse5";
+
+export interface StartTagToken {
+    /**
+     * Tag name.
+     */
+    tagName: string;
+    /**
+     * List of attributes.
+     */
+    attrs: parse5.Attribute[];
+    /**
+     * Indicates if the tag is self-closing.
+     */
+    selfClosing: boolean;
+    /**
+     * Start tag source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+     */
+    sourceCodeLocation?: parse5.StartTagLocation;
+}
+
+export interface EndTagToken {
+    /**
+     * Tag name.
+     */
+    tagName: string;
+    /**
+     * End tag source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+     */
+    sourceCodeLocation?: parse5.Location;
+}
+
+export interface CommentToken {
+    /**
+     * Comment text.
+     */
+    text: string;
+    /**
+     * Comment source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+     */
+    sourceCodeLocation?: parse5.Location;
+}
+
+export interface TextToken {
+    /**
+     * Text content.
+     */
+    text: string;
+    /**
+     * Text content source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+     */
+    sourceCodeLocation?: parse5.Location;
+}
+
+export interface DoctypeToken {
+    /**
+     * Document type name.
+     */
+    name: string;
+    /**
+     * Document type public identifier.
+     */
+    publicId: string;
+    /**
+     * Document type system identifier.
+     */
+    systemId: string;
+    /**
+     * Document type declaration source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+     */
+    sourceCodeLocation?: parse5.Location;
+}
+
+export interface SAXParserOptions {
+    /**
+     * Enables source code location information for the tokens.
+     * When enabled, each token event handler will receive {@link Location} (or {@link StartTagLocation})
+     * object as its last argument.
+     */
+    sourceCodeLocationInfo?: boolean;
+}
+
+/**
+ * Streaming [SAX](https://en.wikipedia.org/wiki/Simple_API_for_XML)-style HTML parser.
+ * A [transform stream](https://nodejs.org/api/stream.html#stream_class_stream_transform)
+ * (which means you can pipe *through* it, see example).
+ *
+ * ** NOTE:** This API is available only for Node.js.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const http = require('http');
+ * const fs = require('fs');
+ *
+ * const file = fs.createWriteStream('/home/google.com.html');
+ * const parser = new parse5.SAXParser();
+ *
+ * parser.on('text', text => {
+ *    // Handle page text content
+ *    ...
+ * });
+ *
+ * http.get('http://google.com', res => {
+ *    // SAXParser is the Transform stream, which means you can pipe
+ *    // through it. So, you can analyze page content and, e.g., save it
+ *    // to the file at the same time:
+ *    res.pipe(parser).pipe(file);
+ * });
+ * ```
+ */
+export default class SAXParser extends stream.Transform {
+    /**
+     * @param options - Parsing options.
+     */
+    constructor(options?: SAXParserOptions);
+
+    /**
+     * Raised when the parser encounters a start tag.
+     *
+     * @param listener.startTag - Start tag token.
+     */
+    on(event: "startTag", listener: (startTag: StartTagToken) => void): this;
+
+    /**
+     * Raised when parser encounters an end tag.
+     *
+     * @param listener.endTag - End tag token.
+     */
+    on(event: "endTag", listener: (endTag: EndTagToken) => void): this;
+    /**
+     * Raised when parser encounters text content.
+     *
+     * @param listener.text - Text token.
+     */
+    on(event: "text", listener: (text: TextToken) => void): this;
+    /**
+     * Raised when parser encounters a comment.
+     *
+     * @param listener.comment - Comment content.
+     */
+    on(event: "comment", listener: (comment: CommentToken) => void): this;
+    /**
+     * Raised when parser encounters a [document type declaration](https://en.wikipedia.org/wiki/Document_type_declaration).
+     *
+     * @param listener.doctype - Document type token.
+     */
+    on(event: "doctype", listener: (doctype: DoctypeToken) => void): this;
+    /**
+     * TransformStream events
+     */
+    on(event: string, listener: (...params: any[]) => any): this;
+
+    /**
+     * Stops parsing. Useful if you want the parser to stop consuming CPU time once you've obtained the desired info
+     * from the input stream. Doesn't prevent piping, so that data will flow through the parser as usual.
+     *
+     * @example
+     * ```js
+     *
+     * const parse5 = require('parse5');
+     * const http = require('http');
+     * const fs = require('fs');
+     *
+     * const file = fs.createWriteStream('google.com.html');
+     * const parser = new parse5.SAXParser();
+     *
+     * parser.on('doctype', (name, publicId, systemId) => {
+     *    // Process doctype info ans stop parsing
+     *    ...
+     *    parser.stop();
+     * });
+     *
+     * http.get('http://google.com', res => {
+     *    // Despite the fact that parser.stop() was called whole
+     *    // content of the page will be written to the file
+     *    res.pipe(parser).pipe(file);
+     * });
+     * ```
+     */
+    stop(): void;
+}
diff --git a/types/parse5-sax-parser/parse5-sax-parser-tests.ts b/types/parse5-sax-parser/parse5-sax-parser-tests.ts
new file mode 100644
index 0000000000..75fd4c25b2
--- /dev/null
+++ b/types/parse5-sax-parser/parse5-sax-parser-tests.ts
@@ -0,0 +1,45 @@
+import SAXParser, {
+    StartTagToken,
+    EndTagToken,
+    CommentToken,
+    TextToken,
+    DoctypeToken
+} from "parse5-sax-parser";
+import { createReadStream, createWriteStream } from "fs";
+
+let sax = new SAXParser();
+
+sax = new SAXParser({ sourceCodeLocationInfo: true });
+
+sax.stop();
+
+sax
+    .on("startTag", (startTag: StartTagToken) => {
+        startTag.tagName; // $ExpectType string
+        startTag.attrs; // $ExpectType Attribute[]
+        startTag.selfClosing; // $ExpectType boolean
+        startTag.sourceCodeLocation!; // $ExpectType StartTagLocation
+    })
+    .on("endTag", (endTag: EndTagToken) => {
+        endTag.tagName; // $ExpectType string
+        endTag.sourceCodeLocation!; // $ExpectType Location
+    })
+    .on("comment", (comment: CommentToken) => {
+        comment.text; // $ExpectType string
+        comment.sourceCodeLocation!; // $ExpectType Location
+    })
+    .on("text", (text: TextToken) => {
+        text.text; // $ExpectType string
+        text.sourceCodeLocation!; // $ExpectType Location
+    })
+    .on("doctype", (doctype: DoctypeToken) => {
+        doctype.name; // $ExpectType string
+        doctype.publicId; // $ExpectType string
+        doctype.systemId; // $ExpectType string
+        doctype.sourceCodeLocation!; // $ExpectType Location
+    })
+    .on("finish", () => {});
+
+createReadStream("file1")
+    .pipe(sax)
+    .pipe(createWriteStream("file2"));
diff --git a/types/parse5-sax-parser/tsconfig.json b/types/parse5-sax-parser/tsconfig.json
new file mode 100644
index 0000000000..13ec568936
--- /dev/null
+++ b/types/parse5-sax-parser/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",
+        "parse5-sax-parser-tests.ts"
+    ]
+}
diff --git a/types/parse5-sax-parser/tslint.json b/types/parse5-sax-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse5-sax-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse5-serializer-stream/index.d.ts b/types/parse5-serializer-stream/index.d.ts
new file mode 100644
index 0000000000..d96db5e40c
--- /dev/null
+++ b/types/parse5-serializer-stream/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for parse5-serializer-stream 5.0
+// Project: https://github.com/inikulin/parse5
+// Definitions by: Ivan Nikulin <https://github.com/inikulin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+import * as parse5 from "parse5";
+
+/**
+ * Streaming AST node to an HTML serializer.
+ * A [readable stream](https://nodejs.org/api/stream.html#stream_class_stream_readable).
+ *
+ * ** NOTE:** This API is available only for Node.js.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const fs = require('fs');
+ *
+ * const file = fs.createWriteStream('/home/index.html');
+ *
+ * // Serializes the parsed document to HTML and writes it to the file.
+ * const document = parse5.parse('<body>Who is John Galt?</body>');
+ * const serializer = new parse5.SerializerStream(document);
+ *
+ * serializer.pipe(file);
+ * ```
+ */
+export default class SerializerStream extends stream.Readable {
+    /**
+     * Streaming AST node to an HTML serializer. A readable stream.
+     *
+     * @param node - Node to serialize.
+     * @param options - Serialization options.
+     */
+    constructor(node: parse5.Node, options?: parse5.SerializerOptions);
+}
diff --git a/types/parse5-serializer-stream/parse5-serializer-stream-tests.ts b/types/parse5-serializer-stream/parse5-serializer-stream-tests.ts
new file mode 100644
index 0000000000..3f5a8fbb96
--- /dev/null
+++ b/types/parse5-serializer-stream/parse5-serializer-stream-tests.ts
@@ -0,0 +1,16 @@
+import { parse, TreeAdapter } from "parse5";
+import SerializerStream from "parse5-serializer-stream";
+import { createReadStream, createWriteStream } from "fs";
+
+const document = parse("<html>");
+const defaultAdapter = new Object() as TreeAdapter;
+let serializer = new SerializerStream(document);
+
+serializer = new SerializerStream(document, {
+    treeAdapter: defaultAdapter
+});
+serializer = new SerializerStream(document, {
+    treeAdapter: defaultAdapter
+});
+
+serializer.pipe(createWriteStream("file"));
diff --git a/types/parse5-serializer-stream/tsconfig.json b/types/parse5-serializer-stream/tsconfig.json
new file mode 100644
index 0000000000..52c5352bf7
--- /dev/null
+++ b/types/parse5-serializer-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",
+        "parse5-serializer-stream-tests.ts"
+    ]
+}
diff --git a/types/parse5-serializer-stream/tslint.json b/types/parse5-serializer-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse5-serializer-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse5/index.d.ts b/types/parse5/index.d.ts
new file mode 100644
index 0000000000..f495207d24
--- /dev/null
+++ b/types/parse5/index.d.ts
@@ -0,0 +1,601 @@
+// Type definitions for parse5 5.0
+// Project: https://github.com/inikulin/parse5
+// Definitions by: Ivan Nikulin <https://github.com/inikulin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export interface Location {
+    /**
+     * One-based line index of the first character
+     */
+    startLine: number;
+    /**
+     * One-based column index of the first character
+     */
+    startCol: number;
+    /**
+     * One-based line index of the last character
+     */
+    endLine: number;
+    /**
+     * One-based column index of the last character
+     */
+    endCol: number;
+    /**
+     * Zero-based first character index
+     */
+    startOffset: number;
+    /**
+     * Zero-based last character index
+     */
+    endOffset: number;
+}
+
+export interface AttributesLocation {
+    [attributeName: string]: Location;
+}
+
+export interface StartTagLocation extends Location {
+    /**
+     * Start tag attributes' location info
+     */
+    attrs: AttributesLocation;
+}
+
+export interface ElementLocation extends StartTagLocation {
+    /**
+     * Element's start tag location info.
+     */
+    startTag: StartTagLocation;
+    /**
+     * Element's end tag location info.
+     */
+    endTag: Location;
+}
+
+export interface ParserOptions {
+    /**
+     * The [scripting flag](https://html.spec.whatwg.org/multipage/parsing.html#scripting-flag). If set
+     * to `true`, `noscript` element content will be parsed as text.
+     *
+     *  **Default:** `true`
+     */
+    scriptingEnabled?: boolean;
+    /**
+     * Enables source code location information. When enabled, each node (except the root node)
+     * will have a `sourceCodeLocation` property. If the node is not an empty element, `sourceCodeLocation` will
+     * be a {@link ElementLocation} object, otherwise it will be {@link Location}.
+     * If the element was implicitly created by the parser (as part of
+     * [tree correction](https://html.spec.whatwg.org/multipage/syntax.html#an-introduction-to-error-handling-and-strange-cases-in-the-parser)),
+     * its `sourceCodeLocation` property will be `undefined`.
+     *
+     * **Default:** `false`
+     */
+    sourceCodeLocationInfo?: boolean;
+    /**
+     * Specifies the resulting tree format.
+     *
+     * **Default:** `treeAdapters.default`
+     */
+    treeAdapter?: TreeAdapter;
+}
+
+export interface SerializerOptions {
+    /***
+     * Specifies input tree format.
+     *
+     * **Default:** `treeAdapters.default`
+     */
+    treeAdapter?: TreeAdapter;
+}
+
+/**
+ * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+ */
+export type DocumentMode = "no-quirks" | "quirks" | "limited-quirks";
+
+// Default tree adapter
+
+/**
+ * Element attribute.
+ */
+export interface Attribute {
+    /**
+     * The name of the attribute.
+     */
+    name: string;
+    /**
+     * The value of the attribute.
+     */
+    value: string;
+    /**
+     * The namespace of the attribute.
+     */
+    namespace?: string;
+    /**
+     * The namespace-related prefix of the attribute.
+     */
+    prefix?: string;
+}
+
+/**
+ * Default tree adapter Node interface.
+ */
+export interface DefaultTreeNode {
+    /**
+     * The name of the node. E.g. {@link Document} will have `nodeName` equal to '#document'`.
+     */
+    nodeName: string;
+}
+
+/**
+ * Default tree adapter ParentNode interface.
+ */
+export interface DefaultTreeParentNode {
+    /**
+     * Child nodes.
+     */
+    childNodes: DefaultTreeNode[];
+}
+
+/**
+ * Default tree adapter DocumentType interface.
+ */
+export interface DefaultTreeDocumentType extends DefaultTreeNode {
+    /**
+     * The name of the node.
+     */
+    nodeName: "#documentType";
+    /**
+     * Document type name.
+     */
+    name: string;
+    /**
+     * Document type public identifier.
+     */
+    publicId: string;
+    /**
+     * Document type system identifier.
+     */
+    systemId: string;
+}
+
+/**
+ * Default tree adapter Document interface.
+ */
+export interface DefaultTreeDocument extends DefaultTreeParentNode {
+    /**
+     * The name of the node.
+     */
+    nodeName: "#document";
+    /**
+     * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+     */
+    mode: DocumentMode;
+}
+
+/**
+ * Default tree adapter DocumentFragment interface.
+ */
+export interface DefaultTreeDocumentFragment extends DefaultTreeParentNode {
+    /**
+     * The name of the node.
+     */
+    nodeName: "#document-fragment";
+}
+
+/**
+ * Default tree adapter Element interface.
+ */
+export interface DefaultTreeElement extends DefaultTreeParentNode {
+    /**
+     * The name of the node. Equals to element {@link tagName}.
+     */
+    nodeName: string;
+    /**
+     * Element tag name.
+     */
+    tagName: string;
+    /**
+     * Element namespace.
+     */
+    namespaceURI: string;
+    /**
+     * List of element attributes.
+     */
+    attrs: Attribute[];
+    /**
+     * Parent node.
+     */
+    parentNode: DefaultTreeParentNode;
+    /**
+     * Element source code location info. Available if location info is enabled via {@link ParserOptions}.
+     */
+    sourceCodeLocation?: ElementLocation;
+}
+
+/**
+ * Default tree adapter CommentNode interface.
+ */
+export interface DefaultTreeCommentNode extends DefaultTreeNode {
+    /**
+     * The name of the node.
+     */
+    nodeName: "#comment";
+    /**
+     * Comment text.
+     */
+    data: string;
+    /**
+     * Parent node.
+     */
+    parentNode: DefaultTreeParentNode;
+    /**
+     * Comment source code location info. Available if location info is enabled via {@link ParserOptions}.
+     */
+    sourceCodeLocation?: Location;
+}
+
+/**
+ * Default tree adapter TextNode interface.
+ */
+export interface DefaultTreeTextNode extends DefaultTreeNode {
+    /**
+     * The name of the node.
+     */
+    nodeName: "#text";
+    /**
+     * Text content.
+     */
+    value: string;
+    /**
+     * Parent node.
+     */
+    parentNode: DefaultTreeParentNode;
+    /**
+     * Text node source code location info. Available if location info is enabled via {@link ParserOptions}.
+     */
+    sourceCodeLocation?: Location;
+}
+
+// Generic node intefaces
+/**
+ * Generic Node interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.DefaultTreeNode}) to get access to the properties.
+ */
+export type Node = DefaultTreeNode | object;
+/**
+ * Generic ParentNode interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.DefaultTreeParentNode}) to get access to the properties.
+ */
+export type ParentNode = DefaultTreeParentNode | object;
+/**
+ * Generic DocumentType interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.DefaultTreeDocumentType}) to get access to the properties.
+ */
+export type DocumentType = DefaultTreeDocumentType | object;
+/**
+ * Generic Document interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.DefaultTreeDocument}) to get access to the properties.
+ */
+export type Document = DefaultTreeDocument | object;
+/**
+ * Generic DocumentFragment interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.DefaultTreeDocumentFragment}) to get access to the properties.
+ */
+export type DocumentFragment = DefaultTreeDocumentFragment | object;
+/**
+ * Generic Element interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.DefaultTreeElement}) to get access to the properties.
+ */
+export type Element = DefaultTreeElement | object;
+/**
+ * Generic TextNode interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.DefaultTreeTextNode}) to get access to the properties.
+ */
+export type TextNode = DefaultTreeTextNode | object;
+/**
+ * Generic CommentNode interface.
+ * Cast to the actual AST interface (e.g. {@link parse5.Default.CommentNode}) to get access to the properties.
+ */
+export type CommentNode = DefaultTreeCommentNode | object;
+
+/**
+ * Tree adapter is a set of utility functions that provides minimal required abstraction layer beetween parser and a specific AST format.
+ * Note that `TreeAdapter` is not designed to be a general purpose AST manipulation library. You can build such library
+ * on top of existing `TreeAdapter` or use one of the existing libraries from npm.
+ *
+ * @see [default implementation](https://github.com/inikulin/parse5/blob/master/lib/tree_adapters/default.js)
+ */
+export interface TreeAdapter {
+    /**
+     * Creates a document node.
+     */
+    createDocument(): Document;
+    /**
+     * Creates a document fragment node.
+     */
+    createDocumentFragment(): DocumentFragment;
+    /**
+     * Creates an element node.
+     *
+     * @param tagName - Tag name of the element.
+     * @param namespaceURI - Namespace of the element.
+     * @param attrs - Attribute name-value pair array. Foreign attributes may contain `namespace` and `prefix` fields as well.
+     */
+    createElement(
+        tagName: string,
+        namespaceURI: string,
+        attrs: Attribute[]
+    ): Element;
+    /**
+     * Creates a comment node.
+     *
+     * @param data - Comment text.
+     */
+    createCommentNode(data: string): CommentNode;
+    /**
+     * Appends a child node to the given parent node.
+     *
+     * @param parentNode - Parent node.
+     * @param newNode -  Child node.
+     */
+    appendChild(parentNode: ParentNode, newNode: Node): void;
+    /**
+     * Inserts a child node to the given parent node before the given reference node.
+     *
+     * @param parentNode - Parent node.
+     * @param newNode -  Child node.
+     * @param referenceNode -  Reference node.
+     */
+    insertBefore(
+        parentNode: ParentNode,
+        newNode: Node,
+        referenceNode: Node
+    ): void;
+    /**
+     * Sets the `<template>` element content element.
+     *
+     * @param templateElement - `<template>` element.
+     * @param contentElement -  Content element.
+     */
+    setTemplateContent(
+        templateElement: Element,
+        contentElement: DocumentFragment
+    ): void;
+    /**
+     * Returns the `<template>` element content element.
+     *
+     * @param templateElement - `<template>` element.
+     */
+    getTemplateContent(templateElement: Element): DocumentFragment;
+    /**
+     * Sets the document type. If the `document` already contains a document type node, the `name`, `publicId` and `systemId`
+     * properties of this node will be updated with the provided values. Otherwise, creates a new document type node
+     * with the given properties and inserts it into the `document`.
+     *
+     * @param document - Document node.
+     * @param name -  Document type name.
+     * @param publicId - Document type public identifier.
+     * @param systemId - Document type system identifier.
+     */
+    setDocumentType(
+        document: Document,
+        name: string,
+        publicId: string,
+        systemId: string
+    ): void;
+    /**
+     * Sets the [document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+     *
+     * @param document - Document node.
+     * @param mode - Document mode.
+     */
+    setDocumentMode(document: Document, mode: DocumentMode): void;
+    /**
+     * Returns [document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+     *
+     * @param document - Document node.
+     */
+    getDocumentMode(document: Document): DocumentMode;
+    /**
+     * Removes a node from its parent.
+     *
+     * @param node - Node to remove.
+     */
+    detachNode(node: Node): void;
+    /**
+     * Inserts text into a node. If the last child of the node is a text node, the provided text will be appended to the
+     * text node content. Otherwise, inserts a new text node with the given text.
+     *
+     * @param parentNode - Node to insert text into.
+     * @param text - Text to insert.
+     */
+    insertText(parentNode: ParentNode, text: string): void;
+    /**
+     * Inserts text into a sibling node that goes before the reference node. If this sibling node is the text node,
+     * the provided text will be appended to the text node content. Otherwise, inserts a new sibling text node with
+     * the given text before the reference node.
+     *
+     * @param parentNode - Node to insert text into.
+     * @param text - Text to insert.
+     * @param referenceNode - Node to insert text before.
+     */
+    insertTextBefore(
+        parentNode: ParentNode,
+        text: string,
+        referenceNode: Node
+    ): void;
+    /**
+     * Copies attributes to the given element. Only attributes that are not yet present in the element are copied.
+     *
+     * @param recipient - Element to copy attributes into.
+     * @param attrs - Attributes to copy.
+     */
+    adoptAttributes(recipient: Element, attrs: Attribute[]): void;
+    /**
+     * Returns the first child of the given node.
+     *
+     * @param node - Node.
+     */
+    getFirstChild(node: ParentNode): Node;
+    /**
+     * Returns the given node's children in an array.
+     *
+     * @param node - Node.
+     */
+    getChildNodes(node: ParentNode): Node[];
+    /**
+     * Returns the given node's parent.
+     *
+     * @param node - Node.
+     */
+    getParentNode(node: Node): ParentNode;
+    /**
+     * Returns the given element's attributes in an array, in the form of name-value pairs.
+     * Foreign attributes may contain `namespace` and `prefix` fields as well.
+     *
+     * @param element - Element.
+     */
+    getAttrList(element: Element): Attribute[];
+    /**
+     * Returns the given element's tag name.
+     *
+     * @param element - Element.
+     */
+    getTagName(element: Element): string;
+    /**
+     * Returns the given element's namespace.
+     *
+     * @param element - Element.
+     */
+    getNamespaceURI(element: Element): string;
+    /**
+     * Returns the given text node's content.
+     *
+     * @param textNode - Text node.
+     */
+    getTextNodeContent(textNode: TextNode): string;
+    /**
+     * Returns the given comment node's content.
+     *
+     * @param commentNode - Comment node.
+     */
+    getCommentNodeContent(commentNode: CommentNode): string;
+    /**
+     * Returns the given document type node's name.
+     *
+     * @param doctypeNode - Document type node.
+     */
+    getDocumentTypeNodeName(doctypeNode: DocumentType): string;
+    /**
+     * Returns the given document type node's public identifier.
+     *
+     * @param doctypeNode - Document type node.
+     */
+    getDocumentTypeNodePublicId(doctypeNode: DocumentType): string;
+    /**
+     * Returns the given document type node's system identifier.
+     *
+     * @param doctypeNode - Document type node.
+     */
+    getDocumentTypeNodeSystemId(doctypeNode: DocumentType): string;
+    /**
+     * Determines if the given node is a text node.
+     *
+     * @param node - Node.
+     */
+    isTextNode(node: Node): boolean;
+    /**
+     * Determines if the given node is a comment node.
+     *
+     * @param node - Node.
+     */
+    isCommentNode(node: Node): boolean;
+    /**
+     * Determines if the given node is a document type node.
+     *
+     * @param node - Node.
+     */
+    isDocumentTypeNode(node: Node): boolean;
+    /**
+     * Determines if the given node is an element.
+     *
+     * @param node - Node.
+     */
+    isElementNode(node: Node): boolean;
+}
+
+/**
+ * Parses an HTML string.
+ *
+ * @param html - Input HTML string.
+ * @param options - Parsing options.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ *
+ * const document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
+ *
+ * console.log(document.childNodes[1].tagName); //> 'html'
+ * ```
+ */
+export function parse(html: string, options?: ParserOptions): Document;
+
+/**
+ * Parses an HTML fragment.
+ *
+ * @param fragmentContext - Parsing context element. If specified, given fragment will be parsed as if it was set to the context element's `innerHTML` property.
+ * @param html - Input HTML fragment string.
+ * @param options - Parsing options.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ *
+ * const documentFragment = parse5.parseFragment('<table></table>');
+ *
+ * console.log(documentFragment.childNodes[0].tagName); //> 'table'
+ *
+ * // Parses the html fragment in the context of the parsed <table> element.
+ * const trFragment = parser.parseFragment(documentFragment.childNodes[0], '<tr><td>Shake it, baby</td></tr>');
+ *
+ * console.log(trFragment.childNodes[0].childNodes[0].tagName); //> 'td'
+ * ```
+ */
+export function parseFragment(
+    fragmentContext: Element,
+    html: string,
+    options?: ParserOptions
+): DocumentFragment;
+export function parseFragment(
+    html: string,
+    options?: ParserOptions
+): DocumentFragment;
+
+/**
+ * Serializes an AST node to an HTML string.
+ *
+ * @param node - Node to serialize.
+ * @param options - Serialization options.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ *
+ * const document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
+ *
+ * // Serializes a document.
+ * const html = parse5.serialize(document);
+ *
+ * // Serializes the <html> element content.
+ * const str = parse5.serialize(document.childNodes[1]);
+ *
+ * console.log(str); //> '<head></head><body>Hi there!</body>'
+ * ```
+ */
+export function serialize(node: Node, options?: SerializerOptions): string;
diff --git a/types/parse5/parse5-tests.ts b/types/parse5/parse5-tests.ts
new file mode 100644
index 0000000000..daafce5e09
--- /dev/null
+++ b/types/parse5/parse5-tests.ts
@@ -0,0 +1,191 @@
+import * as parse5 from "parse5";
+
+// Shorthands
+// parse
+const document = parse5.parse("<html>");
+
+document; // $ExpectType Document
+
+const defaultAdapter = new Object() as parse5.TreeAdapter;
+
+parse5.parse("<html>", {}); // $ExpectType Document
+parse5.parse("<html>", { sourceCodeLocationInfo: true }); // $ExpectType Document
+parse5.parse("<html>", { treeAdapter: defaultAdapter }); // $ExpectType Document
+
+let opt = {
+    sourceCodeLocationInfo: true,
+    scriptingEnabled: false,
+    treeAdapter: defaultAdapter
+};
+
+parse5.parse("<html>", opt); // $ExpectType Document
+
+opt = {
+    sourceCodeLocationInfo: true,
+    scriptingEnabled: false,
+    treeAdapter: defaultAdapter
+};
+
+parse5.parse("<html>", opt); // $ExpectType Document
+
+// parseFragment
+const fragment = parse5.parseFragment("<div>");
+
+fragment; // $ExpectType DocumentFragment
+
+parse5.parseFragment("<div>", {});
+parse5.parseFragment("<div>", { sourceCodeLocationInfo: true });
+parse5.parseFragment("<div>", { treeAdapter: defaultAdapter });
+parse5.parseFragment("<div>", {
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+parse5.parseFragment("<div>", {
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+
+const element = (parse5.parseFragment(
+    "<div>"
+) as parse5.DefaultTreeDocumentFragment).childNodes[0] as parse5.Element;
+
+parse5.parseFragment(element, "<div>");
+parse5.parseFragment(element, "<div>", {});
+parse5.parseFragment(element, "<div>", { sourceCodeLocationInfo: true });
+parse5.parseFragment(element, "<div>", {
+    treeAdapter: defaultAdapter
+});
+parse5.parseFragment(element, "<div>", {
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+parse5.parseFragment(element, "<div>", {
+    sourceCodeLocationInfo: true,
+    treeAdapter: defaultAdapter
+});
+
+// serialize
+const html = parse5.serialize(element);
+
+html; // $ExpectType string
+
+parse5.serialize(element, { treeAdapter: defaultAdapter });
+parse5.serialize(element, { treeAdapter: defaultAdapter });
+
+// Location info
+const loc = (element as parse5.DefaultTreeElement).sourceCodeLocation!;
+
+loc.startLine; // $ExpectType number
+loc.startCol; // $ExpectType number
+loc.endLine; // $ExpectType number
+loc.endCol; // $ExpectType number
+loc.startOffset; // $ExpectType number
+loc.endOffset; // $ExpectType number
+
+loc.startTag.startLine; // $ExpectType number
+loc.startTag.startCol; // $ExpectType number
+loc.startTag.endLine; // $ExpectType number
+loc.startTag.endCol; // $ExpectType number
+loc.startTag.startOffset; // $ExpectType number
+loc.startTag.endOffset; // $ExpectType number
+
+loc.startTag.attrs["someAttr"].startLine; // $ExpectType number
+loc.startTag.attrs["someAttr"].startCol; // $ExpectType number
+loc.startTag.attrs["someAttr"].endLine; // $ExpectType number
+loc.startTag.attrs["someAttr"].endCol; // $ExpectType number
+loc.startTag.attrs["someAttr"].startOffset; // $ExpectType number
+loc.startTag.attrs["someAttr"].endOffset; // $ExpectType number
+
+loc.endTag.startLine; // $ExpectType number
+loc.endTag.startCol; // $ExpectType number
+loc.endTag.endLine; // $ExpectType number
+loc.endTag.endCol; // $ExpectType number
+loc.endTag.startOffset; // $ExpectType number
+loc.endTag.endOffset; // $ExpectType number
+
+// Default AST
+const defaultDocument = document as parse5.DefaultTreeDocument;
+
+defaultDocument.nodeName; // $ExpectType "#document"
+defaultDocument.mode; // $ExpectType DocumentMode
+
+const defaultDoctype = document as parse5.DefaultTreeDocumentType;
+
+defaultDoctype.name; // $ExpectType string
+defaultDoctype.publicId; // $ExpectType string
+defaultDoctype.systemId; // $ExpectType string
+
+const defaultDocumentFragment = fragment as parse5.DefaultTreeDocumentFragment;
+
+defaultDocumentFragment.nodeName; // $ExpectType "#document-fragment"
+
+const defaultElement = defaultDocument
+    .childNodes[0] as parse5.DefaultTreeElement;
+
+defaultElement.sourceCodeLocation!; // $ExpectType ElementLocation
+defaultElement.namespaceURI; // $ExpectType string
+defaultElement.nodeName; // $ExpectType string
+defaultElement.tagName; // $ExpectType string
+defaultElement.parentNode; // $ExpectType DefaultTreeParentNode
+
+const defaultAttr = defaultElement.attrs[0];
+
+defaultAttr.name; // $ExpectType string
+defaultAttr.namespace!; // $ExpectType string
+defaultAttr.prefix!; // $ExpectType string
+defaultAttr.value; // $ExpectType string
+
+const defaultTextNode = defaultDocumentFragment
+    .childNodes[0] as parse5.DefaultTreeTextNode;
+
+defaultTextNode.sourceCodeLocation!; // $ExpectType Location
+defaultTextNode.nodeName; // $ExpectType "#text"
+defaultTextNode.value; // $ExpectType string
+defaultTextNode.parentNode; // $ExpectType DefaultTreeParentNode
+
+const defaultCommentNode = defaultDocumentFragment
+    .childNodes[0] as parse5.DefaultTreeCommentNode;
+
+defaultCommentNode.sourceCodeLocation!; // $ExpectType Location
+defaultCommentNode.nodeName; // $ExpectType "#comment"
+defaultCommentNode.data; // $ExpectType string
+defaultCommentNode.parentNode; // $ExpectType DefaultTreeParentNode
+
+const adapter = defaultAdapter;
+
+adapter.createDocument(); // $ExpectType Document
+adapter.createDocumentFragment(); // $ExpectType DocumentFragment
+adapter.createElement("div", "namespace", [{ name: "someAttr", value: "42" }]); // $ExpectType Element
+adapter.createCommentNode("foo"); // $ExpectType CommentNode
+
+adapter.appendChild(document, element);
+adapter.insertBefore(document, element, element);
+adapter.setTemplateContent(element, fragment);
+
+adapter.getTemplateContent(element); // $ExpectType DocumentFragment
+
+adapter.setDocumentType(document, "name", "publicId", "systemId");
+adapter.setDocumentMode(document, "quirks");
+
+adapter.getDocumentMode(document); // $ExpectType DocumentMode
+
+adapter.detachNode(element);
+adapter.insertText(element, "text");
+adapter.insertTextBefore(document, "text", element);
+adapter.adoptAttributes(element, [{ name: "someAttr", value: "42" }]);
+
+adapter.getFirstChild(element); // $ExpectType Node
+adapter.getChildNodes(element)[0]; // $ExpectType Node
+adapter.getParentNode(element); // $ExpectType ParentNode
+adapter.getAttrList(element)[0]; // $ExpectType Attribute
+adapter.getTagName(element); // $ExpectType string
+adapter.getNamespaceURI(element); // $ExpectType string
+adapter.getTextNodeContent(defaultTextNode); // $ExpectType string
+adapter.getCommentNodeContent(defaultCommentNode); // $ExpectType string
+adapter.getDocumentTypeNodeName(defaultDoctype); // $ExpectType string
+adapter.getDocumentTypeNodePublicId(defaultDoctype); // $ExpectType string
+adapter.getDocumentTypeNodeSystemId(defaultDoctype); // $ExpectType string
+adapter.isTextNode(element); // $ExpectType boolean
+adapter.isCommentNode(element); // $ExpectType boolean
+adapter.isDocumentTypeNode(element); // $ExpectType boolean
+adapter.isElementNode(element); // $ExpectType boolean
diff --git a/types/parse5/tsconfig.json b/types/parse5/tsconfig.json
new file mode 100644
index 0000000000..89e8426182
--- /dev/null
+++ b/types/parse5/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",
+        "parse5-tests.ts"
+    ]
+}
diff --git a/types/parse5/tslint.json b/types/parse5/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse5/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 207749d1fabbf72c898123c88c98016c86a8e461 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Wed, 30 May 2018 04:59:45 -0700
Subject: [PATCH 0842/1124] use native DOM types for text-encoding module

---
 types/text-encoding/index.d.ts    | 59 +++----------------------------
 types/text-encoding/tsconfig.json | 15 +++-----
 2 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/types/text-encoding/index.d.ts b/types/text-encoding/index.d.ts
index d86ee007fb..cc4b2f8555 100644
--- a/types/text-encoding/index.d.ts
+++ b/types/text-encoding/index.d.ts
@@ -1,60 +1,9 @@
 // Type definitions for text-encoding
 // Project: https://github.com/inexorabletash/text-encoding
 // Definitions by: MIZUNE Pine <https://github.com/pine613>
+//                 Mohsen Azimi <https://github.com/mohsen1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
 
-declare namespace TextEncoding {
-    interface TextDecoderOptions {
-        fatal?: boolean;
-        ignoreBOM?: boolean;
-    }
-
-    interface TextDecodeOptions {
-        stream?: boolean;
-    }
-
-    interface TextEncoderOptions {
-        NONSTANDARD_allowLegacyEncoding?: boolean;
-    }
-
-    interface TextDecoder {
-        encoding: string;
-        fatal: boolean;
-        ignoreBOM: boolean;
-        decode(input?: ArrayBuffer | ArrayBufferView, options?: TextDecodeOptions): string;
-    }
-
-    interface TextEncoder {
-        encoding: string;
-        encode(input?: string, options?: TextEncodeOptions): Uint8Array;
-    }
-
-    interface TextEncodeOptions {
-        stream?: boolean;
-    }
-
-    interface TextEncoderStatic {
-        (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
-        new (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
-    }
-
-    interface TextDecoderStatic {
-        (label?: string, options?: TextDecoderOptions): TextDecoder;
-        new (label?: string, options?: TextDecoderOptions): TextDecoder;
-    }
-
-    interface TextEncodingStatic {
-        TextEncoder: TextEncoderStatic;
-        TextDecoder: TextDecoderStatic;
-    }
-}
-
-declare var TextDecoder: TextEncoding.TextDecoderStatic;
-
-declare var TextEncoder: TextEncoding.TextEncoderStatic;
-
-declare var TextEncoding: TextEncoding.TextEncodingStatic;
-
-declare module "text-encoding" {
-    export = TextEncoding;
-}
+export const TextEncoder: TextEncoder;
+export const TextDecoder: TextDecoder;
diff --git a/types/text-encoding/tsconfig.json b/types/text-encoding/tsconfig.json
index 898180941a..c525bf7f7d 100644
--- a/types/text-encoding/tsconfig.json
+++ b/types/text-encoding/tsconfig.json
@@ -1,23 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["dom", "es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "text-encoding-tests.ts"
-    ]
-}
\ No newline at end of file
+    "files": ["index.d.ts", "text-encoding-tests.ts"]
+}

From 4ab8240d7de13d4088cdd1efdd98d8c409c9ca71 Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Wed, 30 May 2018 17:03:59 +0200
Subject: [PATCH 0843/1124] add missing advanced customization props

---
 types/react-native-htmlview/index.d.ts        | 44 ++++++++++++++---
 .../react-native-htmlview-tests.tsx           | 49 +++++++++++++------
 2 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/types/react-native-htmlview/index.d.ts b/types/react-native-htmlview/index.d.ts
index 5bef0c8583..b0eb2ae6a3 100644
--- a/types/react-native-htmlview/index.d.ts
+++ b/types/react-native-htmlview/index.d.ts
@@ -5,7 +5,14 @@
 // TypeScript Version: 2.6
 
 import { Component, ComponentType, ReactNode } from 'react';
-import { StyleProp, TextProperties, TextStyle, ViewStyle, ImageStyle } from 'react-native';
+import {
+    StyleProp,
+    TextProperties,
+    ViewProperties,
+    TextStyle,
+    ViewStyle,
+    ImageStyle,
+} from 'react-native';
 
 export interface HTMLViewNode {
     data?: string;
@@ -43,11 +50,11 @@ export interface HTMLViewProps {
      * @param defaultRenderer the default rendering implementation, so you can use the normal rendering logic for some subtree:
      */
     renderNode?(
-    node: HTMLViewNode,
-    index: number,
-    siblings: HTMLViewNode,
-    parent: HTMLViewNode,
-    defaultRenderer: (node: HTMLViewNode, parent: HTMLViewNode) => ReactNode,
+        node: HTMLViewNode,
+        index: number,
+        siblings: HTMLViewNode,
+        parent: HTMLViewNode,
+        defaultRenderer: (node: HTMLViewNode, parent: HTMLViewNode) => ReactNode
     ): ReactNode;
 
     /**
@@ -71,12 +78,33 @@ export interface HTMLViewProps {
     addLineBreaks?: boolean;
 
     /*
-     * TODO Add futher customisization props
-     * https://github.com/jsdf/react-native-htmlview#customizing-things-even-further
+     * The root wrapper component
      */
+    RootComponent?: ComponentType;
 
+    /*
+     * Properties for the RootComponent, can be used independently from RootComponent
+     */
+    rootComponentProps?: ViewProperties;
+
+    /*
+     * The component used for rendering HTML element nodes
+     */
+    NodeComponent?: ComponentType;
+
+    /*
+     * Properties for the NodeComponent, can be used independently from NodeComponent
+     */
+    nodeComponentProps?: TextProperties;
+
+    /*
+     * The component used for rendering text element nodes
+     */
     TextComponent?: ComponentType;
 
+    /*
+     * Properties for the TextComponent, can be used independently from TextComponent
+     */
     textComponentProps?: TextProperties;
 }
 
diff --git a/types/react-native-htmlview/react-native-htmlview-tests.tsx b/types/react-native-htmlview/react-native-htmlview-tests.tsx
index 086b1287e9..2fc587f9dc 100644
--- a/types/react-native-htmlview/react-native-htmlview-tests.tsx
+++ b/types/react-native-htmlview/react-native-htmlview-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Text, StyleSheet } from 'react-native';
+import { View, Text, StyleSheet } from 'react-native';
 import HTMLView from 'react-native-htmlview';
 
 const styles = StyleSheet.create({
@@ -18,23 +18,40 @@ const defaultTextProps = {
   style: {
     fontSize: 14,
   },
+  allowFontScaling: false,
+};
+
+const defaultNodeProps = {
+  style: {
+    fontFamily: 'Arial',
+  },
+};
+
+const defaultRootProps = {
+  style: {
+    padding: 10,
+  },
 };
 
 class Simple extends React.Component {
-    onPressLink = () => {
-        // Do someting
-    }
+  onPressLink = () => {
+    // Do someting
+  }
 
-    render() {
-        return (
-            <HTMLView
-                TextComponent={Text}
-                textComponentProps={defaultTextProps}
-                value="<br><b>This is html</b><div><p>Yo P</p></p>"
-                addLineBreaks={false}
-                stylesheet={styles}
-                onLinkPress={this.onPressLink}
-            />
-        );
-    }
+  render() {
+    return (
+      <HTMLView
+        value="<br><b>This is html</b><div><p>Yo P</p></p>"
+        addLineBreaks={false}
+        stylesheet={styles}
+        onLinkPress={this.onPressLink}
+        NodeComponent={Text}
+        nodeComponentProps={defaultNodeProps}
+        RootComponent={View}
+        rootComponentProps={defaultRootProps}
+        TextComponent={Text}
+        textComponentProps={defaultTextProps}
+      />
+    );
+  }
 }

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 0844/1124] [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 0845/1124] 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 03f64c066ae3bcdb33d0e212dfa19ec115ffc012 Mon Sep 17 00:00:00 2001
From: Giorgio Garasto <mail@dabolus.com>
Date: Wed, 30 May 2018 19:39:49 +0200
Subject: [PATCH 0846/1124] Add typings for tgfancy

---
 types/tgfancy/index.d.ts       | 76 ++++++++++++++++++++++++++++++++++
 types/tgfancy/tgfancy-tests.ts | 24 +++++++++++
 types/tgfancy/tsconfig.json    | 23 ++++++++++
 types/tgfancy/tslint.json      |  3 ++
 4 files changed, 126 insertions(+)
 create mode 100644 types/tgfancy/index.d.ts
 create mode 100644 types/tgfancy/tgfancy-tests.ts
 create mode 100644 types/tgfancy/tsconfig.json
 create mode 100644 types/tgfancy/tslint.json

diff --git a/types/tgfancy/index.d.ts b/types/tgfancy/index.d.ts
new file mode 100644
index 0000000000..d37083456d
--- /dev/null
+++ b/types/tgfancy/index.d.ts
@@ -0,0 +1,76 @@
+// Type definitions for tgfancy 0.13
+// Project: https://github.com/GochoMugo/tgfancy
+// Definitions by: Giorgio Garasto <https://github.com/Dabolus>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as TelegramBot from 'node-telegram-bot-api';
+
+declare namespace Tgfancy {
+    interface ChatIdResolutionOptions {
+        resolve(token: string, chatId: number | string, callback: ((error: Error | null, target: any) => void)): void;
+    }
+
+    interface EmojificationOptions {
+        emojify(text: string): string;
+    }
+
+    interface RatelimitingOptions {
+        maxRetries?: number;
+        timeout?: number;
+        notify?(methodName: string, ...args: any[]): void;
+        maxBackoff?: number;
+    }
+
+    interface WebSocketOptions {
+        url: string;
+        autoOpen?: boolean;
+    }
+
+    interface TgfancyOptions {
+        chatIdResolution?: boolean | ChatIdResolutionOptions;
+        emojification?: boolean | EmojificationOptions;
+        kickWithoutBan?: boolean;
+        openshiftWebHook?: boolean;
+        orderedSending?: boolean;
+        ratelimiting?: boolean | RatelimitingOptions;
+        textPaging?: boolean;
+        webSocket?: boolean | WebSocketOptions;
+    }
+
+    interface ConstructorOptions extends TelegramBot.ConstructorOptions {
+        tgfancy?: TgfancyOptions;
+    }
+
+    interface ResolvedChat {
+        id: number | string;
+        username: string;
+        type: string;
+        when: string;
+    }
+
+    interface ResolvedGroupOrChannel extends ResolvedChat {
+        title: string;
+    }
+
+    interface ResolvedUser extends ResolvedChat {
+        first_name: string;
+        last_name?: string;
+    }
+}
+
+declare class Tgfancy extends TelegramBot {
+    constructor(token: string, options?: Tgfancy.ConstructorOptions);
+
+    resolveChatId(chatId: string): Promise<Tgfancy.ResolvedChat | Error>;
+
+    openWebSocket(): Promise<undefined | Error>;
+
+    closeWebSocket(): Promise<undefined | Error>;
+
+    hasOpenWebSocket(): boolean;
+
+    kickChatMember(chatId: number | string, userId: number | string, ban?: boolean): Promise<boolean | Error>;
+}
+
+export = Tgfancy;
diff --git a/types/tgfancy/tgfancy-tests.ts b/types/tgfancy/tgfancy-tests.ts
new file mode 100644
index 0000000000..75f2f9fe1c
--- /dev/null
+++ b/types/tgfancy/tgfancy-tests.ts
@@ -0,0 +1,24 @@
+import tgfancy = require('tgfancy');
+
+const MyTgFancyBot = new tgfancy('token', {
+    tgfancy: {
+        chatIdResolution: true,
+        emojification: true,
+        kickWithoutBan: true,
+        ratelimiting: {
+            maxRetries: 132,
+            timeout: 40000
+        },
+        webSocket: {
+            url: 'ws://example.ws',
+            autoOpen: true
+        }
+    }
+});
+
+MyTgFancyBot.resolveChatId('chat id');
+MyTgFancyBot.openWebSocket();
+MyTgFancyBot.closeWebSocket();
+MyTgFancyBot.hasOpenWebSocket();
+MyTgFancyBot.kickChatMember('chat id', 'user id');
+MyTgFancyBot.kickChatMember(13128219, 3181422, true);
diff --git a/types/tgfancy/tsconfig.json b/types/tgfancy/tsconfig.json
new file mode 100644
index 0000000000..386549171f
--- /dev/null
+++ b/types/tgfancy/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",
+        "tgfancy-tests.ts"
+    ]
+}
diff --git a/types/tgfancy/tslint.json b/types/tgfancy/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/tgfancy/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}

From bb756e555b149ff78690de926c206d4b7d4c3e15 Mon Sep 17 00:00:00 2001
From: Giorgio Garasto <mail@dabolus.app>
Date: Wed, 30 May 2018 19:55:56 +0200
Subject: [PATCH 0847/1124] Fix typescript version for tgfancy

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

diff --git a/types/tgfancy/index.d.ts b/types/tgfancy/index.d.ts
index d37083456d..a12936e0da 100644
--- a/types/tgfancy/index.d.ts
+++ b/types/tgfancy/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/GochoMugo/tgfancy
 // Definitions by: Giorgio Garasto <https://github.com/Dabolus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as TelegramBot from 'node-telegram-bot-api';
 

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 0848/1124] 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 c0d59921993bf74ee0072ad5de5eade39246a9d4 Mon Sep 17 00:00:00 2001
From: Mitchell Bundy <mitchell.bundy@ssense.com>
Date: Wed, 30 May 2018 14:34:23 -0400
Subject: [PATCH 0849/1124] update types for restify 7.2 and move typing for v5
 to v5 folder

---
 types/restify/index.d.ts          |   49 +-
 types/restify/v5/index.d.ts       | 1343 +++++++++++++++++++++++++++++
 types/restify/v5/restify-tests.ts |  191 ++++
 types/restify/v5/tsconfig.json    |   28 +
 types/restify/v5/tslint.json      |    7 +
 5 files changed, 1590 insertions(+), 28 deletions(-)
 create mode 100644 types/restify/v5/index.d.ts
 create mode 100644 types/restify/v5/restify-tests.ts
 create mode 100644 types/restify/v5/tsconfig.json
 create mode 100644 types/restify/v5/tslint.json

diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index aa6cc218aa..42b0a1573b 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for restify 7.2
 // 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>, Mitchell Bundy <https://github.com/mgebundy>
+// Definitions by: Bret Little <https://github.com/blittle>
+//                 Steve Hipwell <https://github.com/stevehipwell>
+//                 Leandro Almeida <https://github.com/leanazulyoro>
+//                 Mitchell Bundy <https://github.com/mgebundy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -102,7 +105,7 @@ export interface Server extends http.Server {
      * Wraps node's close().
      * @param     callback optional callback to invoke when done.
      */
-    close(callback?: Function): any;
+    close(callback?: () => any): any;
 
     /**
      * Returns the number of currently inflight requests.
@@ -254,10 +257,10 @@ export interface Server extends http.Server {
 
     /** enable DTrace support */
     dtrace: boolean;
-    
+
     /** Custom response formatters */
     formatters: Formatters;
-    
+
     /** Prevents calling next multiple times */
     onceNext: boolean;
 
@@ -273,10 +276,10 @@ export interface Server extends http.Server {
 
     http2?: boolean;
 
-    ca: ServerOptions['ca']
+    ca: ServerOptions['ca'];
+
+    certificate: ServerOptions['certificate'];
 
-    certificate: ServerOptions['certificate']
-    
     key: ServerOptions['key'];
 
     passphrase: ServerOptions['passphrase'] | null;
@@ -292,16 +295,16 @@ export interface ChainOptions {
 
 export interface Chain {
     /** Get handlers of a chain instance */
-    getHandlers(): Function[];
+    getHandlers(): RequestHandler[];
 
     /** Utilize the given middleware `handler` */
-    add(handler: Function): void;
+    add(handler: RequestHandler): void;
 
     /** Returns the number of handlers */
     count(): number;
 
     /** Handle server requests, punting them down the middleware stack. */
-    run(req: Request, res: Response, done: Function): void;
+    run(req: Request, res: Response, done: () => any): void;
 
     /** Prevents calling next multiple times */
     onceNext: boolean;
@@ -346,11 +349,11 @@ export interface RouterOptions {
 
     ignoreTrailingSlash?: boolean;
 
-    registry?: RouterRegistryRadix; 
+    registry?: RouterRegistryRadix;
 }
 
-export interface Router {
-    constructor(options: RouterOptions): void;
+export class Router {
+    constructor(options: RouterOptions);
 
     /**
      * Lookup for route
@@ -384,7 +387,7 @@ export interface Router {
     /**
      * Default route, when no route found
      */
-    defaultRoute(req: Request, res: Response, next: Function): void;
+    defaultRoute(req: Request, res: Response, next: Next): void;
 
     /**
      * toString() serialization.
@@ -808,21 +811,11 @@ export interface Response extends http.ServerResponse {
      * redirect is sugar method for redirecting.
      * res.redirect({...}, next);
      * `next` is mandatory, to complete the response and trigger audit logger.
-     * @param    url to redirect to
+     * @param    url to redirect to or options object to configure a redirect or
      * @param    next - mandatory, to complete the response and trigger audit logger
      * @emits    redirect
      */
-    redirect(url: string, next: Next): void;
-
-    /**
-     * redirect is sugar method for redirecting.
-     * res.redirect({...}, next);
-     * `next` is mandatory, to complete the response and trigger audit logger.
-     * @param    opts - options object to configure a redirect
-     * @param    next - mandatory, to complete the response and trigger audit logger
-     * @emits    redirect
-     */
-    redirect(opts: RedirectOptions, next: Next): void;
+    redirect(opts: string | RedirectOptions, next: Next): void;
 
     /** HTTP status code. */
     code: number;
@@ -870,7 +863,7 @@ export interface RedirectOptions {
      * by default, will merge the two.
      */
     overrideQuery?: boolean;
-    
+
     /**
      * if true, sets 301. defaults to 302.
      */
@@ -961,7 +954,7 @@ export interface ServerUpgradeResponse {
      * Ends the response
      */
     end(): boolean;
-    
+
     /**
      * Write to the response.
      */
diff --git a/types/restify/v5/index.d.ts b/types/restify/v5/index.d.ts
new file mode 100644
index 0000000000..bacea67cab
--- /dev/null
+++ b/types/restify/v5/index.d.ts
@@ -0,0 +1,1343 @@
+// 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
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import http = require('http');
+import https = require('https');
+import Logger = require('bunyan');
+import url = require('url');
+import spdy = require('spdy');
+import stream = require('stream');
+
+export interface ServerOptions {
+    ca?: string | Buffer | ReadonlyArray<string | Buffer>;
+
+    certificate?: string | Buffer | ReadonlyArray<string | Buffer>;
+
+    key?: string | Buffer | ReadonlyArray<string | Buffer>;
+
+    passphrase?: string;
+
+    requestCert?: boolean;
+
+    ciphers?: string;
+
+    formatters?: Formatters;
+
+    log?: Logger;
+
+    name?: string;
+
+    spdy?: spdy.ServerOptions;
+
+    version?: string;
+
+    versions?: string[];
+
+    handleUpgrades?: boolean;
+
+    httpsServerOptions?: https.ServerOptions;
+
+    handleUncaughtExceptions?: boolean;
+
+    router?: Router;
+
+    socketio?: boolean;
+
+    noWriteContinue?: boolean;
+
+    rejectUnauthorized?: boolean;
+}
+
+export interface AddressInterface {
+    port: number;
+
+    family: string;
+
+    address: string;
+}
+
+export interface Server extends http.Server {
+    /**
+     * Returns the server address. Wraps node's address().
+     */
+    address(): AddressInterface;
+
+    /**
+     * Gets the server up and listening. Wraps node's listen().
+     *
+     * You can call like:
+     *  server.listen(80)
+     *  server.listen(80, '127.0.0.1')
+     *  server.listen('/tmp/server.sock')
+     *
+     * @throws   {TypeError}
+     * @param     callback optionally get notified when listening.
+     */
+    listen(...args: any[]): any;
+
+    /**
+     * Shuts down this server, and invokes callback (optionally) when done.
+     * Wraps node's close().
+     * @param     callback optional callback to invoke when done.
+     */
+    close(...args: any[]): any;
+
+    /**
+     * Returns the number of currently inflight requests.
+     */
+    inflightRequests(): number;
+
+    /**
+     * Mounts a chain on the given path against this HTTP verb
+     *
+     * @param   opts if string, the URL to handle.
+     *                                 if options, the URL to handle, at minimum.
+     * @returns                the newly created route.
+     */
+    del(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
+
+    /**
+     * Mounts a chain on the given path against this HTTP verb
+     *
+     * @param   opts if string, the URL to handle.
+     *                                 if options, the URL to handle, at minimum.
+     * @returns                the newly created route.
+     */
+    get(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
+
+    /**
+     * Mounts a chain on the given path against this HTTP verb
+     *
+     * @param   opts if string, the URL to handle.
+     *                                 if options, the URL to handle, at minimum.
+     * @returns                the newly created route.
+     */
+    head(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
+
+    /**
+     * Mounts a chain on the given path against this HTTP verb
+     *
+     * @param   opts if string, the URL to handle.
+     *                                 if options, the URL to handle, at minimum.
+     * @returns                the newly created route.
+     */
+    opts(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
+
+    /**
+     * Mounts a chain on the given path against this HTTP verb
+     *
+     * @param   opts if string, the URL to handle.
+     *                                 if options, the URL to handle, at minimum.
+     * @returns                the newly created route.
+     */
+    post(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
+
+    /**
+     * Mounts a chain on the given path against this HTTP verb
+     *
+     * @param   opts if string, the URL to handle.
+     *                                 if options, the URL to handle, at minimum.
+     * @returns                the newly created route.
+     */
+    put(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
+
+    /**
+     * Mounts a chain on the given path against this HTTP verb
+     *
+     * @param   opts if string, the URL to handle.
+     *                                 if options, the URL to handle, at minimum.
+     * @returns                the newly created route.
+     */
+    patch(opts: string | RegExp | RouteOptions, ...handlers: RequestHandlerType[]): Route | boolean;
+
+    /**
+     * Minimal port of the functionality offered by Express.js Route Param
+     * Pre-conditions
+     * @link http://expressjs.com/guide.html#route-param%20pre-conditions
+     *
+     * This basically piggy-backs on the `server.use` method. It attaches a
+     * new middleware function that only fires if the specified parameter exists
+     * in req.params
+     *
+     * Exposes an API:
+     *   server.param("user", function (req, res, next) {
+     *     // load the user's information here, always making sure to call next()
+     *   });
+     *
+     * @param      name The name of the URL param to respond to
+     * @param    fn   The middleware function to execute
+     * @returns         returns self
+     */
+    param(name: string, fn: RequestHandler): Server;
+
+    /**
+     * Piggy-backs on the `server.use` method. It attaches a new middleware
+     * function that only fires if the specified version matches the request.
+     *
+     * Note that if the client does not request a specific version, the middleware
+     * function always fires. If you don't want this set a default version with a
+     * pre handler on requests where the client omits one.
+     *
+     * Exposes an API:
+     *   server.versionedUse("version", function (req, res, next, ver) {
+     *     // do stuff that only applies to routes of this API version
+     *   });
+     *
+     * @param    versions the version(s) the URL to respond to
+     * @param        fn       the middleware function to execute, the
+     *                                   fourth parameter will be the selected
+     *                                   version
+     */
+    versionedUse(versions: string | string[], fn: RequestHandler): Server;
+
+    /**
+     * Removes a route from the server.
+     * You pass in the route 'blob' you got from a mount call.
+     * @throws   {TypeError} on bad input.
+     * @param       route the route name.
+     * @returns          true if route was removed, false if not.
+     */
+    rm(route: string): boolean;
+
+    /**
+     * Installs a list of handlers to run _before_ the "normal" handlers of all
+     * routes.
+     *
+     * You can pass in any combination of functions or array of functions.
+     * @returns returns self
+     */
+    use(...handlers: RequestHandlerType[]): Server;
+
+    /**
+     * Gives you hooks to run _before_ any routes are located.  This gives you
+     * a chance to intercept the request and change headers, etc., that routing
+     * depends on.  Note that req.params will _not_ be set yet.
+     * @returns returns self
+     */
+    pre(...pre: RequestHandlerType[]): Server;
+
+    /**
+     * toString() the server for easy reading/output.
+     */
+    toString(): string;
+
+    /**
+     * Return debug information about the server.
+     */
+    getDebugInfo(): any;
+
+    /** Name of the server. */
+    name: string;
+
+    /** Default version(s) to use in all routes. */
+    versions: string[];
+
+    /** bunyan instance. */
+    log: Logger;
+
+    /** List of content-types this server can respond with. */
+    acceptable: string[];
+
+    /** Once listen() is called, this will be filled in with where the server is running. */
+    url: string;
+
+    /** Node server instance */
+    server: http.Server;
+
+    /** Router instance */
+    router: Router;
+}
+
+export interface RouterOptions {
+    contentType?: string | string[];
+
+    strictRouting?: boolean;
+
+    log?: Logger;
+
+    version?: string;
+
+    versions?: string[];
+}
+
+export interface Router {
+    /**
+     * takes an object of route params and query params, and 'renders' a URL.
+     * @param    routeName the route name
+     * @param    params    an object of route params
+     * @param    query     an object of query params
+     */
+    render(routeName: string, params: any, query?: any): string;
+
+    /**
+     * adds a route.
+     * @param    options an options object
+     * @returns  returns the route name if creation is successful.
+     */
+    mount(options: RouteOptions): string | boolean;
+
+    /**
+     * unmounts a route.
+     * @param    name the route name
+     * @returns       the name of the deleted route.
+     */
+    unmount(name: string): string;
+
+    /**
+     * get a route from the router.
+     * @param       name the name of the route to retrieve
+     * @param       req  the request object
+     * @param     cb   callback function
+     */
+    get(name: string, req: Request, cb: FindRouteCallback): void;
+
+    /**
+     * find a route from inside the router, handles versioned routes.
+     * @param      req      the request object
+     * @param      res      the response object
+     * @param    callback callback function
+     */
+    find(req: Request, res: Response, callback: FindRouteCallback): void;
+
+    /**
+     * Find a route by path. Scans the route list for a route with the same RegEx.
+     * i.e. /foo/:param1/:param2 would match an existing route with different
+     * parameter names /foo/:id/:name since the compiled RegExs match.
+     * @param       path      a path to find a route for.
+     * @param                options   an options object
+     * @returns              returns the route if a match is found
+     */
+    findByPath(path: string | RegExp): Route;
+
+    /**
+     * toString() serialization.
+     */
+    toString(): string;
+
+    /**
+     * Return information about the routes registered in the router.
+     * @returns The routes in the router.
+     */
+    getDebugInfo(): any;
+
+    name: string;
+
+    mounts: { [routeName: string]: Route };
+
+    versions: string[];
+
+    contentType: string[];
+
+    routes: {
+        DELETE: Route[];
+        GET: Route[];
+        HEAD: Route[];
+        OPTIONS: Route[];
+        PATCH: Route[];
+        POST: Route[];
+        PUT: Route[];
+    };
+
+    log?: Logger;
+}
+
+export interface RequestFileInterface {
+    path: string;
+    type: string;
+}
+
+export interface RequestAuthorization {
+    scheme: string;
+    credentials: string;
+    basic?: {
+        username: string;
+        password: string;
+    };
+}
+
+export interface Request extends http.IncomingMessage {
+    /**
+     * checks if the accept header is present and has the value requested.
+     * e.g., req.accepts('html');
+     * @param    types an array of accept type headers
+     */
+    accepts(types: string | string[]): boolean;
+
+    /**
+     * checks if the request accepts the encoding types.
+     * @param    types an array of accept type headers
+     */
+    acceptsEncoding(types: string | string[]): boolean;
+
+    /**
+     * gets the content-length header off the request.
+     */
+    getContentLength(): number;
+
+    /**
+     * pass through to getContentLength.
+     */
+    contentLength(): number;
+
+    /**
+     * gets the content-type header.
+     */
+    getContentType(): string;
+
+    /**
+     * pass through to getContentType.
+     */
+    contentType(): string;
+
+    /**
+     * retrieves the complete URI requested by the client.
+     */
+    getHref(): string;
+
+    /**
+     * pass through to getHref.
+     */
+    href(): string;
+
+    /**
+     * retrieves the request uuid. was created when the request was setup.
+     */
+    getId(): string;
+
+    /**
+     * pass through to getId.
+     */
+    id(): string;
+
+    /**
+     * retrieves the cleaned up url path.
+     * e.g., /foo?a=1  =>  /foo
+     */
+    getPath(): string;
+
+    /**
+     * pass through to getPath.
+     */
+    path(): string;
+
+    /**
+     * returns the raw query string
+     */
+    getQuery(): string;
+
+    // /**
+    //  * pass through to getQuery.
+    //  * @public
+    //  * @function query
+    //  * @returns {String}
+    //  */
+    // query(): string;
+
+    /**
+     * returns ms since epoch when request was setup.
+     */
+    time(): number;
+
+    /**
+     * returns a parsed URL object.
+     */
+    getUrl(): url.Url;
+
+    /**
+     * returns the accept-version header.
+     */
+    getVersion(): string;
+
+    /**
+     * pass through to getVersion.
+     */
+    version(): string;
+
+    /**
+     * returns the version of the route that matched.
+     */
+    matchedVersion(): string;
+
+    /**
+     * returns any header off the request. also, 'correct' any
+     * correctly spelled 'referrer' header to the actual spelling used.
+     * @param    name  the name of the header
+     * @param    value default value if header isn't found on the req
+     */
+    header(name: string, value?: string): string;
+
+    /**
+     * returns any trailer header off the request. also, 'correct' any
+     * correctly spelled 'referrer' header to the actual spelling used.
+     * @param    name  the name of the header
+     * @param    value default value if header isn't found on the req
+     */
+    trailer(name: string, value?: string): string;
+
+    /**
+     * Check if the incoming request contains the Content-Type header field, and
+     * if it contains the given mime type.
+     * @param    type  a content-type header value
+     */
+    is(type: string): boolean;
+
+    /**
+     * Check if the incoming request is chunked.
+     */
+    isChunked(): boolean;
+
+    /**
+     * Check if the incoming request is kept alive.
+     */
+    isKeepAlive(): boolean;
+
+    /**
+     * Check if the incoming request is encrypted.
+     */
+    isSecure(): boolean;
+
+    /**
+     * Check if the incoming request has been upgraded.
+     */
+    isUpgradeRequest(): boolean;
+
+    /**
+     * Check if the incoming request is an upload verb.
+     */
+    isUpload(): boolean;
+
+    /**
+     * toString serialization
+     */
+    toString(): string;
+
+    /**
+     * retrieves the user-agent header.
+     */
+    userAgent(): string;
+
+    /**
+     * Start the timer for a request handler function. You must explicitly invoke
+     * endHandlerTimer() after invoking this function. Otherwise timing information
+     * will be inaccurate.
+     * @param       handlerName The name of the handler.
+     */
+    startHandlerTimer(handlerName: string): void;
+
+    /**
+     * Stop the timer for a request handler function.
+     * @param       handlerName The name of the handler.
+     */
+    endHandlerTimer(handlerName: string): void;
+
+    /**
+     * returns the connection state of the request. current valid values are
+     * 'close' and 'aborted'.
+     */
+    connectionState(): string;
+
+    /**
+     * returns the route object to which the current request was matched to.
+     * Route info object structure:
+     * {
+     *  path: '/ping/:name',
+     *  method: 'GET',
+     *  versions: [],
+     *  name: 'getpingname'
+     * }
+     */
+    getRoute(): RouteSpec;
+
+    /** bunyan logger you can piggyback on. */
+    log: Logger;
+
+    /** available when queryParser plugin is used. */
+    query?: any;
+
+    /** available when bodyParser plugin is used. */
+    body?: any;
+
+    /** available when queryParser or bodyParser plugin is used with mapParams enabled. */
+    params?: any;
+
+    /** available when serveStatic plugin is used. */
+    files?: { [name: string]: RequestFileInterface };
+
+    /** available when authorizationParser plugin is used */
+    username?: string;
+
+    /** available when authorizationParser plugin is used */
+    authorization?: RequestAuthorization;
+}
+
+export interface CacheOptions {
+    maxAge: number;
+}
+
+export interface Response extends http.ServerResponse {
+    /**
+     * sets the cache-control header. `type` defaults to _public_,
+     * and options currently only takes maxAge.
+     * @param    type    value of the header
+     * @param    [options] an options object
+     * @returns          the value set to the header
+     */
+    cache(type: string, options?: CacheOptions): string;
+
+    /**
+     * sets the cache-control header. `type` defaults to _public_,
+     * and options currently only takes maxAge.
+     * @param    [options] an options object
+     * @returns          the value set to the header
+     */
+    cache(options?: CacheOptions): string;
+
+    /**
+     * turns off all cache related headers.
+     * @returns  self, the response object
+     */
+    noCache(): Response;
+
+    /**
+     * Appends the provided character set to the response's Content-Type.
+     * e.g., res.charSet('utf-8');
+     * @param    type char-set value
+     * @returns  self, the response object
+     */
+    charSet(type: string): Response;
+
+    /**
+     * retrieves a header off the response.
+     * @param    name the header name
+     */
+    get(name: string): string;
+
+    /**
+     * retrieves all headers off the response.
+     */
+    getHeaders(): any;
+
+    /**
+     * pass through to getHeaders.
+     */
+    headers(): any;
+
+    /**
+     * sets headers on the response.
+     * @param    name  the name of the header
+     * @param    value the value of the header
+     */
+    header(name: string, value?: any): any;
+
+    /**
+     * short hand method for:
+     *     res.contentType = 'json';
+     *     res.send({hello: 'world'});
+     * @param    code    http status code
+     * @param    object    value to json.stringify
+     * @param    [headers] headers to set on the response
+     */
+    json(code: number, object: any, headers?: { [header: string]: string }): any;
+
+    /**
+     * short hand method for:
+     *     res.contentType = 'json';
+     *     res.send({hello: 'world'});
+     * @param    object    value to json.stringify
+     * @param    [headers] headers to set on the response
+     */
+    json(object: any, headers?: { [header: string]: string }): any;
+
+    /**
+     * sets the link heaader.
+     * @param    l   the link key
+     * @param    rel the link value
+     * @returns      the header value set to res
+     */
+    link(l: string, rel: string): string;
+
+    /**
+     * sends the response object. pass through to internal __send that uses a
+     * formatter based on the content-type header.
+     * @param    [code] http status code
+     * @param    [body] the content to send
+     * @param    [headers]  any add'l headers to set
+     * @returns  the response object
+     */
+    send(code?: any, body?: any, headers?: { [header: string]: string }): any;
+
+    /**
+     * sends the response object. pass through to internal __send that skips
+     * formatters entirely and sends the content as is.
+     * @param    [code] http status code
+     * @param    [body] the content to send
+     * @param    [headers]  any add'l headers to set
+     * @returns  the response object
+     */
+    sendRaw(code?: any, body?: any, headers?: { [header: string]: string }): any;
+
+    /**
+     * sets a header on the response.
+     * @param    name name of the header
+     * @param    val  value of the header
+     * @returns       self, the response object
+     */
+    set(name: string, val: string): Response;
+
+    /**
+     * sets the http status code on the response.
+     * @param    code http status code
+     * @returns      the status code passed in
+     */
+    status(code: number): number;
+
+    /**
+     * toString() serialization.
+     */
+    toString(): string;
+
+    /**
+     * redirect is sugar method for redirecting.
+     * res.redirect(301, 'www.foo.com', next);
+     * `next` is mandatory, to complete the response and trigger audit logger.
+     * @param      code the status code
+     * @param      url to redirect to
+     * @param    next fn
+     * @emits    redirect
+     */
+    redirect(code: number, url: string, next: Next): void;
+
+    /**
+     * redirect is sugar method for redirecting.
+     * res.redirect({...}, next);
+     * `next` is mandatory, to complete the response and trigger audit logger.
+     * @param      options the options or url to redirect to
+     * @param    next fn
+     * @emits    redirect
+     */
+    redirect(options: object | string, next: Next): void;
+
+    /** HTTP status code. */
+    code: number;
+
+    /** short hand for the header content-length. */
+    contentLength: number;
+
+    /** short hand for the header content-type. */
+    contentType: string;
+
+    /** A unique request id (x-request-id). */
+    id: string;
+}
+
+export interface Next {
+    (err?: any): void;
+
+    ifError(err?: any): void;
+}
+
+export interface RoutePathRegex extends RegExp {
+    restifyParams: string[];
+}
+
+export interface RouteSpec {
+    method: string;
+    name: string;
+    path: string | RegExp;
+    versions: string[];
+}
+
+export interface Route {
+    name: string;
+    method: string;
+    path: RoutePathRegex;
+    spec: RouteSpec;
+    types: string[];
+    versions: string[];
+}
+
+export interface RouteOptions {
+    name?: string;
+
+    path?: string | RegExp;
+
+    url?: string | RegExp;
+
+    urlParamPattern?: RegExp;
+
+    contentType?: string | string[];
+
+    version?: string;
+
+    versions?: string[];
+}
+
+export interface MountOptions {
+    name: string;
+
+    method: string;
+
+    path?: string | RegExp;
+
+    url?: string | RegExp;
+
+    urlParamPattern?: RegExp;
+
+    contentType?: string | string[];
+
+    version?: string;
+
+    versions?: string[];
+}
+
+export type FindRouteCallback = (err: Error, route?: Route, params?: any) => void;
+
+export type RequestHandler = (req: Request, res: Response, next: Next) => any;
+export type RequestHandlerType = RequestHandler | RequestHandler[];
+
+export namespace bunyan {
+    interface RequestCaptureOptions {
+        /** The stream to which to write when dumping captured records. */
+        stream?: Logger.Stream;
+
+        /** The streams to which to write when dumping captured records. */
+        streams?: ReadonlyArray<Logger.Stream>;
+
+        /**
+         * The level at which to trigger dumping captured records. Defaults to
+         * bunyan.WARN.
+         */
+        level?: Logger.LogLevel;
+
+        /** Number of records to capture. Default 100. */
+        maxRecords?: number;
+
+        /**
+         * Number of simultaneous request id capturing buckets to maintain.
+         * Default 1000.
+         */
+        maxRequestIds?: number;
+
+        /**
+         * If true, then dump captured records on the *default* request id when
+         * dumping. I.e. dump records logged without "req_id" field. Default
+         * false.
+         */
+        dumpDefault?: boolean;
+    }
+
+    /**
+     * A Bunyan stream to capture records in a ring buffer and only pass through
+     * on a higher-level record. E.g. buffer up all records but only dump when
+     * getting a WARN or above.
+     */
+    class RequestCaptureStream extends stream.Stream {
+        constructor(opts: RequestCaptureOptions);
+
+        /** write to the stream */
+        write(record: any): void;
+    }
+
+    const serializers: Logger.Serializers & {
+        err: Logger.Serializer,
+        req: Logger.Serializer,
+        res: Logger.Serializer,
+        client_req: Logger.Serializer,
+        client_res: Logger.Serializer
+    };
+
+    /** create a bunyan logger */
+    function createLogger(name: string): Logger;
+}
+
+export function createServer(options?: ServerOptions): Server;
+
+export type Formatter = (req: Request, res: Response, body: any) => string | null;
+
+export interface Formatters {
+    [contentType: string]: Formatter;
+}
+
+export const formatters: Formatters;
+
+export namespace plugins {
+    namespace pre {
+        /**
+         * Provide req.set(key, val) and req.get(key) methods for setting and retrieving context to a specific request.
+         */
+        function context(): RequestHandler;
+
+        function dedupeSlashes(): RequestHandler;
+
+        /**
+         * This pre handler fixes issues with node hanging when an asyncHandler is used prior to bodyParser.
+         */
+        function pause(): RequestHandler;
+
+        /**
+         * Cleans up duplicate or trailing / on the URL
+         */
+        function sanitizePath(): RequestHandler;
+
+        /**
+         * Automatically reuse incoming request header as the request id.
+         */
+        function reqIdHeaders(options: { headers: string[] }): RequestHandler;
+
+        /**
+         * Checks req.urls query params with strict key/val format and rejects non-strict requests with status code 400.
+         */
+        function strictQueryParams(options?: { message: string }): RequestHandler;
+
+        /**
+         * Regexp to capture curl user-agents
+         */
+        function userAgentConnection(options?: { userAgentRegExp: any }): RequestHandler;
+    }
+
+    // *************** This module includes the following header parser plugins:
+
+    /**
+     * Check the client's Accept header can be handled by this server.
+     */
+    function acceptParser(accepts: string[]): RequestHandler;
+
+    interface AuditLoggerOptions {
+        /**
+         * Bunyan logger
+         */
+        log: Logger;
+
+        /**
+         * The event from the server which initiates the
+         * log, one of 'pre', 'routed', or 'after'
+         */
+        event: 'pre' | 'routed' | 'after';
+        /**
+         * Restify server. If passed in, causes server to emit 'auditlog' event after audit logs are flushed
+         */
+        server?: Server;
+
+        /**
+         * Ringbuffer which is written to if passed in
+         */
+        logBuffer?: any;
+
+        /**
+         * When true, prints audit logs. default true.
+         */
+        printLog?: boolean;
+
+        body?: boolean;
+    }
+
+    /**
+     * An audit logger for recording all handled requests
+     */
+    function auditLogger(options: AuditLoggerOptions): (...args: any[]) => void;
+
+    /**
+     * Authorization header
+     */
+    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-*)
+     */
+    function conditionalRequest(): RequestHandler[];
+
+    /**
+     * Handles disappeared CORS headers
+     */
+    function fullResponse(): RequestHandler;
+
+    // ************ This module includes the following data parsing plugins:
+
+    interface BodyParserOptions {
+        /**
+         * The maximum size in bytes allowed in the HTTP body. Useful for limiting clients from hogging server memory.
+         */
+        maxBodySize?: number;
+
+        /**
+         * If req.params should be filled with parsed parameters from HTTP body.
+         */
+        mapParams?: boolean;
+
+        /**
+         * If req.params should be filled with the contents of files sent through a multipart request.
+         * Formidable is used internally for parsing, and a file is denoted as a multipart part with the filename option set in its Content-Disposition.
+         * This will only be performed if mapParams is true.
+         */
+        mapFiles?: boolean;
+
+        /**
+         * If an entry in req.params should be overwritten by the value in the body if the names are the same.
+         * For instance, if you have the route /:someval, and someone posts an x-www-form-urlencoded Content-Type with the body someval=happy to /sad,
+         * the value will be happy if overrideParams is true, sad otherwise.
+         */
+        overrideParams?: boolean;
+
+        /**
+         * A callback to handle any multipart part which is not a file.
+         * If this is omitted, the default handler is invoked which may or may not map the parts into req.params, depending on the mapParams-option.
+         */
+        multipartHandler?(): void;
+
+        /**
+         * A callback to handle any multipart file.
+         * It will be a file if the part have a Content-Disposition with the filename parameter set.
+         * This typically happens when a browser sends a form and there is a parameter similar to <input type="file" />.
+         * If this is not provided, the default behaviour is to map the contents into req.params.
+         */
+        multipartFileHandler?(): void;
+
+        /**
+         * If you want the uploaded files to include the extensions of the original files (multipart uploads only). Does nothing if multipartFileHandler is defined.
+         */
+        keepExtensions?: boolean;
+
+        /**
+         * Where uploaded files are intermediately stored during transfer before the contents is mapped into req.params. Does nothing if multipartFileHandler is defined.
+         */
+        uploadDir?: string;
+
+        /**
+         * If you want to support html5 multiple attribute in upload fields.
+         */
+        multiples?: boolean;
+
+        /**
+         * If you want checksums calculated for incoming files, set this to either sha1 or md5.
+         */
+        hash?: string;
+
+        /**
+         * Set to true if you want to end the request with a UnsupportedMediaTypeError when none of the supported content types was given.
+         */
+        rejectUnknown?: boolean;
+
+        reviver?: any;
+
+        maxFieldsSize?: number;
+    }
+
+    /**
+     * Parses POST bodies to req.body. automatically uses one of the following parsers based on content type.
+     */
+    function bodyParser(options?: BodyParserOptions): RequestHandler[];
+
+    /**
+     * Reads the body of the request.
+     */
+    function bodyReader(options?: { maxBodySize?: number }): RequestHandler;
+
+    interface UrlEncodedBodyParser {
+        mapParams?: boolean;
+        overrideParams?: boolean;
+    }
+
+    /**
+     * Parse the HTTP request body IFF the contentType is application/x-www-form-urlencoded.
+     *
+     * If req.params already contains a given key, that key is skipped and an
+     * error is logged.
+     */
+    function urlEncodedBodyParser(options?: UrlEncodedBodyParser): RequestHandler[];
+
+    /**
+     * Parses JSON POST bodies
+     */
+    function jsonBodyParser(options?: { mapParams?: boolean, reviver?: any, overrideParams?: boolean }): RequestHandler[];
+
+    /**
+     * Parses JSONP callback
+     */
+    function jsonp(): RequestHandler;
+
+    interface MultipartBodyParser {
+        overrideParams?: boolean;
+        multiples?: boolean;
+        keepExtensions?: boolean;
+        uploadDir?: string;
+        maxFieldsSize?: number;
+        hash?: string;
+        multipartFileHandler?: any;
+        multipartHandler?: any;
+        mapParams?: boolean;
+        mapFiles?: boolean;
+    }
+
+    /**
+     * Parses JSONP callback
+     */
+    function multipartBodyParser(options?: MultipartBodyParser): RequestHandler;
+
+    interface QueryParserOptions {
+        /**
+         * Default `false`. Copies parsed query parameters into `req.params`.
+         */
+        mapParams?: boolean;
+
+        /**
+         * Default `false`. Only applies when if mapParams true. When true, will stomp on req.params field when existing value is found.
+         */
+        overrideParams?: boolean;
+
+        /**
+         *  Default false. Transform `?foo.bar=baz` to a nested object: `{foo: {bar: 'baz'}}`.
+         */
+        allowDots?: boolean;
+
+        /**
+         * Default 20. Only transform `?a[$index]=b` to an array if `$index` is less than `arrayLimit`.
+         */
+        arrayLimit?: number;
+
+        /**
+         * Default 5. The depth limit for parsing nested objects, e.g. `?a[b][c][d][e][f][g][h][i]=j`.
+         */
+        depth?: number;
+
+        /**
+         * Default 1000. Maximum number of query params parsed. Additional params are silently dropped.
+         */
+        parameterLimit?: number;
+
+        /**
+         * Default true. Whether to parse `?a[]=b&a[1]=c` to an array, e.g. `{a: ['b', 'c']}`.
+         */
+        parseArrays?: boolean;
+
+        /**
+         * Default false. Whether `req.query` is a "plain" object -- does not inherit from `Object`.
+         * This can be used to allow query params whose names collide with Object methods, e.g. `?hasOwnProperty=blah`.
+         */
+        plainObjects?: boolean;
+
+        /**
+         * Default false. If true, `?a&b=` results in `{a: null, b: ''}`. Otherwise, `{a: '', b: ''}`.
+         */
+        strictNullHandling?: boolean;
+    }
+
+    /**
+     * Parses URL query paramters into `req.query`. Many options correspond directly to option defined for the underlying [qs.parse](https://github.com/ljharb/qs)
+     */
+    function queryParser(options?: QueryParserOptions): RequestHandler;
+
+    interface RequestLogger {
+        properties?: any;
+        serializers?: any;
+        headers?: any;
+        log?: any;
+    }
+
+    /**
+     * Adds timers for each handler in your request chain
+     *
+     * `options.properties` properties to pass to bunyan's `log.child()` method
+     */
+    function requestLogger(options?: RequestLogger): RequestHandler;
+
+    // ******************** The module includes the following response plugins:
+
+    /**
+     * expires requests based on current time + delta
+     * @param delta - age in seconds
+     */
+    function dateParser(delta?: number): RequestHandler;
+
+    /**
+     * gzips the response if client send `accept-encoding: gzip`
+     * @param options options to pass to gzlib
+     */
+    function gzipResponse(options?: any): RequestHandler;
+
+    interface ServeStatic {
+        appendRequestPath?: boolean;
+        directory?: string;
+        maxAge?: number;
+        match?: any;
+        charSet?: string;
+        file?: string;
+        etag?: string;
+        default?: any;
+        gzip?: boolean;
+    }
+
+    /**
+     * Used to serve static files
+     */
+    function serveStatic(options?: ServeStatic): RequestHandler;
+
+    interface ThrottleOptions {
+        burst?: number;
+        rate?: number;
+        ip?: boolean;
+        username?: boolean;
+        xff?: boolean;
+        tokensTable?: any;
+        maxKeys?: number;
+        overrides?: any; // any
+    }
+
+    interface MetricsCallback {
+        /**
+         *  An error if the request had an error
+         */
+        err: Error;
+
+        metrics: MetricsCallbackOptions;
+
+        req: Request;
+        res: Response;
+
+        /**
+         * The route obj that serviced the request
+         */
+        route: Route;
+    }
+
+    type TMetricsCallback = 'close' | 'aborted' | undefined;
+
+    interface MetricsCallbackOptions {
+        /**
+         * Status code of the response. Can be undefined in the case of an `uncaughtException`.
+         * Otherwise, in most normal scenarios, even calling `res.send()` or `res.end()` should result in a 200 by default.
+         */
+        statusCode: number;
+
+        /**
+         * HTTP request verb
+         */
+        method: string;
+
+        /**
+         * Request latency
+         */
+        latency: number;
+
+        /**
+         * req.path() value
+         */
+        path: string;
+
+        /**
+         * If this value is set, err will be a corresponding `RequestCloseError` or `RequestAbortedError`.
+         *
+         * If connectionState is either 'close' or 'aborted', then the statusCode is not applicable since the connection was severed before a response was written.
+         */
+        connectionState: TMetricsCallback;
+    }
+
+    /**
+     * Listens to the server's after event and emits information about that request (5.x compatible only).
+     *
+     * ```
+     * server.on('after', plugins.metrics( (err, metrics) =>
+     * {
+     *    // metrics is an object containing information about the request
+     * }));
+     * ```
+     */
+    function metrics(opts: { server: Server }, callback: (options: MetricsCallback) => any): (...args: any[]) => void;
+
+    /**
+     * Parse the client's request for an OAUTH2 access tokensTable
+     *
+     * Subsequent handlers will see `req.oauth2`, which looks like:
+     * ```
+     * {
+     *    oauth2: {accessToken: 'mF_9.B5f-4.1JqM&p=q'}
+     * }
+     * ```
+     */
+    function oauth2TokenParser(): RequestHandler;
+
+    /**
+     *  throttles responses
+     */
+    function throttle(options?: ThrottleOptions): RequestHandler;
+
+    interface RequestExpiryOptions {
+        /**
+         * Header name of the absolute time for request expiration
+         */
+        absoluteHeader?: string;
+
+        /**
+         * Header name for the start time of the request
+         */
+        startHeader?: string;
+
+        /**
+         * The header name for the time in milliseconds that should ellapse before the request is considered expired.
+         */
+        timeoutHeader?: string;
+    }
+
+    /**
+     * A request expiry will use headers to tell if the incoming request has expired or not.
+     *
+     * There are two options for this plugin:
+     *   1. Absolute Time
+     *     * Time in Milliseconds since the Epoch when this request should be considered expired
+     *   2. Timeout
+     *     * The request start time is supplied
+     *     * A timeout, in milliseconds, is given
+     *     * The timeout is added to the request start time to arrive at the absolute time
+     *       in which the request is considered expires
+     */
+    function requestExpiry(options?: RequestExpiryOptions): RequestHandler;
+}
+
+export namespace pre {
+    /**
+     * Provide req.set(key, val) and req.get(key) methods for setting and retrieving context to a specific request.
+     */
+    function context(): RequestHandler;
+
+    function dedupeSlashes(): RequestHandler;
+
+    /**
+     * This pre handler fixes issues with node hanging when an asyncHandler is used prior to bodyParser.
+     */
+    function pause(): RequestHandler;
+
+    /**
+     * Cleans up duplicate or trailing / on the URL
+     */
+    function sanitizePath(): RequestHandler;
+
+    /**
+     * Automatically reuse incoming request header as the request id.
+     */
+    function reqIdHeaders(options: { headers: string[] }): RequestHandler;
+
+    /**
+     * Checks req.urls query params with strict key/val format and rejects non-strict requests with status code 400.
+     */
+    function strictQueryParams(options?: { message: string }): RequestHandler;
+
+    /**
+     * Regexp to capture curl user-agents
+     */
+    function userAgentConnection(options?: { userAgentRegExp: any }): RequestHandler;
+}
diff --git a/types/restify/v5/restify-tests.ts b/types/restify/v5/restify-tests.ts
new file mode 100644
index 0000000000..8601d912ac
--- /dev/null
+++ b/types/restify/v5/restify-tests.ts
@@ -0,0 +1,191 @@
+import * as restify from "restify";
+import * as url from "url";
+import * as Logger from "bunyan";
+import * as http from "http";
+import * as stream from "stream";
+
+let server: restify.Server;
+
+server = restify.createServer({
+    formatters: {
+        'application/foo': function formatFoo(req: restify.Request, res: restify.Response, body: any) {
+            if (body instanceof Error)
+                return body.stack;
+
+            if (body)
+                return body.toString('base64');
+
+            return body;
+        }
+    }
+});
+
+server = restify.createServer({});
+
+server.pre(restify.pre.sanitizePath());
+
+server.on('someEvent', () => { });
+
+server.use((req: restify.Request, res: restify.Response, next: restify.Next) => { });
+server.use([(req: restify.Request, res: restify.Response, next: restify.Next) => { }, (req: restify.Request, res: restify.Response, next: restify.Next) => { }]);
+server.use((req: restify.Request, res: restify.Response, next: restify.Next) => { }, (req: restify.Request, res: restify.Response, next: restify.Next) => { });
+
+function send(req: restify.Request, res: restify.Response, next: restify.Next) {
+    req.header('key', 'val');
+    req.header('key') === 'val';
+    req.trailer('key', 'val');
+    req.trailer('key') === 'val';
+
+    let b: boolean;
+    b = req.accepts('test');
+    b = req.accepts(['test']);
+    b = req.acceptsEncoding('test');
+    b = req.acceptsEncoding(['test']);
+    b = req.is('test');
+    b = req.isChunked();
+    b = req.isKeepAlive();
+    b = req.isSecure();
+    b = req.isUpgradeRequest();
+    b = req.isUpload();
+    req.userAgent() === 'test';
+    req.startHandlerTimer('test');
+    req.endHandlerTimer('test');
+
+    const log = req.log;
+    log.debug({ params: req.params }, 'Hello there %s', 'foo');
+
+    req.getContentLength() === 50;
+    req.contentLength() === 50;
+    req.getContentType() === 'test';
+    req.contentType() === 'test';
+    req.getHref() === 'test';
+    req.href() === 'test';
+    req.getId() === 'test';
+    req.id() === 'test';
+    req.getPath() === 'test';
+    req.path() === 'test';
+    req.getQuery() === 'test';
+    req.query === 'test';
+    req.time() === 1463518410080;
+    req.getUrl() === url.parse('https://test.test.test/test');
+    req.getVersion() === 'test';
+    req.version() === 'test';
+    req.params;
+    res.header('test');
+    res.header('test', {});
+    res.header('test', new Date());
+
+    res.cache();
+    res.cache('testst', { maxAge: 60 });
+    res.cache({ maxAge: 60 });
+
+    res.status(344);
+
+    res.send({ hello: 'world' });
+    res.send(201, { hello: 'world' });
+    res.send(new Error('meh'));
+
+    res.json(201, { hello: 'world' });
+    res.json({ hello: 'world' });
+
+    res.code === 50;
+    res.contentLength === 50;
+    res.charSet('test');
+    res.contentType === 'test';
+    res.headers;
+    res.id === 'test';
+
+    res.send('hello ' + req.params.name);
+    res.writeHead(200);
+    res.writeHead(200, {
+        "Content-Type": "application/json"
+    });
+    next();
+}
+
+server.post('/hello', send);
+server.put('/hello', send);
+server.del('/hello', send);
+server.get('/hello', send);
+server.head('/hello', send);
+server.opts('/hello', send);
+
+server.post(/(.*)/, send);
+server.put(/(.*)/, send);
+server.del(/(.*)/, send);
+server.get(/(.*)/, send);
+server.head(/(.*)/, send);
+server.opts(/(.*)/, send);
+
+server.name = "";
+server.versions = [""];
+server.acceptable = ["test"];
+server.url = "";
+server.server = new http.Server();
+
+server.address().port;
+server.address().family;
+server.address().address;
+
+server.listen("somePath", send);
+server.close();
+
+server.use(restify.plugins.acceptParser(server.acceptable));
+server.use(restify.plugins.authorizationParser());
+server.use(restify.plugins.dateParser());
+server.use(restify.plugins.queryParser());
+server.use(restify.plugins.jsonp());
+server.use(restify.plugins.gzipResponse());
+server.use(restify.plugins.bodyParser());
+server.use(restify.plugins.throttle({
+    burst: 100,
+    rate: 50,
+    ip: true,
+    overrides: {
+        '192.168.1.1': {
+            rate: 0,
+            burst: 0
+        }
+    }
+}));
+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" });
+
+server.on('after', restify.plugins.auditLogger({ event: 'after', log: logger }));
+
+server.on('after', (req: restify.Request, res: restify.Response, route: restify.Route, err: any) => {
+    route.spec.method === 'GET';
+    route.spec.name === 'routeName';
+    route.spec.path === '/some/path';
+    route.spec.path === /\/some\/path\/.*/;
+    route.spec.versions === ['v1'];
+    restify.plugins.auditLogger({ event: 'after', log: logger })(req, res, route, err);
+});
+
+(<any> restify).defaultResponseHeaders = function(this: restify.Request, data: any) {
+    this.header('Server', 'helloworld');
+};
+
+const loggerStream: Logger.Stream = {};
+
+const requestCaptureOptions: restify.bunyan.RequestCaptureOptions = {};
+requestCaptureOptions.stream = loggerStream;
+requestCaptureOptions.streams = Object.freeze([loggerStream, loggerStream]);
+requestCaptureOptions.level = Logger.DEBUG;
+requestCaptureOptions.level = "info";
+requestCaptureOptions.maxRecords = 50;
+requestCaptureOptions.maxRequestIds = 500;
+requestCaptureOptions.dumpDefault = true;
+
+const requestCaptureStream = new restify.bunyan.RequestCaptureStream(requestCaptureOptions);
+const asStream: stream.Stream = requestCaptureStream;
+
+const logger2: Logger = restify.bunyan.createLogger("horse");
diff --git a/types/restify/v5/tsconfig.json b/types/restify/v5/tsconfig.json
new file mode 100644
index 0000000000..c249a0b027
--- /dev/null
+++ b/types/restify/v5/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "restify": [
+                "restify/v5"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "restify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/restify/v5/tslint.json b/types/restify/v5/tslint.json
new file mode 100644
index 0000000000..f0f7a6f17a
--- /dev/null
+++ b/types/restify/v5/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "no-unnecessary-class": false
+    }
+}

From db44ac9f22db6127a6ec7240705f5cf92c124291 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 12:35:18 -0600
Subject: [PATCH 0850/1124] Add DescribeSObject typings and cached describe
 functions

---
 types/jsforce/cache.d.ts             |  21 +++
 types/jsforce/connection.d.ts        |   6 +
 types/jsforce/describe-result.d.ts   | 221 ++++++++++++++++++++++++++-
 types/jsforce/index.d.ts             |   2 +
 types/jsforce/jsforce-tests.ts       |  31 +++-
 types/jsforce/salesforce-object.d.ts |   8 +
 types/jsforce/tsconfig.json          |   2 +-
 7 files changed, 285 insertions(+), 6 deletions(-)
 create mode 100644 types/jsforce/cache.d.ts

diff --git a/types/jsforce/cache.d.ts b/types/jsforce/cache.d.ts
new file mode 100644
index 0000000000..35241eb639
--- /dev/null
+++ b/types/jsforce/cache.d.ts
@@ -0,0 +1,21 @@
+import { EventEmitter } from 'events';
+
+export class CacheEntry<T> extends EventEmitter {
+  get(callback?: (err: Error, result: T) => void): T | undefined;
+  set(value: T): void;
+  clear(): void;
+}
+
+export class Cache {
+  /**
+   * Clear cache entries prefix matching given key
+   * @param key Key prefix of cache entry to clear
+   */
+  clear(key?: string): void;
+
+  /**
+   * Retrieve cache entry, or create if not exists
+   * @param key Key of cache entry
+   */
+  get<T>(key?: string): CacheEntry<T>;
+}
\ No newline at end of file
diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 32ed4de267..8f6f50efc5 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -8,6 +8,7 @@ import { Analytics } from './api/analytics';
 import { Chatter } from './api/chatter';
 import { Metadata } from './api/metadata';
 import { Bulk } from './bulk';
+import { Cache } from './cache'
 import { OAuth2, Streaming } from '.';
 
 export type Callback<T> = (err: Error, result: T) => void;
@@ -111,7 +112,11 @@ export abstract class BaseConnection extends EventEmitter {
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     destroy<T>(type: string, ids: string | string[], options?: Object,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
+    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
+    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     sobject<T>(resource: string): SObject<T>;
 }
@@ -126,6 +131,7 @@ export class Connection extends BaseConnection {
     bulk: Bulk;
     oauth2: OAuth2;
     streaming: Streaming;
+    cache: Cache;
 
     // Specific to Connection
     instanceUrl: string;
diff --git a/types/jsforce/describe-result.d.ts b/types/jsforce/describe-result.d.ts
index 352c4223a6..17da9f5917 100644
--- a/types/jsforce/describe-result.d.ts
+++ b/types/jsforce/describe-result.d.ts
@@ -1,9 +1,217 @@
+type maybe<T> = (T | null | undefined)
+
+// From
+// https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_calls_describesobjects_describesobjectresult.htm
 export interface DescribeSObjectResult {
+    activateable: boolean;
+    actionOverrides?: maybe<ActionOverride[]>;
+    childRelationships: ChildRelationship[];
+    compactLayoutable: boolean;
+    createable: boolean;
+    custom: boolean;
+    customSetting: boolean;
+    deleteable: boolean;
+    deprecatedAndHidden: boolean;
+    feedEnabled: boolean;
+    fields: Field[];
+    keyPrefix?: maybe<string>;
     label: string;
-    fields: object[];
+    labelPlural: string;
+    layoutable: boolean;
+    listviewable?: maybe<boolean>;
+    lookupLayoutable?: maybe<boolean>;
+    mergeable: boolean;
+    mruEnabled: boolean;
+    name: string;
+    namedLayoutInfos: NamedLayoutInfo[];
+    networkScopeFieldName?: maybe<string>;
+    queryable: boolean;
+    recordTypeInfos: RecordTypeInfo[];
+    replicateable: boolean;
+    retrieveable: boolean;
+    searchable: boolean;
+    searchLayoutable: boolean;
+    supportedScopes: ScopeInfo[];
+    triggerable: boolean;
+    undeleteable: boolean;
+    updateable: boolean;
+    urlDetail?: string;
+    urlEdit?: string;
+    urlNew?: string;
+    urls: Record<string, string>;
 }
 
-export interface DescribeGlobalResult {
+export interface ActionOverride {
+    formFactor: string;
+    isAvailableInTouch: boolean;
+    name: string;
+    pageId: string;
+    url?: maybe<string>;
+}
+
+export interface ChildRelationship {
+    cascadeDelete: boolean;
+    childSObject: string;
+    deprecatedAndHidden: boolean;
+    field: string;
+    junctionIdListNames: string[];
+    junctionReferenceTo: string[];
+    relationshipName?: maybe<string>;
+    restrictedDelete: boolean;
+}
+
+export interface Field {
+    aggregatable: boolean;
+    autonumber: boolean;
+    byteLength: number;
+    calculated: boolean;
+    calculatedFormula?: maybe<string>;
+    cascadeDelete: boolean;
+    caseSensitive: boolean;
+    compoundFieldName?: maybe<string>;
+    controllerName?: maybe<string>;
+    creatable: boolean;
+    custom: boolean;
+    defaultValue?: maybe<string | boolean>;
+    defaultValueFormula?: maybe<string>;
+    defaultedOnCreate: boolean;
+    dependentPicklist: boolean;
+    deprecatedAndHidden: boolean;
+    digits?: maybe<number>;
+    displayLocationInDecimal?: maybe<boolean>;
+    encrypted?: maybe<true>;
+    externalId: boolean;
+    extraTypeInfo?: maybe<ExtraTypeInfo>;
+    filterable: boolean;
+    filteredLookupInfo?: maybe<FilteredLookupInfo>;
+    formula?: maybe<string>;
+    groupable: boolean;
+    highScaleNumber?: maybe<boolean>;
+    htmlFormatted :boolean;
+    idLookup: boolean;
+    inlineHelpText?: maybe<string>;
+    label: string;
+    length: number;
+    mask?: maybe<string>;
+    maskType?: maybe<string>;
+    name: string;
+    nameField: boolean;
+    namePointing: boolean;
+    nillable: boolean;
+    permissionable: boolean;
+    picklistValues?: maybe<PicklistEntry[]>;
+    polymorphicForeignKey: boolean;
+    precision?: maybe<number>;
+    queryByDistance: boolean;
+    relationshipName?: maybe<string>;
+    relationshipOrder?: maybe<number>;
+    referenceTargetField?: maybe<string>;
+    referenceTo?: maybe<string[]>;
+    restrictedPicklist: boolean;
+    scale: number;
+    searchPrefilterable: boolean;
+    soapType: SOAPType;
+    sortable: boolean;
+    type: FieldType;
+    unique: boolean;
+    updateable: boolean;
+    writeRequiresMasterRead?: maybe<boolean>;
+}
+
+export type ExtraTypeInfo =
+    | 'imageurl'
+    | 'personname'
+    | 'plaintextarea'
+    | 'richtextarea'
+    | 'switchablepersonname'
+    | 'externallookup'
+    | 'indirectlookup'
+
+export type FieldType =
+    | 'string'
+    | 'boolean'
+    | 'int'
+    | 'double'
+    | 'date'
+    | 'datetime'
+    | 'base64'
+    | 'id'
+    | 'reference'
+    | 'currency'
+    | 'textarea'
+    | 'percent'
+    | 'phone'
+    | 'url'
+    | 'email'
+    | 'combobox'
+    | 'picklist'
+    | 'multipicklist'
+    | 'anyType'
+    | 'location'
+    // the following are not found in official documentation, but still occur when describing an sobject
+    | 'time'
+    | 'encryptedstring'
+    | 'address'
+    | 'complexvalue'
+
+export interface FilteredLookupInfo {
+    controllingFields: string[];
+    dependent: boolean;
+    optionalFilter: boolean;
+}
+
+export type SOAPType =
+    | 'tns:ID'
+    | 'xsd:anyType'
+    | 'xsd:base64Binary'
+    | 'xsd:boolean'
+    | 'xsd:date'
+    | 'xsd:dateTime'
+    | 'xsd:double'
+    | 'xsd:int'
+    | 'xsd:string'
+    // the following are not found in official documentation, but still occur when describing an sobject
+    | 'xsd:time'
+    | 'urn:address'
+    | 'urn:JunctionIdListNames'
+    | 'urn:location'
+    | 'urn:RecordTypesSupported'
+    | 'urn:RelationshipReferenceTo'
+    | 'urn:SearchLayoutButtonsDisplayed'
+    | 'urn:SearchLayoutFieldsDisplayed'
+
+export interface PicklistEntry {
+    active: boolean;
+    validFor?: maybe<string>;
+    defaultValue: boolean;
+    label?: maybe<string>;
+    value: string;
+}
+
+export interface RecordTypeInfo {
+    available: boolean;
+    defaultRecordTypeMapping: boolean;
+    developerName?: maybe<string>;
+    master: boolean;
+    name: string;
+    recordTypeId: string;
+    urls: Record<string, string>;
+}
+
+export interface NamedLayoutInfo {
+    name: string;
+    urls: Record<string, string>;
+}
+
+export interface ScopeInfo {
+    label: string;
+    name: string;
+}
+
+// From
+// https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_calls_describeglobal_describeglobalresult.htm#!
+
+export interface DescribeGlobalSObjectResult {
     activateable: boolean;
     createable: boolean;
     custom: boolean;
@@ -13,7 +221,7 @@ export interface DescribeGlobalResult {
     feedEnabled: boolean;
     hasSubtypes: boolean;
     isSubtype: boolean;
-    keyPrefix: string;
+    keyPrefix: string | null;
     label: string;
     labelPlural: string;
     layoutable: boolean;
@@ -27,4 +235,11 @@ export interface DescribeGlobalResult {
     triggerable: boolean;
     undeletable: boolean;
     updateable: boolean;
+    urls: Record<string, string>;
+}
+
+export interface DescribeGlobalResult {
+    encoding: string;
+    maxBatchSize: number;
+    sobjects: DescribeGlobalSObjectResult[];
 }
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index 704bb07655..950bafeb75 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -12,9 +12,11 @@ export * from './api/chatter';
 export * from './api/metadata';
 export * from './batch';
 export * from './bulk';
+export * from './cache';
 export * from './channel';
 export * from './connection';
 export * from './date-enum';
+export * from './describe-result';
 export * from './job';
 export * from './oauth2';
 export * from './promise';
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index c0be86e92c..0ec41ed0fc 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -157,7 +157,7 @@ async function testMetadata(conn: sf.Connection): Promise<void> {
         m.metadataObjects.filter((value: sf.MetadataObject) => value.directoryName === 'pages');
     console.log(`ApexPage?: ${pages[0].xmlName === 'ApexPage'}`);
 
-    const types: sf.ListMetadataQuery[] = [{ type: 'CustomObject', folder: null }];
+    const types: sf.ListMetadataQuery[] = [{ type: 'CustomObject', folder: undefined }];
     md.list(types, '39.0', (err, properties: sf.FileProperties[]) => {
         if (err) {
             console.error('err', err);
@@ -335,7 +335,8 @@ batch.on("response", (rets: sf.BatchResultInfo[]) => {
         if (rets[i].success) {
             console.log(`# ${(i + 1)} loaded successfully, id = ${rets[i].id}`);
         } else {
-            console.log(`# ${(i + 1)} error occurred, message = ${rets[i].errors.join(', ')}`);
+            const errors = rets[i].errors;
+            console.log(`# ${(i + 1)} error occurred, message = ${errors ? errors.join(', ') : ''}`);
         }
     }
 });
@@ -350,3 +351,29 @@ salesforceConnection.streaming.topic("InvoiceStatementUpdates").subscribe((messa
     console.log('Event Created : ' + message.event.createdDate);
     console.log('Object Id : ' + message.sobject.Id);
 });
+
+async function testDescribe() {
+    const global: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal();
+    const globalCached: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal$();
+    const globalCachedCorrectly = global === globalCached;
+
+    globalCached.sobjects.forEach(async (sobject: sf.DescribeGlobalSObjectResult) => {
+        const object: sf.DescribeSObjectResult = await salesforceConnection.describe(sobject.name);
+        const cachedObject: sf.DescribeSObjectResult = await salesforceConnection.describe$(sobject.name);
+
+        object.fields.forEach(field => {
+            const type: sf.FieldType = field.type;
+            // following should never compile
+            // const fail = type === 'hey'
+
+            const isString = type === 'string';
+        });
+
+        // following should never compile (if StrictNullChecks is on)
+        // object.keyPrefix.length;
+
+        console.log(`${sobject.name} Label: `, object.label);
+
+        const correctlyCached = object === cachedObject;
+    });
+}
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index 2c54d598fc..5e603e5073 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -30,8 +30,12 @@ export class SObject<T> {
     findOne<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T) => void): Query<T>;
     findOne<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T) => void): Query<T>;
 
+    /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
+    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     approvalLayouts(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream[] | string[], callback?: (err: Error, ret: RecordResult) => void): Batch;
+    /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
+    compactLayouts$(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
     create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
@@ -45,8 +49,12 @@ export class SObject<T> {
     deleted(start: Date | string, end: Date | string, callback?: (info: DeletedRecordsInfo) => void): Promise<DeletedRecordsInfo>;
     deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
+    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
     insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    /** Returns a value from the cache if it exists, otherwise calls SObject.layouts */
+    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     listview(id: string): ListView;
     listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;
diff --git a/types/jsforce/tsconfig.json b/types/jsforce/tsconfig.json
index bf92077cd0..b239e916e7 100644
--- a/types/jsforce/tsconfig.json
+++ b/types/jsforce/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [

From cd87bfabe87159f3d5029e5604ec01c9176ab913 Mon Sep 17 00:00:00 2001
From: Shawn Clabough <shawnc@outtrack.com>
Date: Wed, 30 May 2018 11:38:58 -0700
Subject: [PATCH 0851/1124] Update index.d.ts (kendo-ui toolbar)

For the grid, a toolbar can be either a string, a function, or an array of either string or GridToolBarItems. Some standard toolbar items are pre-defined as strings (i.e. "Create", "Delete").
---
 types/kendo-ui/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index e734f52cfa..95e279ea7d 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -4311,7 +4311,7 @@ declare namespace kendo.ui {
         scrollable?: boolean | GridScrollable;
         selectable?: boolean|string;
         sortable?: boolean | GridSortable;
-        toolbar?: GridToolbarItem[];
+        toolbar?: string|Function|(string|GridToolbarItem)[];
         beforeEdit?(e: GridBeforeEditEvent): void;
         cancel?(e: GridCancelEvent): void;
         cellClose?(e: GridCellCloseEvent): void;

From 709a66c5f1058e8744b1dcad3593b889c0bb5fab Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 12:39:58 -0600
Subject: [PATCH 0852/1124] Add name to contributors

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

diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index 950bafeb75..ddcb0d8260 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -4,6 +4,7 @@
 //                 Kamil Ejsymont <https://github.com/netes>
 //                 Thomas Dvornik <https://github.com/amphro>
 //                 Tim Noonan <https://github.com/tnoonan-salesforce>
+//                 Abraham White <https://github.com/whiteabelincoln>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From c0b3b895956ad144c7d083665ec95c0c2f4dd1a0 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Wed, 30 May 2018 11:45:46 -0700
Subject: [PATCH 0853/1124] bring back namespace

---
 types/text-encoding/index.d.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/types/text-encoding/index.d.ts b/types/text-encoding/index.d.ts
index cc4b2f8555..bda902dace 100644
--- a/types/text-encoding/index.d.ts
+++ b/types/text-encoding/index.d.ts
@@ -5,5 +5,20 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-export const TextEncoder: TextEncoder;
-export const TextDecoder: TextDecoder;
+declare namespace TextEncoding {
+    interface TextEncoderOptions {
+        NONSTANDARD_allowLegacyEncoding?: boolean;
+    }
+    interface TextEncoderStatic {
+        (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
+        new (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
+    }
+    export const TextEncoder: TextEncoder;
+    export const TextDecoder: TextDecoder;
+}
+
+declare var TextEncoding: TextEncoding.TextEncodingStatic;
+
+declare module "text-encoding" {
+    export = TextEncoding;
+}

From d2f9012bb6e25b8eb1159cab1fcaf750ad91ffc8 Mon Sep 17 00:00:00 2001
From: Mitchell Bundy <mitchell.bundy@ssense.com>
Date: Wed, 30 May 2018 14:55:54 -0400
Subject: [PATCH 0854/1124] removed unnecessary import of dns

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

diff --git a/types/restify/restify-tests.ts b/types/restify/restify-tests.ts
index 9b2736b98b..42bbe12524 100644
--- a/types/restify/restify-tests.ts
+++ b/types/restify/restify-tests.ts
@@ -3,7 +3,6 @@ import * as url from "url";
 import * as Logger from "bunyan";
 import * as http from "http";
 import * as stream from "stream";
-import { resolveSoa } from "dns";
 
 let server: restify.Server;
 

From c73c567f5620d01cb5cc1fc1434ca45546882057 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:00:21 -0600
Subject: [PATCH 0855/1124] Set strictFunctionTypes to true

---
 types/jsforce/jsforce-tests.ts | 12 ++++++------
 types/jsforce/tsconfig.json    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 0ec41ed0fc..6c3895cae9 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -45,8 +45,8 @@ salesforceConnection.sobject("Account").create({
     Name: "Test Acc 2",
     BillingStreet: "Maplestory street",
     BillingPostalCode: "ME4 666"
-}, (err: Error, ret: sf.RecordResult) => {
-    if (err || !ret.success) {
+}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
+    if (err || !Array.isArray(ret) && !ret.success) {
         return;
     }
 });
@@ -56,8 +56,8 @@ salesforceConnection.sobject("ContentVersion").create({
     Title: 'hello',
     PathOnClient: './hello-world.jpg',
     VersionData: '{ Test: Data }'
-}, (err: Error, ret: sf.RecordResult) => {
-    if (err || !ret.success) {
+}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
+    if (err || !Array.isArray(ret) && !ret.success) {
         return;
     }
 });
@@ -77,8 +77,8 @@ salesforceConnection.sobject("ContentDocumentLink").create({
     ContentDocumentId: '',
     LinkedEntityId: '',
     ShareType: "I"
-}, (err: Error, ret: sf.RecordResult) => {
-    if (err || !ret.success) {
+}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
+    if (err || !Array.isArray(ret) && !ret.success) {
         return;
     }
 });
diff --git a/types/jsforce/tsconfig.json b/types/jsforce/tsconfig.json
index b239e916e7..4d6aee9825 100644
--- a/types/jsforce/tsconfig.json
+++ b/types/jsforce/tsconfig.json
@@ -7,7 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 3e7933029419692f7c98222f54f0a07e7824e3bc Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:27:25 -0600
Subject: [PATCH 0856/1124] Remove describeGlobal from SObject

---
 types/jsforce/salesforce-object.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index 5e603e5073..af73962366 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -18,9 +18,6 @@ export class SObject<T> {
     upsert(records: Record<T>, extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult>;
     upsert(records: Array<Record<T>>, extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult[]) => void): Promise<RecordResult[]>;
     upsertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult[] | BatchResultInfo[]) => void): Batch;
-    describeGlobal(callback: (err: Error, res: any) => void): void;
-    describe$(callback: (err: Error, ret: DescribeSObjectResult) => void): void;
-    describeGlobal$(callback: (err: Error, res: any) => void): void;
 
     find<T>(query?: any, callback?: (err: Error, ret: T[]) => void): Query<T>;
     find<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T[]) => void): Query<T>;

From 6abf5805fee3b7c978bc14bf0e97c1715f5e170b Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:49:16 -0600
Subject: [PATCH 0857/1124] Add proper return types for cached describe calls

The [Cache.makeCacheable](http://jsforce.github.io/jsforce/doc/cache.js.html#line175)
method doesn't return a promise, but immediately
returns the saved value. This is dumb, the method
signature should match the passed in method,
returning an immediately resolved Promise instead.
---
 types/jsforce/connection.d.ts        | 4 ++--
 types/jsforce/salesforce-object.d.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 8f6f50efc5..2f970cc764 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -113,10 +113,10 @@ export abstract class BaseConnection extends EventEmitter {
     destroy<T>(type: string, ids: string | string[], options?: Object,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
-    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
     describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
-    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
+    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     sobject<T>(resource: string): SObject<T>;
 }
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index af73962366..0d8bf52e41 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -28,11 +28,11 @@ export class SObject<T> {
     findOne<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T) => void): Query<T>;
 
     /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
-    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
+    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): ApprovalLayoutInfo;
     approvalLayouts(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream[] | string[], callback?: (err: Error, ret: RecordResult) => void): Batch;
     /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
-    compactLayouts$(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
+    compactLayouts$(callback?: CompactLayoutInfo): CompactLayoutInfo;
     compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
     create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
@@ -47,11 +47,11 @@ export class SObject<T> {
     deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
-    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): DescribeSObjectResult;
     insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
     insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     /** Returns a value from the cache if it exists, otherwise calls SObject.layouts */
-    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
+    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): LayoutInfo;
     layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     listview(id: string): ListView;
     listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;

From 5f370cd8d8f0eb2343197c35eb8c8998776f21f9 Mon Sep 17 00:00:00 2001
From: Justin Braithwaite <justinbraithwaite@gmail.com>
Date: Wed, 30 May 2018 12:22:12 -0700
Subject: [PATCH 0858/1124] Add definitions for `react-sticky-el`

---
 types/react-sticky-el/index.d.ts              | 134 ++++++++++++++++++
 .../react-sticky-el/react-sticky-el-tests.tsx |  23 +++
 types/react-sticky-el/tsconfig.json           |  17 +++
 types/react-sticky-el/tslint.json             |   1 +
 4 files changed, 175 insertions(+)
 create mode 100644 types/react-sticky-el/index.d.ts
 create mode 100644 types/react-sticky-el/react-sticky-el-tests.tsx
 create mode 100644 types/react-sticky-el/tsconfig.json
 create mode 100644 types/react-sticky-el/tslint.json

diff --git a/types/react-sticky-el/index.d.ts b/types/react-sticky-el/index.d.ts
new file mode 100644
index 0000000000..b41d48c454
--- /dev/null
+++ b/types/react-sticky-el/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for react-sticky-el 1.0
+// Project: https://github.com/gm0t/react-sticky-el
+// Definitions by: Justin Braithwaite <https://github.com/jbraithwaite>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+
+export default Sticky;
+
+declare class Sticky extends React.Component<Sticky.Props> {}
+
+declare namespace Sticky {
+    interface Props<HolderProps extends object = {}>
+        extends React.HTMLAttributes<HTMLElement> {
+        /**
+         * 'top' or 'bottom' - to which side element should stick.
+         *
+         * Defaults to 'top'.
+         */
+        mode?: "top" | "bottom";
+
+        /**
+         * Allows you to disable sticking by setting this prop to `true`.
+         *
+         * Defaults to `false`.
+         */
+        disabled?: boolean;
+
+        /**
+         * This handler will be called right before changing `fixed` state.
+         *
+         * Defaults to `null`.
+         */
+        onFixedToggle?: (fixed: boolean) => void;
+
+        /**
+         * Anything that can be used by `React.createElement`. Used for `wrapper
+         * element`. If you want to use some custom component, please be sure that
+         * you don't lose `style` and `className` props.
+         *
+         * Defaults to 'div'.
+         */
+        wrapperCmp?: keyof React.ReactHTML | React.ReactElement<any>;
+
+        /**
+         * Anything that can be used by React.createElement. Used for holder
+         * element. If you want to use some custom component, please be sure that
+         * you don't lose style and className props.
+         *
+         * Defaults to 'div'.
+         */
+        holderCmp?: keyof React.ReactHTML | React.ReactElement<HolderProps>;
+
+        /**
+         * These props will be used to create `holderElement`.
+         */
+        holderProps?: HolderProps;
+
+        /**
+         * Selector to define a `boundaryElement`. It should be one of the parents
+         * of the current element.
+         *
+         * Defaults to `null`.
+         */
+        boundaryElement?: string;
+
+        /**
+         * Selector to define a `scrollElement`. All position checks will be
+         * performed according to this element, also it will be listened for
+         * 'scroll' event.
+         *
+         * It should be one of the parents of the current element. Possible
+         * selectors: 'body', 'window', '#{id}', anything suitable for
+         * `Element.matches`.
+         *
+         * Defaults to `window`.
+         */
+        scrollElement?: string;
+
+        /**
+         * If your DOM structure is mutating (you are adding/removing elements), it
+         * will be usefull to provide `positionRecheckInterval` greater than zero,
+         * in this case position check will be also performed using setInterval in
+         * addition to scroll events.
+         *
+         * Defaults to `0`.
+         */
+        positionRecheckInterval?: number;
+
+        /**
+         * In the event that you wish to override the style rules applied, simply
+         * pass in the style object as a prop.
+         *
+         * Note: You likely want to avoid messing with the following attributes in
+         * your stickyStyle: `left`, `top`, and `width`.
+         */
+        stickyStyle?: React.CSSProperties;
+
+        /**
+         * You can also specify a class name to be applied when the element becomes
+         * sticky.
+         *
+         * Defaults to 'sticky'.
+         */
+        stickyClassName?: string;
+
+        /**
+         * Sticky state will be triggered when the top of the element is `topOffset`
+         * pixels from the top of the `scrollElement`. Positive numbers give the
+         * impression of a lazy sticky state, whereas negative numbers are more
+         * eager in their attachment.
+         *
+         * Defaults to `0`.
+         */
+        topOffset?: number;
+
+        /**
+         * Sticky state will be triggered when the bottom of the element is
+         * `bottomOffset` pixels from the bottom of the `scrollElement`.
+         *
+         * Defaults to `0`.
+         */
+        bottomOffset?: number;
+
+        /**
+         * If `false` then boundaryEl should have position: relative. In this case
+         * sticky element won't disappear on reaching it's boundaries.
+         *
+         * Defaults to `true`.
+         */
+        hideOnBoundaryHit?: boolean;
+    }
+}
diff --git a/types/react-sticky-el/react-sticky-el-tests.tsx b/types/react-sticky-el/react-sticky-el-tests.tsx
new file mode 100644
index 0000000000..522802945a
--- /dev/null
+++ b/types/react-sticky-el/react-sticky-el-tests.tsx
@@ -0,0 +1,23 @@
+import * as React from "react";
+import Sticky from "react-sticky-el";
+
+const StickyBasic = () => <Sticky />;
+const StickyAllFeatures = () => (
+    <Sticky
+        mode="bottom"
+        disabled
+        onFixedToggle={fixed => fixed}
+        wrapperCmp="div"
+        holderCmp={<div />}
+        holderProps={{ title: "a title" }}
+        boundaryElement=".an-element"
+        scrollElement=".another-element"
+        positionRecheckInterval={0}
+        stickyStyle={{ display: "block" }}
+        stickyClassName="sticky"
+        topOffset={0}
+        bottomOffset={0}
+        hideOnBoundaryHit
+        children="a child"
+    />
+);
diff --git a/types/react-sticky-el/tsconfig.json b/types/react-sticky-el/tsconfig.json
new file mode 100644
index 0000000000..31843c62b4
--- /dev/null
+++ b/types/react-sticky-el/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "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-sticky-el-tests.tsx"]
+}
diff --git a/types/react-sticky-el/tslint.json b/types/react-sticky-el/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-sticky-el/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 13d8a50a57c6ecb33f4b138b70f9c1942a7ecfe3 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 13:59:54 -0600
Subject: [PATCH 0859/1124] Update tests

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

diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 6c3895cae9..741b1875f7 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -354,12 +354,12 @@ salesforceConnection.streaming.topic("InvoiceStatementUpdates").subscribe((messa
 
 async function testDescribe() {
     const global: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal();
-    const globalCached: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal$();
+    const globalCached: sf.DescribeGlobalResult = salesforceConnection.describeGlobal$();
     const globalCachedCorrectly = global === globalCached;
 
     globalCached.sobjects.forEach(async (sobject: sf.DescribeGlobalSObjectResult) => {
         const object: sf.DescribeSObjectResult = await salesforceConnection.describe(sobject.name);
-        const cachedObject: sf.DescribeSObjectResult = await salesforceConnection.describe$(sobject.name);
+        const cachedObject: sf.DescribeSObjectResult = salesforceConnection.describe$(sobject.name);
 
         object.fields.forEach(field => {
             const type: sf.FieldType = field.type;

From e7e45f53ffa7e8c56935998f637594b636364386 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Wed, 30 May 2018 14:42:46 -0600
Subject: [PATCH 0860/1124] Add clear() method to caching describe methods

---
 types/jsforce/connection.d.ts        | 14 ++++++++++----
 types/jsforce/jsforce-tests.ts       |  2 ++
 types/jsforce/salesforce-object.d.ts | 26 +++++++++++++++++++-------
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 2f970cc764..9759d67a9d 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -112,11 +112,17 @@ export abstract class BaseConnection extends EventEmitter {
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     destroy<T>(type: string, ids: string | string[], options?: Object,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
-    /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
-    describe$<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
+    describe$: {
+        /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
+        <T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
+        clear(): void;
+    }
     describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
-    /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
-    describeGlobal$<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
+    describeGlobal$: {
+        /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
+        <T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
+        clear(): void;
+    }
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     sobject<T>(resource: string): SObject<T>;
 }
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 741b1875f7..8eb97aebc7 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -356,10 +356,12 @@ async function testDescribe() {
     const global: sf.DescribeGlobalResult = await salesforceConnection.describeGlobal();
     const globalCached: sf.DescribeGlobalResult = salesforceConnection.describeGlobal$();
     const globalCachedCorrectly = global === globalCached;
+    salesforceConnection.describeGlobal$.clear();
 
     globalCached.sobjects.forEach(async (sobject: sf.DescribeGlobalSObjectResult) => {
         const object: sf.DescribeSObjectResult = await salesforceConnection.describe(sobject.name);
         const cachedObject: sf.DescribeSObjectResult = salesforceConnection.describe$(sobject.name);
+        salesforceConnection.describe$.clear();
 
         object.fields.forEach(field => {
             const type: sf.FieldType = field.type;
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index 0d8bf52e41..ab3e398891 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -27,12 +27,18 @@ export class SObject<T> {
     findOne<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T) => void): Query<T>;
     findOne<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T) => void): Query<T>;
 
-    /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
-    approvalLayouts$(callback?: (layoutInfo: ApprovalLayoutInfo) => void): ApprovalLayoutInfo;
+    approvalLayouts$: {
+        /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
+        (callback?: (layoutInfo: ApprovalLayoutInfo) => void): ApprovalLayoutInfo;
+        clear(): void;
+    }
     approvalLayouts(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
     bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream[] | string[], callback?: (err: Error, ret: RecordResult) => void): Batch;
-    /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
-    compactLayouts$(callback?: CompactLayoutInfo): CompactLayoutInfo;
+    compactLayouts$: {
+        /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
+        (callback?: CompactLayoutInfo): CompactLayoutInfo;
+        clear(): void;
+    }
     compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
     count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
     create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
@@ -46,12 +52,18 @@ export class SObject<T> {
     deleted(start: Date | string, end: Date | string, callback?: (info: DeletedRecordsInfo) => void): Promise<DeletedRecordsInfo>;
     deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
-    /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
-    describe$(callback?: (err: Error, ret: DescribeSObjectResult) => void): DescribeSObjectResult;
+    describe$: {
+        /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
+        (callback?: (err: Error, ret: DescribeSObjectResult) => void): DescribeSObjectResult;
+        clear(): void;
+    }
     insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
     insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
     /** Returns a value from the cache if it exists, otherwise calls SObject.layouts */
-    layouts$(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): LayoutInfo;
+    layouts$: {
+        (layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): LayoutInfo;
+        clear(): void;
+    }
     layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
     listview(id: string): ListView;
     listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;

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 0861/1124] 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 34ff751d0683acaa10d97237f417ba3b0889f240 Mon Sep 17 00:00:00 2001
From: MikeBall0 <mike.ball@mikutech.com>
Date: Wed, 30 May 2018 20:59:20 +0000
Subject: [PATCH 0862/1124] Fix for issue 25343

Including `& TOwnProps` in `TInjectedProps` for `InferableComponentEnhancerWithProps` causes the `TOwnProps` to need to exist in the extended component, when really those props are defined by the `mapStateToProps`.
---
 types/react-redux/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 0519a43bb5..90ac6c78a7 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -105,17 +105,17 @@ export interface Connect {
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>
-    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp & TOwnProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp, TOwnProps>;
 
     <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TDispatchProps & TOwnProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps & TOwnProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,

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 0863/1124] 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 0864/1124] 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 9bb15a49700d315490fae7beb18317bf6b999186 Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Wed, 30 May 2018 16:52:34 -0600
Subject: [PATCH 0865/1124] Update okta-vue defs with new loginRedirect args

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

diff --git a/types/okta__okta-vue/index.d.ts b/types/okta__okta-vue/index.d.ts
index 5f67b78fc2..da7ec34d2e 100644
--- a/types/okta__okta-vue/index.d.ts
+++ b/types/okta__okta-vue/index.d.ts
@@ -12,9 +12,19 @@ declare namespace OktaVuePlugin {
 		issuer: string;
 		client_id: string;
 		redirect_uri: string;
-		scope: string;
+        scope?: string;
+        response_type?: string;
 	}
 
+    interface OktaOpenIDOptions {
+        sessionToken?: string;
+        responseMode?: string;
+        responseType?: string | string[];
+        scopes?: string[];
+        state?: string;
+        nonce?: string;
+    }
+
 	function install(vm: VueConstructor, options: OktaVueOptions): PluginFunction<VueConstructor>;
     function handleCallback(): VueConstructor;
 }
@@ -24,7 +34,7 @@ export default OktaVuePlugin;
 declare module 'vue/types/vue' {
     interface Vue {
         $auth: {
-            loginRedirect(): void;
+            loginRedirect(fromUri?: string, additionalParams?: OktaVuePlugin.OktaOpenIDOptions): void;
             logout(): Promise<void>;
             isAuthenticated(): Promise<boolean>;
             handleAuthentication(): Promise<void>;
diff --git a/types/okta__okta-vue/okta__okta-vue-tests.ts b/types/okta__okta-vue/okta__okta-vue-tests.ts
index 881726a9f0..70ec9135f4 100644
--- a/types/okta__okta-vue/okta__okta-vue-tests.ts
+++ b/types/okta__okta-vue/okta__okta-vue-tests.ts
@@ -46,5 +46,15 @@ const component = Vue.extend({
         redirect() {
             this.$auth.loginRedirect();
         },
+        profileRedirect() {
+            this.$auth.loginRedirect('/profile', {
+                sessionToken: 'string',
+                responseMode: 'string',
+                responseType: 'string',
+                scopes: ['string1', 'string2'],
+                state: 'string',
+                nonce: 'string',
+            });
+        },
     },
 });

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 0866/1124] 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 aad0f413814fb95c0106f0f42bd9d67e147e819f Mon Sep 17 00:00:00 2001
From: Afshawn Lotfi <afshawn.audatica292@gmail.com>
Date: Wed, 30 May 2018 20:57:01 -0400
Subject: [PATCH 0867/1124] Updated Project Header

Added original repo URL
---
 types/ajv-errors/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/ajv-errors/index.d.ts b/types/ajv-errors/index.d.ts
index a8a9db4a2a..fed9e4585f 100644
--- a/types/ajv-errors/index.d.ts
+++ b/types/ajv-errors/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for ajv-errors 1.0
-// Project: https://github.com/afshawnlotfi/types-ajv-errors
+// Project: https://github.com/epoberezkin/ajv-errors
 // Definitions by: Afshawn Lotfi <https://github.com/afshawnlotfi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 

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 0868/1124] 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 c64fec9022880267c4f47a5494b705b0c4226275 Mon Sep 17 00:00:00 2001
From: Craig Bruce <cbruce@nine.com.au>
Date: Thu, 31 May 2018 11:43:28 +1000
Subject: [PATCH 0869/1124] Fix all TSLint errors and begin first test

---
 .../cast.framework.breaks.d.ts                |  20 +-
 .../cast.framework.d.ts                       |  89 ++--
 .../cast.framework.events.d.ts                | 325 ++++++------
 .../cast.framework.messages.d.ts              | 465 +++++++++---------
 .../cast.framework.system.d.ts                | 302 ++++++------
 .../cast.framework.ui.d.ts                    |  99 ++--
 .../chromecast-caf-receiver-tests.ts          |  67 +--
 types/chromecast-caf-receiver/index.d.ts      |  21 +-
 types/chromecast-caf-receiver/tsconfig.json   |  20 +-
 types/chromecast-caf-receiver/tslint.json     |   9 +-
 10 files changed, 673 insertions(+), 744 deletions(-)

diff --git a/types/chromecast-caf-receiver/cast.framework.breaks.d.ts b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
index 4fed094a12..309d87fd74 100644
--- a/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
@@ -1,21 +1,9 @@
-// Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./index.d.ts" />
-/// <reference path="./cast.framework.d.ts" />
-/// <reference path="./cast.framework.events.d.ts" />
-/// <reference path="./cast.framework.messages.d.ts" />
-/// <reference path="./cast.framework.system.d.ts" />
-/// <reference path="./cast.framework.ui.d.ts" />
-
-import { Break, BreakClip } from './cast.framework.messages';
+import { Break, BreakClip } from "./cast.framework.messages";
 
 export = cast.framework.breaks;
 
 declare namespace cast.framework.breaks {
-    export class BreakSeekData {
+    class BreakSeekData {
         constructor(seekFrom: number, seekTo: number, breaks: Break[]);
 
         /**
@@ -35,7 +23,7 @@ declare namespace cast.framework.breaks {
     }
 
     /** Provide context information for break clip load interceptor. */
-    export class BreakClipLoadInterceptorContext {
+    class BreakClipLoadInterceptorContext {
         constructor(brk: Break);
 
         /**
@@ -45,7 +33,7 @@ declare namespace cast.framework.breaks {
     }
 
     /** Interface to manage breaks */
-    export interface BreakManager {
+    interface BreakManager {
         /**
          * Get current media break by id.
          * @param {*} id
diff --git a/types/chromecast-caf-receiver/cast.framework.d.ts b/types/chromecast-caf-receiver/cast.framework.d.ts
index a22e9a24b9..1435859859 100644
--- a/types/chromecast-caf-receiver/cast.framework.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.d.ts
@@ -1,16 +1,4 @@
-// Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./index.d.ts" />
-/// <reference path="./cast.framework.breaks.d.ts" />
-/// <reference path="./cast.framework.events.d.ts" />
-/// <reference path="./cast.framework.messages.d.ts" />
-/// <reference path="./cast.framework.system.d.ts" />
-/// <reference path="./cast.framework.ui.d.ts" />
-
-import { EventType } from './cast.framework.events';
+import { EventType } from "./cast.framework.events";
 import {
     PlayerState,
     PlayStringId,
@@ -27,38 +15,35 @@ import {
     LiveSeekableRange,
     MediaInformation,
     ErrorData,
-    RequestData,
-} from './cast.framework.messages';
-import { BreakManager } from './cast.framework.breaks';
-import { EventHandler, RequestHandler, BinaryHandler } from './cast';
+    RequestData
+} from "./cast.framework.messages";
+import { BreakManager } from "./cast.framework.breaks";
+import { EventHandler, RequestHandler, BinaryHandler } from "./index";
 import {
+    EventType as SystemEventType,
     ApplicationData,
     Sender,
     StandbyState,
-    SystemState,
-} from './cast.framework.system';
+    SystemState
+} from "./cast.framework.system";
 
 export = cast.framework;
-
+type HTMLMediaElement = any;
 declare namespace cast.framework {
-    export type LoggerLevel =
-        | 'DEBUG'
-        | 'VERBOSE'
-        | 'INFO'
-        | 'WARNING'
-        | 'ERROR'
-        | 'NONE';
+    type LoggerLevel =
+        | "DEBUG"
+        | "VERBOSE"
+        | "INFO"
+        | "WARNING"
+        | "ERROR"
+        | "NONE";
 
-    export type ContentProtection =
-        | 'NONE'
-        | 'CLEARKEY'
-        | 'PLAYREADY'
-        | 'WIDEVINE';
+    type ContentProtection = "NONE" | "CLEARKEY" | "PLAYREADY" | "WIDEVINE";
 
     /**
      * Manages text tracks.
      */
-    export class TextTracksManager {
+    class TextTracksManager {
         constructor(params: any);
 
         /**
@@ -120,7 +105,7 @@ declare namespace cast.framework {
     /**
      * QueueManager exposes several queue manipulation APIs to developers.
      */
-    export class QueueManager {
+    class QueueManager {
         constructor(params: any);
 
         /**
@@ -162,7 +147,7 @@ declare namespace cast.framework {
     /**
      * Base implementation of a queue.
      */
-    export class QueueBase {
+    class QueueBase {
         /**
          * Fetches a window of items using the specified item id as reference; called by the receiver MediaManager when it needs more queue items; often as a request from senders. If only one of nextCount and prevCount is non-zero; fetchItems should only return items after or before the reference item; if both nextCount and prevCount are non-zero; a window of items including the reference item should be returned.
          */
@@ -175,7 +160,9 @@ declare namespace cast.framework {
         /**
          * Initializes the queue with the requestData. This is called when a new LOAD request comes in to the receiver. If this returns or resolves to null; our default queueing implementation will create a queue based on queueData.items or the single media in the load request data.
          */
-        initialize(requestData: LoadRequestData): QueueData | Promise<QueueData>;
+        initialize(
+            requestData: LoadRequestData
+        ): QueueData | Promise<QueueData>;
 
         /**
          * Returns next items after the reference item; often the end of the current queue; called by the receiver MediaManager.
@@ -211,7 +198,7 @@ declare namespace cast.framework {
     /**
      * Controls and monitors media playback.
      */
-    export class PlayerManager {
+    class PlayerManager {
         constructor(params: any);
 
         /**
@@ -444,7 +431,7 @@ declare namespace cast.framework {
     /**
      * Configuration to customize playback behavior.
      */
-    export class PlaybackConfig {
+    class PlaybackConfig {
         /**
          * Duration of buffered media in seconds to start buffering.
          */
@@ -523,7 +510,7 @@ declare namespace cast.framework {
     /**
      * HTTP(s) Request/Response information.
      */
-    export class NetworkRequestInfo {
+    class NetworkRequestInfo {
         /**
          * The content of the request. Can be used to modify license request body.
          */
@@ -545,7 +532,7 @@ declare namespace cast.framework {
         withCredentials: boolean;
     }
     /** Cast receiver context options. All options are optionals. */
-    export class CastReceiverOptions {
+    class CastReceiverOptions {
         /**
          * Optional map of custom messages namespaces to initialize and their types.
          * Custom messages namespaces need to be initiated before the application started;
@@ -624,7 +611,7 @@ declare namespace cast.framework {
     }
 
     /** Manages loading of underlying libraries and initializes underlying cast receiver SDK. */
-    export class CastReceiverContext {
+    class CastReceiverContext {
         /** Returns the CastReceiverContext singleton instance. */
         static getInstance(): CastReceiverContext;
 
@@ -633,12 +620,18 @@ declare namespace cast.framework {
         /**
          * Sets message listener on custom message channel.
          */
-        addCustomMessageListener(namespace: string, listener: EventHandler): void;
+        addCustomMessageListener(
+            namespace: string,
+            listener: EventHandler
+        ): void;
 
         /**
          * Add listener to cast system events.
          */
-        addEventListener(type: EventType, handler: EventHandler): void;
+        addEventListener(
+            type: SystemEventType | SystemEventType[],
+            handler: EventHandler
+        ): void;
 
         /**
          * Checks if the given media params of video or audio streams are supported by the platform.
@@ -690,7 +683,7 @@ declare namespace cast.framework {
         /**
          * Reports if the cast application is the HDMI active input.
          */
-        getVisibilityState(): VisibilityState;
+        getVisibilityState(): any;
 
         /**
          * When the application calls start; the system will send the ready event to indicate
@@ -720,7 +713,11 @@ declare namespace cast.framework {
         /**
          * Sends a message to a specific sender.
          */
-        sendCustomMessage(namespace: string, senderId: string, message: any): void;
+        sendCustomMessage(
+            namespace: string,
+            senderId: string,
+            message: any
+        ): void;
 
         /**
          * This function should be called in response to the feedbackstarted event if the application
@@ -760,7 +757,7 @@ declare namespace cast.framework {
     }
 
     /** Manages audio tracks. */
-    export class AudioTracksManager {
+    class AudioTracksManager {
         constructor(params: any);
         getActiveId(): number;
         getActiveTrack(): Track;
diff --git a/types/chromecast-caf-receiver/cast.framework.events.d.ts b/types/chromecast-caf-receiver/cast.framework.events.d.ts
index c5e2e71771..0ad1bfee8c 100644
--- a/types/chromecast-caf-receiver/cast.framework.events.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.events.d.ts
@@ -1,147 +1,135 @@
-// Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./index.d.ts" />
-/// <reference path="./cast.framework.d.ts" />
-/// <reference path="./cast.framework.breaks.d.ts" />
-/// <reference path="./cast.framework.messages.d.ts" />
-/// <reference path="./cast.framework.system.d.ts" />
-/// <reference path="./cast.framework.ui.d.ts" />
-
 import {
     RequestData,
     MediaInformation,
     Track,
-    MediaStatus,
-} from './cast.framework.messages';
+    MediaStatus
+} from "./cast.framework.messages";
 export = cast.framework.events;
 
 declare namespace cast.framework.events {
-    export type EventType =
-        | 'ALL'
-        | 'ABORT'
-        | 'CAN_PLAY'
-        | 'CAN_PLAY_THROUGH'
-        | 'DURATION_CHANGE'
-        | 'EMPTIED'
-        | 'ENDED'
-        | 'LOADED_DATA'
-        | 'LOADED_METADATA'
-        | 'LOAD_START'
-        | 'PAUSE'
-        | 'PLAY'
-        | 'PLAYING'
-        | 'PROGRESS'
-        | 'RATE_CHANGE'
-        | 'SEEKED'
-        | 'SEEKING'
-        | 'STALLED'
-        | 'TIME_UPDATE'
-        | 'SUSPEND'
-        | 'WAITING'
-        | 'BITRATE_CHANGED'
-        | 'BREAK_STARTED'
-        | 'BREAK_ENDED'
-        | 'BREAK_CLIP_LOADING'
-        | 'BREAK_CLIP_STARTED'
-        | 'BREAK_CLIP_ENDED'
-        | 'BUFFERING'
-        | 'CACHE_LOADED'
-        | 'CACHE_HIT'
-        | 'CACHE_INSERTED'
-        | 'CLIP_STARTED'
-        | 'CLIP_ENDED'
-        | 'EMSG'
-        | 'ERROR'
-        | 'ID3'
-        | 'MEDIA_STATUS'
-        | 'MEDIA_FINISHED'
-        | 'PLAYER_PRELOADING'
-        | 'PLAYER_PRELOADING_CANCELLED'
-        | 'PLAYER_LOAD_COMPLETE'
-        | 'PLAYER_LOADING'
-        | 'SEGMENT_DOWNLOADED'
-        | 'REQUEST_SEEK'
-        | 'REQUEST_LOAD'
-        | 'REQUEST_STOP'
-        | 'REQUEST_PAUSE'
-        | 'REQUEST_PLAY'
-        | 'REQUEST_PLAY_AGAIN'
-        | 'REQUEST_PLAYBACK_RATE_CHANGE'
-        | 'REQUEST_SKIP_AD'
-        | 'REQUEST_VOLUME_CHANGE'
-        | 'REQUEST_EDIT_TRACKS_INFO'
-        | 'REQUEST_EDIT_AUDIO_TRACKS'
-        | 'REQUEST_SET_CREDENTIALS'
-        | 'REQUEST_LOAD_BY_ENTITY'
-        | 'REQUEST_USER_ACTION'
-        | 'REQUEST_DISPLAY_STATUS'
-        | 'REQUEST_CUSTOM_COMMAND'
-        | 'REQUEST_FOCUS_STATE'
-        | 'REQUEST_QUEUE_LOAD'
-        | 'REQUEST_QUEUE_INSERT'
-        | 'REQUEST_QUEUE_UPDATE'
-        | 'REQUEST_QUEUE_REMOVE'
-        | 'REQUEST_QUEUE_REORDER'
-        | 'REQUEST_QUEUE_GET_ITEM_RANGE'
-        | 'REQUEST_QUEUE_GET_ITEMS'
-        | 'REQUEST_QUEUE_GET_ITEM_IDS'
-        | 'REQUEST_PRECACHE';
+    type EventType =
+        | "ALL"
+        | "ABORT"
+        | "CAN_PLAY"
+        | "CAN_PLAY_THROUGH"
+        | "DURATION_CHANGE"
+        | "EMPTIED"
+        | "ENDED"
+        | "LOADED_DATA"
+        | "LOADED_METADATA"
+        | "LOAD_START"
+        | "PAUSE"
+        | "PLAY"
+        | "PLAYING"
+        | "PROGRESS"
+        | "RATE_CHANGE"
+        | "SEEKED"
+        | "SEEKING"
+        | "STALLED"
+        | "TIME_UPDATE"
+        | "SUSPEND"
+        | "WAITING"
+        | "BITRATE_CHANGED"
+        | "BREAK_STARTED"
+        | "BREAK_ENDED"
+        | "BREAK_CLIP_LOADING"
+        | "BREAK_CLIP_STARTED"
+        | "BREAK_CLIP_ENDED"
+        | "BUFFERING"
+        | "CACHE_LOADED"
+        | "CACHE_HIT"
+        | "CACHE_INSERTED"
+        | "CLIP_STARTED"
+        | "CLIP_ENDED"
+        | "EMSG"
+        | "ERROR"
+        | "ID3"
+        | "MEDIA_STATUS"
+        | "MEDIA_FINISHED"
+        | "PLAYER_PRELOADING"
+        | "PLAYER_PRELOADING_CANCELLED"
+        | "PLAYER_LOAD_COMPLETE"
+        | "PLAYER_LOADING"
+        | "SEGMENT_DOWNLOADED"
+        | "REQUEST_SEEK"
+        | "REQUEST_LOAD"
+        | "REQUEST_STOP"
+        | "REQUEST_PAUSE"
+        | "REQUEST_PLAY"
+        | "REQUEST_PLAY_AGAIN"
+        | "REQUEST_PLAYBACK_RATE_CHANGE"
+        | "REQUEST_SKIP_AD"
+        | "REQUEST_VOLUME_CHANGE"
+        | "REQUEST_EDIT_TRACKS_INFO"
+        | "REQUEST_EDIT_AUDIO_TRACKS"
+        | "REQUEST_SET_CREDENTIALS"
+        | "REQUEST_LOAD_BY_ENTITY"
+        | "REQUEST_USER_ACTION"
+        | "REQUEST_DISPLAY_STATUS"
+        | "REQUEST_CUSTOM_COMMAND"
+        | "REQUEST_FOCUS_STATE"
+        | "REQUEST_QUEUE_LOAD"
+        | "REQUEST_QUEUE_INSERT"
+        | "REQUEST_QUEUE_UPDATE"
+        | "REQUEST_QUEUE_REMOVE"
+        | "REQUEST_QUEUE_REORDER"
+        | "REQUEST_QUEUE_GET_ITEM_RANGE"
+        | "REQUEST_QUEUE_GET_ITEMS"
+        | "REQUEST_QUEUE_GET_ITEM_IDS"
+        | "REQUEST_PRECACHE";
 
-    export type DetailedErrorCode =
-        | 'MEDIA_UNKNOWN'
-        | 'MEDIA_ABORTED'
-        | 'MEDIA_DECODE'
-        | 'MEDIA_NETWORK'
-        | 'MEDIA_SRC_NOT_SUPPORTED'
-        | 'SOURCE_BUFFER_FAILURE'
-        | 'MEDIAKEYS_UNKNOWN'
-        | 'MEDIAKEYS_NETWORK'
-        | 'MEDIAKEYS_UNSUPPORTED'
-        | 'MEDIAKEYS_WEBCRYPTO'
-        | 'NETWORK_UNKNOWN'
-        | 'SEGMENT_NETWORK'
-        | 'HLS_NETWORK_MASTER_PLAYLIST'
-        | 'HLS_NETWORK_PLAYLIST'
-        | 'HLS_NETWORK_NO_KEY_RESPONSE'
-        | 'HLS_NETWORK_KEY_LOAD'
-        | 'HLS_NETWORK_INVALID_SEGMENT'
-        | 'HLS_SEGMENT_PARSING'
-        | 'DASH_NETWORK'
-        | 'DASH_NO_INIT'
-        | 'SMOOTH_NETWORK'
-        | 'SMOOTH_NO_MEDIA_DATA'
-        | 'MANIFEST_UNKNOWN'
-        | 'HLS_MANIFEST_MASTER'
-        | 'HLS_MANIFEST_PLAYLIST'
-        | 'DASH_MANIFEST_UNKNOWN'
-        | 'DASH_MANIFEST_NO_PERIODS'
-        | 'DASH_MANIFEST_NO_MIMETYPE'
-        | 'DASH_INVALID_SEGMENT_INFO'
-        | 'SMOOTH_MANIFEST'
-        | 'SEGMENT_UNKNOWN'
-        | 'TEXT_UNKNOWN'
-        | 'APP'
-        | 'BREAK_CLIP_LOADING_ERROR'
-        | 'BREAK_SEEK_INTERCEPTOR_ERROR'
-        | 'IMAGE_ERROR'
-        | 'LOAD_INTERRUPTED'
-        | 'GENERIC';
+    type DetailedErrorCode =
+        | "MEDIA_UNKNOWN"
+        | "MEDIA_ABORTED"
+        | "MEDIA_DECODE"
+        | "MEDIA_NETWORK"
+        | "MEDIA_SRC_NOT_SUPPORTED"
+        | "SOURCE_BUFFER_FAILURE"
+        | "MEDIAKEYS_UNKNOWN"
+        | "MEDIAKEYS_NETWORK"
+        | "MEDIAKEYS_UNSUPPORTED"
+        | "MEDIAKEYS_WEBCRYPTO"
+        | "NETWORK_UNKNOWN"
+        | "SEGMENT_NETWORK"
+        | "HLS_NETWORK_MASTER_PLAYLIST"
+        | "HLS_NETWORK_PLAYLIST"
+        | "HLS_NETWORK_NO_KEY_RESPONSE"
+        | "HLS_NETWORK_KEY_LOAD"
+        | "HLS_NETWORK_INVALID_SEGMENT"
+        | "HLS_SEGMENT_PARSING"
+        | "DASH_NETWORK"
+        | "DASH_NO_INIT"
+        | "SMOOTH_NETWORK"
+        | "SMOOTH_NO_MEDIA_DATA"
+        | "MANIFEST_UNKNOWN"
+        | "HLS_MANIFEST_MASTER"
+        | "HLS_MANIFEST_PLAYLIST"
+        | "DASH_MANIFEST_UNKNOWN"
+        | "DASH_MANIFEST_NO_PERIODS"
+        | "DASH_MANIFEST_NO_MIMETYPE"
+        | "DASH_INVALID_SEGMENT_INFO"
+        | "SMOOTH_MANIFEST"
+        | "SEGMENT_UNKNOWN"
+        | "TEXT_UNKNOWN"
+        | "APP"
+        | "BREAK_CLIP_LOADING_ERROR"
+        | "BREAK_SEEK_INTERCEPTOR_ERROR"
+        | "IMAGE_ERROR"
+        | "LOAD_INTERRUPTED"
+        | "GENERIC";
 
-    export type EndedReason =
-        | 'END_OF_STREAM'
-        | 'ERROR'
-        | 'STOPPED'
-        | 'INTERRUPTED'
-        | 'SKIPPED'
-        | 'BREAK_SWITCH';
+    type EndedReason =
+        | "END_OF_STREAM"
+        | "ERROR"
+        | "STOPPED"
+        | "INTERRUPTED"
+        | "SKIPPED"
+        | "BREAK_SWITCH";
 
     /**
      * Event data for @see{@link EventType.SEGMENT_DOWNLOADED} event.
      */
-    export class SegmentDownloadedEvent {
+    class SegmentDownloadedEvent extends Event {
         constructor(downloadTime?: number, size?: number);
 
         /**
@@ -158,8 +146,12 @@ declare namespace cast.framework.events {
     /**
      * Event data for all events that represent requests made to the receiver.
      */
-    export class RequestEvent {
-        constructor(type: EventType, requestData?: RequestData, senderId?: string);
+    class RequestEvent extends Event {
+        constructor(
+            type: EventType,
+            requestData?: RequestData,
+            senderId?: string
+        );
 
         /**
          * The data that was sent with the request.
@@ -172,11 +164,22 @@ declare namespace cast.framework.events {
         senderId?: string;
     }
 
+    /**
+     * Event data superclass for all events dispatched by @see{@link PlayerManager}
+     */
+    class Event {
+        constructor(type: EventType);
+
+        /**
+         * Type of the event.
+         */
+        type: EventType;
+    }
     /**
      * Event data for @see{@link EventType.MEDIA_STATUS} event.
      */
-    export class MediaStatusEvent {
-        constructor(mediaStatus?: MediaStatus);
+    class MediaStatusEvent extends Event {
+        constructor(type: EventType, mediaStatus?: MediaStatus);
 
         /**
          * The media status that was sent.
@@ -186,7 +189,7 @@ declare namespace cast.framework.events {
     /**
      * Event data for pause events forwarded from the MediaElement.
      */
-    export class MediaPauseEvent {
+    class MediaPauseEvent extends Event {
         constructor(currentMediaTime?: number, ended?: boolean);
 
         /**
@@ -197,7 +200,7 @@ declare namespace cast.framework.events {
     /**
      * Event data for @see{@link EventType.MEDIA_FINISHED} event.
      */
-    export class MediaFinishedEvent {
+    class MediaFinishedEvent extends Event {
         constructor(currentMediaTime?: number, endedReason?: EndedReason);
 
         /**
@@ -213,7 +216,7 @@ declare namespace cast.framework.events {
     /**
      * Event data for all events forwarded from the MediaElement.
      */
-    export class MediaElementEvent {
+    class MediaElementEvent extends Event {
         constructor(type: EventType, currentMediaTime?: number);
 
         /**
@@ -224,7 +227,7 @@ declare namespace cast.framework.events {
     /**
      * Event data for all events pertaining to processing a load / preload request. made to the player.
      */
-    export class LoadEvent {
+    class LoadEvent extends Event {
         constructor(type: EventType, media?: MediaInformation);
 
         /**
@@ -235,7 +238,7 @@ declare namespace cast.framework.events {
     /**
      * Event data for @see{@link EventType.INBAND_TRACK_ADDED} event.
      */
-    export class InbandTrackAddedEvent {
+    class InbandTrackAddedEvent {
         constructor(track: Track);
 
         /**
@@ -245,7 +248,7 @@ declare namespace cast.framework.events {
     }
 
     /** Event data for @see{@link EventType.ID3} event. */
-    export class Id3Event {
+    class Id3Event extends Event {
         constructor(segmentData: Uint8Array);
 
         /**
@@ -253,21 +256,10 @@ declare namespace cast.framework.events {
          */
         segmentData: Uint8Array;
     }
-    /**
-     * Event data superclass for all events dispatched by @see{@link PlayerManager}
-     */
-    export class Event {
-        constructor(type: EventType);
-
-        /**
-         * Type of the event.
-         */
-        type: EventType;
-    }
     /**
      * Event data for @see{@link EventType.EMSG} event.
      */
-    export class EmsgEvent {
+    class EmsgEvent extends Event {
         constructor(emsgData: any);
 
         /**
@@ -323,7 +315,7 @@ declare namespace cast.framework.events {
     /**
      * Event data for @see{@link EventType.CLIP_ENDED} event.
      */
-    export class ClipEndedEvent {
+    class ClipEndedEvent extends Event {
         constructor(currentMediaTime: number, endedReason?: EndedReason);
 
         /**
@@ -340,7 +332,7 @@ declare namespace cast.framework.events {
     /**
      * Event data for @see{@link EventType.CACHE_LOADED} event.
      */
-    export class CacheLoadedEvent {
+    class CacheLoadedEvent extends Event {
         constructor(media?: MediaInformation);
 
         /**
@@ -349,7 +341,7 @@ declare namespace cast.framework.events {
         media: MediaInformation;
     }
 
-    export class CacheItemEvent {
+    class CacheItemEvent extends Event {
         constructor(type: EventType, url: string);
 
         /**
@@ -358,7 +350,7 @@ declare namespace cast.framework.events {
         url: string;
     }
 
-    export class BufferingEvent {
+    class BufferingEvent extends Event {
         constructor(isBuffering: boolean);
 
         /**
@@ -367,7 +359,7 @@ declare namespace cast.framework.events {
         isBuffering: boolean;
     }
 
-    export class BreaksEvent {
+    class BreaksEvent extends Event {
         constructor(
             type: EventType,
             currentMediaTime?: number,
@@ -381,17 +373,17 @@ declare namespace cast.framework.events {
         /**
          * The break clip's id. Refer to BreakClip.id
          */
-        breakClipId: string;
+        breakClipId?: string;
 
         /**
          * The time in the currently playing media when the break event occurred.
          */
-        currentMediaTime: string;
+        currentMediaTime?: string;
 
         /**
          * The reason the break clip ended.
          */
-        endedReason: EndedReason;
+        endedReason?: EndedReason;
 
         /**
          * Index of break clip; which starts from 1.
@@ -406,16 +398,23 @@ declare namespace cast.framework.events {
         /**
          * When to skip current break clip in sec; after break clip begins to play.
          */
-        whenSkippable: number;
+        whenSkippable?: number;
     }
 
     /**
      * Event data for @see {@link EventType.BITRATE_CHANGED} event.
      */
-    export class BitrateChangedEvent {
+    class BitrateChangedEvent {
         constructor(totalBitrate?: number);
 
         /** The bitrate of the media (audio and video) in bits per second. */
         totalBitrate: number;
     }
+
+    class ErrorEvent extends Event {
+        constructor(detailedErrorCode: DetailedErrorCode, error?: any);
+
+        detailedErrorCode: DetailedErrorCode;
+        error?: any;
+    }
 }
diff --git a/types/chromecast-caf-receiver/cast.framework.messages.d.ts b/types/chromecast-caf-receiver/cast.framework.messages.d.ts
index dc5c1ac07b..311232e5e0 100644
--- a/types/chromecast-caf-receiver/cast.framework.messages.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.messages.d.ts
@@ -1,212 +1,202 @@
-// Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./index.d.ts" />
-/// <reference path="./cast.framework.d.ts" />
-/// <reference path="./cast.framework.breaks.d.ts" />
-/// <reference path="./cast.framework.events.d.ts" />
-/// <reference path="./cast.framework.system.d.ts" />
-/// <reference path="./cast.framework.ui.d.ts" />
-
-import { DetailedErrorCode } from './cast.framework.events';
+import { Event, DetailedErrorCode } from "./cast.framework.events";
 export = cast.framework.messages;
 
 declare namespace cast.framework.messages {
-    export type UserAction =
-        | 'LIKE'
-        | 'DISLIKE'
-        | 'FOLLOW'
-        | 'UNFOLLOW'
-        | 'FLAG'
-        | 'SKIP_AD';
+    type UserAction =
+        | "LIKE"
+        | "DISLIKE"
+        | "FOLLOW"
+        | "UNFOLLOW"
+        | "FLAG"
+        | "SKIP_AD";
 
-    export type UserActionContext =
-        | 'UNKNOWN_CONTEXT'
-        | 'ALBUM'
-        | 'ARTIST'
-        | 'PLAYLIST'
-        | 'EPISODE'
-        | 'SERIES'
-        | 'MOVIE'
-        | 'CHANNEL'
-        | 'TEAM'
-        | 'PLAYER'
-        | 'COACH';
+    type UserActionContext =
+        | "UNKNOWN_CONTEXT"
+        | "ALBUM"
+        | "ARTIST"
+        | "PLAYLIST"
+        | "EPISODE"
+        | "SERIES"
+        | "MOVIE"
+        | "CHANNEL"
+        | "TEAM"
+        | "PLAYER"
+        | "COACH";
 
-    export type TextTrackType =
-        | 'SUBTITLES'
-        | 'CAPTIONS'
-        | 'DESCRIPTIONS'
-        | 'CHAPTERS'
-        | 'METADATA';
+    type TextTrackType =
+        | "SUBTITLES"
+        | "CAPTIONS"
+        | "DESCRIPTIONS"
+        | "CHAPTERS"
+        | "METADATA";
 
-    export type TextTrackWindowType = 'NONE' | 'NORMAL' | 'ROUNDED_CORNERS';
+    type TextTrackWindowType = "NONE" | "NORMAL" | "ROUNDED_CORNERS";
 
-    export type TrackType = 'TEXT' | 'AUDIO' | 'VIDEO';
+    type TrackType = "TEXT" | "AUDIO" | "VIDEO";
 
-    export type TextTrackFontGenericFamily =
-        | 'SANS_SERIF'
-        | 'MONOSPACED_SANS_SERIF'
-        | 'SERIF'
-        | 'MONOSPACED_SERIF'
-        | 'CASUAL'
-        | 'CURSIVE'
-        | 'SMALL_CAPITALS';
+    type TextTrackFontGenericFamily =
+        | "SANS_SERIF"
+        | "MONOSPACED_SANS_SERIF"
+        | "SERIF"
+        | "MONOSPACED_SERIF"
+        | "CASUAL"
+        | "CURSIVE"
+        | "SMALL_CAPITALS";
 
-    export type TextTrackFontStyle = 'NORMAL' | 'BOLD' | 'BOLD_ITALIC' | 'ITALIC';
+    type TextTrackFontStyle = "NORMAL" | "BOLD" | "BOLD_ITALIC" | "ITALIC";
 
-    export type TextTrackEdgeType =
-        | 'NONE'
-        | 'OUTLINE'
-        | 'DROP_SHADOW'
-        | 'RAISED'
-        | 'DEPRESSED';
+    type TextTrackEdgeType =
+        | "NONE"
+        | "OUTLINE"
+        | "DROP_SHADOW"
+        | "RAISED"
+        | "DEPRESSED";
 
-    export type Command =
-        | 'PAUSE'
-        | 'SEEK'
-        | 'STREAM_VOLUME'
-        | 'STREAM_MUTE'
-        | 'ALL_BASIC_MEDIA'
-        | 'QUEUE_NEXT'
-        | 'QUEUE_PREV'
-        | 'QUEUE_SHUFFLE'
-        | 'SKIP_AD';
+    type Command =
+        | "PAUSE"
+        | "SEEK"
+        | "STREAM_VOLUME"
+        | "STREAM_MUTE"
+        | "ALL_BASIC_MEDIA"
+        | "QUEUE_NEXT"
+        | "QUEUE_PREV"
+        | "QUEUE_SHUFFLE"
+        | "SKIP_AD";
 
-    export type SeekResumeState = 'PLAYBACK_START' | 'PLAYBACK_PAUSE';
+    type SeekResumeState = "PLAYBACK_START" | "PLAYBACK_PAUSE";
 
-    export type StreamingProtocolType =
-        | 'UNKNOWN'
-        | 'MPEG_DASH'
-        | 'HLS'
-        | 'SMOOTH_STREAMING';
+    type StreamingProtocolType =
+        | "UNKNOWN"
+        | "MPEG_DASH"
+        | "HLS"
+        | "SMOOTH_STREAMING";
 
-    export type StreamType = 'BUFFERED' | 'LIVE' | 'NONE';
+    type StreamType = "BUFFERED" | "LIVE" | "NONE";
 
-    export type FocusState = 'IN_FOCUS' | 'NOT_IN_FOCUS';
+    type FocusState = "IN_FOCUS" | "NOT_IN_FOCUS";
 
-    export type ExtendedPlayerState = 'LOADING';
+    type ExtendedPlayerState = "LOADING";
 
-    export type ErrorType =
-        | 'INVALID_PLAYER_STATE'
-        | 'LOAD_FAILED'
-        | 'LOAD_CANCELLED'
-        | 'INVALID_REQUEST'
-        | 'ERROR';
+    type ErrorType =
+        | "INVALID_PLAYER_STATE"
+        | "LOAD_FAILED"
+        | "LOAD_CANCELLED"
+        | "INVALID_REQUEST"
+        | "ERROR";
 
-    export type ErrorReason =
-        | 'INVALID_COMMAND'
-        | 'INVALID_PARAMS'
-        | 'INVALID_MEDIA_SESSION_ID'
-        | 'SKIP_LIMIT_REACHED'
-        | 'NOT_SUPPORTED'
-        | 'LANGUAGE_NOT_SUPPORTED'
-        | 'END_OF_QUEUE'
-        | 'APP_ERROR'
-        | 'AUTHENTICATION_EXPIRED'
-        | 'PREMIUM_ACCOUNT_REQUIRED'
-        | 'CONCURRENT_STREAM_LIMIT'
-        | 'PARENTAL_CONTROL_RESTRICTED'
-        | 'NOT_AVAILABLE_IN_REGION'
-        | 'CONTENT_ALREADY_PLAYING'
-        | 'INVALID_REQUEST'
-        | 'GENERIC_LOAD_ERROR';
+    type ErrorReason =
+        | "INVALID_COMMAND"
+        | "INVALID_PARAMS"
+        | "INVALID_MEDIA_SESSION_ID"
+        | "SKIP_LIMIT_REACHED"
+        | "NOT_SUPPORTED"
+        | "LANGUAGE_NOT_SUPPORTED"
+        | "END_OF_QUEUE"
+        | "APP_ERROR"
+        | "AUTHENTICATION_EXPIRED"
+        | "PREMIUM_ACCOUNT_REQUIRED"
+        | "CONCURRENT_STREAM_LIMIT"
+        | "PARENTAL_CONTROL_RESTRICTED"
+        | "NOT_AVAILABLE_IN_REGION"
+        | "CONTENT_ALREADY_PLAYING"
+        | "INVALID_REQUEST"
+        | "GENERIC_LOAD_ERROR";
 
-    export type RepeatMode =
-        | 'REPEAT_OFF'
-        | 'REPEAT_ALL'
-        | 'REPEAT_SINGLE'
-        | 'REPEAT_ALL_AND_SHUFFLE';
+    type RepeatMode =
+        | "REPEAT_OFF"
+        | "REPEAT_ALL"
+        | "REPEAT_SINGLE"
+        | "REPEAT_ALL_AND_SHUFFLE";
 
-    export type IdleReason = 'CANCELLED' | 'INTERRUPTED' | 'FINISHED' | 'ERROR';
+    type IdleReason = "CANCELLED" | "INTERRUPTED" | "FINISHED" | "ERROR";
 
-    export type HlsSegmentFormat = 'AAC' | 'AC3' | 'MP3' | 'TS' | 'TS_AAC';
+    type HlsSegmentFormat = "AAC" | "AC3" | "MP3" | "TS" | "TS_AAC";
 
-    export type HdrType = 'SDR' | 'HDR' | 'DV';
+    type HdrType = "SDR" | "HDR" | "DV";
 
-    export type PlayStringId =
-        | 'FREE_TRIAL_ABOUT_TO_EXPIRE'
-        | 'SUBSCRIPTION_ABOUT_TO_EXPIRE'
-        | 'STREAM_HIJACKED';
+    type PlayStringId =
+        | "FREE_TRIAL_ABOUT_TO_EXPIRE"
+        | "SUBSCRIPTION_ABOUT_TO_EXPIRE"
+        | "STREAM_HIJACKED";
 
-    export type GetStatusOptions = 'NO_METADATA' | 'NO_QUEUE_ITEMS';
+    type GetStatusOptions = "NO_METADATA" | "NO_QUEUE_ITEMS";
 
-    export type MessageType =
-        | 'MEDIA_STATUS'
-        | 'CLOUD_STATUS'
-        | 'QUEUE_CHANGE'
-        | 'QUEUE_ITEMS'
-        | 'QUEUE_ITEM_IDS'
-        | 'GET_STATUS'
-        | 'LOAD'
-        | 'PAUSE'
-        | 'STOP'
-        | 'PLAY'
-        | 'SKIP_AD'
-        | 'PLAY_AGAIN'
-        | 'SEEK'
-        | 'SET_PLAYBACK_RATE'
-        | 'SET_VOLUME'
-        | 'EDIT_TRACKS_INFO'
-        | 'EDIT_AUDIO_TRACKS'
-        | 'PRECACHE'
-        | 'PRELOAD'
-        | 'QUEUE_LOAD'
-        | 'QUEUE_INSERT'
-        | 'QUEUE_UPDATE'
-        | 'QUEUE_REMOVE'
-        | 'QUEUE_REORDER'
-        | 'QUEUE_NEXT'
-        | 'QUEUE_PREV'
-        | 'QUEUE_GET_ITEM_RANGE'
-        | 'QUEUE_GET_ITEMS'
-        | 'QUEUE_GET_ITEM_IDS'
-        | 'QUEUE_SHUFFLE'
-        | 'SET_CREDENTIALS'
-        | 'LOAD_BY_ENTITY'
-        | 'USER_ACTION'
-        | 'DISPLAY_STATUS'
-        | 'FOCUS_STATE'
-        | 'CUSTOM_COMMAND';
+    type MessageType =
+        | "MEDIA_STATUS"
+        | "CLOUD_STATUS"
+        | "QUEUE_CHANGE"
+        | "QUEUE_ITEMS"
+        | "QUEUE_ITEM_IDS"
+        | "GET_STATUS"
+        | "LOAD"
+        | "PAUSE"
+        | "STOP"
+        | "PLAY"
+        | "SKIP_AD"
+        | "PLAY_AGAIN"
+        | "SEEK"
+        | "SET_PLAYBACK_RATE"
+        | "SET_VOLUME"
+        | "EDIT_TRACKS_INFO"
+        | "EDIT_AUDIO_TRACKS"
+        | "PRECACHE"
+        | "PRELOAD"
+        | "QUEUE_LOAD"
+        | "QUEUE_INSERT"
+        | "QUEUE_UPDATE"
+        | "QUEUE_REMOVE"
+        | "QUEUE_REORDER"
+        | "QUEUE_NEXT"
+        | "QUEUE_PREV"
+        | "QUEUE_GET_ITEM_RANGE"
+        | "QUEUE_GET_ITEMS"
+        | "QUEUE_GET_ITEM_IDS"
+        | "QUEUE_SHUFFLE"
+        | "SET_CREDENTIALS"
+        | "LOAD_BY_ENTITY"
+        | "USER_ACTION"
+        | "DISPLAY_STATUS"
+        | "FOCUS_STATE"
+        | "CUSTOM_COMMAND";
 
-    export type PlayerState = 'IDLE' | 'PLAYING' | 'PAUSED' | 'BUFFERING';
+    type PlayerState = "IDLE" | "PLAYING" | "PAUSED" | "BUFFERING";
 
-    export type QueueChangeType =
-        | 'INSERT'
-        | 'REMOVE'
-        | 'ITEMS_CHANGE'
-        | 'UPDATE'
-        | 'NO_CHANGE';
+    type QueueChangeType =
+        | "INSERT"
+        | "REMOVE"
+        | "ITEMS_CHANGE"
+        | "UPDATE"
+        | "NO_CHANGE";
 
-    export type QueueType =
-        | 'ALBUM'
-        | 'PLAYLIST'
-        | 'AUDIOBOOK'
-        | 'RADIO_STATION'
-        | 'PODCAST_SERIES'
-        | 'TV_SERIES'
-        | 'VIDEO_PLAYLIST'
-        | 'LIVE_TV'
-        | 'MOVIE';
+    type QueueType =
+        | "ALBUM"
+        | "PLAYLIST"
+        | "AUDIOBOOK"
+        | "RADIO_STATION"
+        | "PODCAST_SERIES"
+        | "TV_SERIES"
+        | "VIDEO_PLAYLIST"
+        | "LIVE_TV"
+        | "MOVIE";
 
-    export type MetadataType =
-        | 'GENERIC'
-        | 'MOVIE'
-        | 'TV_SHOW'
-        | 'MUSIC_TRACK'
-        | 'PHOTO';
+    type MetadataType =
+        | "GENERIC"
+        | "MOVIE"
+        | "TV_SHOW"
+        | "MUSIC_TRACK"
+        | "PHOTO";
 
     /**
      * RefreshCredentials request data.
      */
-    export interface RefreshCredentialsRequestData { }
+    interface RefreshCredentialsRequestData {
+        [key: string]: any;
+    }
 
     /**
      * Media event SET_VOLUME request data.
      */
-    export interface VolumeRequestData extends RequestData {
+    interface VolumeRequestData extends RequestData {
         /**
          * The media stream volume
          */
@@ -216,7 +206,7 @@ declare namespace cast.framework.messages {
     /**
      * Represents the volume of a media session stream.
      */
-    export interface Volume {
+    interface Volume {
         /**
          * Value from 0 to 1 that represents the current stream volume level.
          */
@@ -231,7 +221,7 @@ declare namespace cast.framework.messages {
     /**
      * Video information such as video resolution and High Dynamic Range (HDR).
      */
-    export class VideoInformation {
+    class VideoInformation {
         constructor(width: number, height: number, hdrType: HdrType);
 
         /**
@@ -253,7 +243,7 @@ declare namespace cast.framework.messages {
     /**
      * VAST ad request configuration.
      */
-    export interface VastAdsRequest {
+    interface VastAdsRequest {
         /**
          * Specifies a VAST document to be used as the ads response instead of making a request via an ad tag url. This can be useful for debugging and other situations where a VAST response is already available.
          */
@@ -268,7 +258,7 @@ declare namespace cast.framework.messages {
     /**
      * UserAction request data.
      */
-    export interface UserActionRequestData {
+    interface UserActionRequestData {
         /**
          * Optional request source. It contain the assistent query that initiate the request.
          */
@@ -288,7 +278,7 @@ declare namespace cast.framework.messages {
     /**
      * A TV episode media description.
      */
-    export interface TvShowMediaMetadata {
+    interface TvShowMediaMetadata {
         /**
          * TV episode number. A positive integer.
          */
@@ -342,7 +332,7 @@ declare namespace cast.framework.messages {
     /**
      * Describes track metadata information.
      */
-    export class Track {
+    class Track {
         constructor(trackId: number, trackType: TrackType);
 
         /**
@@ -388,7 +378,7 @@ declare namespace cast.framework.messages {
     /**
      * Describes style information for a text track.
      */
-    export interface TextTrackStyle {
+    interface TextTrackStyle {
         /**
          * The background 32 bit RGBA color. The alpha channel should be used for transparent backgrounds.
          */
@@ -453,7 +443,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event playback rate request data.
      */
-    export interface SetPlaybackRateRequestData extends RequestData {
+    interface SetPlaybackRateRequestData extends RequestData {
         /**
          * New playback rate (>0).
          */
@@ -468,7 +458,7 @@ declare namespace cast.framework.messages {
     /**
      * SetCredentials request data.
      */
-    export interface SetCredentialsRequestData {
+    interface SetCredentialsRequestData {
         /**
          * Credentials to use by receiver.
          */
@@ -488,7 +478,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event SEEK request data.
      */
-    export interface SeekRequestData extends RequestData {
+    interface SeekRequestData extends RequestData {
         /**
          * Seconds since beginning of content.
          */
@@ -508,7 +498,7 @@ declare namespace cast.framework.messages {
     /**
      * Provides seekable range in seconds.
      */
-    export class SeekableRange {
+    class SeekableRange {
         constructor(start?: number, end?: number);
 
         /**
@@ -525,7 +515,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event request data.
      */
-    export class RequestData {
+    class RequestData {
         constructor(type: MessageType);
 
         /**
@@ -547,7 +537,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event UPDATE queue request data.
      */
-    export interface QueueUpdateRequestData {
+    interface QueueUpdateRequestData {
         /**
          * ID of the current media Item after the deletion (if not provided; the currentItem value will be the same as before the deletion; if it does not exist because it has been deleted; the currentItem will point to the next logical item in the list).
          */
@@ -582,7 +572,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event queue REORDER request data.
      */
-    export class QueueReorderRequestData extends RequestData {
+    class QueueReorderRequestData extends RequestData {
         constructor(itemIds: number[]);
 
         /**
@@ -601,21 +591,21 @@ declare namespace cast.framework.messages {
         insertBefore?: number;
 
         /**
-               * IDs of the items to be reordered; in the new order. Items not provided will keep their existing order. The provided list will be inserted at the position determined by insertBefore. For example:
+           * IDs of the items to be reordered; in the new order. Items not provided will keep their existing order. The provided list will be inserted at the position determined by insertBefore. For example:
 
-                  If insertBefore is not specified Existing queue: “A”;”D”;”G”;”H”;”B”;”E” itemIds: “D”;”H”;”B” New Order: “A”;”G”;”E”;“D”;”H”;”B”
+              If insertBefore is not specified Existing queue: “A”;”D”;”G”;”H”;”B”;”E” itemIds: “D”;”H”;”B” New Order: “A”;”G”;”E”;“D”;”H”;”B”
 
-                  If insertBefore is “A” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “D”;”H”;”B”;“A”;”G”;”E”
+              If insertBefore is “A” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “D”;”H”;”B”;“A”;”G”;”E”
 
-                  If insertBefore is “G” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “A”;“D”;”H”;”B”;”G”;”E”
-               */
+              If insertBefore is “G” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “A”;“D”;”H”;”B”;”G”;”E”
+           */
         itemIds: number[];
     }
 
     /**
      * Media event queue REMOVE request data.
      */
-    export class QueueRemoveRequestData extends RequestData {
+    class QueueRemoveRequestData extends RequestData {
         constructor(itemIds: number[]);
 
         /**
@@ -636,8 +626,8 @@ declare namespace cast.framework.messages {
     /**
      * Media event queue LOAD request data.
      */
-    export interface QueueLoadRequestData extends RequestData {
-        constructor(items: QueueItem[]): QueueLoadRequestData;
+    class QueueLoadRequestData extends RequestData {
+        constructor(items: QueueItem[]);
 
         /**
          * Seconds (since the beginning of content) to start playback of the first item to be played. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user casts the item that was playing locally so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
@@ -663,7 +653,7 @@ declare namespace cast.framework.messages {
     /**
      * Queue item information. Application developers may need to create a QueueItem to insert a queue element using InsertQueueItems. In this case they should not provide an itemId (as the actual itemId will be assigned when the item is inserted in the queue). This prevents ID collisions with items added from a sender app.
      */
-    export class QueueItem {
+    class QueueItem {
         constructor(opt_itemId?: number);
 
         /**
@@ -710,7 +700,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event queue INSERT request data.
      */
-    export class QueueInsertRequestData extends RequestData {
+    class QueueInsertRequestData extends RequestData {
         constructor(items: QueueItem[]);
 
         /**
@@ -742,7 +732,7 @@ declare namespace cast.framework.messages {
     /**
      * Represents a data message containing the full list of queue ids.
      */
-    export interface QueueIds {
+    interface QueueIds {
         /**
          * List of queue item ids.
          */
@@ -762,7 +752,7 @@ declare namespace cast.framework.messages {
     /**
      * Queue data as part of the LOAD request.
      */
-    export class QueueData {
+    class QueueData {
         constructor(
             id?: string,
             name?: string,
@@ -822,7 +812,7 @@ declare namespace cast.framework.messages {
     /**
      * Represents a queue change message; such as insert; remove; and update.
      */
-    export interface QueueChange {
+    interface QueueChange {
         /**
          * The actual queue change type.
          */
@@ -857,7 +847,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event PRELOAD request data.
      */
-    export class PreloadRequestData implements LoadRequestData {
+    class PreloadRequestData implements LoadRequestData {
         /**
          * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
          */
@@ -913,7 +903,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event PRECACHE request data. (Some fields of the load request; like autoplay and queueData; are ignored).
      */
-    export class PrecacheRequestData implements LoadRequestData {
+    class PrecacheRequestData implements LoadRequestData {
         /**
          * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
          */
@@ -969,7 +959,7 @@ declare namespace cast.framework.messages {
     /**
      * PlayString request data.
      */
-    export class PlayStringRequestData {
+    class PlayStringRequestData {
         constructor(stringId: PlayStringId, opt_arguments?: string[]);
 
         /**
@@ -986,7 +976,7 @@ declare namespace cast.framework.messages {
     /**
      * A photo media description.
      */
-    export interface PhotoMediaMetadata {
+    interface PhotoMediaMetadata {
         /**
          * Name of the photographer.
          */
@@ -1036,7 +1026,7 @@ declare namespace cast.framework.messages {
     /**
      * A music track media description.
      */
-    export interface MusicTrackMediaMetadata {
+    interface MusicTrackMediaMetadata {
         /**
          * Album artist name.
          */
@@ -1101,7 +1091,7 @@ declare namespace cast.framework.messages {
     /**
      * A movie media description.
      */
-    export interface MovieMediaMetadata {
+    interface MovieMediaMetadata {
         /**
          * Content images. Examples would include cover art or a thumbnail of the currently playing media.
          */
@@ -1135,7 +1125,7 @@ declare namespace cast.framework.messages {
     /**
      * Represents the status of a media session.
      */
-    export interface MediaStatus {
+    interface MediaStatus {
         /**
          * List of IDs corresponding to the active tracks.
          */
@@ -1244,7 +1234,7 @@ declare namespace cast.framework.messages {
     /**
      * Common media metadata used as part of MediaInformation
      */
-    export class MediaMetadata {
+    class MediaMetadata {
         constructor(type: MetadataType);
 
         /**
@@ -1256,7 +1246,7 @@ declare namespace cast.framework.messages {
     /**
      * Represents the media information.
      */
-    export interface MediaInformation {
+    interface MediaInformation {
         /**
          * Partial list of break clips that includes current break clip that receiver is playing or ones that receiver will play shortly after; instead of sending whole list of clips. This is to avoid overflow of MediaStatus message.
          */
@@ -1326,7 +1316,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event LOAD request data.
      */
-    export interface LoadRequestData extends RequestData {
+    interface LoadRequestData extends RequestData {
         /**
          * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
          */
@@ -1371,7 +1361,7 @@ declare namespace cast.framework.messages {
     /**
      * LoadByEntity request data.
      */
-    export interface LoadByEntityRequestData {
+    interface LoadByEntityRequestData {
         /**
          * Content entity information; typically represented by a stringified JSON object
          */
@@ -1391,7 +1381,7 @@ declare namespace cast.framework.messages {
     /**
      * Provides live seekable range with start and end time in seconds and two more attributes.
      */
-    export class LiveSeekableRange {
+    class LiveSeekableRange {
         constructor(
             start?: number,
             end?: number,
@@ -1413,7 +1403,7 @@ declare namespace cast.framework.messages {
     /**
      * Represents a data message containing item information for each requested ids.
      */
-    export interface ItemsInfo {
+    interface ItemsInfo {
         /**
          * List of changed itemIds.
          */
@@ -1434,7 +1424,7 @@ declare namespace cast.framework.messages {
      * An image that describes a receiver application or media item.
      * This could be an application icon; cover art; or a thumbnail.
      */
-    export class Image {
+    class Image {
         constructor(url: string);
 
         /**
@@ -1453,7 +1443,7 @@ declare namespace cast.framework.messages {
         width?: number;
     }
     /** Media event GET_STATUS request data. */
-    export interface GetStatusRequestData extends RequestData {
+    interface GetStatusRequestData extends RequestData {
         /**
          * The options of a GET_STATUS request.
          */
@@ -1463,8 +1453,8 @@ declare namespace cast.framework.messages {
     /**
      * Get items info request data.
      */
-    export interface GetItemsInfoRequestData extends RequestData {
-        constructor(itemIds: number[]): GetItemsInfoRequestData;
+    class GetItemsInfoRequestData extends RequestData {
+        constructor(itemIds: number[]);
 
         /**
          * List of item ids to be requested.
@@ -1474,7 +1464,7 @@ declare namespace cast.framework.messages {
     /**
      * A generic media description.
      */
-    export interface GenericMediaMetadata {
+    interface GenericMediaMetadata extends MediaMetadata {
         /**
          * Content images. Examples would include cover art or a thumbnail of the currently playing media.
          */
@@ -1504,7 +1494,7 @@ declare namespace cast.framework.messages {
     /**
      * Focus state change message.
      */
-    export interface FocusStateRequestData {
+    interface FocusStateRequestData {
         /**
          * The focus state of the app.
          */
@@ -1512,7 +1502,7 @@ declare namespace cast.framework.messages {
     }
 
     /** Fetch items request data. */
-    export class FetchItemsRequestData extends RequestData {
+    class FetchItemsRequestData extends RequestData {
         constructor(itemId: number, nextCount: number, prevCount: number);
 
         /**
@@ -1534,8 +1524,11 @@ declare namespace cast.framework.messages {
     /**
      * Extended media status information
      */
-    export class ExtendedMediaStatus {
-        constructor(playerState: MediaInformation, opt_media?: MediaInformation);
+    class ExtendedMediaStatus {
+        constructor(
+            playerState: MediaInformation,
+            opt_media?: MediaInformation
+        );
 
         /**
          *
@@ -1549,7 +1542,7 @@ declare namespace cast.framework.messages {
     }
 
     /** Event data for @see{@link EventType.ERROR} event. */
-    export class ErrorEvent {
+    class ErrorEvent extends Event {
         constructor(detailedErrorCode?: DetailedErrorCode, error?: any);
         /**
          * An error code representing the cause of the error.
@@ -1564,7 +1557,7 @@ declare namespace cast.framework.messages {
         error?: any;
     }
 
-    export class ErrorData {
+    class ErrorData {
         constructor(type: ErrorType);
 
         /**
@@ -1574,13 +1567,13 @@ declare namespace cast.framework.messages {
         customData?: any;
 
         /**
-                Id of the request; used to correlate request/response.
-               */
+            Id of the request; used to correlate request/response.
+           */
         requestId?: number;
     }
 
     /**  Media event EDIT_TRACKS_INFO request data. */
-    export interface EditTracksInfoRequestData extends RequestData {
+    interface EditTracksInfoRequestData extends RequestData {
         /**
          * Array of the Track trackIds that should be active.
          * If it is not provided; the active tracks will not change.
@@ -1616,7 +1609,7 @@ declare namespace cast.framework.messages {
     /**
      * Media event EDIT_AUDIO_TRACKS request data. If language is not provided; the default audio track for the media will be enabled.
      */
-    export interface EditAudioTracksRequestData extends RequestData {
+    interface EditAudioTracksRequestData extends RequestData {
         /**
          * Indicates that the provided language was not explicit user request; but rather inferred from used language in voice query.
          * It allows receiver apps to use user saved preference instead of spoken language.
@@ -1630,7 +1623,7 @@ declare namespace cast.framework.messages {
     }
 
     /** DisplayStatus request data. */
-    export interface DisplayStatusRequestData {
+    interface DisplayStatusRequestData {
         /**
          * Optional request source. It contain the assistent query that initiate the request.
          */
@@ -1638,7 +1631,7 @@ declare namespace cast.framework.messages {
     }
 
     /** CustomCommand request data. */
-    export interface CustomCommandRequestData {
+    interface CustomCommandRequestData {
         /**
          * Custom Data; typically represented by a stringified JSON object.
          */
@@ -1649,12 +1642,8 @@ declare namespace cast.framework.messages {
          */
         source: string;
     }
-    /** Cloud media status. Media status that is only sent to the cloud sender. */
-    export class CloudMediaStatus {
-        constructor();
-    }
 
-    export class BreakStatus {
+    class BreakStatus {
         constructor(currentBreakTime: number, currentBreakClipTime: number);
 
         /**
@@ -1688,7 +1677,7 @@ declare namespace cast.framework.messages {
     /**
      * Represents break clip (e.g. a clip of ad during ad break)
      */
-    export class BreakClip {
+    class BreakClip {
         constructor(id: string);
 
         /**
@@ -1719,7 +1708,7 @@ declare namespace cast.framework.messages {
         /**
          * The format of the HLS media segment.
          */
-        hlsSegmentFormat: HlsSegmentFormat;
+        hlsSegmentFormat?: HlsSegmentFormat;
         /**
          * Unique id of break clip.
          */
@@ -1735,7 +1724,7 @@ declare namespace cast.framework.messages {
         /**
          * VAST ad request configuration. Used if contentId or contentUrl is not provided.
          */
-        vastAdsRequest: VastAdsRequest;
+        vastAdsRequest?: VastAdsRequest;
         /**
          * The time in sec when this break clip becomes skippable.
          * 5 means that end user can skip this break clip after 5 seconds.
@@ -1745,7 +1734,7 @@ declare namespace cast.framework.messages {
     }
 
     /** Represents break (e.g. ad break) included in main video. */
-    export class Break {
+    class Break {
         constructor(id: string, breakClipIds: string[], position: number);
         /**
          * List of ids of break clip that this break includes.
diff --git a/types/chromecast-caf-receiver/cast.framework.system.d.ts b/types/chromecast-caf-receiver/cast.framework.system.d.ts
index 1f465761b0..92e7732f7f 100644
--- a/types/chromecast-caf-receiver/cast.framework.system.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.system.d.ts
@@ -1,177 +1,191 @@
-// Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./index.d.ts" />
-/// <reference path="./cast.framework.d.ts" />
-/// <reference path="./cast.framework.breaks.d.ts" />
-/// <reference path="./cast.framework.events.d.ts" />
-/// <reference path="./cast.framework.messages.d.ts" />
-/// <reference path="./cast.framework.ui.d.ts" />
-
-import { EventType } from './cast.framework.events';
+import { EventType } from "./cast.framework.events";
 export = cast.framework.system;
 
 declare namespace cast.framework.system {
-  export type SystemState =
-    | 'NOT_STARTED'
-    | 'STARTING_IN_BACKGROUND'
-    | 'STARTING'
-    | 'READY'
-    | 'STOPPING_IN_BACKGROUND'
-    | 'STOPPING';
+    type EventType =
+        // Fired when the system is ready.
+        | "READY"
+        // Fired when the application is terminated.
+        | "SHUTDOWN"
+        // Fired when a new sender has connected.
+        | "SENDER_CONNECTED"
+        // Fired when a sender has disconnected.
+        | "SENDER_DISCONNECTED"
+        // Fired when there is a system error.
+        | "ERROR"
+        // Fired when the system volume has changed.
+        | "SYSTEM_VOLUME_CHANGED"
+        // Fired when the visibility of the application has changed (for example after a HDMI Input change or when the TV is turned off/on and the cast device is externally powered). Note that this API has the same effect as the webkitvisibilitychange event raised by your document, we provided it as CastReceiverManager API for convenience and to avoid a dependency on a webkit-prefixed event.
+        | "VISIBILITY_CHANGED"
+        // Fired when the standby state of the TV has changed. This event is related to the visibility chnaged event, as if the TV is in standby the visibility will be false, the visibility is more granular (as it also detects that the TV has selected a different channel) but it is not reliably detected in all TVs, standby can be used in those cases as most TVs implement it.
+        | "STANDBY_CHANGED"
+        | "MAX_VIDEO_RESOLUTION_CHANGED"
+        | "FEEDBACK_STARTED";
 
-  export type StandbyState = 'STANDBY' | 'NOT_STANDBY' | 'UNKNOWN';
+    type SystemState =
+        | "NOT_STARTED"
+        | "STARTING_IN_BACKGROUND"
+        | "STARTING"
+        | "READY"
+        | "STOPPING_IN_BACKGROUND"
+        | "STOPPING";
 
-  export type DisconnectReason = 'REQUESTED_BY_SENDER' | 'ERROR' | 'UNKNOWN';
+    type StandbyState = "STANDBY" | "NOT_STANDBY" | "UNKNOWN";
 
-  /**
-   * Event dispatched by @see{@link CastReceiverManager} when the visibility of the application changes (HDMI input change; TV is turned off).
-   */
-  export class VisibilityChangedEvent {
-    constructor(isVisible: boolean);
+    type DisconnectReason = "REQUESTED_BY_SENDER" | "ERROR" | "UNKNOWN";
 
     /**
-     * Whether the Cast device is the active input or not.
+     * Event dispatched by @see{@link CastReceiverManager} when the visibility of the application changes (HDMI input change; TV is turned off).
      */
-    isVisible: boolean;
-  }
+    class VisibilityChangedEvent {
+        constructor(isVisible: boolean);
 
-  /**
-   * Represents the system volume data.
-   */
-  export interface SystemVolumeData {
-    /**
-     * The level (from 0.0 to 1.0) of the system volume.
-     */
-    level: number;
+        /**
+         * Whether the Cast device is the active input or not.
+         */
+        isVisible: boolean;
+    }
 
     /**
-     * Whether the system volume is muted or not.
+     * Represents the system volume data.
      */
-    muted: boolean;
-  }
-  /**
-   * Event dispatched by @see{CastReceiverManager} when the system volume changes.
-   */
-  export class SystemVolumeChangedEvent extends Event {
-    constructor(volume: SystemVolumeData);
+    interface SystemVolumeData {
+        /**
+         * The level (from 0.0 to 1.0) of the system volume.
+         */
+        level: number;
+
+        /**
+         * Whether the system volume is muted or not.
+         */
+        muted: boolean;
+    }
+    /**
+     * Event dispatched by @see{CastReceiverManager} when the system volume changes.
+     */
+    class SystemVolumeChangedEvent extends Event {
+        constructor(volume: SystemVolumeData);
+
+        /**
+         *  The system volume data
+         */
+        data: SystemVolumeData;
+    }
+    /**
+     * Event dispatched by @see{@link CastReceiverManager} when the TV enters/leaves the standby state.
+     */
+    class StandbyChangedEvent {
+        constructor(isStandby: boolean);
+
+        /**
+         *
+         */
+        isStandby: boolean;
+    }
+    /**
+     * Whether the TV is in standby or not.
+     */
+    interface ShutdownEvent extends Event {
+        [key: string]: any;
+    }
 
     /**
-     *  The system volume data
+     * Event dispatched by @see{@link CastReceiverManager} when a sender is disconnected.
      */
-    data: SystemVolumeData;
-  }
-  /**
-   * Event dispatched by @see{@link CastReceiverManager} when the TV enters/leaves the standby state.
-   */
-  export class StandbyChangedEvent {
-    constructor(isStandby: boolean);
+    class SenderDisconnectedEvent extends Event {
+        constructor(senderId: string, userAgent: string);
+        /**
+         * The ID of the sender connected.
+         */
+        senderId: string;
+
+        /**
+         * The user agent of the sender.
+         */
+        userAgent: string;
+
+        /**
+         * The reason the sender was disconnected.
+         */
+        reason?: DisconnectReason;
+    }
 
     /**
-     *
+     * Event dispatched by @see{@link CastReceiverManager} when a sender is connected.
      */
-    isStandby: boolean;
-  }
-  /**
-   * Whether the TV is in standby or not.
-   */
-  export interface ShutdownEvent extends Event {}
+    class SenderConnectedEvent extends Event {
+        constructor(senderId: string, userAgent: string);
+        /**
+         * The ID of the sender connected.
+         */
+        senderId: string;
 
-  /**
-   * Event dispatched by @see{@link CastReceiverManager} when a sender is disconnected.
-   */
-  export class SenderDisconnectedEvent extends Event {
-    constructor(senderId: string, userAgent: string);
-    /**
-     * The ID of the sender connected.
-     */
-    senderId: string;
+        /**
+         * The user agent of the sender.
+         */
+        userAgent: string;
+    }
 
     /**
-     * The user agent of the sender.
+     * Represents the data of a connected sender device.
      */
-    userAgent: string;
+    interface Sender {
+        /**
+         * The sender Id.
+         */
+        id: string;
+
+        /**
+         * Indicate the sender supports large messages (>64KB).
+         */
+        largeMessageSupported?: boolean;
+
+        /**
+         * The userAgent of the sender.
+         */
+        userAgent?: string;
+    }
 
     /**
-     * The reason the sender was disconnected.
+     * Event dispatched by CastReceiverManager when the system is ready.
      */
-    reason?: DisconnectReason;
-  }
+    class ReadyEvent {
+        constructor(applicationData: ApplicationData);
 
-  /**
-   * Event dispatched by @see{@link CastReceiverManager} when a sender is connected.
-   */
-  export class SenderConnectedEvent extends Event {
-    constructor(senderId: string, userAgent: string);
-    /**
-     * The ID of the sender connected.
-     */
-    senderId: string;
+        /**
+         * The application data
+         */
+        data: ApplicationData;
+    }
 
     /**
-     * The user agent of the sender.
+     * Event dispatched by @see{@link CastReceiverManager} when the system needs to update the restriction on maximum video resolution.
      */
-    userAgent: string;
-  }
+    class MaxVideoResolutionChangedEvent extends Event {
+        constructor(height: number);
 
-  /**
-   * Represents the data of a connected sender device.
-   */
-  export interface Sender {
-    /**
-     * The sender Id.
-     */
-    id: string;
+        /**
+         * Maximum video resolution requested by the system. The value of 0 means there is no restriction.
+         */
+        height: number;
+    }
+    /** Event dispatched by @see{@link CastReceiverManager} when the systems starts to create feedback report. */
+    interface FeedbackStartedEvent extends Event {
+        [key: string]: any;
+    }
+    /** Event dispatched by @see{@link CastReceiverContext} which contains system information. */
+    class Event {
+        constructor(type: EventType, data?: any);
+        type: EventType;
+        data?: any;
+    }
 
-    /**
-     * Indicate the sender supports large messages (>64KB).
-     */
-    largeMessageSupported?: boolean;
-
-    /**
-     * The userAgent of the sender.
-     */
-    userAgent?: string;
-  }
-
-  /**
-   * Event dispatched by CastReceiverManager when the system is ready.
-   */
-  export class ReadyEvent {
-    constructor(applicationData: ApplicationData);
-
-    /**
-     * The application data
-     */
-    data: ApplicationData;
-  }
-
-  /**
-   * Event dispatched by @see{@link CastReceiverManager} when the system needs to update the restriction on maximum video resolution.
-   */
-  export class MaxVideoResolutionChangedEvent extends Event {
-    constructor(height: number);
-
-    /**
-     * Maximum video resolution requested by the system. The value of 0 means there is no restriction.
-     */
-    height: number;
-  }
-  /** Event dispatched by @see{@link CastReceiverManager} when the systems starts to create feedback report. */
-  export interface FeedbackStartedEvent extends Event {}
-  /** Event dispatched by @see{@link CastReceiverContext} which contains system information. */
-  export class Event {
-    constructor(type: EventType, data?: any);
-  }
-
-  /** Represents the data of the launched application. */
-  export interface ApplicationData {
-    id(): string;
-    launchingSenderId(): string;
-    name(): string;
-    namespaces(): string[];
-    sessionId(): number;
-  }
+    /** Represents the data of the launched application. */
+    interface ApplicationData {
+        id(): string;
+        launchingSenderId(): string;
+        name(): string;
+        namespaces(): string[];
+        sessionId(): number;
+    }
 }
diff --git a/types/chromecast-caf-receiver/cast.framework.ui.d.ts b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
index fbc61f56d0..b13f036be2 100644
--- a/types/chromecast-caf-receiver/cast.framework.ui.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
@@ -1,59 +1,48 @@
-// Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="./index.d.ts" />
-/// <reference path="./cast.framework.d.ts" />
-/// <reference path="./cast.framework.breaks.d.ts" />
-/// <reference path="./cast.framework.events.d.ts" />
-/// <reference path="./cast.framework.messages.d.ts" />
-/// <reference path="./cast.framework.system.d.ts" />
-
-import { PlayerDataEventType } from './cast.framework.ui';
-import { MediaMetadata } from './cast.framework.messages';
+import { PlayerDataEventType } from "./cast.framework.ui";
+import { MediaMetadata } from "./cast.framework.messages";
+import { PlayerDataChangedEventHandler } from "./index";
 
 export = cast.framework.ui;
 
 declare namespace cast.framework.ui {
-    export type ContentType = 'VIDEO' | 'AUDIO' | 'IMAGE';
+    type ContentType = "video" | "audio" | "image";
 
-    export type State =
-        | 'LAUNCHING'
-        | 'IDLE'
-        | 'LOADING'
-        | 'BUFFERING'
-        | 'PAUSED'
-        | 'PLAYING';
+    type State =
+        | "launching"
+        | "idle"
+        | "loading"
+        | "buffering"
+        | "paused"
+        | "playing";
 
-    export type PlayerDataEventType =
-        | 'ANY_CHANGE'
-        | 'STATE_CHANGED'
-        | 'IS_SEEKING_CHANGED'
-        | 'DURATION_CHANGED'
-        | 'CURRENT_TIME_CHANGED'
-        | 'METADATA_CHANGED'
-        | 'TITLE_CHANGED'
-        | 'SUBTITLE_CHANGED'
-        | 'THUMBNAIL_URL_CHANGED'
-        | 'NEXT_TITLE_CHANGED'
-        | 'NEXT_SUBTITLE_CHANGED'
-        | 'NEXT_THUMBNAIL_URL_CHANGED'
-        | 'PRELOADING_NEXT_CHANGED'
-        | 'CONTENT_TYPE_CHANGED'
-        | 'IS_LIVE_CHANGED'
-        | 'BREAK_PERCENTAGE_POSITIONS_CHANGED'
-        | 'IS_PLAYING_BREAK_CHANGED'
-        | 'IS_BREAK_SKIPPABLE_CHANGED'
-        | 'WHEN_SKIPPABLE_CHANGED'
-        | 'NUMBER_BREAK_CLIPS_CHANGED'
-        | 'CURRENT_BREAK_CLIP_NUMBER_CHANGED'
-        | 'DISPLAY_STATUS_CHANGED';
+    type PlayerDataEventType =
+        | "ANY_CHANGE"
+        | "STATE_CHANGED"
+        | "IS_SEEKING_CHANGED"
+        | "DURATION_CHANGED"
+        | "CURRENT_TIME_CHANGED"
+        | "METADATA_CHANGED"
+        | "TITLE_CHANGED"
+        | "SUBTITLE_CHANGED"
+        | "THUMBNAIL_URL_CHANGED"
+        | "NEXT_TITLE_CHANGED"
+        | "NEXT_SUBTITLE_CHANGED"
+        | "NEXT_THUMBNAIL_URL_CHANGED"
+        | "PRELOADING_NEXT_CHANGED"
+        | "CONTENT_TYPE_CHANGED"
+        | "IS_LIVE_CHANGED"
+        | "BREAK_PERCENTAGE_POSITIONS_CHANGED"
+        | "IS_PLAYING_BREAK_CHANGED"
+        | "IS_BREAK_SKIPPABLE_CHANGED"
+        | "WHEN_SKIPPABLE_CHANGED"
+        | "NUMBER_BREAK_CLIPS_CHANGED"
+        | "CURRENT_BREAK_CLIP_NUMBER_CHANGED"
+        | "DISPLAY_STATUS_CHANGED";
 
     /**
      * Player data changed event. Provides the changed field (type); and new value.
      */
-    export class PlayerDataChangedEvent {
+    class PlayerDataChangedEvent {
         constructor(type: PlayerDataEventType, field: string, value: any);
 
         /**
@@ -74,23 +63,29 @@ declare namespace cast.framework.ui {
     /**
      * Player data binder. Bind a player data object to the player state. The player data will be updated to reflect correctly the current player state without firing any change event.
      */
-    export class PlayerDataBinder {
-        constructor(playerData: PlayerData | any);
+    class PlayerDataBinder {
+        constructor(playerData: PlayerData);
 
         /**
          * Add listener to player data changes.
          */
-        // addEventListener: (type: PlayerDataEventType; listener: PlayerDataChangedEventHandler);
+        addEventListener: (
+            type: PlayerDataEventType,
+            listener: PlayerDataChangedEventHandler
+        ) => void;
 
         /**
          * Remove listener to player data changes.
          */
-        // removeEventListener: (type: PlayerDataEventType; listener: PlayerDataChangedEventHandler);
+        removeEventListener: (
+            type: PlayerDataEventType,
+            listener: PlayerDataChangedEventHandler
+        ) => void;
     }
     /**
      * Player data. Provide the player media and break state.
      */
-    export interface PlayerData {
+    interface PlayerData {
         /**
          * Array of breaks positions in percentage.
          */
@@ -144,7 +139,7 @@ declare namespace cast.framework.ui {
         /**
          * Media metadata.
          */
-        metadata: MediaMetadata | any;
+        metadata: MediaMetadata;
 
         /**
          * Next Item subtitle.
diff --git a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
index a4f59bd985..29d842b060 100644
--- a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
+++ b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
@@ -1,66 +1,3 @@
-// Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+import { BreakSeekData } from "chromecast-caf-receiver/cast.framework.breaks";
 
-/// <reference path="./index.d.ts" />
-/// <reference path="./cast.framework.d.ts" />
-/// <reference path="./cast.framework.breaks.d.ts" />
-/// <reference path="./cast.framework.events.d.ts" />
-/// <reference path="./cast.framework.messages.d.ts" />
-/// <reference path="./cast.framework.system.d.ts" />
-/// <reference path="./cast.framework.ui.d.ts" />
-
-import { TextTracksManager } from "cast.framework";
-import { StandbyChangedEvent } from "cast.framework.system";
-import { PlayerData, ContentType } from "cast.framework.ui";
-import { BreakManager } from "cast.framework.breaks";
-import { MediaStatusEvent } from "cast.framework.events";
-import { Track, Break, MediaStatus, QueueData } from "cast.framework.messages";
-
-const ct = ContentType.VIDEO;
-// framework tests
-const track = new Track(123, {});
-const ttm = new TextTracksManager({});
-ttm.addTracks(track);
-
-// $ExpectError
-ttm.addTracks("should fail");
-
-// system tests
-const sce = new StandbyChangedEvent(true);
-// $ExpectError
-const wrongSce = new StandbyChangedEvent("error");
-
-const result: boolean = sce.isStandby;
-// $ExpectError
-const failure: string = sce.isStandby;
-
-// ui tests
-const pd = new PlayerData();
-
-const cn: number = pd.currentBreakClipNumber;
-// $ExpectError
-const wrongCn: boolean = pd.currentBreakClipNumber;
-
-// breaks tests
-const bm: BreakManager = new BreakManager();
-const brk1: Break = bm.getBreakById("123");
-// $ExpectError
-const brk2: string = bm.getBreakById("123");
-// $ExpectError
-const brk3: Break = bm.getBreakById(123);
-// events tests
-
-const evt: MediaStatusEvent = new MediaStatusEvent();
-const ms: MediaStatus = evt.mediaStatus;
-// $ExpectError
-const ms: string = evt.mediaStatus;
-
-// messages tests
-const qd = new QueueData("id", "name", "description", "mode");
-// $ExpectError
-const wrongQd = new QueueData({});
-const name: string = qd.name;
-// $ExpectError
-const wrongName: number = qd.name;
+const breakSeekData = new BreakSeekData(0, 100, []);
diff --git a/types/chromecast-caf-receiver/index.d.ts b/types/chromecast-caf-receiver/index.d.ts
index 5dc89456e6..73a13f53ca 100644
--- a/types/chromecast-caf-receiver/index.d.ts
+++ b/types/chromecast-caf-receiver/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for chromecast-caf-receiver 3.x
-// Project: https://developers.google.com/cast/docs/reference/caf_receiver/
-// Definitions by: Craig Bruce https://github.com/craigrbruce
+// Project: https://github.com/googlecast
+// Definitions by: Craig Bruce <https://github.com/craigrbruce>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference path="./cast.framework.d.ts" />
 /// <reference path="./cast.framework.breaks.d.ts" />
@@ -14,12 +15,10 @@ import { PlayerDataChangedEvent } from './cast.framework.ui';
 import { NetworkRequestInfo } from './cast.framework';
 import { Event } from './cast.framework.events';
 
-export = cast;
-declare namespace cast {
-    export type EventHandler = (event: Event) => void;
-    export type PlayerDataChangedEventHandler = (
-        event: PlayerDataChangedEvent
-    ) => void;
-    export type RequestHandler = (request: NetworkRequestInfo) => void;
-    export type BinaryHandler = (data: Uint8Array) => Uint8Array;
-}
+export as namespace cast;
+export type EventHandler = (event: Event) => void;
+export type PlayerDataChangedEventHandler = (
+    event: PlayerDataChangedEvent
+) => void;
+export type RequestHandler = (request: NetworkRequestInfo) => void;
+export type BinaryHandler = (data: Uint8Array) => Uint8Array;
diff --git a/types/chromecast-caf-receiver/tsconfig.json b/types/chromecast-caf-receiver/tsconfig.json
index 5c13aa8765..452dd41e91 100644
--- a/types/chromecast-caf-receiver/tsconfig.json
+++ b/types/chromecast-caf-receiver/tsconfig.json
@@ -1,22 +1,26 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": false,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",
-        "chromecast-caf-receiver-tests.ts"
+        "chromecast-caf-receiver-tests.ts",
+        "cast.framework.d.ts",
+        "cast.framework.breaks.d.ts",
+        "cast.framework.events.d.ts",
+        "cast.framework.messages.d.ts",
+        "cast.framework.system.d.ts",
+        "cast.framework.ui.d.ts"
     ]
 }
diff --git a/types/chromecast-caf-receiver/tslint.json b/types/chromecast-caf-receiver/tslint.json
index 3db14f85ea..f85a173bd5 100644
--- a/types/chromecast-caf-receiver/tslint.json
+++ b/types/chromecast-caf-receiver/tslint.json
@@ -1 +1,8 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-redundant-jsdoc-2": false,
+        "jsdoc-format": false,
+        "max-line-length": false
+    }
+}

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 0870/1124] 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 0871/1124] 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 0872/1124] 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 0873/1124] 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 2534c15d9ede387030eca0be0566a9799c50f091 Mon Sep 17 00:00:00 2001
From: Craig Bruce <cbruce@nine.com.au>
Date: Thu, 31 May 2018 13:40:18 +1000
Subject: [PATCH 0874/1124] write a simple spread of tests for a few classes
 from each namespace

---
 .../cast.framework.d.ts                       |   6 +-
 .../chromecast-caf-receiver-tests.ts          | 105 +++++++++++++++++-
 2 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/types/chromecast-caf-receiver/cast.framework.d.ts b/types/chromecast-caf-receiver/cast.framework.d.ts
index 1435859859..2ee078021a 100644
--- a/types/chromecast-caf-receiver/cast.framework.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.d.ts
@@ -44,7 +44,7 @@ declare namespace cast.framework {
      * Manages text tracks.
      */
     class TextTracksManager {
-        constructor(params: any);
+        constructor(params?: any);
 
         /**
          * Adds text tracks to the list.
@@ -106,7 +106,7 @@ declare namespace cast.framework {
      * QueueManager exposes several queue manipulation APIs to developers.
      */
     class QueueManager {
-        constructor(params: any);
+        constructor(params?: any);
 
         /**
          * Returns the current queue item.
@@ -199,7 +199,7 @@ declare namespace cast.framework {
      * Controls and monitors media playback.
      */
     class PlayerManager {
-        constructor(params: any);
+        constructor(params?: any);
 
         /**
          * Adds an event listener for player event.
diff --git a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
index 29d842b060..a75834b0a8 100644
--- a/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
+++ b/types/chromecast-caf-receiver/chromecast-caf-receiver-tests.ts
@@ -1,3 +1,106 @@
-import { BreakSeekData } from "chromecast-caf-receiver/cast.framework.breaks";
+import {
+    PlayerData,
+    PlayerDataBinder
+} from "chromecast-caf-receiver/cast.framework.ui";
+import {
+    ReadyEvent,
+    ApplicationData
+} from "chromecast-caf-receiver/cast.framework.system";
+import {
+    RequestEvent,
+    Event
+} from "chromecast-caf-receiver/cast.framework.events";
+import {
+    QueueBase,
+    TextTracksManager,
+    QueueManager,
+    PlayerManager
+} from "chromecast-caf-receiver/cast.framework";
+import {
+    BreakSeekData,
+    BreakClipLoadInterceptorContext,
+    BreakManager
+} from "chromecast-caf-receiver/cast.framework.breaks";
+import {
+    Break,
+    BreakClip,
+    LoadRequestData,
+    Track,
+    MediaMetadata
+} from "chromecast-caf-receiver/cast.framework.messages";
 
+const track = new Track(1, "TEXT");
+const breakClip = new BreakClip("id");
+const adBreak = new Break("id", ["id"], 1);
+const rEvent = new RequestEvent("BITRATE_CHANGED", { requestId: 2 });
+const pManager = new PlayerManager();
+pManager.addEventListener("STALLED", () => {});
+const ttManager = new TextTracksManager();
+const qManager = new QueueManager();
+const qBase = new QueueBase();
+const items = qBase.fetchItems(1, 3, 4);
 const breakSeekData = new BreakSeekData(0, 100, []);
+const breakClipLoadContext = new BreakClipLoadInterceptorContext(adBreak);
+const breakManager: BreakManager = {
+    getBreakById: () => adBreak,
+    getBreakClipById: () => breakClip,
+    getBreakClips: () => [breakClip],
+    getBreaks: () => [adBreak],
+    getPlayWatchedBreak: () => true,
+    setBreakClipLoadInterceptor: () => {},
+    setBreakSeekInterceptor: () => {},
+    setPlayWatchedBreak: () => {},
+    setVastTrackingInterceptor: () => {}
+};
+
+const lrd: LoadRequestData = {
+    requestId: 1,
+    activeTrackIds: [1, 2],
+    media: {
+        tracks: [],
+        textTrackStyle: {},
+        streamType: "BUFFERED",
+        metadata: { metadataType: "GENERIC" },
+        hlsSegmentFormat: "AAC",
+        contentId: "id",
+        contentType: "type",
+        breakClips: [breakClip],
+        breaks: [adBreak]
+    },
+    queueData: {}
+};
+
+const appData: ApplicationData = {
+    id: () => "id",
+    launchingSenderId: () => "launch-id",
+    name: () => "name",
+    namespaces: () => ["namespace"],
+    sessionId: () => 1
+};
+
+const readyEvent = new ReadyEvent(appData);
+const data = readyEvent.data;
+const pData: PlayerData = {
+    breakPercentagePositions: [1],
+    contentType: "video",
+    currentBreakClipNumber: 2,
+    currentTime: 1234,
+    displayStatus: true,
+    duration: 222,
+    isBreakSkippable: false,
+    isLive: true,
+    isPlayingBreak: false,
+    isSeeking: true,
+    metadata: new MediaMetadata("GENERIC"),
+    nextSubtitle: "sub",
+    nextThumbnailUrl: "url",
+    nextTitle: "title",
+    numberBreakClips: 3,
+    preloadingNext: false,
+    state: "paused",
+    thumbnailUrl: "url",
+    title: "title",
+    whenSkippable: 321
+};
+const binder = new PlayerDataBinder(pData);
+binder.addEventListener("ANY_CHANGE", e => {});

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 0875/1124] 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 0876/1124]  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 0877/1124] 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 0878/1124] 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 0879/1124] 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 80f59b24c62bcfde171d49eaaefa9d72210e9e06 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Thu, 31 May 2018 00:25:13 -0700
Subject: [PATCH 0880/1124] Mouse event is not required

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

diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
index 72ec6aa296..b52668aed2 100644
--- a/types/storybook__addon-links/index.d.ts
+++ b/types/storybook__addon-links/index.d.ts
@@ -9,6 +9,9 @@ import * as React from 'react';
 
 export type LinkToFunction = (...args: any[]) => string;
 
-export function linkTo<T>(book: string | LinkToFunction, kind?: string | LinkToFunction): React.MouseEventHandler<T>;
+export function linkTo<T>(
+  book: string | LinkToFunction,
+  kind?: string | LinkToFunction
+): (event?: React.MouseEvent<T>) => void;
 
 export function hrefTo(kind: string, story: string): Promise<string>;

From f9a3f3c2da18980f7c5b089eb6d298dc0fd3797b Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Thu, 31 May 2018 00:28:32 -0700
Subject: [PATCH 0881/1124] Fix everything

---
 types/text-encoding/index.d.ts             | 23 +++++++++++--
 types/text-encoding/text-encoding-tests.ts | 40 ++++++++++++----------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/types/text-encoding/index.d.ts b/types/text-encoding/index.d.ts
index bda902dace..4038f805d2 100644
--- a/types/text-encoding/index.d.ts
+++ b/types/text-encoding/index.d.ts
@@ -13,11 +13,28 @@ declare namespace TextEncoding {
         (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
         new (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
     }
-    export const TextEncoder: TextEncoder;
-    export const TextDecoder: TextDecoder;
+
+    export var TextEncoder: {
+        new (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
+        (utfLabel?: string, options?: TextEncoderOptions): TextEncoder;
+        encoding: string;
+    };
+
+    export var TextDecoder: {
+        (label?: string, options?: TextDecoderOptions): TextDecoder;
+        new (label?: string, options?: TextDecoderOptions): TextDecoder;
+        encoding: string;
+    };
 }
 
-declare var TextEncoding: TextEncoding.TextEncodingStatic;
+interface TextEncodeOptions {
+    stream?: boolean;
+}
+
+interface TextEncoder {
+    readonly encoding: string;
+    encode(input?: string, options?: TextEncodeOptions): Uint8Array;
+}
 
 declare module "text-encoding" {
     export = TextEncoding;
diff --git a/types/text-encoding/text-encoding-tests.ts b/types/text-encoding/text-encoding-tests.ts
index 914f680bd3..6b2bb13017 100644
--- a/types/text-encoding/text-encoding-tests.ts
+++ b/types/text-encoding/text-encoding-tests.ts
@@ -1,21 +1,24 @@
-
+import { TextEncoder, TextDecoder } from "text-encoding";
 
 function test_encoder() {
     var text = "plain text";
-    var uint8array: Uint8Array;
+    var uint8array = new Uint8Array([]);
 
     // constructor
     uint8array = new TextEncoder().encode(text);
-    uint8array = new TextEncoder('utf-8').encode(text);
-    uint8array = new TextEncoder('windows-1252', { NONSTANDARD_allowLegacyEncoding: true }).encode(text);
+    uint8array = new TextEncoder("utf-8").encode(text);
+    uint8array = new TextEncoder("windows-1252", {
+        NONSTANDARD_allowLegacyEncoding: true
+    }).encode(text);
 
     uint8array = TextEncoder().encode(text);
-    uint8array = TextEncoder('utf-8').encode(text);
-    uint8array = TextEncoder('windows-1252', { NONSTANDARD_allowLegacyEncoding: true }).encode(text);
+    uint8array = TextEncoder("utf-8").encode(text);
+    uint8array = TextEncoder("windows-1252", {
+        NONSTANDARD_allowLegacyEncoding: true
+    }).encode(text);
 
     // attributes
     var encoder = new TextEncoder();
-    encoder.encoding = 'utf-8';
     var encoding: string = encoder.encoding;
 
     // methods
@@ -27,31 +30,30 @@ function test_encoder() {
 function test_decoder() {
     var text = "plain text";
     var uint8array: Uint8Array = TextEncoder().encode(text);
-    var arrayBuffer: ArrayBuffer = uint8array.buffer
+    var arrayBuffer: ArrayBuffer = uint8array.buffer;
 
     // constructor
     text = new TextDecoder().decode(uint8array);
-    text = new TextDecoder('utf-8').decode(uint8array);
-    text = new TextDecoder('windows-1252', {}).decode(uint8array);
-    text = new TextDecoder('windows-1252', { fatal: true }).decode(uint8array);
-    text = new TextDecoder('windows-1252', { ignoreBOM: true }).decode(uint8array);
+    text = new TextDecoder("utf-8").decode(uint8array);
+    text = new TextDecoder("windows-1252", {}).decode(uint8array);
+    text = new TextDecoder("windows-1252", { fatal: true }).decode(uint8array);
+    text = new TextDecoder("windows-1252", { ignoreBOM: true }).decode(
+        uint8array
+    );
 
     text = TextDecoder().decode(uint8array);
-    text = TextDecoder('utf-8').decode(uint8array);
-    text = TextDecoder('windows-1252', {}).decode(uint8array);
-    text = TextDecoder('windows-1252', { fatal: true }).decode(uint8array);
-    text = TextDecoder('windows-1252', { ignoreBOM: true }).decode(uint8array);
+    text = TextDecoder("utf-8").decode(uint8array);
+    text = TextDecoder("windows-1252", {}).decode(uint8array);
+    text = TextDecoder("windows-1252", { fatal: true }).decode(uint8array);
+    text = TextDecoder("windows-1252", { ignoreBOM: true }).decode(uint8array);
 
     // attributes
     var decoder = new TextDecoder();
 
-    decoder.encoding = 'utf-8';
     var encoding: string = decoder.encoding;
 
-    decoder.fatal = true;
     var fatal: boolean = decoder.fatal;
 
-    decoder.ignoreBOM = true;
     var ignoreBOM: boolean = decoder.ignoreBOM;
 
     // methods

From 6ae3ebc5fdbd583ab29001921b69489e0d3b1b39 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Thu, 31 May 2018 00:56:19 -0700
Subject: [PATCH 0882/1124] Remove argument

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

diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
index b52668aed2..99a9edc492 100644
--- a/types/storybook__addon-links/index.d.ts
+++ b/types/storybook__addon-links/index.d.ts
@@ -12,6 +12,6 @@ export type LinkToFunction = (...args: any[]) => string;
 export function linkTo<T>(
   book: string | LinkToFunction,
   kind?: string | LinkToFunction
-): (event?: React.MouseEvent<T>) => void;
+): () => void;
 
 export function hrefTo(kind: string, story: string): Promise<string>;

From d8a6f623d25722c46d6ce08869eb1b6e1f0f5a53 Mon Sep 17 00:00:00 2001
From: Raanan Weber <info@raananweber.com>
Date: Thu, 31 May 2018 12:26:54 +0200
Subject: [PATCH 0883/1124] fixing handlebars runtime module declaration

Was done according to the file structure in handlebars' npm package. the filename is runtime.js, handlebars.runtime results in error unless forced as alias.
See also - https://github.com/DefinitelyTyped/DefinitelyTyped/issues/19441 .
---
 types/handlebars/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/handlebars/index.d.ts b/types/handlebars/index.d.ts
index 351d98fb10..480f91f6f0 100644
--- a/types/handlebars/index.d.ts
+++ b/types/handlebars/index.d.ts
@@ -338,6 +338,6 @@ declare module "handlebars" {
     export = Handlebars;
 }
 
-declare module "handlebars/handlebars.runtime" {
+declare module "handlebars/runtime" {
     export = Handlebars;
 }

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 0884/1124] 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 72ad09138fa01bca47b9613e5e10bce97637e5c6 Mon Sep 17 00:00:00 2001
From: mare <marko@centiva.si>
Date: Thu, 31 May 2018 13:45:07 +0200
Subject: [PATCH 0885/1124] Update index.d.ts

provide default export otherwise imports in TS don't work
---
 types/esri-leaflet/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts
index 69c5eb5827..3dbd351cb5 100644
--- a/types/esri-leaflet/index.d.ts
+++ b/types/esri-leaflet/index.d.ts
@@ -1105,3 +1105,5 @@ declare module 'leaflet' {
         function find(options: FindOptions | MapService): Find;
     }
 }
+
+export = L.esri;

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 0886/1124] [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 0f66934b7fa34c84c42b17c11fae1caf5d71dab0 Mon Sep 17 00:00:00 2001
From: Brecht Carlier <erazerbrecht@gmail.com>
Date: Thu, 31 May 2018 15:21:42 +0200
Subject: [PATCH 0887/1124] Updated index.d.ts for 'connect-mongo'

Because of changes in 'express-session' the existing type definition doesn't work anymore.
Caused by https://github.com/DefinitelyTyped/DefinitelyTyped/commit/215d7f0324b3616dee3f2332ee958dcfbfd14311
---
 types/connect-mongo/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/connect-mongo/index.d.ts b/types/connect-mongo/index.d.ts
index 6f71906fa5..cf3d5ddb3e 100644
--- a/types/connect-mongo/index.d.ts
+++ b/types/connect-mongo/index.d.ts
@@ -105,11 +105,11 @@ declare namespace connectMongo {
 
     export class MongoStore extends session.Store {
         get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
-        set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-        destroy: (sid: string, callback: (err: any) => 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;
-        touch: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
+        clear: (callback?: (err: any) => void) => void;
+        touch: (sid: string, session: Express.Session, callback?: (err: any) => void) => void;
     }
 }
 

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 0888/1124] 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 0889/1124] (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 0890/1124] 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 fab68fe2e91119fff60169e0df77695e29fff9a9 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <dcfinlinson@gmail.com>
Date: Thu, 31 May 2018 10:02:37 -0600
Subject: [PATCH 0891/1124] Make formParameters optional for
 Xrm.Navigation.openForm

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

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 18d8cae218..8521a198e8 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4378,7 +4378,7 @@ declare namespace Xrm {
         /**
          * Opens an entity form or a quick create form.
          */
-        openForm(entityFormOptions: Navigation.EntityFormOptions, formParameters: Utility.OpenParameters): Async.PromiseLike<any>;
+        openForm(entityFormOptions: Navigation.EntityFormOptions, formParameters?: Utility.OpenParameters): Async.PromiseLike<any>;
 
         /**
          * Opens a URL, including file URLs.

From 4f7e3eac4adb1ee9cf9bca3f57b7ea7faf2de4f0 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <dcfinlinson@gmail.com>
Date: Thu, 31 May 2018 10:32:47 -0600
Subject: [PATCH 0892/1124] Add interface for OpenFormResult

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

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 8521a198e8..7be5205c24 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4198,6 +4198,13 @@ declare namespace Xrm {
             confirmed: boolean;
         }
 
+        interface OpenFormResult {
+            /**
+             * Identifies the record displayed or created
+             */
+            savedEntityReference: LookupValue[]
+        }
+
         /**
          * Details to show in the Error dialog
          */
@@ -4378,7 +4385,7 @@ declare namespace Xrm {
         /**
          * Opens an entity form or a quick create form.
          */
-        openForm(entityFormOptions: Navigation.EntityFormOptions, formParameters?: Utility.OpenParameters): Async.PromiseLike<any>;
+        openForm(entityFormOptions: Navigation.EntityFormOptions, formParameters?: Utility.OpenParameters): Async.PromiseLike<Navigation.OpenFormResult>;
 
         /**
          * Opens a URL, including file URLs.

From e30046775d6b5a52a9f5bfdc5b18886a522a80b0 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <dcfinlinson@gmail.com>
Date: Thu, 31 May 2018 10:49:59 -0600
Subject: [PATCH 0893/1124] Missing semicolon

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

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 7be5205c24..511fcc1083 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4202,7 +4202,7 @@ declare namespace Xrm {
             /**
              * Identifies the record displayed or created
              */
-            savedEntityReference: LookupValue[]
+            savedEntityReference: LookupValue[];
         }
 
         /**

From 3a982e28f67185c82b5fb1305bd1ec7bdf5c6897 Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Thu, 31 May 2018 10:40:11 -0400
Subject: [PATCH 0894/1124] Add chromecast-caf-sender types

---
 .../chromecast-caf-sender-tests.ts            | 134 ++++++++
 types/chromecast-caf-sender/index.d.ts        | 306 ++++++++++++++++++
 types/chromecast-caf-sender/tsconfig.json     |  23 ++
 types/chromecast-caf-sender/tslint.json       |   1 +
 4 files changed, 464 insertions(+)
 create mode 100644 types/chromecast-caf-sender/chromecast-caf-sender-tests.ts
 create mode 100644 types/chromecast-caf-sender/index.d.ts
 create mode 100644 types/chromecast-caf-sender/tsconfig.json
 create mode 100644 types/chromecast-caf-sender/tslint.json

diff --git a/types/chromecast-caf-sender/chromecast-caf-sender-tests.ts b/types/chromecast-caf-sender/chromecast-caf-sender-tests.ts
new file mode 100644
index 0000000000..49e2bf5fee
--- /dev/null
+++ b/types/chromecast-caf-sender/chromecast-caf-sender-tests.ts
@@ -0,0 +1,134 @@
+cast.framework.VERSION === "1.0.06";
+cast.framework.setLoggerLevel(cast.framework.LoggerLevel.DEBUG);
+
+const context = cast.framework.CastContext.getInstance();
+context.getCastState() === cast.framework.CastState.CONNECTED;
+context.getSessionState() === cast.framework.SessionState.NO_SESSION;
+
+context.setOptions({
+  autoJoinPolicy: chrome.cast.AutoJoinPolicy.ORIGIN_SCOPED,
+  language: "en-US",
+  receiverApplicationId: "test",
+  resumeSavedSession: true
+});
+
+context.addEventListener(
+  cast.framework.CastContextEventType.CAST_STATE_CHANGED,
+  event => {
+    const { castState } = event;
+  }
+);
+context.addEventListener(
+  cast.framework.CastContextEventType.SESSION_STATE_CHANGED,
+  event => {
+    const { sessionState } = event;
+  }
+);
+
+const handleSessionStateChange = (
+  event: cast.framework.SessionStateEventData
+) => {};
+context.removeEventListener(
+  cast.framework.CastContextEventType.SESSION_STATE_CHANGED,
+  handleSessionStateChange
+);
+
+context.requestSession().then(err => {
+  if (err === chrome.cast.ErrorCode.CHANNEL_ERROR) return;
+
+  const session = cast.framework.CastContext.getInstance().getCurrentSession();
+  if (!session) return;
+
+  const handleError = (err?: chrome.cast.ErrorCode) => {};
+
+  session.getSessionObj().sessionId === session.getSessionId();
+  session.getSessionState() === cast.framework.SessionState.SESSION_STARTED;
+  session.getCastDevice().name;
+  session.getApplicationMetadata().applicationId;
+  session.getApplicationStatus() === "";
+  session.getActiveInputState() ===
+    cast.framework.ActiveInputState.ACTIVE_INPUT_STATE_UNKNOWN;
+  session.endSession(false);
+  session.setVolume(0.5).then(handleError);
+  session.getVolume() === 0.5;
+  session.setMute(true).then(handleError);
+  session.isMute();
+  session.sendMessage("namespace", { obj: 1 }).then(handleError);
+  session.sendMessage("namespace", "string");
+  session.sendMessage("namespace", 2);
+
+  session.addMessageListener("namespace", (namespace, message) => {});
+  session.removeMessageListener("namespace", (namespace, message) => {});
+
+  const req = new chrome.cast.media.LoadRequest(
+    new chrome.cast.media.MediaInfo("id", "type")
+  );
+  session.loadMedia(req);
+
+  const media = session.getMediaSession();
+  if (media && media.sessionId) {
+  }
+
+  session.addEventListener(
+    cast.framework.SessionEventType.ACTIVE_INPUT_STATE_CHANGED,
+    ({ activeInputState }) => {}
+  );
+  session.addEventListener(
+    cast.framework.SessionEventType.APPLICATION_METADATA_CHANGED,
+    ({ metadata }) => {}
+  );
+  session.addEventListener(
+    cast.framework.SessionEventType.APPLICATION_STATUS_CHANGED,
+    ({ status }) => {}
+  );
+  session.addEventListener(
+    cast.framework.SessionEventType.MEDIA_SESSION,
+    ({ mediaSession }) => {}
+  );
+  session.addEventListener(
+    cast.framework.SessionEventType.VOLUME_CHANGED,
+    ({ volume }) => {}
+  );
+  session.removeEventListener(
+    cast.framework.SessionEventType.VOLUME_CHANGED,
+    ({ volume }) => {}
+  );
+});
+
+const player = new cast.framework.RemotePlayer();
+{
+  const bool: boolean =
+    player.isConnected &&
+    player.isMediaLoaded &&
+    player.canControlVolume &&
+    player.isPaused &&
+    player.isMuted &&
+    player.canPause &&
+    player.canSeek;
+  const sum: number = player.duration + player.currentTime + player.volumeLevel;
+  const str: string =
+    player.displayName + player.statusText + player.title + player.displayName;
+}
+player.mediaInfo && player.mediaInfo.contentId;
+player.imageUrl && player.imageUrl === "";
+player.playerState && player.playerState === chrome.cast.media.PlayerState.IDLE;
+player.savedPlayerState && player.savedPlayerState.currentTime;
+player.controller === null;
+
+const playerCtrl = new cast.framework.RemotePlayerController(player);
+player.controller === playerCtrl;
+playerCtrl.playOrPause();
+playerCtrl.stop();
+playerCtrl.seek();
+playerCtrl.muteOrUnmute();
+playerCtrl.setVolumeLevel();
+playerCtrl.getFormattedTime(60);
+playerCtrl.getSeekPosition(1, 60) === playerCtrl.getSeekTime(1, 60);
+playerCtrl.addEventListener(
+  cast.framework.RemotePlayerEventType.ANY_CHANGE,
+  () => {}
+);
+playerCtrl.removeEventListener(
+  cast.framework.RemotePlayerEventType.ANY_CHANGE,
+  () => {}
+);
diff --git a/types/chromecast-caf-sender/index.d.ts b/types/chromecast-caf-sender/index.d.ts
new file mode 100644
index 0000000000..e1e5c8ae65
--- /dev/null
+++ b/types/chromecast-caf-sender/index.d.ts
@@ -0,0 +1,306 @@
+// Type definitions for Cast Application Framework Sender API 1.0
+// Project: https://developers.google.com/cast/docs/caf_receiver_overview
+// Definitions by: Samuel Maddock <https://github.com/samuelmaddock>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="chrome" />
+/// <reference types="chrome/chrome-cast" />
+
+////////////////////
+// Global object
+////////////////////
+interface Window {
+  cast: typeof cast;
+}
+
+////////////////////
+// Framework
+////////////////////
+/**
+ * Cast Application Framework
+ * @see https://developers.google.com/cast/docs/reference/chrome/cast.framework
+ */
+declare namespace cast.framework {
+  enum LoggerLevel {
+    DEBUG,
+    INFO,
+    WARNING,
+    ERROR,
+    NONE
+  }
+
+  enum CastState {
+    NO_DEVICES_AVAILABLE = "NO_DEVICES_AVAILABLE",
+    NOT_CONNECTED = "NOT_CONNECTED",
+    CONNECTING = "CONNECTING",
+    CONNECTED = "CONNECTED"
+  }
+
+  enum SessionState {
+    NO_SESSION = "NO_SESSION",
+    SESSION_STARTING = "SESSION_STARTING",
+    SESSION_STARTED = "SESSION_STARTED",
+    SESSION_START_FAILED = "SESSION_START_FAILED",
+    SESSION_ENDING = "SESSION_ENDING",
+    SESSION_ENDED = "SESSION_ENDED",
+    SESSION_RESUMED = "SESSION_RESUMED"
+  }
+  enum CastContextEventType {
+    CAST_STATE_CHANGED = "caststatechanged",
+    SESSION_STATE_CHANGED = "sessionstatechanged"
+  }
+  enum SessionEventType {
+    APPLICATION_STATUS_CHANGED = "applicationstatuschanged",
+    APPLICATION_METADATA_CHANGED = "applicationmetadatachanged",
+    ACTIVE_INPUT_STATE_CHANGED = "activeinputstatechanged",
+    VOLUME_CHANGED = "volumechanged",
+    MEDIA_SESSION = "mediasession"
+  }
+  enum RemotePlayerEventType {
+    ANY_CHANGE = "anyChanged",
+    IS_CONNECTED_CHANGED = "isConnectedChanged",
+    IS_MEDIA_LOADED_CHANGED = "isMediaLoadedChanged",
+    DURATION_CHANGED = "durationChanged",
+    CURRENT_TIME_CHANGED = "currentTimeChanged",
+    IS_PAUSED_CHANGED = "isPausedChanged",
+    VOLUME_LEVEL_CHANGED = "volumeLevelChanged",
+    CAN_CONTROL_VOLUME_CHANGED = "canControlVolumeChanged",
+    IS_MUTED_CHANGED = "isMutedChanged",
+    CAN_PAUSE_CHANGED = "canPauseChanged",
+    CAN_SEEK_CHANGED = "canSeekChanged",
+    DISPLAY_NAME_CHANGED = "displayNameChanged",
+    STATUS_TEXT_CHANGED = "statusTextChanged",
+    TITLE_CHANGED = "titleChanged",
+    DISPLAY_STATUS_CHANGED = "displayStatusChanged",
+    MEDIA_INFO_CHANGED = "mediaInfoChanged",
+    IMAGE_URL_CHANGED = "imageUrlChanged",
+    PLAYER_STATE_CHANGED = "playerStateChanged"
+  }
+
+  enum ActiveInputState {
+    ACTIVE_INPUT_STATE_UNKNOWN = -1,
+    ACTIVE_INPUT_STATE_NO = 0,
+    ACTIVE_INPUT_STATE_YES = 1
+  }
+
+  interface CastOptions {
+    autoJoinPolicy: chrome.cast.AutoJoinPolicy;
+    language?: string;
+    receiverApplicationId?: string;
+    resumeSavedSession?: boolean;
+  }
+
+  const VERSION: string;
+  function setLoggerLevel(level: LoggerLevel): void;
+
+  class CastContext {
+    static getInstance(): CastContext;
+    setOptions(options: CastOptions): void;
+    getCastState(): CastState;
+    getSessionState(): SessionState;
+    requestSession(): Promise<chrome.cast.ErrorCode | undefined>;
+    getCurrentSession(): CastSession | null;
+    endCurrentSession(stopCasting: boolean): void;
+
+    addEventListener(
+      type: CastContextEventType.CAST_STATE_CHANGED,
+      handler: (event: CastStateEventData) => void
+    ): void;
+    addEventListener(
+      type: CastContextEventType.SESSION_STATE_CHANGED,
+      handler: (event: SessionStateEventData) => void
+    ): void;
+    removeEventListener(
+      type: CastContextEventType.CAST_STATE_CHANGED,
+      handler: (event: CastStateEventData) => void
+    ): void;
+    removeEventListener(
+      type: CastContextEventType.SESSION_STATE_CHANGED,
+      handler: (event: SessionStateEventData) => void
+    ): void;
+  }
+
+  class CastSession {
+    constructor(sessionObj: chrome.cast.Session, state: SessionState);
+    getSessionObj(): chrome.cast.Session;
+    getSessionId(): string;
+    getSessionState(): SessionState;
+    getCastDevice(): chrome.cast.Receiver;
+    getApplicationMetadata(): ApplicationMetadata;
+    getApplicationStatus(): string;
+    getActiveInputState(): ActiveInputState;
+    endSession(stopCasting: boolean): void;
+    setVolume(volume: number): Promise<chrome.cast.ErrorCode | undefined>;
+    getVolume(): number;
+    setMute(mute: boolean): Promise<chrome.cast.ErrorCode | undefined>;
+    isMute(): boolean;
+    sendMessage(
+      namespace: string,
+      data: any
+    ): Promise<chrome.cast.ErrorCode | undefined>;
+    addMessageListener(
+      namespace: string,
+      listener: (namespace: string, message: string) => void
+    ): void;
+    removeMessageListener(
+      namespace: string,
+      listener: (namespace: string, message: string) => void
+    ): void;
+    loadMedia(
+      request: chrome.cast.media.LoadRequest
+    ): Promise<chrome.cast.ErrorCode | undefined>;
+    getMediaSession(): chrome.cast.media.Media | null;
+
+    addEventListener(
+      type: SessionEventType.ACTIVE_INPUT_STATE_CHANGED,
+      handler: (event: ActiveInputStateEventData) => void
+    ): void;
+    addEventListener(
+      type: SessionEventType.APPLICATION_METADATA_CHANGED,
+      handler: (event: ApplicationMetadataEventData) => void
+    ): void;
+    addEventListener(
+      type: SessionEventType.APPLICATION_STATUS_CHANGED,
+      handler: (event: ApplicationStatusEventData) => void
+    ): void;
+    addEventListener(
+      type: SessionEventType.MEDIA_SESSION,
+      handler: (event: MediaSessionEventData) => void
+    ): void;
+    addEventListener(
+      type: SessionEventType.VOLUME_CHANGED,
+      handler: (event: VolumeEventData) => void
+    ): void;
+    removeEventListener(
+      type: SessionEventType.ACTIVE_INPUT_STATE_CHANGED,
+      handler: (event: ActiveInputStateEventData) => void
+    ): void;
+    removeEventListener(
+      type: SessionEventType.APPLICATION_METADATA_CHANGED,
+      handler: (event: ApplicationMetadataEventData) => void
+    ): void;
+    removeEventListener(
+      type: SessionEventType.APPLICATION_STATUS_CHANGED,
+      handler: (event: ApplicationStatusEventData) => void
+    ): void;
+    removeEventListener(
+      type: SessionEventType.MEDIA_SESSION,
+      handler: (event: MediaSessionEventData) => void
+    ): void;
+    removeEventListener(
+      type: SessionEventType.VOLUME_CHANGED,
+      handler: (event: VolumeEventData) => void
+    ): void;
+  }
+
+  class RemotePlayerController {
+    constructor(player: RemotePlayer);
+    playOrPause(): void;
+    stop(): void;
+    seek(): void;
+    muteOrUnmute(): void;
+    setVolumeLevel(): void;
+    getFormattedTime(timeInSec: number): string;
+    getSeekPosition(currentTime: number, duration: number): number;
+    getSeekTime(currentPosition: number, duration: number): number;
+
+    addEventListener(
+      type: RemotePlayerEventType,
+      handler: (event: RemotePlayerChangedEvent) => void
+    ): void;
+    removeEventListener(
+      type: RemotePlayerEventType,
+      handler: (event: RemotePlayerChangedEvent) => void
+    ): void;
+  }
+
+  interface SavedPlayerState {
+    mediaInfo: chrome.cast.media.PlayerState | null;
+    currentTime: number;
+    isPaused: boolean;
+  }
+
+  class RemotePlayer {
+    isConnected: boolean;
+    isMediaLoaded: boolean;
+    duration: number;
+    currentTime: number;
+    volumeLevel: number;
+    canControlVolume: boolean;
+    isPaused: boolean;
+    isMuted: boolean;
+    canPause: boolean;
+    canSeek: boolean;
+    displayName: string;
+    statusText: string;
+    title: string;
+    displayStatus: string;
+    mediaInfo?: chrome.cast.media.MediaInfo;
+    imageUrl: string | null;
+    playerState: chrome.cast.media.PlayerState | null;
+    savedPlayerState: SavedPlayerState | null;
+    controller: RemotePlayerController | null;
+  }
+
+  class ApplicationMetadata {
+    constructor(sessionObj: chrome.cast.Session);
+    applicationId: string;
+    images: chrome.cast.Image[];
+    name: string;
+    namespaces: string[];
+  }
+
+  abstract class EventData {
+    constructor(type: string);
+    type: string;
+  }
+
+  class ActiveInputStateEventData extends EventData {
+    constructor(activeInputState: ActiveInputState);
+    activeInputState: ActiveInputState;
+  }
+
+  class ApplicationMetadataEventData extends EventData {
+    constructor(metadata: ApplicationMetadata);
+    metadata: ApplicationMetadata;
+  }
+
+  class ApplicationStatusEventData extends EventData {
+    constructor(status: string);
+    status: string;
+  }
+
+  class CastStateEventData extends EventData {
+    constructor(castState: CastState);
+    castState: CastState;
+  }
+
+  class MediaSessionEventData extends EventData {
+    constructor(mediaSession: chrome.cast.media.Media);
+    mediaSession: chrome.cast.media.Media;
+  }
+
+  class RemotePlayerChangedEvent<T = any> extends EventData {
+    constructor(type: RemotePlayerEventType, field: string, value: T);
+    field: string;
+    value: T;
+  }
+
+  class SessionStateEventData extends EventData {
+    constructor(
+      session: CastSession,
+      sessionState: SessionState,
+      opt_errorCode: chrome.cast.ErrorCode
+    );
+    errorCode: chrome.cast.ErrorCode;
+    session: CastSession;
+    sessionState: SessionState;
+  }
+
+  class VolumeEventData extends EventData {
+    constructor(volume: number, isMute: boolean);
+    isMute: boolean;
+    volume: number;
+  }
+}
diff --git a/types/chromecast-caf-sender/tsconfig.json b/types/chromecast-caf-sender/tsconfig.json
new file mode 100644
index 0000000000..0d8a0cad6e
--- /dev/null
+++ b/types/chromecast-caf-sender/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "chromecast-caf-sender-tests.ts"
+    ]
+}
diff --git a/types/chromecast-caf-sender/tslint.json b/types/chromecast-caf-sender/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/chromecast-caf-sender/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 14446c91d72027b1fe3936a1e25c5d35a40a76e1 Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Thu, 31 May 2018 11:16:39 -0400
Subject: [PATCH 0895/1124] Move chrome/chrome-cast types into folder

---
 types/chrome/{chrome-cast.d.ts => chrome-cast/index.d.ts} | 0
 types/chrome/tsconfig.json                                | 4 ++--
 types/chromecast-caf-sender/index.d.ts                    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename types/chrome/{chrome-cast.d.ts => chrome-cast/index.d.ts} (100%)

diff --git a/types/chrome/chrome-cast.d.ts b/types/chrome/chrome-cast/index.d.ts
similarity index 100%
rename from types/chrome/chrome-cast.d.ts
rename to types/chrome/chrome-cast/index.d.ts
diff --git a/types/chrome/tsconfig.json b/types/chrome/tsconfig.json
index 1463d006eb..d4342a641c 100644
--- a/types/chrome/tsconfig.json
+++ b/types/chrome/tsconfig.json
@@ -20,10 +20,10 @@
     "files": [
         "index.d.ts",
         "chrome-app.d.ts",
-        "chrome-cast.d.ts",
         "chrome-webview.d.ts",
+        "chrome-cast/index.d.ts",
         "test/index.ts",
         "test/chrome-app.ts",
         "test/chrome-webview.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/chromecast-caf-sender/index.d.ts b/types/chromecast-caf-sender/index.d.ts
index e1e5c8ae65..de152b0715 100644
--- a/types/chromecast-caf-sender/index.d.ts
+++ b/types/chromecast-caf-sender/index.d.ts
@@ -4,7 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-/// <reference types="chrome" />
 /// <reference types="chrome/chrome-cast" />
 
 ////////////////////

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 0896/1124] [@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 0897/1124] 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 0898/1124] 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 0899/1124] 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 8e4d4150bde976f21c6177e76cfdbc5788ea9939 Mon Sep 17 00:00:00 2001
From: Danny Cochran <daniel@cochrans.org>
Date: Thu, 31 May 2018 13:07:31 -0700
Subject: [PATCH 0900/1124] make RequestPromise generic

The default Promise interface is a generic which is useful for specifying your expected return value from the promise resolving.
---
 types/request-promise-native/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/request-promise-native/index.d.ts b/types/request-promise-native/index.d.ts
index 0b5ef4300c..201983dd6e 100644
--- a/types/request-promise-native/index.d.ts
+++ b/types/request-promise-native/index.d.ts
@@ -9,10 +9,10 @@ import request = require('request');
 import http = require('http');
 
 declare namespace requestPromise {
-    interface RequestPromise extends request.Request {
-        then: Promise<any>["then"];
-        catch: Promise<any>["catch"];
-        promise(): Promise<any>;
+    interface RequestPromise<T = any> extends request.Request {
+        then: Promise<T>["then"];
+        catch: Promise<T>["catch"];
+        promise(): Promise<T>;
     }
 
     interface RequestPromiseOptions extends request.CoreOptions {

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 0901/1124] 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 0902/1124] 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 f24e32d8ad345ac7d89438ed75e7afe2451cde29 Mon Sep 17 00:00:00 2001
From: danielcollette <daniel.collette@pb.com>
Date: Thu, 31 May 2018 17:11:03 -0400
Subject: [PATCH 0903/1124] change markerStyle to any

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

diff --git a/types/leaflet.locatecontrol/index.d.ts b/types/leaflet.locatecontrol/index.d.ts
index 542461cec7..458f7232ca 100644
--- a/types/leaflet.locatecontrol/index.d.ts
+++ b/types/leaflet.locatecontrol/index.d.ts
@@ -27,7 +27,7 @@ declare module 'leaflet' {
             drawMarker?: boolean;
             markerClass?: any;
             circleStyle?: PathOptions;
-            markerStyle?: PathOptions;
+            markerStyle?: any;
             followCircleStyle?: PathOptions;
             followMarkerStyle?: PathOptions;
             icon?: string;

From 05456db91a07bb89509dc8a72c33b9c5783b0dc7 Mon Sep 17 00:00:00 2001
From: Grzegorz Blaszczyk <grzegorz.blaszczyk@screen9.com>
Date: Thu, 31 May 2018 23:42:24 +0200
Subject: [PATCH 0904/1124] adds 'one' method, fixes some indentation problems.

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

diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index 3a658fc05f..5383cf8261 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -5,6 +5,7 @@
 //                 Sean Bennett <https://github.com/SWBennett06>
 //                 Christoph Wagner <https://github.com/IgelCampus>
 //                 Gio Freitas <https://github.com/giofreitas>
+//                 Grzegorz Błaszczyk <https://github.com/gjanblaszczyk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // The Video.js API allows you to interact with the video through
@@ -109,8 +110,8 @@ declare namespace videojs {
 	}
 
 	class Player extends Component {
-        autoplay(value?: boolean): string;
-		addRemoteTextTrack(options: {}): HTMLTrackElement;
+		autoplay(value?: boolean): string;
+		addRemoteTextTrack(options: {}, manualCleanup?: boolean): HTMLTrackElement;
 		buffered(): TimeRanges;
 		bufferedPercent(): number;
 		cancelFullScreen(): Player;
@@ -122,16 +123,17 @@ declare namespace videojs {
 		height(): number;
 		height(num: number): void;
 		languageSwitch(options: any): void;
-        loop(value?: boolean): string;
-        muted(muted?: boolean): boolean;
+		loop(value?: boolean): string;
+		muted(muted?: boolean): boolean;
 		off(eventName?: string, callback?: (eventObject: Event) => void): void;
 		on(eventName: string, callback: (eventObject: Event) => void): void;
+		one(eventName: string, callback: (eventObject: Event) => void): void;
 		pause(): Player;
 		paused(): boolean;
 		play(): Player;
 		playbackRate(rate?: number): number;
 		poster(val?: string): string | Player;
-        preload(value?: boolean): string;
+		preload(value?: boolean): string;
 		removeRemoteTextTrack(track: HTMLTrackElement): void;
 		requestFullScreen(): Player;
 		size(width: number, height: number): Player;

From b6ff750cd5ae729db8de62195f2979cc69a32fed Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Thu, 31 May 2018 16:34:11 -0700
Subject: [PATCH 0905/1124] Starting Recurrence Updates

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index da9e84fa1b..b96ff69f2a 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -277,6 +277,12 @@ declare namespace Office {
          */
         name: string;
     }
+    export namespace AddinCommands {
+        export interface Event {
+            
+            completed(): void;
+        }
+    }
     /**
      * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes, in your Office Add-ins. 
      */
@@ -5226,6 +5232,54 @@ declare namespace Office {
         urls: string[];
     }
 
+    /**
+     * Provides a method to get the from value of a message in an Outlook add-in.
+     * 
+     * [Api set: Mailbox Preview]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * 
+     * Applicable Outlook mode: Compose
+     */
+    export interface From {
+        /**
+         * Gets the from value of a message.
+         * 
+         * The getAsync method starts an asynchronous call to the Exchange server to get the from value of a message.
+         * 
+         * The from value of the item is provided as an EmailAddressDetails in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @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;
+        /**
+         * Gets the from value of a message.
+         * 
+         * The getAsync method starts an asynchronous call to the Exchange server to get the from value of a message.
+         * 
+         * The from value of the item is provided as an EmailAddressDetails in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @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;
+    }
 
     export interface Appointment extends Item {
     }
@@ -7872,6 +7926,36 @@ declare namespace Office {
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
 
     }
+
+    /**
+     * The recurrence object provides methods to get and set the recurrence pattern of appointments but only get the recurrence pattern of meeting requests. It will have a dictionary with the following keys: seriesTime, recurrenceType, recurrenceProperties, and recurrenceTimeZone (optional).
+     * 
+     * 
+     * [Api set: Mailbox Preview]
+     * 
+     * @remarks
+     * 
+     * |State|Editable?|Viewable?|
+     * |-----|---------|---------|
+     * |Appointment Organizer - Compose Series|Yes (setAsync)|Yes (getAsync)|
+     * |Appointment Organizer - Compose Instance|No (setAsync returns error)|Yes (getAsync)|
+     * |Appointment Attendee - Read Series|No (setAsync not available)|Yes (item.recurrence)|
+     * |Appointment Attendee - Read Instance|No (setAsync not available)|Yes (item.recurrence)|
+     * |Meeting Request - Read Series|No (setAsync not available)|Yes (item.recurrence)|
+     * |Meeting Request - Read Instance|No (setAsync not available)|Yes (item.recurrence)|
+     * 
+     * Minimum permission level: ReadItem
+     * 
+     * Applicable Outlook mode: Compose or read
+     */
+    export interface Recurrence {
+        recurrenceProperties :RecurrenceProperties
+    }
+
+    export interface RecurrenceProperties {
+        
+    }
+
     export interface ReplyFormAttachment {
         type: string;
         name: string;

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 0906/1124] 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 0907/1124] 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 0908/1124] 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 0909/1124] 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>;

From c122cd24a649fe9bc80d1a37ad645b9e43710d3b Mon Sep 17 00:00:00 2001
From: James Ide <ide@expo.io>
Date: Thu, 31 May 2018 20:40:05 -0700
Subject: [PATCH 0910/1124] Fix parameterized type inference for async-retry

The async-retry function has a generic type parameter `A` and TypeScript is unable to infer the concret type when the `bail` function, whose type references the generic type, is specified. Reading the source and API documentation of async-retry, `bail` returns nothing so `void` is the right type here. This in turn fixes inference of the generic type parameter `A`.

Tested by adding some expected return types to the test file. The type checks failed before this commit. With this commit, they pass.
---
 types/async-retry/async-retry-tests.ts | 4 ++--
 types/async-retry/index.d.ts           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/async-retry/async-retry-tests.ts b/types/async-retry/async-retry-tests.ts
index 68327b66bd..20dfc62c4b 100644
--- a/types/async-retry/async-retry-tests.ts
+++ b/types/async-retry/async-retry-tests.ts
@@ -10,12 +10,12 @@ const o: Options = {
   onRetry: (e: Error) => 42
 };
 
-retry(
+const hello: Promise<string> = retry(
   bail => 'hello',
   { retries: 3 }
 );
 
-retry(
+const answer: Promise<number> = retry(
   bail => Promise.resolve(42),
   { retries: 3 }
 );
diff --git a/types/async-retry/index.d.ts b/types/async-retry/index.d.ts
index a2f65e00a4..6b50c71b63 100644
--- a/types/async-retry/index.d.ts
+++ b/types/async-retry/index.d.ts
@@ -19,7 +19,7 @@ declare namespace AsyncRetry {
 		onRetry?: (e: Error) => any;
 	}
 
-	type RetryFunction<A> = (bail: (e: Error) => A, attempt: number) => A|Promise<A>;
+	type RetryFunction<A> = (bail: (e: Error) => void, attempt: number) => A|Promise<A>;
 }
 
 export = AsyncRetry;

From 47667055bbb80097f2a43bed68d5e022d6e7fa6a Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Fri, 1 Jun 2018 10:45:09 +0700
Subject: [PATCH 0911/1124] Restore .gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac63b6f6b5..c8e25cec8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,3 @@ npm-debug.log
 
 # yarn
 yarn.lock
-
-# pnpm
-shrinkwrap.yaml

From 51e68748407f5bb35f9eb218255985f4aa2ef7db Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Fri, 1 Jun 2018 10:48:21 +0700
Subject: [PATCH 0912/1124] Ignore shrinkwrap.yaml

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index c8e25cec8d..ac63b6f6b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ npm-debug.log
 
 # yarn
 yarn.lock
+
+# pnpm
+shrinkwrap.yaml

From 475d739f1a01951cfa5bab8f9840c9fe0d2ed68c Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Thu, 31 May 2018 22:02:11 -0700
Subject: [PATCH 0913/1124] Revert "S3rver: Add `declare namespace S3rver` to
 fix import"

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

diff --git a/types/s3rver/index.d.ts b/types/s3rver/index.d.ts
index 6b052e9bae..2ec50a1f84 100644
--- a/types/s3rver/index.d.ts
+++ b/types/s3rver/index.d.ts
@@ -28,6 +28,4 @@ interface S3rverOptions {
     directory: string;
 }
 
-declare namespace S3rver {}
-
 export = S3rver;

From 698e6953ad64c24fc9990465d4b5e99833374502 Mon Sep 17 00:00:00 2001
From: xc-zhang-office <studentzxc@live.cn>
Date: Fri, 1 Jun 2018 15:28:16 +0800
Subject: [PATCH 0914/1124] Added several methods introduced in
 node-telegram-bot-api v0.30.0

---
 types/node-telegram-bot-api/index.d.ts        | 30 +++++++++++++++++--
 .../node-telegram-bot-api-tests.ts            |  6 ++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
index 7785617957..792b1deb73 100644
--- a/types/node-telegram-bot-api/index.d.ts
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -4,13 +4,14 @@
 //                 Agadar <https://github.com/agadar>
 //                 Giorgio Garasto <https://github.com/Dabolus>
 //                 Kallu609 <https://github.com/Kallu609>
+//                 XC-Zhang <https://github.com/XC-Zhang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="node" />
 
 import { EventEmitter } from 'events';
-import { Stream } from 'stream';
+import { Stream, Readable } from 'stream';
 import { ServerOptions } from 'https';
 import { Options } from 'request';
 
@@ -58,6 +59,11 @@ declare namespace TelegramBot {
         restart?: boolean;
     }
 
+    interface StopPollingOptions {
+        cancel?: boolean;
+        reason?: string;
+    }
+
     interface SetWebHookOptions {
         url?: string;
         certificate?: string | Stream;
@@ -136,6 +142,10 @@ declare namespace TelegramBot {
 
     type SendLocationOptions = SendBasicOptions;
 
+    type EditMessageLiveLocationOptions = EditMessageCaptionOptions;
+
+    type StopMessageLiveLocationOptions = EditMessageCaptionOptions;
+
     interface SendVenueOptions extends SendBasicOptions {
         foursquare_id?: string;
     }
@@ -147,6 +157,7 @@ declare namespace TelegramBot {
     type SendGameOptions = SendBasicOptions;
 
     interface SendInvoiceOptions extends SendBasicOptions {
+        provider_data?: string;
         photo_url?: string;
         photo_size?: number;
         photo_width?: number;
@@ -818,7 +829,7 @@ declare class TelegramBot extends EventEmitter {
 
     startPolling(options?: TelegramBot.StartPollingOptions): Promise<any>;
 
-    stopPolling(): Promise<any>;
+    stopPolling(options?: TelegramBot.StopPollingOptions): Promise<any>;
 
     isPolling(): boolean;
 
@@ -886,6 +897,11 @@ declare class TelegramBot extends EventEmitter {
 
     unpinChatMessage(chatId: number | string): Promise<boolean | Error>;
 
+    answerCallbackQuery(callbackQueryId: string, options?: Partial<TelegramBot.AnswerCallbackQueryOptions>): Promise<boolean | Error>;
+
+    /**
+     * @deprecated since version 0.30.0
+     */
     answerCallbackQuery(options?: TelegramBot.AnswerCallbackQueryOptions): Promise<boolean | Error>;
 
     editMessageText(text: string, options?: TelegramBot.EditMessageTextOptions): Promise<TelegramBot.Message | boolean | Error>;
@@ -898,6 +914,10 @@ declare class TelegramBot extends EventEmitter {
 
     sendLocation(chatId: number | string, latitude: number, longitude: number, options?: TelegramBot.SendLocationOptions): Promise<TelegramBot.Message | Error>;
 
+    editMessageLiveLocation(latitude: number, longitude: number, options?: TelegramBot.EditMessageLiveLocationOptions): Promise<TelegramBot.Message | boolean | Error>;
+
+    stopMessageLiveLocation(options?: TelegramBot.StopMessageLiveLocationOptions): Promise<TelegramBot.Message | boolean | Error>;
+
     sendVenue(chatId: number | string, latitude: number, longitude: number, title: string, address: string, options?: TelegramBot.SendVenueOptions): Promise<TelegramBot.Message | Error>;
 
     sendContact(chatId: number | string, phoneNumber: string, firstName: string, options?: TelegramBot.SendContactOptions): Promise<TelegramBot.Message | Error>;
@@ -906,6 +926,8 @@ declare class TelegramBot extends EventEmitter {
 
     getFileLink(fileId: string): Promise<string | Error>;
 
+    getFileStream(fileId: string): Readable;
+
     downloadFile(fileId: string, downloadDir: string): Promise<string | Error>;
 
     onText(regexp: RegExp, callback: ((msg: TelegramBot.Message, match: RegExpExecArray | null) => void)): void;
@@ -926,6 +948,10 @@ declare class TelegramBot extends EventEmitter {
 
     leaveChat(chatId: number | string): Promise<boolean | Error>;
 
+    setChatStickerSet(chatId: number | string, stickerSetName: string): Promise<boolean | Error>;
+
+    deleteChatStickerSet(chatId: number | string): Promise<boolean | Error>;
+
     sendGame(chatId: number | string, gameShortName: string, options?: TelegramBot.SendGameOptions): Promise<TelegramBot.Message | Error>;
 
     setGameScore(userId: string, score: number, options?: TelegramBot.SetGameScoreOptions): Promise<TelegramBot.Message | boolean | Error>;
diff --git a/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
index 58d4fb8b7e..dcd8adc238 100644
--- a/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
+++ b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
@@ -44,6 +44,7 @@ MyTelegramBot.setChatTitle(1234, 'Chat Title');
 MyTelegramBot.setChatDescription(1234, 'Chat Description');
 MyTelegramBot.pinChatMessage(1234, 'Pinned Message');
 MyTelegramBot.unpinChatMessage(1234);
+MyTelegramBot.answerCallbackQuery('432832');
 MyTelegramBot.answerCallbackQuery({ callback_query_id: '432832' });
 MyTelegramBot.editMessageText('test-text', { disable_web_page_preview: true });
 MyTelegramBot.editMessageCaption('My Witty Caption', { message_id: 1245 });
@@ -52,10 +53,13 @@ MyTelegramBot.editMessageReplyMarkup({ inline_keyboard: [[{
 }]] }, { message_id: 1244 });
 MyTelegramBot.getUserProfilePhotos('myUserID', { limit: 10 });
 MyTelegramBot.sendLocation(1234, 100, 200, { reply_to_message_id: 1234 });
+MyTelegramBot.editMessageLiveLocation(100, 200, { message_id: 1245 });
+MyTelegramBot.stopMessageLiveLocation({ message_id: 1245 });
 MyTelegramBot.sendVenue(1234, 100, 200, 'Venue Title', '123 Fake St.', { reply_to_message_id: 1234 });
 MyTelegramBot.sendContact(1234, '345-555-0192', 'John', { last_name: 'Smith' });
 MyTelegramBot.getFile('My/File/ID');
 MyTelegramBot.getFileLink('My/File/ID');
+MyTelegramBot.getFileStream('My/File/ID');
 MyTelegramBot.downloadFile('My/File/ID', 'mydownloaddir/');
 MyTelegramBot.onText(/regex/, (msg, match) => { });
 MyTelegramBot.removeTextListener(/regex/);
@@ -66,6 +70,8 @@ MyTelegramBot.getChatAdministrators(1234);
 MyTelegramBot.getChatMembersCount(1234);
 MyTelegramBot.getChatMember(1234, 'myUserID');
 MyTelegramBot.leaveChat(1234);
+MyTelegramBot.setChatStickerSet(1234, 'sticker');
+MyTelegramBot.deleteChatStickerSet(1234);
 MyTelegramBot.sendGame(1234, 'MygameName', { reply_to_message_id: 1234 });
 MyTelegramBot.setGameScore('myUserID', 99, { message_id: 1234 });
 MyTelegramBot.getGameHighScores('myUserID', { message_id: 1234 });

From 0751408375f48acb4bffa13d481f69e5622d6497 Mon Sep 17 00:00:00 2001
From: Austin Riedhammer <austinried@gmail.com>
Date: Fri, 1 Jun 2018 01:13:57 -0700
Subject: [PATCH 0915/1124] remove dep on net interface only in node>=10

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

diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index 9bdf092f38..3667941753 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -168,6 +168,12 @@ declare namespace WebSocket {
         maxPayload?: number;
     }
 
+    interface AddressInfo {
+        address: string;
+        family: string;
+        port: number;
+    }
+
     // WebSocket Server
     class Server extends events.EventEmitter {
         options: ServerOptions;
@@ -176,7 +182,7 @@ declare namespace WebSocket {
 
         constructor(options?: ServerOptions, callback?: () => void);
 
-        address(): net.AddressInfo | string;
+        address(): AddressInfo | string;
         close(cb?: (err?: Error) => void): void;
         handleUpgrade(request: http.IncomingMessage, socket: net.Socket,
             upgradeHead: Buffer, callback: (client: WebSocket) => void): void;

From 162d29c8c978946374eb5aa0e8c0a38b52b81016 Mon Sep 17 00:00:00 2001
From: xc-zhang-office <studentzxc@live.cn>
Date: Fri, 1 Jun 2018 16:53:25 +0800
Subject: [PATCH 0916/1124] Updated version.

---
 types/node-telegram-bot-api/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
index 792b1deb73..47d50223d2 100644
--- a/types/node-telegram-bot-api/index.d.ts
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-telegram-bot-api 0.28
+// Type definitions for node-telegram-bot-api 0.30
 // Project: https://github.com/yagop/node-telegram-bot-api
 // Definitions by: Alex Muench <https://github.com/ammuench>
 //                 Agadar <https://github.com/agadar>

From c67f9444e85978f438bee8744cfa34fe467fa5c6 Mon Sep 17 00:00:00 2001
From: Cerberuser <computers05@mail.ru>
Date: Fri, 1 Jun 2018 16:28:14 +0700
Subject: [PATCH 0917/1124] Fix for CollectionElements

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

diff --git a/types/cytoscape/cytoscape-tests.ts b/types/cytoscape/cytoscape-tests.ts
index 0b7bac436e..25d6151259 100644
--- a/types/cytoscape/cytoscape-tests.ts
+++ b/types/cytoscape/cytoscape-tests.ts
@@ -80,3 +80,17 @@ cy.on('zoom', (event) => {
     cy.nodes('$node > node').style('opacity', 0);
   }
 });
+
+cy.animate({
+  fit: {
+    padding: 10,
+    eles: cy.nodes()
+  },
+  duration: 500
+});
+
+const node = cy.nodes()[0];
+cy.animate({
+  center: {eles: node},
+  duration: 500
+});
diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index 18c3c0d1b5..e85041861a 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -1127,8 +1127,7 @@ declare namespace cytoscape {
     /**
      * The output is a collection of node and edge elements OR single element.
      */
-    interface CollectionElements extends
-        EdgeCollection, NodeCollection, SingularElement { }
+    type CollectionElements = EdgeCollection | NodeCollection | SingularElement;
 
     /**
      * edges -> Cy.EdgeCollection

From 2965cd1dd2de32f0fb64dcd7d9f7308a31872011 Mon Sep 17 00:00:00 2001
From: Grzegorz Blaszczyk <grzegorz.blaszczyk@screen9.com>
Date: Fri, 1 Jun 2018 12:28:35 +0200
Subject: [PATCH 0918/1124] Moves on, off and one method from Player to
 Component

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

diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index 5383cf8261..6fd8d15028 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -94,6 +94,9 @@ declare namespace videojs {
 		name(): string;
 		options(obj: any): any;
 		player(): Player;
+		off(eventName?: string, callback?: (eventObject: Event) => void): void;
+		on(eventName: string, callback: (eventObject: Event) => void): void;
+		one(eventName: string, callback: (eventObject: Event) => void): void;
 		ready(callback: (this: this) => void): this;
 		removeAttribute(attribute: string): void;
 		removeChild(component: Component): void;
@@ -125,9 +128,6 @@ declare namespace videojs {
 		languageSwitch(options: any): void;
 		loop(value?: boolean): string;
 		muted(muted?: boolean): boolean;
-		off(eventName?: string, callback?: (eventObject: Event) => void): void;
-		on(eventName: string, callback: (eventObject: Event) => void): void;
-		one(eventName: string, callback: (eventObject: Event) => void): void;
 		pause(): Player;
 		paused(): boolean;
 		play(): Player;

From 26ca6ba88154b314276a98d9e535113c2bb0fb29 Mon Sep 17 00:00:00 2001
From: Grzegorz Blaszczyk <grzegorz.blaszczyk@screen9.com>
Date: Fri, 1 Jun 2018 12:59:16 +0200
Subject: [PATCH 0919/1124] Fixes the order of methods in the Component.

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

diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index 6fd8d15028..5ba14c022d 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -92,11 +92,11 @@ declare namespace videojs {
 		initChildren(): void;
 		localize(key: string, tokens?: string[], defaultValue?: string): string;
 		name(): string;
-		options(obj: any): any;
-		player(): Player;
 		off(eventName?: string, callback?: (eventObject: Event) => void): void;
 		on(eventName: string, callback: (eventObject: Event) => void): void;
 		one(eventName: string, callback: (eventObject: Event) => void): void;
+		options(obj: any): any;
+		player(): Player;
 		ready(callback: (this: this) => void): this;
 		removeAttribute(attribute: string): void;
 		removeChild(component: Component): void;

From 6e21fee45a3ef9ea750c055473a2424931c886da Mon Sep 17 00:00:00 2001
From: SoraYama <sorayamahou@gmail.com>
Date: Fri, 1 Jun 2018 19:02:55 +0800
Subject: [PATCH 0920/1124] feat: update to urllib v2.28.0

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

diff --git a/types/urllib/index.d.ts b/types/urllib/index.d.ts
index f9e7100b8c..b5925161fd 100644
--- a/types/urllib/index.d.ts
+++ b/types/urllib/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for urllib 2.25
+// Type definitions for urllib 2.28
 // Project: http://github.com/node-modules/urllib
 // Definitions by: SoraYama <https://github.com/sorayama>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,11 +9,14 @@ import * as http from 'http';
 import * as url from 'url';
 import { Readable, Writable } from 'stream';
 import { EventEmitter } from 'events';
+import { LookupFunction } from 'net';
 
 export as namespace urllib;
 export interface RequestOptions {
   /** Request method, defaults to GET. Could be GET, POST, DELETE or PUT. Alias 'type'. */
   method?: "GET" | "POST" | "DELETE" | "PUT";
+  /** Alias method  */
+  type?: "GET" | "POST" | "DELETE" | "PUT";
   /** Data to be sent. Will be stringify automatically. */
   data?: any;
   /** Force convert data to query string. */
@@ -111,6 +114,17 @@ export interface RequestOptions {
   enableProxy?: boolean;
   /** proxy agent uri or options, default is null. */
   proxy?: string | { [key: string]: any };
+  /**
+   * Custom DNS lookup function, default is dns.lookup.
+   * Require node >= 4.0.0(for http protocol) and node >=8(for https protocol)
+   */
+  lookup?: LookupFunction;
+  /**
+   * check request address to protect from SSRF and similar attacks.
+   * It receive two arguments(ip and family) and should return true or false to identified the address is legal or not.
+   * It rely on lookup and have the same version requirement.
+   */
+  checkAddress?: (ip: string, family: number | string) => boolean;
 }
 
 /**

From b1b69f331821280661a82132d6a1235fe16dd997 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Fri, 1 Jun 2018 18:17:38 +0700
Subject: [PATCH 0921/1124] Jest 23 requires test functions to not be undefined

Reference: https://git.io/vhchc
---
 types/jest/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 4520247216..16fe2a2a01 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -218,7 +218,7 @@ declare namespace jest {
          * @param fn The function for your test
          * @param timeout The timeout for an async function test
          */
-        (name: string, fn?: ProvidesCallback, timeout?: number): void;
+        (name: string, fn: ProvidesCallback, timeout?: number): void;
         /**
          * Only runs this test in the current file.
          */

From a268074f6026655bbe66adb65fd27786ef67ed8b Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Fri, 1 Jun 2018 19:34:22 +0700
Subject: [PATCH 0922/1124] Bump Jest version to 23.0.0

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 16fe2a2a01..7879d6508a 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 22.2
+// Type definitions for Jest 23.0.0
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>

From 5fc5db79fbb797218c4c25c3f0386a769ed76f72 Mon Sep 17 00:00:00 2001
From: khai96_ <hvksmr1996@gmail.com>
Date: Fri, 1 Jun 2018 19:42:34 +0700
Subject: [PATCH 0923/1124] Fix version header

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 7879d6508a..af86996795 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 23.0.0
+// Type definitions for Jest 23.0
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>

From 1e652759d94a3a3499ca93b676e659a29a5508c2 Mon Sep 17 00:00:00 2001
From: Steve Fenton <Steve-Fenton@users.noreply.github.com>
Date: Fri, 1 Jun 2018 13:49:43 +0100
Subject: [PATCH 0924/1124] Update sharedworker-tests.ts

Demonstrating need for the SharedWorkerGlobalScope.
---
 types/sharedworker/sharedworker-tests.ts | 26 ++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/types/sharedworker/sharedworker-tests.ts b/types/sharedworker/sharedworker-tests.ts
index 0674166f8d..1fe55e8e06 100644
--- a/types/sharedworker/sharedworker-tests.ts
+++ b/types/sharedworker/sharedworker-tests.ts
@@ -1,7 +1,25 @@
 var worker_with_name = new SharedWorker('worker.js', "worker");
 
-var worker = new SharedWorker('worker.js');
+/* Caller */
+let worker = new SharedWorker('worker.js');
+worker.port.start();
 
-worker.port.onmessage = function(e) {
-    console.log(e);
-};
+worker.port.onmessage = function (e) {
+    console.log('Caller Received:', e.data);
+}
+
+worker.port.postMessage('Message');
+
+/* Worker */
+const _self: SharedWorker.SharedWorkerGlobalScope = self as any;
+
+_self.onconnect = function (e) {
+    var port = e.ports[0];
+
+    port.addEventListener('message', function (e) {
+        console.log('Worker Received', e.data);
+        port.postMessage('Result');
+    });
+
+    port.start();
+}

From 2231f8cf14d1f9354c424b149a1170a0cb4ee432 Mon Sep 17 00:00:00 2001
From: Steve Fenton <Steve-Fenton@users.noreply.github.com>
Date: Fri, 1 Jun 2018 13:51:02 +0100
Subject: [PATCH 0925/1124] Update index.d.ts

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

diff --git a/types/sharedworker/index.d.ts b/types/sharedworker/index.d.ts
index 1f3d5bee9a..df03ac80a3 100644
--- a/types/sharedworker/index.d.ts
+++ b/types/sharedworker/index.d.ts
@@ -2,7 +2,6 @@
 // Project: http://www.w3.org/TR/workers/
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 declare namespace SharedWorker {
     interface AbstractWorker extends EventTarget {
         onerror: (ev: ErrorEvent) => any;
@@ -16,6 +15,10 @@ declare namespace SharedWorker {
          */
         port: MessagePort;
     }
+
+    interface SharedWorkerGlobalScope {
+        onconnect: (event: MessageEvent) => void;
+    }
 }
 
 declare var SharedWorker: {
@@ -25,5 +28,5 @@ declare var SharedWorker: {
      * @param {string} stringUrl    Pathname to JavaScript file
      * @param {string} name         Name of the worker to execute
      */
-    new (stringUrl: string, name?: string): SharedWorker.SharedWorker;
+    new(stringUrl: string, name?: string): SharedWorker.SharedWorker;
 };

From daf742c84442637d0a019d6929b91a8436bb9cce Mon Sep 17 00:00:00 2001
From: Steve Fenton <Steve-Fenton@users.noreply.github.com>
Date: Fri, 1 Jun 2018 13:56:07 +0100
Subject: [PATCH 0926/1124] Update index.d.ts

Add Worker to SharedWorkerGlobalScope.
---
 types/sharedworker/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/sharedworker/index.d.ts b/types/sharedworker/index.d.ts
index df03ac80a3..de01a0583f 100644
--- a/types/sharedworker/index.d.ts
+++ b/types/sharedworker/index.d.ts
@@ -16,7 +16,7 @@ declare namespace SharedWorker {
         port: MessagePort;
     }
 
-    interface SharedWorkerGlobalScope {
+    interface SharedWorkerGlobalScope extends Worker {
         onconnect: (event: MessageEvent) => void;
     }
 }

From 3354c1bb24e4e6eb1ccc1896d2998faadfb6461b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20Damgaard=20M=C3=B8ller?= <jakobdo@gmail.com>
Date: Fri, 1 Jun 2018 14:57:19 +0200
Subject: [PATCH 0927/1124] Missing valueFormats in definitions

DiscreteBarChart and MultiBarHorizontalChart is missing the valueFormat(function) version.
---
 types/nvd3/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/nvd3/index.d.ts b/types/nvd3/index.d.ts
index cd60da4b8d..7f92d2410e 100644
--- a/types/nvd3/index.d.ts
+++ b/types/nvd3/index.d.ts
@@ -1698,6 +1698,8 @@ id(value: number|string): this;
         valueFormat(): string;
         /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
         valueFormat(value: string): this;
+		/*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(format: (d: any) => string): this;
         /* The width the graph or component created inside the SVG should be made*/
         width(): number;
         /*The width the graph or component created inside the SVG should be made.*/
@@ -2649,6 +2651,8 @@ id(value: number|string): this;
         valueFormat(): string;
         /*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
         valueFormat(value: string): this;
+		/*D3 Format object for the label of pie/donut, discrete bar and multibar charts.*/
+        valueFormat(format: (d: any) => string): this;
         /*.*/
         valuePadding(): number;
         /**/

From 495678f5cab66eadf7f6b98534038e60a6ac5265 Mon Sep 17 00:00:00 2001
From: Steve Fenton <Steve-Fenton@users.noreply.github.com>
Date: Fri, 1 Jun 2018 13:59:21 +0100
Subject: [PATCH 0928/1124] Update index.d.ts

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

diff --git a/types/sharedworker/index.d.ts b/types/sharedworker/index.d.ts
index de01a0583f..8cd19d6b68 100644
--- a/types/sharedworker/index.d.ts
+++ b/types/sharedworker/index.d.ts
@@ -16,7 +16,7 @@ declare namespace SharedWorker {
         port: MessagePort;
     }
 
-    interface SharedWorkerGlobalScope extends Worker {
+    export interface SharedWorkerGlobalScope extends Worker {
         onconnect: (event: MessageEvent) => void;
     }
 }

From ca0fbc2e08699be3749e631c3798e09374809ec5 Mon Sep 17 00:00:00 2001
From: Steve Fenton <Steve-Fenton@users.noreply.github.com>
Date: Fri, 1 Jun 2018 14:07:04 +0100
Subject: [PATCH 0929/1124] Update index.d.ts

TypeScript 2.8 comment
---
 types/sharedworker/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/sharedworker/index.d.ts b/types/sharedworker/index.d.ts
index 8cd19d6b68..9614fa98ef 100644
--- a/types/sharedworker/index.d.ts
+++ b/types/sharedworker/index.d.ts
@@ -2,6 +2,8 @@
 // Project: http://www.w3.org/TR/workers/
 // Definitions by: Toshiya Nakakura <https://github.com/nakakura>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
 declare namespace SharedWorker {
     interface AbstractWorker extends EventTarget {
         onerror: (ev: ErrorEvent) => any;

From 14f39d7936c068746bcd89063fc3634a3cb9901b Mon Sep 17 00:00:00 2001
From: Teemu Koivisto <tkoivisto456@gmail.com>
Date: Fri, 1 Jun 2018 16:11:18 +0300
Subject: [PATCH 0930/1124] Fix missing LabelList typing & update README

---
 types/recharts/README.MD          |  8 ++++++++
 types/recharts/index.d.ts         | 17 +++++++++++++++++
 types/recharts/recharts-tests.tsx | 24 ++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/types/recharts/README.MD b/types/recharts/README.MD
index 063a6dab3c..970e15ec0b 100644
--- a/types/recharts/README.MD
+++ b/types/recharts/README.MD
@@ -2,3 +2,11 @@ Typings for [Recharts](http://recharts.org/), a composable charting library buil
 
 The [Recharts website](https://github.com/recharts/recharts.org) has comprehensive API documentation which is generated from JavaScript files.
 Those files are used as input to generate these typings.
+
+# How to run tests
+
+As of 1.6.2018.
+
+1) Install typescript globally: `npm i -g typescript`
+2) Install React's dependencies: `cd ../react && npm i`
+3) Run tests: `cd ../recharts && tsc`
\ No newline at end of file
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index ecdcd1f420..d6e4a084a7 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -841,6 +841,23 @@ export interface LabelProps {
     content?: React.ReactElement<any> | ContentRenderer<Label>;
 }
 
+export class LabelList extends React.Component<LabelListProps> { }
+
+export interface LabelListProps {
+    angle?: number;
+    children?: React.ReactNode[] | React.ReactNode;
+    className?: string;
+    clockWise?: boolean;
+    content?: React.ReactElement<any> | ContentRenderer<Label>;
+    data?: number;
+    dataKey: string | number | RechartsFunction;
+    formatter?: LabelFormatter;
+    id?: string;
+    offset?: number;
+    position?: PositionType;
+    valueAccessor?: RechartsFunction;
+}
+
 export type AxisDomain = string | number | ContentRenderer<any> | 'auto' | 'dataMin' | 'dataMax';
 
 export interface XPadding {
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 7eed634119..d76ede7e97 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -4,8 +4,8 @@ import * as ReactDOM from 'react-dom';
 import {
     CartesianGrid, Line, LineChart, PieChart, Pie,
     Sector, XAxis, YAxis, Tooltip, ReferenceLine,
-    ReferenceArea, ResponsiveContainer, Label, Brush,
-    ScatterChart, ZAxis, Legend, Scatter
+    ReferenceArea, ResponsiveContainer, Label, LabelList, Brush,
+    ScatterChart, ZAxis, Legend, Scatter, Bar, BarChart
 } from 'recharts';
 
 interface ComponentState {
@@ -184,6 +184,26 @@ class Component extends React.Component<{}, ComponentState> {
                         <Scatter name="A school" data={data} fill="#8884d8" />
                     </ScatterChart>
                 </ResponsiveContainer>
+                <ResponsiveContainer>
+                    <BarChart
+                        width={730}
+                        height={250}
+                        data={data}
+                        margin={{ top: 15, right: 30, left: 20, bottom: 5 }}
+                    >
+                    <CartesianGrid strokeDasharray="3 3" />
+                    <XAxis dataKey="name">
+                        <Label value="Pages of my website" offset={0} position="insideBottom" />
+                    </XAxis>
+                    <YAxis label='pv of page' />
+                    <Bar dataKey="pv" fill="#8884d8">
+                        <LabelList dataKey="name" position="insideTop" angle={45}  />
+                    </Bar>
+                    <Bar dataKey="uv" fill="#82ca9d">
+                        <LabelList dataKey="uv" position="top" />
+                    </Bar>
+                    </BarChart>
+                </ResponsiveContainer>
             </div>
         );
     }

From 597f48efd836d90f08ba74f95e12d6daaedbe100 Mon Sep 17 00:00:00 2001
From: Michal Kubenka <mkubenka@gmail.com>
Date: Fri, 1 Jun 2018 15:50:42 +0200
Subject: [PATCH 0931/1124] Add missing hoverlabel.

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

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 689214138b..d16a80818a 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -397,6 +397,7 @@ export interface ScatterData {
                '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';
+	hoverlabel: Partial<Label>;
 	fill: 'none' | 'tozeroy' | 'tozerox' | 'tonexty' | 'tonextx' | 'toself' | 'tonext';
 	fillcolor: string;
 	legendgroup: string;

From e5ba2b3ffd9191c04a18709891aed3994bdaa2d7 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 1 Jun 2018 09:27:58 -0700
Subject: [PATCH 0932/1124] react-navigation: Fix lint (#26205)

---
 types/react-navigation/v2/index.d.ts  | 18 +++++++++---------
 types/react-navigation/v2/tslint.json |  8 +++++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/types/react-navigation/v2/index.d.ts b/types/react-navigation/v2/index.d.ts
index 36251eba5b..561558d540 100644
--- a/types/react-navigation/v2/index.d.ts
+++ b/types/react-navigation/v2/index.d.ts
@@ -46,11 +46,11 @@ export type HeaderMode = 'float' | 'screen' | 'none';
 
 export interface HeaderForceInset {
   horizontal?: string;
-  vertical?: string,
-  left?: string,
-  right?: string,
-  top?: string,
-  bottom?: string,
+  vertical?: string;
+  left?: string;
+  right?: string;
+  top?: string;
+  bottom?: string;
 }
 
 export interface HeaderProps extends NavigationSceneRendererProps {
@@ -665,8 +665,8 @@ export interface NavigationContainerProps<S = {}, O = {}> {
     action: NavigationAction
   ) => void | null | undefined;
   navigation?: NavigationScreenProp<S>;
-  persistenceKey?: string | null | undefined;
-  renderLoadingExperimental?: React.ComponentType<{}>,
+  persistenceKey?: string | null;
+  renderLoadingExperimental?: React.ComponentType;
   screenProps?: any;
   navigationOptions?: O;
   style?: StyleProp<ViewStyle>;
@@ -987,14 +987,14 @@ export interface NavigationDescriptor<Params = NavigationParams> {
   key: string;
   state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
   navigation: NavigationScreenProp<any>;
-  getComponent: () => React.ComponentType<{}>;
+  getComponent: () => React.ComponentType;
 }
 
 export type NavigationView<O, S> = React.ComponentType<{
   descriptors: { [key: string]: NavigationDescriptor };
 } & NavigationInjectedProps>;
 
-export function createNavigator<C, S, Options>(
+export function createNavigator<S, Options>(
   view: NavigationView<Options, S>,
   router: NavigationRouter<S, Options>,
   navigatorConfig?: {} | null,
diff --git a/types/react-navigation/v2/tslint.json b/types/react-navigation/v2/tslint.json
index 3db14f85ea..b1439230db 100644
--- a/types/react-navigation/v2/tslint.json
+++ b/types/react-navigation/v2/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "no-any-union": false
+    }
+}

From ac965730ca8a94f2a3daa619940a62ce20362bd8 Mon Sep 17 00:00:00 2001
From: Luna <malalunapg@gmail.com>
Date: Fri, 1 Jun 2018 12:53:29 -0400
Subject: [PATCH 0933/1124] Added new apiEndpoint options key for Google PubSub
 definition type

---
 types/google-cloud__pubsub/index.d.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/types/google-cloud__pubsub/index.d.ts b/types/google-cloud__pubsub/index.d.ts
index 2cadd026cd..6205c8aee7 100644
--- a/types/google-cloud__pubsub/index.d.ts
+++ b/types/google-cloud__pubsub/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for @google-cloud/pubsub 0.14
+// Type definitions for @google-cloud/pubsub 0.18
 // Project: https://github.com/GoogleCloudPlatform/google-cloud-node/tree/master/packages/pubsub
-// Definitions by: Paul Huynh <https://github.com/pheromonez>
+// Definitions by: Paul Huynh <https://github.com/pheromonez>, LunaPg <https://github.com/LunaPg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -13,9 +13,13 @@ declare namespace PubSub {
     // https://googlecloudplatform.github.io/google-cloud-node/#/docs/pubsub/0.14.1/pubsub/v1
     function v1(config?: GCloudConfiguration): any;
 
+    /**
+     * @version: Google PubSub 0.18.0
+     */
     interface GCloudConfiguration {
         projectId?: string;
         keyFilename?: string;
+        apiEndpoint?: string;
         email?: string;
         credentials?: {
             client_email?: string;

From 54bca77d2224bda9eda3d54e4c6fa853eb5a0d0a Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Fri, 1 Jun 2018 19:00:04 +0200
Subject: [PATCH 0934/1124] imperium: Set new methods to public

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

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index 9ec2ca9c09..f6765eea93 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -33,13 +33,13 @@ export class Imperium {
 
     private addRole(roleName: string, getAcl: GetAcl): void;
 
-    private evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
+    evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
 
-    private evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
+    evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
 
-    private evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
+    evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
 
-    private evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
+    evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
 }
 
 interface Roles {

From 43f6ef69879fa15acd133a731fd1d2e52eabcc6e Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Fri, 1 Jun 2018 18:05:58 +0100
Subject: [PATCH 0935/1124] Add typings for webpack-serve and
 webpack-hot-client

---
 types/webpack-hot-client/index.d.ts           | 51 ++++++++++
 types/webpack-hot-client/tsconfig.json        | 23 +++++
 types/webpack-hot-client/tslint.json          |  1 +
 .../webpack-hot-client-tests.ts               |  6 ++
 types/webpack-serve/index.d.ts                | 93 +++++++++++++++++++
 types/webpack-serve/tsconfig.json             | 23 +++++
 types/webpack-serve/tslint.json               |  1 +
 types/webpack-serve/webpack-serve-tests.ts    | 22 +++++
 8 files changed, 220 insertions(+)
 create mode 100644 types/webpack-hot-client/index.d.ts
 create mode 100644 types/webpack-hot-client/tsconfig.json
 create mode 100644 types/webpack-hot-client/tslint.json
 create mode 100644 types/webpack-hot-client/webpack-hot-client-tests.ts
 create mode 100644 types/webpack-serve/index.d.ts
 create mode 100644 types/webpack-serve/tsconfig.json
 create mode 100644 types/webpack-serve/tslint.json
 create mode 100644 types/webpack-serve/webpack-serve-tests.ts

diff --git a/types/webpack-hot-client/index.d.ts b/types/webpack-hot-client/index.d.ts
new file mode 100644
index 0000000000..337581fedb
--- /dev/null
+++ b/types/webpack-hot-client/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for webpack-hot-client 3.0
+// Project: https://github.com/webpack-contrib/webpack-hot-client
+// Definitions by: Ryan Clark <https://github.com/rynclark>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import * as webpack from 'webpack';
+import * as http from 'http';
+
+export = WebpackHotClient;
+
+declare function WebpackHotClient(
+  compiler: webpack.Compiler | webpack.MultiCompiler,
+  options: WebpackHotClient.Options
+): void;
+
+declare namespace WebpackHotClient {
+  interface WebpackHotHost {
+    /** Client hostname that is used in the browser by WebSockets */
+    client: string;
+    /** Server hostname */
+    server: string;
+  }
+
+  interface Options {
+    /** Automatically configure every entry */
+    allEntries?: boolean;
+    /** Auto configure the given webpack config with the hot configuration */
+    autoConfigure?: boolean;
+    /** Level of information for webpack-hot-client to output */
+    host?: WebpackHotHost | string;
+    /** Enable hot module reloading */
+    hmr?: boolean;
+    /** Enable HTTPS */
+    https?: boolean;
+    /** Level of information for webpack-hot-client to output */
+    logLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error';
+    /** Prepend timestamp to each log line */
+    logTime?: boolean;
+    /** Port that the WebSocket listens on */
+    port?: number;
+    /** Reload the page if a patch cannot be applied by webpack */
+    reload?: boolean;
+    /** Server instance for webpack-hot-client to connect to */
+    server?: http.Server;
+    /** Webpack stats configuration */
+    stats?: webpack.Options.Stats;
+  }
+}
diff --git a/types/webpack-hot-client/tsconfig.json b/types/webpack-hot-client/tsconfig.json
new file mode 100644
index 0000000000..43b0f2ec10
--- /dev/null
+++ b/types/webpack-hot-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",
+    "webpack-hot-client-tests.ts"
+  ]
+}
diff --git a/types/webpack-hot-client/tslint.json b/types/webpack-hot-client/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-hot-client/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-hot-client/webpack-hot-client-tests.ts b/types/webpack-hot-client/webpack-hot-client-tests.ts
new file mode 100644
index 0000000000..29ab2341a7
--- /dev/null
+++ b/types/webpack-hot-client/webpack-hot-client-tests.ts
@@ -0,0 +1,6 @@
+import webpack = require('webpack');
+import hot = require('webpack-hot-client');
+
+const compiler = webpack();
+
+hot(compiler, { logLevel: 'info', reload: false });
diff --git a/types/webpack-serve/index.d.ts b/types/webpack-serve/index.d.ts
new file mode 100644
index 0000000000..8e597097a7
--- /dev/null
+++ b/types/webpack-serve/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for webpack-serve 1.0
+// Project: https://github.com/webpack-contrib/webpack-serve
+// Definitions by: Ryan Clark <https://github.com/rynclark>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import * as koa from 'koa';
+import * as webpack from 'webpack';
+import * as webpackDevMiddleware from 'webpack-dev-middleware';
+import * as webpackHotClient from 'webpack-hot-client';
+import * as https from 'https';
+
+export = WebpackServe;
+
+declare module 'webpack' {
+  interface Configuration {
+    serve: WebpackServe.Options;
+  }
+}
+
+declare function WebpackServe(
+  { config }: { config: WebpackServe.Options }
+): Promise<WebpackServe.Instance>;
+
+declare namespace WebpackServe {
+  interface WebpackServeOpen {
+    /** Name of the browser to open */
+    app: string;
+    /** Path on the server to open */
+    path: string;
+  }
+
+  interface WebpackServeMiddleware {
+    /** Function to call to add koa-static */
+    content: () => koa.Middleware;
+    /** Function to call to add the webpack-dev-middleware */
+    webpack: () => webpackDevMiddleware.WebpackDevMiddleware;
+  }
+
+  interface Instance {
+    /** Subscriber function for events */
+    on(event: 'build-started', listener: (args: { compiler: webpack.Compiler }) => void): this;
+    on(event: 'build-finished', listener: (args: { compiler: webpack.Compiler, stats: webpack.Stats }) => void): this;
+    on(event: 'compiler-error' | 'compiler-warning', listener: (args: { compiler: webpack.Compiler, stats: any }) => void): this;
+    on(event: 'listening', listener: (args: { server: koa, options: Options }) => void): this;
+
+    /** Close webpack-serve */
+    close: () => void;
+  }
+
+  interface ListenersObject {
+    'build-started': (args: { compiler: webpack.Compiler }) => void;
+    'build-finished': (args: { compiler: webpack.Compiler, stats: webpack.Stats }) => void;
+    'compiler-error': (args: { compiler: webpack.Compiler, stats: any }) => void;
+    'compiler-warning': (args: { compiler: webpack.Compiler, stats: any }) => void;
+    'listening': (args: { server: koa, options: Options }) => void;
+  }
+
+  interface Options {
+    /** Addon to webpack-serve that allows access to the Koa server instance */
+    add?: (app: koa, middleware: WebpackServeMiddleware, options: Options) => void;
+    /** Copy the server URL to the clipboard when the server is started */
+    clipboard?: boolean;
+    /** Custom instance of a webpack compiler */
+    compiler?: webpack.Compiler;
+    /** Webpack configuration for creating a new webpack compiler instance */
+    config?: webpack.Configuration;
+    /** A path or array of paths where content will be served from */
+    content?: string | string[];
+    /** Options for webpack-dev-middleware */
+    dev?: webpackDevMiddleware.Options;
+    /** The host the server will listen on */
+    host?: string;
+    /** Options for webpack-hot-client */
+    hot?: webpackHotClient.Options | boolean;
+    /** Enable HTTP2 support */
+    http2?: boolean;
+    /** Configuration object for the server to use HTTPS */
+    https?: https.ServerOptions;
+    /** Level of information for webpack-serve to output */
+    logLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error';
+    /** Prepend timestamp to each log line */
+    logTime?: boolean;
+    /** Object of subscribers to webpack-serve bus events */
+    on?: ListenersObject;
+    /** Open the browser when started */
+    open?: WebpackServeOpen | boolean;
+    /** Port that the server listens on */
+    port?: number;
+  }
+}
diff --git a/types/webpack-serve/tsconfig.json b/types/webpack-serve/tsconfig.json
new file mode 100644
index 0000000000..11c218b9c9
--- /dev/null
+++ b/types/webpack-serve/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "webpack-serve-tests.ts"
+  ]
+}
diff --git a/types/webpack-serve/tslint.json b/types/webpack-serve/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-serve/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-serve/webpack-serve-tests.ts b/types/webpack-serve/webpack-serve-tests.ts
new file mode 100644
index 0000000000..fff9668b29
--- /dev/null
+++ b/types/webpack-serve/webpack-serve-tests.ts
@@ -0,0 +1,22 @@
+import webpack = require('webpack');
+import serve = require('webpack-serve');
+
+const compiler = webpack();
+
+const server = serve({
+  config: {
+    http2: true,
+    dev: {
+      publicPath: '/',
+      logLevel: 'info'
+    },
+    host: 'localhost'
+  }
+});
+
+server
+  .then((server) => {
+    server.on('listening', () => {
+      server.close();
+    });
+  });

From 3946686b7ed4b211002886f276a29b91349a4418 Mon Sep 17 00:00:00 2001
From: Retsam <chess19@gmail.com>
Date: Fri, 1 Jun 2018 13:10:21 -0400
Subject: [PATCH 0936/1124] Remove empty namespace from backo2 typings

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

diff --git a/types/backo2/backo2-tests.ts b/types/backo2/backo2-tests.ts
index d257408b2d..71b20378d2 100644
--- a/types/backo2/backo2-tests.ts
+++ b/types/backo2/backo2-tests.ts
@@ -1,4 +1,4 @@
-import * as Backoff from "backo2";
+import Backoff = require("backo2");
 
 const backoff = new Backoff();
 const backoff2 = new Backoff({});
diff --git a/types/backo2/index.d.ts b/types/backo2/index.d.ts
index 4050fd813d..9dcaba9f2a 100644
--- a/types/backo2/index.d.ts
+++ b/types/backo2/index.d.ts
@@ -32,6 +32,5 @@ declare class Backoff {
      */
     setJitter(jitter: number): void;
 }
-declare namespace Backoff {}
 
 export = Backoff;

From d05a372e212812bef2173e2661cc1aa09a81266c Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Fri, 1 Jun 2018 18:53:23 +0100
Subject: [PATCH 0937/1124] Add typings for generate-json-webpack-plugin

---
 .../generate-json-webpack-plugin-tests.ts     |  9 ++++++++
 types/generate-json-webpack-plugin/index.d.ts | 13 +++++++++++
 .../tsconfig.json                             | 23 +++++++++++++++++++
 .../generate-json-webpack-plugin/tslint.json  |  1 +
 4 files changed, 46 insertions(+)
 create mode 100644 types/generate-json-webpack-plugin/generate-json-webpack-plugin-tests.ts
 create mode 100644 types/generate-json-webpack-plugin/index.d.ts
 create mode 100644 types/generate-json-webpack-plugin/tsconfig.json
 create mode 100644 types/generate-json-webpack-plugin/tslint.json

diff --git a/types/generate-json-webpack-plugin/generate-json-webpack-plugin-tests.ts b/types/generate-json-webpack-plugin/generate-json-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..44422f02ad
--- /dev/null
+++ b/types/generate-json-webpack-plugin/generate-json-webpack-plugin-tests.ts
@@ -0,0 +1,9 @@
+import GenerateJsonWebpackPlugin = require('generate-json-webpack-plugin');
+
+new GenerateJsonWebpackPlugin('name', { key: 'value '});
+
+new GenerateJsonWebpackPlugin('name', { key: 'value '}, (key, value) => `${key}${value}`);
+
+new GenerateJsonWebpackPlugin('name', { key: 'value '}, (key, value) => `${key}${value}`, 4);
+
+new GenerateJsonWebpackPlugin('name', { key: 'value '}, (key, value) => `${key}${value}`, ' ');
diff --git a/types/generate-json-webpack-plugin/index.d.ts b/types/generate-json-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..65ebf8cbd0
--- /dev/null
+++ b/types/generate-json-webpack-plugin/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for generate-json-webpack-plugin 0.3
+// Project: https://github.com/elliottsj/generate-json-webpack-plugin
+// Definitions by: Ryan Clark <https://github.com/rynclark>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Plugin } from 'webpack';
+
+export = GenerateJsonWebpackPlugin;
+
+declare class GenerateJsonWebpackPlugin extends Plugin {
+	constructor(fileName: string, value: object, replacer?: (key: string, value: any) => any, space?: string | number);
+}
diff --git a/types/generate-json-webpack-plugin/tsconfig.json b/types/generate-json-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..9d288fa4f9
--- /dev/null
+++ b/types/generate-json-webpack-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "generate-json-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/generate-json-webpack-plugin/tslint.json b/types/generate-json-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/generate-json-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6249fa61e23eda946ed9c45ced6ebf1ae05e5b6c Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Fri, 1 Jun 2018 19:12:39 +0100
Subject: [PATCH 0938/1124] Add typings for webpackbar

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

diff --git a/types/webpackbar/index.d.ts b/types/webpackbar/index.d.ts
new file mode 100644
index 0000000000..cf62b1ae81
--- /dev/null
+++ b/types/webpackbar/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for webpackbar 2.6
+// Project: https://github.com/nuxt/webpackbar
+// Definitions by: Ryan Clark <https://github.com/rynclark>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Plugin } from 'webpack';
+
+export = WebpackBar;
+
+declare class WebpackBar extends Plugin {
+	constructor(options?: WebpackBar.Options);
+
+  state: WebpackBar.State;
+}
+
+declare namespace WebpackBar {
+  interface Stats {
+    count: number;
+    time: [number, number];
+  }
+
+  class Profile {
+    requests: any[];
+
+    name: string;
+
+    constructor(name: string);
+
+    getStats(): { ext: Stats, loader: Stats };
+  }
+
+  interface State {
+    isRunning: boolean;
+    color: string;
+    profile: Profile | null;
+  }
+
+  interface SharedState {
+    [name: string]: State;
+  }
+
+  interface Options {
+    /** Display name */
+    name?: string;
+    /** Color output of the progress bar */
+    color?: string;
+    /** Enable the profiler for files and loaders */
+    profile?: boolean;
+    /** Stream to rwite to */
+    stream?: NodeJS.WriteStream;
+    /** Minimal output */
+    minimal?: boolean;
+    /** Show compiled in time */
+    compiledIn?: boolean;
+    /** Function called when all builds are finished */
+    done?: (sharedState: SharedState, ctx: WebpackBar) => void;
+  }
+}
diff --git a/types/webpackbar/tsconfig.json b/types/webpackbar/tsconfig.json
new file mode 100644
index 0000000000..fb07f91a45
--- /dev/null
+++ b/types/webpackbar/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",
+        "webpackbar-tests.ts"
+    ]
+}
diff --git a/types/webpackbar/tslint.json b/types/webpackbar/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpackbar/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpackbar/webpackbar-tests.ts b/types/webpackbar/webpackbar-tests.ts
new file mode 100644
index 0000000000..e8c53c6e00
--- /dev/null
+++ b/types/webpackbar/webpackbar-tests.ts
@@ -0,0 +1,9 @@
+import WebpackBar = require('webpackbar');
+
+new WebpackBar();
+
+new WebpackBar({ color: '#ff0000' });
+
+new WebpackBar({ stream: process.stdout });
+
+new WebpackBar({ done: (sharedState, ctx) => {} });

From e741786eaf6e88b9077cf2cb0dcc44f0a011396d Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Fri, 1 Jun 2018 20:24:44 +0100
Subject: [PATCH 0939/1124] Add typings for svg-sprite-loader

---
 types/svg-sprite-loader/index.d.ts            | 14 +++++++++++
 types/svg-sprite-loader/plugin.d.ts           | 16 +++++++++++++
 .../svg-sprite-loader-tests.ts                |  7 ++++++
 types/svg-sprite-loader/tsconfig.json         | 24 +++++++++++++++++++
 types/svg-sprite-loader/tslint.json           |  1 +
 5 files changed, 62 insertions(+)
 create mode 100644 types/svg-sprite-loader/index.d.ts
 create mode 100644 types/svg-sprite-loader/plugin.d.ts
 create mode 100644 types/svg-sprite-loader/svg-sprite-loader-tests.ts
 create mode 100644 types/svg-sprite-loader/tsconfig.json
 create mode 100644 types/svg-sprite-loader/tslint.json

diff --git a/types/svg-sprite-loader/index.d.ts b/types/svg-sprite-loader/index.d.ts
new file mode 100644
index 0000000000..b192e8bd01
--- /dev/null
+++ b/types/svg-sprite-loader/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for svg-sprite-loader 3.9
+// Project: https://github.com/kisenka/svg-sprite-loader/releases
+// Definitions by: Ryan Clark <https://github.com/rynclark>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { loader } from 'webpack';
+
+export = SVGSpriteLoader;
+
+declare function SVGSpriteLoader(
+  this: loader.LoaderContext,
+  source: string | Buffer
+): string | Buffer | void | undefined;
diff --git a/types/svg-sprite-loader/plugin.d.ts b/types/svg-sprite-loader/plugin.d.ts
new file mode 100644
index 0000000000..183d5009a6
--- /dev/null
+++ b/types/svg-sprite-loader/plugin.d.ts
@@ -0,0 +1,16 @@
+import { Plugin } from 'webpack';
+
+export = SVGSpriteLoaderPlugin;
+
+declare class SVGSpriteLoaderPlugin extends Plugin {
+	constructor(options?: SVGSpriteLoaderPlugin.Options);
+}
+
+declare namespace SVGSpriteLoaderPlugin {
+  interface Options {
+    /** Render plain sprite without styles and usages */
+    plainSprite?: boolean;
+    /** Custom tag attributes for the svg */
+    spriteAttrs?: {[key: string]: any};
+  }
+}
diff --git a/types/svg-sprite-loader/svg-sprite-loader-tests.ts b/types/svg-sprite-loader/svg-sprite-loader-tests.ts
new file mode 100644
index 0000000000..e8c16de710
--- /dev/null
+++ b/types/svg-sprite-loader/svg-sprite-loader-tests.ts
@@ -0,0 +1,7 @@
+import SpriteLoaderPlugin = require('svg-sprite-loader/plugin');
+
+new SpriteLoaderPlugin();
+
+new SpriteLoaderPlugin({ plainSprite: true });
+
+new SpriteLoaderPlugin({ spriteAttrs: { testAttr: 'testValue' } });
diff --git a/types/svg-sprite-loader/tsconfig.json b/types/svg-sprite-loader/tsconfig.json
new file mode 100644
index 0000000000..89cd036620
--- /dev/null
+++ b/types/svg-sprite-loader/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",
+        "plugin.d.ts",
+        "svg-sprite-loader-tests.ts"
+    ]
+}
diff --git a/types/svg-sprite-loader/tslint.json b/types/svg-sprite-loader/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/svg-sprite-loader/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 945b7bdd9bdf3a48e901818e52884ee908cb444d Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:05:26 -0500
Subject: [PATCH 0940/1124] Add typings for yauzl-promise

---
 types/yauzl-promise/index.d.ts             | 61 ++++++++++++++++++++++
 types/yauzl-promise/package.json           |  6 +++
 types/yauzl-promise/tsconfig.json          | 22 ++++++++
 types/yauzl-promise/tslint.json            |  1 +
 types/yauzl-promise/yauzl-promise-tests.ts | 51 ++++++++++++++++++
 5 files changed, 141 insertions(+)
 create mode 100644 types/yauzl-promise/index.d.ts
 create mode 100644 types/yauzl-promise/package.json
 create mode 100644 types/yauzl-promise/tsconfig.json
 create mode 100644 types/yauzl-promise/tslint.json
 create mode 100644 types/yauzl-promise/yauzl-promise-tests.ts

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
new file mode 100644
index 0000000000..9374a62e5c
--- /dev/null
+++ b/types/yauzl-promise/index.d.ts
@@ -0,0 +1,61 @@
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader} from 'yauzl';
+import { Readable } from 'stream';
+import { EventEmitter } from 'events';
+
+// This class is not directly compatible with @types/yauzl 's ZipFile as this library changes the function signatures
+// Therefore, it is replaced, albeit with a significant portion
+export class ZipFile extends EventEmitter {
+    // This chunk taken directly from @types/yauzl
+    autoClose: boolean;
+    comment: string;
+    decodeStrings: boolean;
+    emittedError: boolean;
+    entriesRead: number;
+    entryCount: number;
+    fileSize: number;
+    isOpen: boolean;
+    lazyEntries: boolean;
+    readEntryCursor: boolean;
+    validateEntrySizes: boolean;
+
+    constructor(
+        reader: RandomAccessReader,
+        centralDirectoryOffset: number,
+        fileSize: number,
+        entryCount: number,
+        comment: string,
+        autoClose: boolean,
+        lazyEntries: boolean,
+        decodeStrings: boolean,
+        validateEntrySizes: boolean,
+    );
+
+    // These funcitons are custom to yauzl-promise
+
+    close(): Promise<void>;
+    readEntry(): Promise<Entry>;
+    readEntries(numEntries?: number): Promise<Entry[]>;
+    walkEntries(callback: (entry: Entry) => Promise<void> | void, numEntries?: number): Promise<void>;
+    openReadStream(entry: Entry, options?: ZipFileOptions): Promise<Readable>;
+}
+
+export class Entry extends BaseEntry {
+    openReadStream(options?: ZipFileOptions): Promise<Readable>;
+}
+
+
+export function open(path: string, options?: Options): Promise<ZipFile>;
+// export function open(path: string): Promise<ZipFile>;
+export function fromFd(fd: number, options?: Options): Promise<ZipFile>;
+// export function fromFd(fd: number): Promise<ZipFile>;
+export function fromBuffer(buffer: Buffer, options?: Options): Promise<ZipFile>;
+// export function fromBuffer(buffer: Buffer): Promise<ZipFile>;
+export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: number, options?: Options): Promise<ZipFile>;
+// export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: number): Promise<ZipFile>;
+
+// These are copied directly from @types/yauzl, I beleive they are unmodified
+export function dosDateTimeToDate(date: number, time: number): Date;
+export function validateFileName(fileName: string): string | null;
+
+
+export { RandomAccessReader, Options, ZipFileOptions }
\ No newline at end of file
diff --git a/types/yauzl-promise/package.json b/types/yauzl-promise/package.json
new file mode 100644
index 0000000000..747879f783
--- /dev/null
+++ b/types/yauzl-promise/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/yauzl": "^2.9.0"
+    }
+}
diff --git a/types/yauzl-promise/tsconfig.json b/types/yauzl-promise/tsconfig.json
new file mode 100644
index 0000000000..73510344fe
--- /dev/null
+++ b/types/yauzl-promise/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yauzl-promise-tests.ts"
+    ]
+}
diff --git a/types/yauzl-promise/tslint.json b/types/yauzl-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yauzl-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yauzl-promise/yauzl-promise-tests.ts b/types/yauzl-promise/yauzl-promise-tests.ts
new file mode 100644
index 0000000000..6d7ed97298
--- /dev/null
+++ b/types/yauzl-promise/yauzl-promise-tests.ts
@@ -0,0 +1,51 @@
+import * as yauzl from 'yauzl-promise';
+
+class FakeRaR extends yauzl.RandomAccessReader {
+
+}
+
+const options: yauzl.Options = {
+    autoClose: true
+};
+
+const zipOptions: yauzl.ZipFileOptions = {
+    decrypt: true,
+    decompress: true,
+    start: 0,
+    end: 1
+};
+
+const date = yauzl.dosDateTimeToDate(1, 1);
+const fn = yauzl.validateFileName("fake");
+
+async function test() {
+    const zip = await yauzl.open("");
+    const open2 = await yauzl.open("", options);
+
+    const fd1 = await yauzl.fromFd(0);
+    const fd2 = await yauzl.fromFd(0, options);
+
+    const buffer1 = await yauzl.fromBuffer(Buffer.from("test", "utf-8"));
+    const buffer2 = await yauzl.fromBuffer(Buffer.from("test", "utf-8"), options);
+
+    const rar1 = await yauzl.fromRandomAccessReader(new FakeRaR(), 1);
+    const rar2 = await yauzl.fromRandomAccessReader(new FakeRaR(), 1, options);
+
+    const entry = await zip.readEntry();
+    await zip.readEntries();
+    await zip.readEntries(1);
+
+    const rs = await zip.openReadStream(entry);
+    await zip.openReadStream(entry, zipOptions);
+
+    await entry.openReadStream();
+    await entry.openReadStream(zipOptions);
+
+    await zip.walkEntries(async (entry: yauzl.Entry) => {
+        console.log("foo");
+    });
+
+    await zip.walkEntries(async (entry: yauzl.Entry) => {
+        console.log("foo");
+    }, 1);
+}

From ea6a794194004c55af94ee03e05e76b25999b53a Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:20:18 -0500
Subject: [PATCH 0941/1124] fix lint issues, add header

---
 types/yauzl-promise/index.d.ts             | 15 +++++++++++----
 types/yauzl-promise/tsconfig.json          |  1 +
 types/yauzl-promise/yauzl-promise-tests.ts |  4 +---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
index 9374a62e5c..b859d8891e 100644
--- a/types/yauzl-promise/index.d.ts
+++ b/types/yauzl-promise/index.d.ts
@@ -1,4 +1,13 @@
-import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader} from 'yauzl';
+// Type definitions for yauzl-promise 2.1
+// Project: https://github.com/overlookmotel/yauzl-promise
+// Definitions by: Dave Lee <https://github.com/dlee-nvisia>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from 'yauzl';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 
@@ -43,7 +52,6 @@ export class Entry extends BaseEntry {
     openReadStream(options?: ZipFileOptions): Promise<Readable>;
 }
 
-
 export function open(path: string, options?: Options): Promise<ZipFile>;
 // export function open(path: string): Promise<ZipFile>;
 export function fromFd(fd: number, options?: Options): Promise<ZipFile>;
@@ -57,5 +65,4 @@ export function fromRandomAccessReader(reader: RandomAccessReader, totalSize: nu
 export function dosDateTimeToDate(date: number, time: number): Date;
 export function validateFileName(fileName: string): string | null;
 
-
-export { RandomAccessReader, Options, ZipFileOptions }
\ No newline at end of file
+export { RandomAccessReader, Options, ZipFileOptions };
diff --git a/types/yauzl-promise/tsconfig.json b/types/yauzl-promise/tsconfig.json
index 73510344fe..86c1696468 100644
--- a/types/yauzl-promise/tsconfig.json
+++ b/types/yauzl-promise/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/yauzl-promise/yauzl-promise-tests.ts b/types/yauzl-promise/yauzl-promise-tests.ts
index 6d7ed97298..0a33ad6440 100644
--- a/types/yauzl-promise/yauzl-promise-tests.ts
+++ b/types/yauzl-promise/yauzl-promise-tests.ts
@@ -1,8 +1,6 @@
 import * as yauzl from 'yauzl-promise';
 
-class FakeRaR extends yauzl.RandomAccessReader {
-
-}
+class FakeRaR extends yauzl.RandomAccessReader {}
 
 const options: yauzl.Options = {
     autoClose: true

From 9a0c840e20cc95cc368cc61af802f993e99de426 Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:26:00 -0500
Subject: [PATCH 0942/1124] travis says that I shouldn't use a package.json for
 a @types dependency. Use relative path instead?

---
 types/yauzl-promise/index.d.ts   | 2 +-
 types/yauzl-promise/package.json | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 types/yauzl-promise/package.json

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
index b859d8891e..ed84f3273c 100644
--- a/types/yauzl-promise/index.d.ts
+++ b/types/yauzl-promise/index.d.ts
@@ -7,7 +7,7 @@
 
 /// <reference types="node" />
 
-import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from 'yauzl';
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from '../yauzl';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 
diff --git a/types/yauzl-promise/package.json b/types/yauzl-promise/package.json
deleted file mode 100644
index 747879f783..0000000000
--- a/types/yauzl-promise/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "@types/yauzl": "^2.9.0"
-    }
-}

From 25c3781cfe19ad8e5cba50d26ea732ddc839239d Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Fri, 1 Jun 2018 15:34:42 -0500
Subject: [PATCH 0943/1124] Travis has informed that relative paths are wrong
 too. 3rd time is the charm?

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

diff --git a/types/yauzl-promise/index.d.ts b/types/yauzl-promise/index.d.ts
index ed84f3273c..b859d8891e 100644
--- a/types/yauzl-promise/index.d.ts
+++ b/types/yauzl-promise/index.d.ts
@@ -7,7 +7,7 @@
 
 /// <reference types="node" />
 
-import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from '../yauzl';
+import { Entry as BaseEntry, Options, ZipFileOptions, RandomAccessReader } from 'yauzl';
 import { Readable } from 'stream';
 import { EventEmitter } from 'events';
 

From 0e1cd536d391223fafd6e23dbe82bde37a3459c0 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Fri, 1 Jun 2018 13:36:41 -0700
Subject: [PATCH 0944/1124] Office JS: Use AsyncContextOptions in more places

---
 types/office-js/index.d.ts | 130 +++++++++++++++----------------------
 1 file changed, 53 insertions(+), 77 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 93a556840a..43990d2068 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -608,7 +608,7 @@ 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.
+     * Provides an option for preserving context data of any type, unchanged, for use in a callback.
      */
     interface AsyncContextOptions {
         /**
@@ -1276,11 +1276,10 @@ 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 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.
          */
-        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Returns the data contained within the binding.
          *
@@ -1292,7 +1291,6 @@ 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 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?: GetBindingDataOptions, callback?: (result: AsyncResult) => void): void;
@@ -1415,11 +1413,10 @@ declare namespace Office {
          *
          * 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 options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @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;
+        getAllAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves a binding based on its Name
          *
@@ -1431,11 +1428,10 @@ declare namespace Office {
          * 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 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.
           */
-        getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getByIdAsync(id: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the binding from the document
          *
@@ -1447,11 +1443,10 @@ declare namespace Office {
          * 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 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.
          */
-        releaseByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        releaseByIdAsync(id: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
     * Represents the runtime environment of the add-in and provides access to key objects of the API.
@@ -1510,11 +1505,10 @@ declare namespace Office {
          * 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 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.
          */
-        getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getNodesAsync(xPath: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node value.
          *
@@ -1523,11 +1517,10 @@ declare namespace Office {
          *
          * 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 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.
          */
-        getNodeValueAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getNodeValueAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the text of an XML node in a custom XML part.
          *
@@ -1536,11 +1529,10 @@ declare namespace Office {
          *
          * 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 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.
          */
-        getTextAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getTextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node's XML.
          *
@@ -1549,11 +1541,10 @@ declare namespace Office {
          *
          * 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 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.
          */
-        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getXmlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node value.
          *
@@ -1563,11 +1554,10 @@ declare namespace Office {
          * 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.
+         * @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.
          */
-        setNodeValueAsync(value: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        setNodeValueAsync(value: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
          *
@@ -1577,11 +1567,10 @@ declare namespace Office {
          * 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.
+         * @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.
          */
-        setTextAsync(text: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        setTextAsync(text: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node XML.
          *
@@ -1591,11 +1580,10 @@ declare namespace Office {
          * 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.
+         * @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.
          */
-        setXmlAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        setXmlAsync(xml: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * Represents a single CustomXMLPart in a CustomXMLParts collection.
@@ -1643,11 +1631,10 @@ declare namespace Office {
          *
          * @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 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.
          */
-        addHandlerAsync(eventType: EventType, handler: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: EventType, handler: (result: any) => void, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Deletes the Custom XML Part.
          *
@@ -1656,11 +1643,10 @@ declare namespace Office {
          *
          * 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 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.
          */
-        deleteAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        deleteAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
          *
@@ -1670,11 +1656,10 @@ declare namespace Office {
          * 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 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.
         */
-        getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getNodesAsync(xPath: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the XML inside this custom XML part.
          *
@@ -1683,11 +1668,10 @@ declare namespace Office {
          *
          * 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 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.
         */
-        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getXmlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an event handler for the specified event type.
          *
@@ -1720,11 +1704,10 @@ declare namespace Office {
          * 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.
+         * @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.
          */
-        addAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        addAsync(xml: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
          *
@@ -1734,11 +1717,10 @@ declare namespace Office {
          * 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 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.
          */
-        getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getByIdAsync(id: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
          *
@@ -1748,11 +1730,10 @@ declare namespace Office {
          * 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 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.
         */
-        getByNamespaceAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getByNamespaceAsync(ns: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * Represents a collection of CustomXmlPart objects.
@@ -1773,11 +1754,10 @@ declare namespace Office {
          *
          * @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 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.
          */
-        addNamespaceAsync(prefix: string, ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        addNamespaceAsync(prefix: string, ns: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the namespace mapped to the specified prefix.
          *
@@ -1789,11 +1769,10 @@ declare namespace Office {
          * 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 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.
          */
-        getNamespaceAsync(prefix: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getNamespaceAsync(prefix: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the prefix for the specified namespace.
          *
@@ -1805,11 +1784,10 @@ declare namespace Office {
          * 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 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.
         */
-        getPrefixAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getPrefixAsync(ns: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * An abstract class that represents the document the add-in is interacting with.
@@ -1867,10 +1845,10 @@ declare namespace Office {
          *
          * @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 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.
          */
-        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Returns the state of the current view of the presentation (edit or read).
          *
@@ -1881,10 +1859,10 @@ declare namespace Office {
          *
          * 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 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.
         */
-        getActiveViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getActiveViewAsync(options?: AsyncContextOptions, 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.
          *
@@ -1920,10 +1898,10 @@ declare namespace Office {
          *
          * 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 options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @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;
+        getFilePropertiesAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Reads the data contained in the current selection in the document.
          *
@@ -2391,11 +2369,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 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 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.
          */
-        addColumnsAsync(tableData: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
+        addColumnsAsync(tableData: TableData | any[][], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds the specified data to the table as additional rows.
          *
@@ -7356,11 +7333,10 @@ declare namespace Office {
          *
          * @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 options Optional. Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @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;
+        addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Converts an item ID formatted for REST into EWS format.
          *

From 605624586924b1266b6f55f7f6750d3d467e52fb Mon Sep 17 00:00:00 2001
From: Luna <malalunapg@gmail.com>
Date: Fri, 1 Jun 2018 17:10:19 -0400
Subject: [PATCH 0945/1124] Changes format for contributor

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

diff --git a/types/google-cloud__pubsub/index.d.ts b/types/google-cloud__pubsub/index.d.ts
index 6205c8aee7..130e62a5e4 100644
--- a/types/google-cloud__pubsub/index.d.ts
+++ b/types/google-cloud__pubsub/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for @google-cloud/pubsub 0.18
 // Project: https://github.com/GoogleCloudPlatform/google-cloud-node/tree/master/packages/pubsub
-// Definitions by: Paul Huynh <https://github.com/pheromonez>, LunaPg <https://github.com/LunaPg>
+// Definitions by: Paul Huynh <https://github.com/pheromonez>
+//                 LunaPg <https://github.com/LunaPg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From c57f7905a6802827c0e1c2d473aca175cde8e773 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Fri, 1 Jun 2018 15:46:17 -0700
Subject: [PATCH 0946/1124] Office JS: Combine and complete the Context
 interface declarations

---
 types/office-js/index.d.ts | 176 +++++++++++++++++--------------------
 1 file changed, 80 insertions(+), 96 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 43990d2068..786bd742bb 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -400,59 +400,86 @@ declare namespace Office {
         * 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
-    */
+    }    
     interface Context {
         /**
         * Provides information and access to the signed-in user.
         */
         auth: Auth;
+        /**
+         * True if developers can display, on the current platform, a UI in the add-in sell or upgrade; otherwise returns False.
+         * 
+         * @remarks
+         * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.
+         */
+        commerceAllowed: boolean;
         /**
         * Gets the locale (language) specified by the user for editing the document or item.
         */
         contentLanguage: string;
         /**
+        * Gets information about the environment in which the add-in is running.
+        */
+        diagnostics: {
+            /**
+            * Gets the Office application host in which the add-in is running.
+            */
+            host: HostType;
+            /**
+            * Gets the platform on which the add-in is running.
+            */
+            platform: PlatformType;
+            /**
+            * Gets the version of Office on which the add-in is running.
+            */
+            version: string;
+        };
+        /**
         * Gets the locale (language) specified by the user for the UI of the Office host application.
+        * @remarks
+        * When using in Outlook,the applicable modes are Compose or read.
         */
         displayLanguage: string;
         /**
-        *
+        * Gets an object that represents the document the content or task pane add-in is interacting with.
+        */
+        document: Document;
+        /**
+        * Contains the Office application host in which the add-in is running.
+        */
+        host: HostType;
+        /**
+        * Gets the license information for the user's Office installation.
         */
         license: 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;
         /**
         * 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
+        * Provides the platform on which the add-in is running.
         */
         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: {
@@ -463,6 +490,30 @@ declare namespace Office {
              */
             isSetSupported(name: string, minVersion?: number): boolean;
         }
+        /**
+         * 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;
+        /**
+        * Specifies whether the platform and device allows touch interaction.
+        * 
+        * @remarks
+        * Use the touchEnabled property to determine when your add-in is running on a touch device and if necessary, adjust the kind of controls, and size and spacing of elements in your add-in's UI to accommodate touch interactions.
+        */
+        touchEnabled: boolean;
+        /**
+        * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes.
+        */
+        ui: UI;
     }
     /**
      * Provides specific information about an error that occurred during an asynchronous data operation.
@@ -1448,18 +1499,6 @@ declare namespace Office {
          */
         releaseByIdAsync(id: string, options?: AsyncContextOptions, 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
-    */
-    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.
      *
@@ -5295,61 +5334,6 @@ 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.
-     *
-     * [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
-     */
-    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 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.
      *

From bf8a25bb8ce3a11835d9ecd6f69815c0b76bc902 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Fri, 1 Jun 2018 15:54:57 -0700
Subject: [PATCH 0947/1124] replace description I mistakenly deleted

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 786bd742bb..09d19de4ed 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -400,7 +400,13 @@ declare namespace Office {
         * 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 
+     */     
     interface Context {
         /**
         * Provides information and access to the signed-in user.

From 55aa0245a6c466f6f54e0e3d33079d4b8f5d35de Mon Sep 17 00:00:00 2001
From: Viko <viko@vikomprenas.com>
Date: Fri, 1 Jun 2018 17:33:11 -0600
Subject: [PATCH 0948/1124] ejs, mem-fs-editor: Correct types per
 @uniqueiniquity's comments

---
 types/ejs/index.d.ts           | 10 ++++------
 types/mem-fs-editor/index.d.ts |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/types/ejs/index.d.ts b/types/ejs/index.d.ts
index 9371bb0da7..73eb716e23 100644
--- a/types/ejs/index.d.ts
+++ b/types/ejs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://ejs.co/
 // Definitions by: Ben Liddicott <https://github.com/benliddicott>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.4
 
 export interface Data {
     [name: string]: any;
@@ -30,8 +30,7 @@ export function resolveInclude(name: string, filename: string, isDir: boolean):
  */
 export function compile(template: string, opts?: Options & { async: false }): TemplateFunction;
 export function compile(template: string, opts: Options & { async: true }): AsyncTemplateFunction;
-export function compile(template: string, opts: Options & { async: boolean }): TemplateFunction | AsyncTemplateFunction;
-export function compile(template: string, opts: Exclude<Options, { async: any }>): TemplateFunction;
+export function compile(template: string, opts: Options & { async?: never }): TemplateFunction;
 export function compile(template: string, opts?: Options): TemplateFunction | AsyncTemplateFunction;
 /**
  * Render the given `template` of ejs.
@@ -40,9 +39,8 @@ export function compile(template: string, opts?: Options): TemplateFunction | As
  * call this function with `data` being an empty object or `null`.
  */
 export function render(template: string, data?: Data, opts?: Options & { async: false }): string;
-export function render(template: string, data: Data, opts: Options & { async: true }): Promise<string>;
-export function render(template: string, data: Data, opts: Options & { async: boolean }): string | Promise<string>;
-export function render(template: string, data: Data, opts: Exclude<Options, { async: any }>): string;
+export function render(template: string, data: Data | undefined, opts: Options & { async: true }): Promise<string>;
+export function render(template: string, data: Data | undefined, opts: Options & { async?: never }): string;
 export function render(template: string, data?: Data, opts?: Options): string | Promise<string>;
 
 export type RenderFileCallback<T> = (err: Error, str?: string) => T;
diff --git a/types/mem-fs-editor/index.d.ts b/types/mem-fs-editor/index.d.ts
index 636afa2698..01234bbc0c 100644
--- a/types/mem-fs-editor/index.d.ts
+++ b/types/mem-fs-editor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/SBoudrias/mem-fs-editor#readme
 // Definitions by: My Food Bag <https://github.com/MyFoodBag>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.4
 
 /// <reference types="node" />
 

From e0de9eb7748df427ced252d78103021cf04cec50 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Fri, 1 Jun 2018 16:48:26 -0700
Subject: [PATCH 0949/1124] Partial Recurrence Work

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 282c63b337..26e74b00b3 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4748,6 +4748,56 @@ declare namespace Office {
              */
             Cloud
         }
+        /**
+         * Specifies the day of week or type of day.
+         *
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
+        enum Days {
+            /**
+             * Monday
+             */
+            Mon = "mon",
+            /**
+             * Tuesday
+             */
+            Tue = "tue",
+            /**
+             * Wednesday
+             */
+            Wed = "wed",
+            /**
+             * Thursday
+             */
+            Thu = "thu",
+            /**
+             * Friday
+             */
+            Fri = "fri",
+            /**
+             * Saturday
+             */
+            Sat = "sat",
+            /**
+             * Sunday
+             */
+            Sun = "sun",
+            /**
+             * Week day (excludes weekend days): 'Mon', 'Tue', 'Wed', 'Thu', and 'Fri'.
+             */
+            Weekday = "weekday",
+            /**
+             * Weekend day: 'Sat' and 'Sun'.
+             */
+            WeekendDay = "weekendDay",
+            /**
+             * Day of week.
+             */
+            Day = "day"
+        }
         /**
          * Specifies an entity's type.
          *
@@ -4826,6 +4876,64 @@ declare namespace Office {
              */
             Appointment
         }
+        /**
+         * Specifies the month.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
+        enum Month {
+            /**
+             * January
+             */
+            Jan = "jan",
+            /**
+             * February
+             */
+            Feb = "feb",
+            /**
+             * March
+             */
+            Mar = "mar",
+            /**
+             * April
+             */
+            Apr = "apr",
+            /**
+             * May
+             */
+            May = "may",
+            /**
+             * June
+             */
+            Jun = "jun",
+            /**
+             * July
+             */
+            Jul = "jul",
+            /**
+             * August
+             */
+            Aug = "aug",
+            /**
+             * September
+             */
+            Sep = "sep",
+            /**
+             * October
+             */
+            Oct = "oct",
+            /**
+             * November
+             */
+            Nov = "nov",
+            /**
+             * December
+             */
+            Dec = "dec"
+        }
         /**
          * Specifies the type of recipient for an appointment.
          *
@@ -4851,6 +4959,21 @@ declare namespace Office {
              * Specifies that the recipient is not one of the other recipient types.
              */
             Other
+        }
+        /**
+         * Specifies the time zone applied to the recurrence.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
+        enum RecurrenceTimeZone {
+
+        }
+
+        enum RecurrenceType {
+
         }
         /**
          * Specifies the type of response to a meeting invitation.
@@ -4904,6 +5027,36 @@ declare namespace Office {
              */
             Beta
         }
+        /**
+         * Specifies the week of the month.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
+        enum WeekNumber {
+            /**
+             * First week of the month.
+             */
+            First = "first",
+            /**
+             * Second week of the month.
+             */
+            Second = "second",
+            /**
+             * Third week of the month.
+             */
+            Third = "third",
+            /**
+             * Fourth week of the month.
+             */
+            Fourth = "fourth",
+            /**
+             * Last week of the month.
+             */
+            Last = "last"
+        }
     }
     interface AsyncContextOptions {
         asyncContext?: any;
@@ -8335,11 +8488,89 @@ declare namespace Office {
      * Applicable Outlook mode: Compose or read
      */
     export interface Recurrence {
-        recurrenceProperties :RecurrenceProperties
+        /**
+         * Gets or sets the properties of the recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        recurrenceProperties: RecurrenceProperties;
+        /**
+         * Gets or sets the properties of the recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        recurrenceTimeZone: RecurrenceTimeZone;
     }
 
+    /**
+     * Gets or sets the properties of the recurrence.
+     * 
+     * [Api set: Mailbox Preview]
+     * 
+     * @remarks
+     * 
+     * Minimum permission level: ReadItem
+     * 
+     * Applicable Outlook mode: Compose or read
+     */
     export interface RecurrenceProperties {
-        
+        /**
+         * Represents the period between instances of the same recurring series.
+         */
+        interval: number;
+        /**
+         * Represents the day of the month.
+         */
+        dayOfMonth: number;
+        /**
+         * Represents the day of the week or type of day, for example, weekend day vs weekday.
+         */
+        dayOfWeek: MailboxEnums.Days;
+        /**
+         * Represents the set of days for this recurrence. Valid values are: 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', and 'Sun'.
+         */
+        days: MailboxEnums.Days[];
+        /**
+         * Represents the number of the week in the selected month e.g. 'first' for first week of the month.
+         */
+        weekNumber: MailboxEnums.WeekNumber;
+        /**
+         * Represents the month.
+         */
+        month: MailboxEnums.Month;
+        /**
+         * Represents your chosen first day of the week otherwise the default is the value in the current user's settings. Valid values are: 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', and 'Sun'.
+         */
+        firstDayOfWeek: MailboxEnums.Days;
+    }
+
+    /**
+     * Represents the time zone applied to the recurrence.
+     * 
+     * Note: If you include the offset but it is not valid given the name, then the offset is ignored.
+     * 
+     * [Api set: Mailbox Preview]
+     * 
+     * @remarks
+     * 
+     * Minimum permission level: ReadItem
+     * 
+     * Applicable Outlook mode: Compose or read
+     */
+    export interface RecurrenceTimeZone {
+        name: 
     }
 
     export interface ReplyFormAttachment {

From 02f71216f1a03a1a54bdc92865a7af4b939d2a43 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Fri, 1 Jun 2018 18:12:50 -0700
Subject: [PATCH 0950/1124] Partial Recurrence Work

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 26e74b00b3..e75ac54b2c 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4969,13 +4969,557 @@ declare namespace Office {
          * Applicable Outlook mode: Compose or read
          */
         enum RecurrenceTimeZone {
-
+            /**
+             * Afghanistan Standard Time
+             */
+            AfghanistanStandardTime = "Afghanistan Standard Time",
+            /**
+             * Alaskan Standard Time
+             */
+            AlaskanStandardTime = "Alaskan Standard Time",
+            /**
+             * Aleutian Standard Time
+             */
+            AleutianStandardTime = "Aleutian Standard Time",
+            /**
+             * Altai Standard Time
+             */
+            AltaiStandardTime = "Altai Standard Time",
+            /**
+             * Arab Standard Time
+             */
+            ArabStandardTime = "Arab Standard Time",
+            /**
+             * Arabian Standard Time
+             */
+            ArabianStandardTime = "Arabian Standard Time",
+            /**
+             * Arabic Standard Time
+             */
+            ArabicStandardTime = "Arabic Standard Time",
+            /**
+             * Argentina Standard Time
+             */
+            ArgentinaStandardTime = "Argentina Standard Time",
+            /**
+             * Astrakhan Standard Time
+             */
+            AstrakhanStandardTime = "Astrakhan Standard Time",
+            /**
+             * Atlantic Standard Time
+             */
+            AtlanticStandardTime = "Atlantic Standard Time",
+            /**
+             * Australia Central Standard Time
+             */
+            AUSCentralStandardTime = "AUS Central Standard Time",
+            /**
+             * Australia Central West Standard Time
+             */
+            AusCentralW_StandardTime = "Aus Central W. Standard Time",
+            /**
+             * AUS Eastern Standard Time
+             */
+            AUSEasternStandardTime = "AUS Eastern Standard Time",
+            /**
+             * Azerbaijan Standard Time
+             */
+            AzerbaijanStandardTime = "Azerbaijan Standard Time",
+            /**
+             * Azores Standard Time
+             */
+            AzoresStandardTime = "Azores Standard Time",
+            /**
+             * Bahia Standard Time
+             */
+            BahiaStandardTime = "Bahia Standard Time",
+            /**
+             * Bangladesh Standard Time
+             */
+            BangladeshStandardTime = "Bangladesh Standard Time",
+            /**
+             * Belarus Standard Time
+             */
+            BelarusStandardTime = "Belarus Standard Time",
+            /**
+             * Bougainville Standard Time
+             */
+            BougainvilleStandardTime = "Bougainville Standard Time",
+            /**
+             * Canada Central Standard Time
+             */
+            CanadaCentralStandardTime = "Canada Central Standard Time",
+            /**
+             * Cape Verde Standard Time
+             */
+            CapeVerdeStandardTime = "Cape Verde Standard Time",
+            /**
+             * Caucasus Standard Time
+             */
+            CaucasusStandardTime = "Caucasus Standard Time",
+            /**
+             * Central Australia Standard Time
+             */
+            CenAustraliaStandardTime = "Cen. Australia Standard Time",
+            /**
+             * Central America Standard Time
+             */
+            CentralAmericaStandardTime = "Central America Standard Time",
+            /**
+             * Central Asia Standard Time
+             */
+            CentralAsiaStandardTime = "Central Asia Standard Time",
+            /**
+             * Central Brazilian Standard Time
+             */
+            CentralBrazilianStandardTime = "Central Brazilian Standard Time",
+            /**
+             * Central Europe Standard Time
+             */
+            CentralEuropeStandardTime = "Central Europe Standard Time",
+            /**
+             * Central European Standard Time
+             */
+            CentralEuropeanStandardTime = "Central European Standard Time",
+            /**
+             * Central Pacific Standard Time
+             */
+            CentralPacificStandardTime = "Central Pacific Standard Time",
+            /**
+             * Central Standard Time
+             */
+            CentralStandardTime = "Central Standard Time",
+            /**
+             * Central Standard Time (Mexico)
+             */
+            CentralStandardTime_Mexico = "Central Standard Time (Mexico)",
+            /**
+             * Chatham Islands Standard Time
+             */
+            ChathamIslandsStandardTime = "Chatham Islands Standard Time",
+            /**
+             * China Standard Time
+             */
+            ChinaStandardTime = "China Standard Time",
+            /**
+             * Cuba Standard Time
+             */
+            CubaStandardTime = "Cuba Standard Time",
+            /**
+             * Dateline Standard Time
+             */
+            DatelineStandardTime = "Dateline Standard Time",
+            /**
+             * East Africa Standard Time
+             */
+            E_AfricaStandardTime = "E. Africa Standard Time",
+            /**
+             * East Australia Standard Time
+             */
+            E_AustraliaStandardTime = "E. Australia Standard Time",
+            /**
+             * East Europe Standard Time
+             */
+            E_EuropeStandardTime = "E. Europe Standard Time",
+            /**
+             * East South America Standard Time
+             */
+            E_SouthAmericaStandardTime = "E. South America Standard Time",
+            /**
+             * Easter Island Standard Time
+             */
+            EasterIslandStandardTime = "Easter Island Standard Time",
+            /**
+             * Eastern Standard Time
+             */
+            EasternStandardTime = "Eastern Standard Time",
+            /**
+             * Eastern Standard Time (Mexico)
+             */
+            EasternStandardTime_Mexico = "Eastern Standard Time (Mexico)",
+            /**
+             * Egypt Standard Time
+             */
+            EgyptStandardTime = "Egypt Standard Time",
+            /**
+             * Ekaterinburg Standard Time
+             */
+            EkaterinburgStandardTime = "Ekaterinburg Standard Time",
+            /**
+             * Fiji Standard Time
+             */
+            FijiStandardTime = "Fiji Standard Time",
+            /**
+             * FLE Standard Time
+             */
+            FLEStandardTime = "FLE Standard Time",
+            /**
+             * Georgian Standard Time
+             */
+            GeorgianStandardTime = "Georgian Standard Time",
+            /**
+             * GMT Standard Time
+             */
+            GMTStandardTime = "GMT Standard Time",
+            /**
+             * Greenland Standard Time
+             */
+            GreenlandStandardTime = "Greenland Standard Time",
+            /**
+             * Greenwich Standard Time
+             */
+            GreenwichStandardTime = "Greenwich Standard Time",
+            /**
+             * GTB Standard Time
+             */
+            GTBStandardTime = "GTB Standard Time",
+            /**
+             * Haiti Standard Time
+             */
+            HaitiStandardTime = "Haiti Standard Time",
+            /**
+             * Hawaiian Standard Time
+             */
+            HawaiianStandardTime = "Hawaiian Standard Time",
+            /**
+             * India Standard Time
+             */
+            IndiaStandardTime = "India Standard Time",
+            /**
+             * Iran Standard Time
+             */
+            IranStandardTime = "Iran Standard Time",
+            /**
+             * Israel Standard Time
+             */
+            IsraelStandardTime = "Israel Standard Time",
+            /**
+             * Jordan Standard Time
+             */
+            JordanStandardTime = "Jordan Standard Time",
+            /**
+             * Kaliningrad Standard Time
+             */
+            KaliningradStandardTime = "Kaliningrad Standard Time",
+            /**
+             * Kamchatka Standard Time
+             */
+            KamchatkaStandardTime = "Kamchatka Standard Time",
+            /**
+             * Korea Standard Time
+             */
+            KoreaStandardTime = "Korea Standard Time",
+            /**
+             * Libya Standard Time
+             */
+            LibyaStandardTime = "Libya Standard Time",
+            /**
+             * Line Islands Standard Time
+             */
+            LineIslandsStandardTime = "Line Islands Standard Time",
+            /**
+             * Lord Howe Standard Time
+             */
+            LordHoweStandardTime = "Lord Howe Standard Time",
+            /**
+             * Magadan Standard Time
+             */
+            MagadanStandardTime = "Magadan Standard Time",
+            /**
+             * Magallanes Standard Time
+             */
+            MagallanesStandardTime = "Magallanes Standard Time",
+            /**
+             * Marquesas Standard Time
+             */
+            MarquesasStandardTime = "Marquesas Standard Time",
+            /**
+             * Mauritius Standard Time
+             */
+            MauritiusStandardTime = "Mauritius Standard Time",
+            /**
+             * Mid-Atlantic Standard Time
+             */
+            MidAtlanticStandardTime = "Mid-Atlantic Standard Time",
+            /**
+             * Middle East Standard Time
+             */
+            MiddleEastStandardTime = "Middle East Standard Time",
+            /**
+             * Montevideo Standard Time
+             */
+            MontevideoStandardTime = "Montevideo Standard Time",
+            /**
+             * Morocco Standard Time
+             */
+            MoroccoStandardTime = "Morocco Standard Time",
+            /**
+             * Mountain Standard Time
+             */
+            MountainStandardTime = "Mountain Standard Time",
+            /**
+             * Mountain Standard Time (Mexico)
+             */
+            MountainStandardTime_Mexico = "Mountain Standard Time (Mexico)",
+            /**
+             * Myanmar Standard Time
+             */
+            MyanmarStandardTime = "Myanmar Standard Time",
+            /**
+             * North Central Asia Standard Time
+             */
+            N_CentralAsiaStandardTime = "N. Central Asia Standard Time",
+            /**
+             * Namibia Standard Time
+             */
+            NamibiaStandardTime = "Namibia Standard Time",
+            /**
+             * Nepal Standard Time
+             */
+            NepalStandardTime = "Nepal Standard Time",
+            /**
+             * New Zealand Standard Time
+             */
+            NewZealandStandardTime = "New Zealand Standard Time",
+            /**
+             * Newfoundland Standard Time
+             */
+            NewfoundlandStandardTime = "Newfoundland Standard Time",
+            /**
+             * Norfolk Standard Time
+             */
+            NorfolkStandardTime = "Norfolk Standard Time",
+            /**
+             * North Asia East Standard Time
+             */
+            NorthAsiaEastStandardTime = "North Asia East Standard Time",
+            /**
+             * North Asia Standard Time
+             */
+            NorthAsiaStandardTime = "North Asia Standard Time",
+            /**
+             * North Korea Standard Time
+             */
+            NorthKoreaStandardTime = "North Korea Standard Time",
+            /**
+             * Omsk Standard Time
+             */
+            OmskStandardTime = "Omsk Standard Time",
+            /**
+             * Pacific SA Standard Time
+             */
+            PacificSAStandardTime = "Pacific SA Standard Time",
+            /**
+             * Pacific Standard Time
+             */
+            PacificStandardTime = "Pacific Standard Time",
+            /**
+             * Pacific Standard Time (Mexico)
+             */
+            PacificStandardTimeMexico = "Pacific Standard Time (Mexico)",
+            /**
+             * Pakistan Standard Time
+             */
+            PakistanStandardTime = "Pakistan Standard Time",
+            /**
+             * Paraguay Standard Time
+             */
+            ParaguayStandardTime = "Paraguay Standard Time",
+            /**
+             * Romance Standard Time
+             */
+            RomanceStandardTime = "Romance Standard Time",
+            /**
+             * Russia Time Zone 10
+             */
+            RussiaTimeZone10 = "Russia Time Zone 10",
+            /**
+             * Russia Time Zone 11
+             */
+            RussiaTimeZone11 = "Russia Time Zone 11",
+            /**
+             * Russia Time Zone 3
+             */
+            RussiaTimeZone3 = "Russia Time Zone 3",
+            /**
+             * Russian Standard Time
+             */
+            RussianStandardTime = "Russian Standard Time",
+            /**
+             * SA Eastern Standard Time
+             */
+            SAEasternStandardTime = "SA Eastern Standard Time",
+            /**
+             * SA Pacific Standard Time
+             */
+            SAPacificStandardTime = "SA Pacific Standard Time",
+            /**
+             * SA Western Standard Time
+             */
+            SAWesternStandardTime = "SA Western Standard Time",
+            /**
+             * Saint Pierre Standard Time
+             */
+            SaintPierreStandardTime = "Saint Pierre Standard Time",
+            /**
+             * Sakhalin Standard Time
+             */
+            SakhalinStandardTime = "Sakhalin Standard Time",
+            /**
+             * Samoa Standard Time
+             */
+            SamoaStandardTime = "Samoa Standard Time",
+            /**
+             * Saratov Standard Time
+             */
+            SaratovStandardTime = "Saratov Standard Time",
+            /**
+             * Southeast Asia Standard Time
+             */
+            SEAsiaStandardTime = "SE Asia Standard Time",
+            /**
+             * Singapore Standard Time
+             */
+            SingaporeStandardTime = "Singapore Standard Time",
+            /**
+             * South Africa Standard Time
+             */
+            SouthAfricaStandardTime = "South Africa Standard Time",
+            /**
+             * Sri Lanka Standard Time
+             */
+            SriLankaStandardTime = "Sri Lanka Standard Time",
+            /**
+             * Sudan Standard Time
+             */
+            SudanStandardTime = "Sudan Standard Time",
+            /**
+             * Syria Standard Time
+             */
+            SyriaStandardTime = "Syria Standard Time",
+            /**
+             * Taipei Standard Time
+             */
+            TaipeiStandardTime = "Taipei Standard Time",
+            /**
+             * Tasmania Standard Time
+             */
+            TasmaniaStandardTime = "Tasmania Standard Time",
+            /**
+             * Tocantins Standard Time
+             */
+            TocantinsStandardTime = "Tocantins Standard Time",
+            /**
+             * Tokyo Standard Time
+             */
+            TokyoStandardTime = "Tokyo Standard Time",
+            /**
+             * Tomsk Standard Time
+             */
+            TomskStandardTime = "Tomsk Standard Time",
+            /**
+             * Tonga Standard Time
+             */
+            TongaStandardTime = "Tonga Standard Time",
+            /**
+             * Transbaikal Standard Time
+             */
+            TransbaikalStandardTime = "Transbaikal Standard Time",
+            /**
+             * Turkey Standard Time
+             */
+            TurkeyStandardTime = "Turkey Standard Time",
+            /**
+             * Turks And Caicos Standard Time
+             */
+            TurksAndCaicosStandardTime = "Turks And Caicos Standard Time",
+            /**
+             * Ulaanbaatar Standard Time
+             */
+            UlaanbaatarStandardTime = "Ulaanbaatar Standard Time",
+            /**
+             * United States Eastern Standard Time
+             */
+            USEasternStandardTime = "US Eastern Standard Time",
+            /**
+             * United States Mountain Standard Time
+             */
+            USMountainStandardTime = "US Mountain Standard Time",
+            /**
+             * Coordinated Universal Time (UTC)
+             */
+            UTC = "UTC",
+            /**
+             * Coordinated Universal Time (UTC) + 12 hours
+             */
+            UTCPLUS12 = "UTC+12",
+            /**
+             * Coordinated Universal Time (UTC) + 13 hours
+             */
+            UTCPLUS13 = "UTC+13",
+            /**
+             * Coordinated Universal Time (UTC) - 2 hours
+             */
+            UTCMINUS02 = "UTC-02",
+            /**
+             * Coordinated Universal Time (UTC) - 8 hours
+             */
+            UTCMINUS08 = "UTC-08",
+            /**
+             * Coordinated Universal Time (UTC) - 9 hours
+             */
+            UTCMINUS09 = "UTC-09",
+            /**
+             * Coordinated Universal Time (UTC) - 11 hours
+             */
+            UTCMINUS11 = "UTC-11",
+            /**
+             * Venezuela Standard Time
+             */
+            VenezuelaStandardTime = "Venezuela Standard Time",
+            /**
+             * Vladivostok Standard Time
+             */
+            VladivostokStandardTime = "Vladivostok Standard Time",
+            /**
+             * West Australia Standard Time
+             */
+            W_AustraliaStandardTime = "W. Australia Standard Time",
+            /**
+             * West Central Africa Standard Time
+             */
+            W_CentralAfricaStandardTime = "W. Central Africa Standard Time",
+            /**
+             * West Europe Standard Time
+             */
+            W_EuropeStandardTime = "W. Europe Standard Time",
+            /**
+             * West Mongolia Standard Time
+             */
+            W_MongoliaStandardTime = "W. Mongolia Standard Time",
+            /**
+             * West Asia Standard Time
+             */
+            WestAsiaStandardTime = "West Asia Standard Time",
+            /**
+             * West Bank Standard Time
+             */
+            WestBankStandardTime = "West Bank Standard Time",
+            /**
+             * West Pacific Standard Time
+             */
+            WestPacificStandardTime = "West Pacific Standard Time",
+            /**
+             * Yakutsk Standard Time
+             */
+            YakutskStandardTime = "Yakutsk Standard Time"
+            
         }
 
         enum RecurrenceType {
 
         }
-        /**
+        /**  
          * Specifies the type of response to a meeting invitation.
          *
          * [Api set: Mailbox 1.0]

From 1a85a336e38f4cc007c576b3acb703dc3455517d Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Sat, 2 Jun 2018 03:43:58 +0100
Subject: [PATCH 0951/1124] Make serve property optional on webpack config

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

diff --git a/types/webpack-serve/index.d.ts b/types/webpack-serve/index.d.ts
index 8e597097a7..222b8d8f09 100644
--- a/types/webpack-serve/index.d.ts
+++ b/types/webpack-serve/index.d.ts
@@ -16,7 +16,7 @@ export = WebpackServe;
 
 declare module 'webpack' {
   interface Configuration {
-    serve: WebpackServe.Options;
+    serve?: WebpackServe.Options;
   }
 }
 

From ad2163b71c260f234e3c8a7294b8e1762e50d15f Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Sat, 2 Jun 2018 04:17:18 +0100
Subject: [PATCH 0952/1124] Change node API to accept the full webpack config

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

diff --git a/types/webpack-serve/index.d.ts b/types/webpack-serve/index.d.ts
index 222b8d8f09..5a1a302af0 100644
--- a/types/webpack-serve/index.d.ts
+++ b/types/webpack-serve/index.d.ts
@@ -21,7 +21,7 @@ declare module 'webpack' {
 }
 
 declare function WebpackServe(
-  { config }: { config: WebpackServe.Options }
+  { config }: { config: webpack.Configuration }
 ): Promise<WebpackServe.Instance>;
 
 declare namespace WebpackServe {

From d080b3fd445921d1a1b51090c13caa1b485ea975 Mon Sep 17 00:00:00 2001
From: Thomas Chia <thomas.h.chia@googlemail.com>
Date: Sat, 2 Jun 2018 12:01:59 +0800
Subject: [PATCH 0953/1124] Options are spread into props.

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

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index fa68cb1b31..e8e88757b2 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -30,7 +30,7 @@ export namespace ReactStripeElements {
 	interface StripeProviderOptions {
 		stripeAccount?: string;
 	}
-	type StripeProviderProps = { apiKey: string; stripe?: never; options?: StripeProviderOptions } | { apiKey?: never; stripe: StripeProps | null; options?: StripeProviderOptions; };
+	type StripeProviderProps = { apiKey: string; stripe?: never; } & StripeProviderOptions | { apiKey?: never; stripe: StripeProps | null; } & 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 575987a1d9..ef1af5fa86 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -197,6 +197,7 @@ const TestStripeProviderProps3: React.SFC<{
 }> = props => <StripeProvider stripe={null} />;
 
 /**
- * StripeProvider should be able to accept an `options` prop
+ * StripeProvider should be able to accept options.
+ * See: https://stripe.com/docs/stripe-js/reference#stripe-function for options.
  */
-const TestStripeProviderOptions: React.SFC = () => <StripeProvider apiKey="" options={{stripeAccount: ""}} />;
+const TestStripeProviderOptions: React.SFC = () => <StripeProvider apiKey="" stripeAccount="" />;

From 3f71e50e9ae4ba133ee8c2c6e42482a3d3b4f5e8 Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Sat, 2 Jun 2018 05:02:36 +0100
Subject: [PATCH 0954/1124] Fix tests

---
 types/webpack-serve/webpack-serve-tests.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/types/webpack-serve/webpack-serve-tests.ts b/types/webpack-serve/webpack-serve-tests.ts
index fff9668b29..551072926c 100644
--- a/types/webpack-serve/webpack-serve-tests.ts
+++ b/types/webpack-serve/webpack-serve-tests.ts
@@ -5,13 +5,15 @@ const compiler = webpack();
 
 const server = serve({
   config: {
-    http2: true,
-    dev: {
-      publicPath: '/',
-      logLevel: 'info'
+    serve: {
+      http2: true,
+      dev: {
+        publicPath: '/',
+        logLevel: 'info'
+      },
+      host: 'localhost'
     },
-    host: 'localhost'
-  }
+  }.
 });
 
 server

From 76e8c2a450b398508249fa27b3a1fd1e8699e7f1 Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Sat, 2 Jun 2018 05:08:29 +0100
Subject: [PATCH 0955/1124] Allow either HTTP or HTTPS server

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

diff --git a/types/webpack-hot-client/index.d.ts b/types/webpack-hot-client/index.d.ts
index 337581fedb..295e6819be 100644
--- a/types/webpack-hot-client/index.d.ts
+++ b/types/webpack-hot-client/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="node" />
 
 import * as webpack from 'webpack';
-import * as http from 'http';
+import * as net from 'net';
 
 export = WebpackHotClient;
 
@@ -44,7 +44,7 @@ declare namespace WebpackHotClient {
     /** Reload the page if a patch cannot be applied by webpack */
     reload?: boolean;
     /** Server instance for webpack-hot-client to connect to */
-    server?: http.Server;
+    server?: net.Server;
     /** Webpack stats configuration */
     stats?: webpack.Options.Stats;
   }

From 2e23a68431898e85576a9bd36665872583723656 Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Sat, 2 Jun 2018 07:47:54 +0100
Subject: [PATCH 0956/1124] Fix typo

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

diff --git a/types/webpack-serve/webpack-serve-tests.ts b/types/webpack-serve/webpack-serve-tests.ts
index 551072926c..2a29cec317 100644
--- a/types/webpack-serve/webpack-serve-tests.ts
+++ b/types/webpack-serve/webpack-serve-tests.ts
@@ -13,7 +13,7 @@ const server = serve({
       },
       host: 'localhost'
     },
-  }.
+  },
 });
 
 server

From 992f00693a6d6f0bb9c29cd7689bc477c8bec588 Mon Sep 17 00:00:00 2001
From: Maciek Blim <m.blim@binarapps.com>
Date: Sat, 2 Jun 2018 10:02:57 +0200
Subject: [PATCH 0957/1124] optional `key` param for `createPortal`

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

diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index bd9541217d..e7a5afe59d 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -19,7 +19,7 @@ import {
 export function findDOMNode(instance: ReactInstance): Element | null | Text;
 export function unmountComponentAtNode(container: Element): boolean;
 
-export function createPortal(children: ReactNode, container: Element): ReactPortal;
+export function createPortal(children: ReactNode, container: Element, key?: null | string): ReactPortal;
 
 export const version: string;
 export const render: Renderer;
diff --git a/types/react-dom/react-dom-tests.tsx b/types/react-dom/react-dom-tests.tsx
index 3f153b0a75..ff5ef5850e 100644
--- a/types/react-dom/react-dom-tests.tsx
+++ b/types/react-dom/react-dom-tests.tsx
@@ -42,7 +42,14 @@ describe('ReactDOM', () => {
             }
         }
 
-        ReactDOM.createPortal(React.createElement('div'), portalTarget);
+        ReactDOM.createPortal(<div />, document.createElement('div'));
+        ReactDOM.createPortal(<div />, document.createElement('div'), null);
+        ReactDOM.createPortal(<div />, document.createElement('div'), 'key');
+
+        ReactDOM.createPortal(React.createElement('div'), document.createElement('div'));
+        ReactDOM.createPortal(React.createElement('div'), document.createElement('div'), null);
+        ReactDOM.createPortal(React.createElement('div'), document.createElement('div'), 'key');
+
         ReactDOM.render(<ClassComponent />, rootElement);
     });
 });

From bfea1b206873a901431feabfe193b06f4b17f422 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Sat, 2 Jun 2018 12:40:32 +0200
Subject: [PATCH 0958/1124] New attributes for SMTPServerSession and
 SMTPServerOptions

---
 types/smtp-server/index.d.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/types/smtp-server/index.d.ts b/types/smtp-server/index.d.ts
index bbcee547e6..d7e25dd342 100644
--- a/types/smtp-server/index.d.ts
+++ b/types/smtp-server/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for smtp-server 3.3
+// Type definitions for smtp-server 3.4
 // Project: https://github.com/nodemailer/smtp-server
 // Definitions by: markisme <https://github.com/markisme>
 //                 taisiias <https://github.com/Taisiias>
@@ -72,11 +72,19 @@ export interface SMTPServerSession {
      */
     id: string;
     /**
-     * the IP address for the connected client
+     * local IP address for the connected client
+     */
+    localAddress: string;
+    /**
+     * local port number for the connected client
+     */
+    localPort: number;
+    /**
+     * remote IP address for the connected client
      */
     remoteAddress: string;
     /**
-     * port number the connected client
+     * remote port number for the connected client
      */
     remotePort: number;
     /**
@@ -126,6 +134,8 @@ export interface SMTPServerOptions extends tls.TlsOptions {
      * createServer can be added directly onto this options object.
      */
     secure?: boolean;
+    /** indicate an TLS server where TLS is handled upstream */
+    secured?: boolean;
     /** optional private keys in PEM format */
     key?: string | string[] | Buffer | Buffer[] | Array<{ pem: string | Buffer, passphrase: string }>;
     /** optional cert chains in PEM format */

From 529312a91e089e287d5de9adeef35b74c7f23d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= <jeremy.magrin@gmail.com>
Date: Sat, 2 Jun 2018 12:51:10 +0200
Subject: [PATCH 0959/1124] Fix subfolder error

---
 types/react-navigation/index.d.ts             | 497 +++++++++++-------
 .../react-navigation-tests.tsx                |  41 +-
 types/react-navigation/tsconfig.json          |  14 +-
 types/react-navigation/tslint.json            |   8 +-
 types/react-navigation/{v2 => v1}/index.d.ts  | 497 +++++++-----------
 .../{v2 => v1}/react-navigation-tests.tsx     |  41 +-
 .../react-navigation/{v2 => v1}/tsconfig.json |  14 +-
 types/react-navigation/v1/tslint.json         |   1 +
 types/react-navigation/v2/tslint.json         |   7 -
 9 files changed, 560 insertions(+), 560 deletions(-)
 rename types/react-navigation/{v2 => v1}/index.d.ts (67%)
 rename types/react-navigation/{v2 => v1}/react-navigation-tests.tsx (93%)
 rename types/react-navigation/{v2 => v1}/tsconfig.json (65%)
 create mode 100644 types/react-navigation/v1/tslint.json
 delete 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 1233ca39e3..561558d540 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
 // 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>
+//                 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/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,24 @@ 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>;
+  leftInterpolator: (props: NavigationSceneRendererProps) => {};
+  titleInterpolator: (props: NavigationSceneRendererProps) => {};
+  rightInterpolator: (props: NavigationSceneRendererProps) => {};
   style: StyleProp<ViewStyle>;
 }
 
@@ -73,12 +83,14 @@ export interface NavigationState {
    * Index refers to the active child route in the routes array.
    */
   index: number;
-  routes: any[];
+  routes: NavigationRoute[];
 }
 
-export type NavigationRoute<Params = NavigationParams> = NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
+export type NavigationRoute<Params = NavigationParams> =
+  | NavigationLeafRoute<Params>
+  | NavigationStateRoute<Params>;
 
-export interface NavigationLeafRoute<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.
@@ -100,7 +112,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 +127,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 +139,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 +164,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 +173,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 +183,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<NavigationParams, 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 +226,8 @@ export interface NavigationNavigateActionPayload {
   key?: string;
 }
 
-export interface NavigationNavigateAction extends NavigationNavigateActionPayload {
+export interface NavigationNavigateAction
+  extends NavigationNavigateActionPayload {
   type: 'Navigation/NAVIGATE';
 }
 
@@ -226,7 +247,8 @@ export interface NavigationSetParamsActionPayload {
   params?: NavigationParams;
 }
 
-export interface NavigationSetParamsAction extends NavigationSetParamsActionPayload {
+export interface NavigationSetParamsAction
+  extends NavigationSetParamsActionPayload {
   type: 'Navigation/SET_PARAMS';
 }
 
@@ -271,40 +293,70 @@ 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>;
+  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 {
@@ -317,7 +369,7 @@ export interface NavigationStackRouterConfig {
 }
 
 export type NavigationStackAction =
-  NavigationInitAction
+  | NavigationInitAction
   | NavigationNavigateAction
   | NavigationBackAction
   | NavigationSetParamsAction
@@ -326,25 +378,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;
@@ -352,6 +409,7 @@ export interface NavigationPathsConfig {
 
 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'
@@ -360,45 +418,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 +474,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 +497,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,8 +512,11 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   navigate(
     routeNameOrOptions: string,
     params?: NavigationParams,
-    action?: NavigationAction,
+    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: (
@@ -467,6 +535,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 = {}> {
@@ -550,6 +619,14 @@ export interface TransitionConfig {
   // 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 = (
@@ -558,7 +635,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 +644,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;
+  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,14 +694,21 @@ 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 {
@@ -636,11 +719,18 @@ export interface SwitchNavigatorConfig {
 }
 
 // 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 +745,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 +778,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 +802,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 +843,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 +870,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 +907,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 +931,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 +956,7 @@ export interface TransitionerState {
 export class Transitioner extends React.Component<
   TransitionerProps,
   TransitionerState
-> { }
+  > { }
 
 /**
  * Tab Router
@@ -853,12 +983,23 @@ export function StackRouter(
  *
  * @see https://github.com/react-navigation/react-navigation/blob/master/src/navigators/createNavigator.js
  */
-export function createNavigator<C, S, Options>(
+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<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 +1020,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 +1080,7 @@ export interface SafeAreaViewProps extends ViewProps {
     horizontal?: SafeAreaViewForceInsetValue;
     vertical?: SafeAreaViewForceInsetValue;
   };
+  children?: React.ReactNode;
 }
 
 export const SafeAreaView: React.ComponentClass<SafeAreaViewProps>;
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index b00b0a27fc..b59474bd11 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -5,7 +5,7 @@ import {
     ViewStyle,
 } from 'react-native';
 import {
-    DrawerNavigator,
+    createDrawerNavigator,
     DrawerNavigatorConfig,
     NavigationAction,
     NavigationActions,
@@ -22,15 +22,14 @@ import {
     NavigationStackScreenOptions,
     NavigationTabScreenOptions,
     NavigationTransitionProps,
-    StackNavigator,
+    createStackNavigator,
     StackNavigatorConfig,
-    SwitchNavigator,
+    createSwitchNavigator,
     SwitchNavigatorConfig,
     TabBarTop,
-    TabNavigator,
+    createTabNavigator,
     TabNavigatorConfig,
     Transitioner,
-    addNavigationHelpers,
     HeaderBackButton,
     Header,
     NavigationContainer,
@@ -128,7 +127,7 @@ const routeConfigMap: NavigationRouteConfigMap = {
         screen: NextScreen,
     },
 };
-export const AppNavigator = StackNavigator(
+export const AppNavigator = createStackNavigator(
     routeConfigMap,
     {
         initialRouteName: ROUTE_NAME_START_SCREEN,
@@ -147,7 +146,7 @@ const StatelessScreen: NavigationScreenComponent<StatelessScreenParams> = (props
 
 StatelessScreen.navigationOptions = { title: 'Stateless' };
 
-const SimpleStackNavigator = StackNavigator(
+const SimpleStackNavigator = createStackNavigator(
     {
         simple: {
             screen: StatelessScreen,
@@ -155,20 +154,6 @@ const SimpleStackNavigator = StackNavigator(
     }
 );
 
-/**
- * Router.
- */
-const Router = (props: any) => (
-    <AppNavigator
-        navigation={
-            addNavigationHelpers({
-                dispatch: (action: NavigationStackAction): boolean => true,
-                state: {},
-            })
-        }
-    />
-);
-
 /**
  * Tab navigator.
  */
@@ -204,7 +189,7 @@ const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
     },
 };
 
-const BasicTabNavigator = TabNavigator(
+const BasicTabNavigator = createTabNavigator(
     routeConfigMap,
     tabNavigatorConfig,
 );
@@ -232,7 +217,7 @@ const stackNavigatorConfig: StackNavigatorConfig = {
     navigationOptions: stackNavigatorScreenOptions,
 };
 
-const BasicStackNavigator = StackNavigator(
+const BasicStackNavigator = createStackNavigator(
     routeConfigMap,
     stackNavigatorConfig,
 );
@@ -252,7 +237,7 @@ const stackNavigatorConfigWithNavigationOptionsAsFunction: StackNavigatorConfig
     navigationOptions: ({navigationOptions, navigation, screenProps}) => (stackNavigatorScreenOptions),
 };
 
-const AdvancedStackNavigator = StackNavigator(
+const AdvancedStackNavigator = createStackNavigator(
     routeConfigMap,
     stackNavigatorConfigWithNavigationOptionsAsFunction
 );
@@ -276,7 +261,7 @@ const switchNavigatorConfig: SwitchNavigatorConfig = {
     backBehavior: 'none'
 };
 
-const BasicSwitchNavigator = SwitchNavigator(
+const BasicSwitchNavigator = createSwitchNavigator(
     routeConfigMap,
     switchNavigatorConfig,
 );
@@ -296,7 +281,7 @@ const switchNavigatorConfigWithInitialRoute: SwitchNavigatorConfig = {
     backBehavior: 'initialRoute'
 };
 
-const SwitchNavigatorWithInitialRoute = SwitchNavigator(
+const SwitchNavigatorWithInitialRoute = createSwitchNavigator(
     routeConfigMap,
     switchNavigatorConfigWithInitialRoute,
 );
@@ -326,7 +311,7 @@ const drawerNavigatorConfig: DrawerNavigatorConfig = {
     },
 };
 
-const BasicDrawerNavigator = DrawerNavigator(
+const BasicDrawerNavigator = createDrawerNavigator(
     routeConfigMap,
     stackNavigatorConfig,
 );
@@ -449,7 +434,7 @@ const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
 
 class Page1 extends React.Component { }
 
-const RootNavigator: NavigationContainer = SwitchNavigator({
+const RootNavigator: NavigationContainer = createSwitchNavigator({
     default: { getScreen: () => Page1 },
 });
 
diff --git a/types/react-navigation/tsconfig.json b/types/react-navigation/tsconfig.json
index ac0fcf1f1f..1afd5d30f6 100644
--- a/types/react-navigation/tsconfig.json
+++ b/types/react-navigation/tsconfig.json
@@ -9,12 +9,20 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": false,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "jsx": "react",
         "typeRoots": [
-            "../"
+            "../../"
         ],
         "types": [],
+        "paths": {
+            "react-navigation": [
+                "react-navigation/v2"
+            ],
+            "react-navigation/*": [
+                "react-navigation/v2/*"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -22,4 +30,4 @@
         "index.d.ts",
         "react-navigation-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-navigation/tslint.json b/types/react-navigation/tslint.json
index 3db14f85ea..b1439230db 100644
--- a/types/react-navigation/tslint.json
+++ b/types/react-navigation/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODO
+        "no-any-union": false
+    }
+}
diff --git a/types/react-navigation/v2/index.d.ts b/types/react-navigation/v1/index.d.ts
similarity index 67%
rename from types/react-navigation/v2/index.d.ts
rename to types/react-navigation/v1/index.d.ts
index 561558d540..1233ca39e3 100644
--- a/types/react-navigation/v2/index.d.ts
+++ b/types/react-navigation/v1/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-navigation 2.0
+// 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>
-//                 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
+ * 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,24 +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>;
-  leftInterpolator: (props: NavigationSceneRendererProps) => {};
-  titleInterpolator: (props: NavigationSceneRendererProps) => {};
-  rightInterpolator: (props: NavigationSceneRendererProps) => {};
+  router: NavigationRouter<
+    NavigationState,
+    NavigationStackScreenOptions
+  >;
+  getScreenDetails: (navigationScene: NavigationScene) => NavigationScreenDetails<
+    NavigationStackScreenOptions
+  >;
   style: StyleProp<ViewStyle>;
 }
 
@@ -83,14 +73,12 @@ export interface NavigationState {
    * Index refers to the active child route in the routes array.
    */
   index: number;
-  routes: NavigationRoute[];
+  routes: any[];
 }
 
-export type NavigationRoute<Params = NavigationParams> =
-  | NavigationLeafRoute<Params>
-  | NavigationStateRoute<Params>;
+export type NavigationRoute<Params = NavigationParams> = NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
 
-export interface NavigationLeafRoute<Params = NavigationParams> {
+export interface NavigationLeafRoute<Params> {
   /**
    * React's key used by some navigators. No need to specify these manually,
    * they will be defined by the router.
@@ -112,9 +100,7 @@ export interface NavigationLeafRoute<Params = NavigationParams> {
   params?: Params;
 }
 
-export type NavigationStateRoute<
-  NavigationLeafRouteParams
-  > = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
+export type NavigationStateRoute<NavigationLeafRouteParams> = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
 
 export type NavigationScreenOptionsGetter<Options> = (
   navigation: NavigationScreenProp<NavigationRoute<any>>,
@@ -127,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
@@ -139,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;
 
@@ -164,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;
@@ -173,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>;
@@ -183,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<NavigationParams, 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;
@@ -226,8 +206,7 @@ export interface NavigationNavigateActionPayload {
   key?: string;
 }
 
-export interface NavigationNavigateAction
-  extends NavigationNavigateActionPayload {
+export interface NavigationNavigateAction extends NavigationNavigateActionPayload {
   type: 'Navigation/NAVIGATE';
 }
 
@@ -247,8 +226,7 @@ export interface NavigationSetParamsActionPayload {
   params?: NavigationParams;
 }
 
-export interface NavigationSetParamsAction
-  extends NavigationSetParamsActionPayload {
+export interface NavigationSetParamsAction extends NavigationSetParamsActionPayload {
   type: 'Navigation/SET_PARAMS';
 }
 
@@ -293,70 +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>;
-  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 {
@@ -369,7 +317,7 @@ export interface NavigationStackRouterConfig {
 }
 
 export type NavigationStackAction =
-  | NavigationInitAction
+  NavigationInitAction
   | NavigationNavigateAction
   | NavigationBackAction
   | NavigationSetParamsAction
@@ -378,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;
@@ -409,7 +352,6 @@ export interface NavigationPathsConfig {
 
 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'
@@ -418,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 {
@@ -474,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;
@@ -497,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;
@@ -512,11 +447,8 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   navigate(
     routeNameOrOptions: string,
     params?: NavigationParams,
-    action?: NavigationAction
+    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: (
@@ -535,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,14 +550,6 @@ export interface TransitionConfig {
   // 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 = (
@@ -635,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
@@ -644,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;
-  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 };
@@ -694,21 +618,14 @@ 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 {
@@ -719,18 +636,11 @@ export interface SwitchNavigatorConfig {
 }
 
 // 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;
 
@@ -745,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;
 
 /**
@@ -778,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;
@@ -802,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 {
@@ -843,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;
@@ -870,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;
@@ -907,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;
 }
 
 /**
@@ -931,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
@@ -956,7 +826,7 @@ export interface TransitionerState {
 export class Transitioner extends React.Component<
   TransitionerProps,
   TransitionerState
-  > { }
+> { }
 
 /**
  * Tab Router
@@ -983,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<S, Options>(
-  view: NavigationView<Options, S>,
+export function createNavigator<C, S, Options>(
   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
@@ -1020,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>;
@@ -1080,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/react-navigation-tests.tsx b/types/react-navigation/v1/react-navigation-tests.tsx
similarity index 93%
rename from types/react-navigation/v2/react-navigation-tests.tsx
rename to types/react-navigation/v1/react-navigation-tests.tsx
index b59474bd11..b00b0a27fc 100644
--- a/types/react-navigation/v2/react-navigation-tests.tsx
+++ b/types/react-navigation/v1/react-navigation-tests.tsx
@@ -5,7 +5,7 @@ import {
     ViewStyle,
 } from 'react-native';
 import {
-    createDrawerNavigator,
+    DrawerNavigator,
     DrawerNavigatorConfig,
     NavigationAction,
     NavigationActions,
@@ -22,14 +22,15 @@ import {
     NavigationStackScreenOptions,
     NavigationTabScreenOptions,
     NavigationTransitionProps,
-    createStackNavigator,
+    StackNavigator,
     StackNavigatorConfig,
-    createSwitchNavigator,
+    SwitchNavigator,
     SwitchNavigatorConfig,
     TabBarTop,
-    createTabNavigator,
+    TabNavigator,
     TabNavigatorConfig,
     Transitioner,
+    addNavigationHelpers,
     HeaderBackButton,
     Header,
     NavigationContainer,
@@ -127,7 +128,7 @@ const routeConfigMap: NavigationRouteConfigMap = {
         screen: NextScreen,
     },
 };
-export const AppNavigator = createStackNavigator(
+export const AppNavigator = StackNavigator(
     routeConfigMap,
     {
         initialRouteName: ROUTE_NAME_START_SCREEN,
@@ -146,7 +147,7 @@ const StatelessScreen: NavigationScreenComponent<StatelessScreenParams> = (props
 
 StatelessScreen.navigationOptions = { title: 'Stateless' };
 
-const SimpleStackNavigator = createStackNavigator(
+const SimpleStackNavigator = StackNavigator(
     {
         simple: {
             screen: StatelessScreen,
@@ -154,6 +155,20 @@ const SimpleStackNavigator = createStackNavigator(
     }
 );
 
+/**
+ * Router.
+ */
+const Router = (props: any) => (
+    <AppNavigator
+        navigation={
+            addNavigationHelpers({
+                dispatch: (action: NavigationStackAction): boolean => true,
+                state: {},
+            })
+        }
+    />
+);
+
 /**
  * Tab navigator.
  */
@@ -189,7 +204,7 @@ const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
     },
 };
 
-const BasicTabNavigator = createTabNavigator(
+const BasicTabNavigator = TabNavigator(
     routeConfigMap,
     tabNavigatorConfig,
 );
@@ -217,7 +232,7 @@ const stackNavigatorConfig: StackNavigatorConfig = {
     navigationOptions: stackNavigatorScreenOptions,
 };
 
-const BasicStackNavigator = createStackNavigator(
+const BasicStackNavigator = StackNavigator(
     routeConfigMap,
     stackNavigatorConfig,
 );
@@ -237,7 +252,7 @@ const stackNavigatorConfigWithNavigationOptionsAsFunction: StackNavigatorConfig
     navigationOptions: ({navigationOptions, navigation, screenProps}) => (stackNavigatorScreenOptions),
 };
 
-const AdvancedStackNavigator = createStackNavigator(
+const AdvancedStackNavigator = StackNavigator(
     routeConfigMap,
     stackNavigatorConfigWithNavigationOptionsAsFunction
 );
@@ -261,7 +276,7 @@ const switchNavigatorConfig: SwitchNavigatorConfig = {
     backBehavior: 'none'
 };
 
-const BasicSwitchNavigator = createSwitchNavigator(
+const BasicSwitchNavigator = SwitchNavigator(
     routeConfigMap,
     switchNavigatorConfig,
 );
@@ -281,7 +296,7 @@ const switchNavigatorConfigWithInitialRoute: SwitchNavigatorConfig = {
     backBehavior: 'initialRoute'
 };
 
-const SwitchNavigatorWithInitialRoute = createSwitchNavigator(
+const SwitchNavigatorWithInitialRoute = SwitchNavigator(
     routeConfigMap,
     switchNavigatorConfigWithInitialRoute,
 );
@@ -311,7 +326,7 @@ const drawerNavigatorConfig: DrawerNavigatorConfig = {
     },
 };
 
-const BasicDrawerNavigator = createDrawerNavigator(
+const BasicDrawerNavigator = DrawerNavigator(
     routeConfigMap,
     stackNavigatorConfig,
 );
@@ -434,7 +449,7 @@ const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
 
 class Page1 extends React.Component { }
 
-const RootNavigator: NavigationContainer = createSwitchNavigator({
+const RootNavigator: NavigationContainer = SwitchNavigator({
     default: { getScreen: () => Page1 },
 });
 
diff --git a/types/react-navigation/v2/tsconfig.json b/types/react-navigation/v1/tsconfig.json
similarity index 65%
rename from types/react-navigation/v2/tsconfig.json
rename to types/react-navigation/v1/tsconfig.json
index 1afd5d30f6..ac0fcf1f1f 100644
--- a/types/react-navigation/v2/tsconfig.json
+++ b/types/react-navigation/v1/tsconfig.json
@@ -9,20 +9,12 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": false,
-        "baseUrl": "../../",
+        "baseUrl": "../",
         "jsx": "react",
         "typeRoots": [
-            "../../"
+            "../"
         ],
         "types": [],
-        "paths": {
-            "react-navigation": [
-                "react-navigation/v2"
-            ],
-            "react-navigation/*": [
-                "react-navigation/v2/*"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -30,4 +22,4 @@
         "index.d.ts",
         "react-navigation-tests.tsx"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/react-navigation/v1/tslint.json b/types/react-navigation/v1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-navigation/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-navigation/v2/tslint.json b/types/react-navigation/v2/tslint.json
deleted file mode 100644
index b1439230db..0000000000
--- a/types/react-navigation/v2/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODO
-        "no-any-union": false
-    }
-}

From e030f2b4de55de98595664b1a98136f06a62944a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= <jeremy.magrin@gmail.com>
Date: Sat, 2 Jun 2018 13:00:09 +0200
Subject: [PATCH 0960/1124] Fix dependencies

---
 types/react-navigation/tsconfig.json             | 4 ++--
 types/react-router-navigation-core/tsconfig.json | 4 ++--
 types/react-router-navigation/tsconfig.json      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/react-navigation/tsconfig.json b/types/react-navigation/tsconfig.json
index 1afd5d30f6..3fc9fba7ce 100644
--- a/types/react-navigation/tsconfig.json
+++ b/types/react-navigation/tsconfig.json
@@ -17,10 +17,10 @@
         "types": [],
         "paths": {
             "react-navigation": [
-                "react-navigation/v2"
+                "react-navigation/v1"
             ],
             "react-navigation/*": [
-                "react-navigation/v2/*"
+                "react-navigation/v1/*"
             ]
         },
         "noEmit": true,
diff --git a/types/react-router-navigation-core/tsconfig.json b/types/react-router-navigation-core/tsconfig.json
index b773967cc9..fb95df56d6 100644
--- a/types/react-router-navigation-core/tsconfig.json
+++ b/types/react-router-navigation-core/tsconfig.json
@@ -7,10 +7,10 @@
         "types": [],
         "paths": {
             "react-navigation": [
-                "react-navigation/v2"
+                "react-navigation/v1"
             ],
             "react-navigation/*": [
-                "react-navigation/v2/*"
+                "react-navigation/v1/*"
             ]
         },
         "module": "commonjs",
diff --git a/types/react-router-navigation/tsconfig.json b/types/react-router-navigation/tsconfig.json
index c55f423c19..5c345d9c7a 100644
--- a/types/react-router-navigation/tsconfig.json
+++ b/types/react-router-navigation/tsconfig.json
@@ -7,10 +7,10 @@
         "types": [],
         "paths": {
             "react-navigation": [
-                "react-navigation/v2"
+                "react-navigation/v1"
             ],
             "react-navigation/*": [
-                "react-navigation/v2/*"
+                "react-navigation/v1/*"
             ]
         },
         "module": "commonjs",

From 418b3b2691f3f1eb5f488d2a1512c76f3c3c4c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= <jeremy.magrin@gmail.com>
Date: Sat, 2 Jun 2018 13:03:44 +0200
Subject: [PATCH 0961/1124] Fix paths

---
 types/react-navigation/tsconfig.json    | 12 ++----------
 types/react-navigation/v1/tsconfig.json | 14 +++++++++++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/types/react-navigation/tsconfig.json b/types/react-navigation/tsconfig.json
index 3fc9fba7ce..c1d4d83209 100644
--- a/types/react-navigation/tsconfig.json
+++ b/types/react-navigation/tsconfig.json
@@ -9,20 +9,12 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": false,
-        "baseUrl": "../../",
+        "baseUrl": "../",
         "jsx": "react",
         "typeRoots": [
-            "../../"
+            "../"
         ],
         "types": [],
-        "paths": {
-            "react-navigation": [
-                "react-navigation/v1"
-            ],
-            "react-navigation/*": [
-                "react-navigation/v1/*"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/react-navigation/v1/tsconfig.json b/types/react-navigation/v1/tsconfig.json
index ac0fcf1f1f..3fc9fba7ce 100644
--- a/types/react-navigation/v1/tsconfig.json
+++ b/types/react-navigation/v1/tsconfig.json
@@ -9,12 +9,20 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": false,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "jsx": "react",
         "typeRoots": [
-            "../"
+            "../../"
         ],
         "types": [],
+        "paths": {
+            "react-navigation": [
+                "react-navigation/v1"
+            ],
+            "react-navigation/*": [
+                "react-navigation/v1/*"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -22,4 +30,4 @@
         "index.d.ts",
         "react-navigation-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From 79bd7180d09eb71a5b1d6da6fa2c9aab4442d647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= <jeremy.magrin@gmail.com>
Date: Sat, 2 Jun 2018 13:28:26 +0200
Subject: [PATCH 0962/1124] Fix createMaterialTopNavigator to
 createMaterialTopTabNavigator

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 561558d540..90f440d006 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -826,7 +826,7 @@ export function createBottomTabNavigator(
   drawConfig?: TabNavigatorConfig
 ): NavigationContainer;
 
-export function createMaterialTopNavigator(
+export function createMaterialTopTabNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   drawConfig?: TabNavigatorConfig
 ): NavigationContainer;

From 502b45cf1534228e1e1033393b833900788d5e69 Mon Sep 17 00:00:00 2001
From: Bohdan Stupak <stupakbogdan@ukr.net>
Date: Sat, 2 Jun 2018 20:36:23 +0300
Subject: [PATCH 0963/1124] Add types to jquery.nicescroll

---
 types/jquery.nicescroll/index.d.ts            | 105 ++++++++++++++++++
 .../jquery.nicescroll-tests.ts                |  41 +++++++
 types/jquery.nicescroll/tsconfig.json         |  24 ++++
 types/jquery.nicescroll/tslint.json           |   3 +
 4 files changed, 173 insertions(+)
 create mode 100644 types/jquery.nicescroll/index.d.ts
 create mode 100644 types/jquery.nicescroll/jquery.nicescroll-tests.ts
 create mode 100644 types/jquery.nicescroll/tsconfig.json
 create mode 100644 types/jquery.nicescroll/tslint.json

diff --git a/types/jquery.nicescroll/index.d.ts b/types/jquery.nicescroll/index.d.ts
new file mode 100644
index 0000000000..1b5b714cb8
--- /dev/null
+++ b/types/jquery.nicescroll/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for jquery.nicescroll 3.7.6
+// Project: https://nicescroll.areaaperta.com
+// Definitions by: Bohdan Stupak <https://github.com/Wkalmar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery"/>
+
+declare namespace JQueryNiceScroll {
+    interface NiceScrollPage {
+        maxw: number
+        maxh: number
+        width: number
+        height: number
+        w: number
+        h: number
+    }
+    
+    interface NiceScroll {
+        show(): NiceScroll
+        hide(): NiceScroll
+        toggle(): NiceScroll
+        onResize(e?: Event, page?: NiceScrollPage): NiceScroll
+        resize(e?: Event, page?: NiceScrollPage): NiceScroll
+        remove(): void
+        stop(): NiceScroll
+        doScrollPos(x: number, y: number, spd: number): void
+        doScrollLeft(x: number, duration: number): void
+        doScrollTop(x: number, duration: number): void
+    }
+    
+    interface NiceScrollOptions {
+        zindex?: "auto" | number
+        cursoropacitymin?: number
+        cursoropacitymax?: number
+        cursorcolor?: string
+        cursorwidth?: string
+        cursorborder?: string
+        cursorborderradius?: string
+        scrollspeed?: number
+        mousescrollstep?: number
+        touchbehavior?: boolean
+        emulatetouch?: boolean
+        hwacceleration?: boolean
+        usetransition?: boolean
+        boxzoom?: boolean
+        dblclickzoom?: boolean
+        gesturezoom?: boolean
+        grabcursorenabled?: boolean
+        autohidemode?: "leave" | "scroll" | "cursor" | "hidden" | boolean
+        background?: string
+        iframeautoresize?: boolean
+        cursorminheight?: number
+        preservenativescrolling?: boolean
+        railoffset?: boolean | {
+            top?: number
+            left?: number
+        }
+        railhoffset?: boolean  | {
+            top?: number
+            left?: number
+        }
+        bouncescroll?: boolean
+        spacebarenabled?: boolean
+        railpadding?: {
+          top: number
+          right: number
+          left: number
+          bottom: number
+        }
+        disableoutline?: boolean
+        horizrailenabled?: boolean
+        railalign?: "right" | "left" | "top" | "bottom"
+        railvalign?: "right" | "left" | "top" | "bottom"
+        enabletranslate3d?: boolean
+        enablemousewheel?: boolean
+        enablekeyboard?: boolean
+        smoothscroll?: boolean
+        sensitiverail?: boolean
+        enablemouselockapi?: boolean
+        cursorfixedheight?: number
+        directionlockdeadzone?: number
+        hidecursordelay?: number
+        nativeparentscrolling?: boolean
+        enablescrollonselection?: boolean
+        overflowx?: "auto" | "hidden" | "inherit" | "initial" | "overlay" | "scroll" | "unset" | "visible"
+        overflowy?: "auto" | "hidden" | "inherit" | "initial" | "overlay" | "scroll" | "unset" | "visible"
+        cursordragspeed?: number
+        rtlmode?: "auto" | boolean
+        cursordragontouch?: boolean
+        oneaxismousemode?: "auto" | boolean
+        scriptpath?: string
+        preventmultitouchscrolling?: boolean
+        disablemutationobserver?: boolean
+        enableobserver?: boolean
+        scrollbarid?: string
+        scrollCLass?: string
+    }  
+}
+
+interface JQuery {
+    niceScroll(options?: JQueryNiceScroll.NiceScrollOptions) : JQueryNiceScroll.NiceScroll;
+    niceScroll(wrapper: string, options: JQueryNiceScroll.NiceScrollOptions) : JQueryNiceScroll.NiceScroll;
+    getNiceScroll(index?: number) : JQueryNiceScroll.NiceScroll;
+}
\ No newline at end of file
diff --git a/types/jquery.nicescroll/jquery.nicescroll-tests.ts b/types/jquery.nicescroll/jquery.nicescroll-tests.ts
new file mode 100644
index 0000000000..2d4599d8d6
--- /dev/null
+++ b/types/jquery.nicescroll/jquery.nicescroll-tests.ts
@@ -0,0 +1,41 @@
+//cases from documentation
+// 1. Simple mode, it styles document scrollbar:
+$(function() {  
+    $("body").niceScroll();
+});
+
+// 2. Instance with object returned:
+let nice;
+$(function() {  
+    nice = $("body").niceScroll();
+});
+
+// 3. Style a DIV and change cursor color:
+$(function() {  
+    $("#thisdiv").niceScroll({cursorcolor:"#00F"});
+});
+
+// 4. DIV with "wrapper", formed by two divs, the first is the vieport, the latter is the content:
+$(function() {
+    $("#viewportdiv").niceScroll("#wrapperdiv",{cursorcolor:"#00F"});
+});
+
+// 5. Get nicescroll object:
+nice = $("#mydiv").getNiceScroll();
+
+// 6. Hide scrollbars:
+$("#mydiv").getNiceScroll().hide();
+
+// 7. Check for scrollbars resize (when content or position have changed):
+$("#mydiv").getNiceScroll().resize();
+
+// 8. Scrolling to a position:
+$("#mydiv").getNiceScroll(0).doScrollLeft(1, 2); // Scroll X Axis
+$("#mydiv").getNiceScroll(0).doScrollTop(1, 14); // Scroll Y Axis
+
+//other cases
+$(".ui-grid-viewport").niceScroll({
+    cursorcolor: "#fff",
+    cursorwidth: "8px",
+    autohidemode: "leave"
+});
\ No newline at end of file
diff --git a/types/jquery.nicescroll/tsconfig.json b/types/jquery.nicescroll/tsconfig.json
new file mode 100644
index 0000000000..a5d8cb44a3
--- /dev/null
+++ b/types/jquery.nicescroll/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.nicescroll-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery.nicescroll/tslint.json b/types/jquery.nicescroll/tslint.json
new file mode 100644
index 0000000000..8bc7a53d89
--- /dev/null
+++ b/types/jquery.nicescroll/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json",    
+}

From d2b232d5e94150fd49bbc6ea986f6bfaf195328e Mon Sep 17 00:00:00 2001
From: Errietta Kostala <errietta@errietta.me>
Date: Sat, 2 Jun 2018 19:41:05 +0100
Subject: [PATCH 0964/1124] Update openpgp.js type definitions to match module

---
 types/openpgp/index.d.ts       | 275 ++++++++++++++++++++++++---------
 types/openpgp/openpgp-tests.ts |  45 ++----
 2 files changed, 211 insertions(+), 109 deletions(-)

diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index 79e92daa7f..6c8e073c04 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -1,22 +1,73 @@
 // Type definitions for openpgpjs
 // Project: http://openpgpjs.org/
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
+//                 Errietta Kostala <https://github.com/errietta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace openpgp;
 
-export interface KeyPair {
+export interface UserId {
+    name?: string,
+    email?: string,
+}
+
+export interface SessionKey  {
+    data: Uint8Array,
+    algorithm: string
+}
+
+export interface EncryptOptions {
+    data: string|Uint8Array,
+    dataType?: 'utf8'|'binary'|'text'|'mime',
+    publicKeys?: key.Key | key.Key[],
+    privateKeys?: key.Key | key.Key[],
+    passwords?: string|string[],
+    sessionKey?: SessionKey,
+    filename?: string,
+    compression?: enums.compression,
+    armor?: boolean,
+    detached?: boolean,
+    signature?: Signature,
+    returnSessionKey?: boolean,
+    wildcard?: boolean,
+    date?: Date,
+    fromUserId?: UserId,
+    toUserId?: UserId,
+}
+
+export interface EncryptedMessage {
+    data: string,
+    message: string,
+}
+
+export interface DecryptOptions {
+    message: message.Message,
+    privateKeys?: key.Key | key.Key[],
+    passwords?: string | string[],
+    sessionKeys?: SessionKey | SessionKey[],
+    publicKeys?: key.Key | key.Key[],
+    format?: string,
+    signature?: Signature,
+    date?: Date,
+}
+
+export interface KeyContainer {
     key: key.Key,
+}
+
+export interface KeyPair extends KeyContainer {
     privateKeyArmored: string,
     publicKeyArmored: string
 }
 
 export interface KeyOptions {
-    keyType?: enums.publicKey,
-    numBits: number,
-    userId: string,
-    passphrase: string,
-    unlocked?: boolean
+    userIds?: UserId[],
+    passphrase?: string,
+    numBits?: number,
+    keyExpirationTime?: number,
+    curve?: string,
+    date?: Date,
+    subkeys?: KeyOptions[]
 }
 
 export interface Keyid {
@@ -29,91 +80,153 @@ export interface Signature {
 }
 
 export interface VerifiedMessage {
-    text: string,
-    signatures: Array<Signature>
+    data: Uint8Array|string,
+    signatures: Array<Signature>,
+    filename: string,
 }
 
-/** Decrypts message and verifies signatures
+export interface OpenPGPWorker {
+    randomCallback(): void;
+    configure(config: any): void;
+    seedRandom(buffer: ArrayBuffer): void;
+    delegate(id: number, method: string, options: any): void;
+    response(event: any): void;
+}
 
-    @param privateKey private key with decrypted secret key data
-    @param publicKeys array of keys to verify signatures
-    @param msg the message object with signed and encrypted data
-    */
-export function decryptAndVerifyMessage(privateKey: key.Key, publicKeys: Array<key.Key>, msg: string): Promise<VerifiedMessage>;
-/** Decrypts message and verifies signatures
+export interface WorkerOptions {
+    path?: string,
+    n?: number,
+    workers?: OpenPGPWorker[],
+    config?: any,
+}
 
-    @param privateKey private key with decrypted secret key data
-    @param publicKey single key to verify signatures
-    @param msg the message object with signed and encrypted data
-    */
-export function decryptAndVerifyMessage(privateKey: key.Key, publicKey: key.Key, msg: string): Promise<VerifiedMessage>;
+export class AsyncProxy {
+    constructor(options: WorkerOptions);
+    getId(): number;
+    seedRandom(workerId: number, size: number): Promise<void>;
+    terminate(): void;
+    delegate(method: string, options: any): void;
 
-/** Decrypts message
+    workers: OpenPGPWorker[];
+}
 
-    @param privateKey private key with decrypted secret key data
-    @param msg the message object with the encrypted data
-    */
-export function decryptMessage(privateKey: key.Key, msg: message.Message): Promise<string>;
+/**
+ * Set the path for the web worker script and create an instance of the async proxy
+ * @param {String} path            relative path to the worker scripts, default: 'openpgp.worker.js'
+ * @param {Number} n               number of workers to initialize
+ * @param {Array<Object>} workers  alternative to path parameter: web workers initialized with 'openpgp.worker.js'
+ */
+export function initWorker(options: WorkerOptions): boolean;
 
-/** Encrypts message text with keys
-    @param keys array of keys used to encrypt the message
-    @param text message as native JavaScript string
-    @returns encrypted ASCII armored message
-    */
-export function encryptMessage(keys: Array<key.Key>, message: string): Promise<string>;
-/** Encrypts message text with keys
+/**
+ * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
+ * @returns {module:worker/async_proxy.AsyncProxy|null} the async proxy or null if not initialized
+ */
+export function getWorker(): AsyncProxy;
 
-    @param single key used to encrypt the message
-    @param text message as native JavaScript string
-    */
-export function encryptMessage(key: key.Key, message: string): Promise<string>;
+/**
+ * Cleanup the current instance of the web worker.
+ */
+export function destroyWorker(): void;
 
-/** Generates a new OpenPGP key pair. Currently only supports RSA keys. Primary and subkey will be of same type.
-    @param options
-    */
-export function generateKeyPair(options: KeyOptions): Promise<KeyPair>;
+/**
+ * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
+ *   must be specified. If private keys are specified, those will be used to sign the message.
+ * @param  {String|Uint8Array} data               text/data to be encrypted as JavaScript binary string or Uint8Array
+ * @param  {utf8|binary|text|mime} dataType       (optional) data packet type
+ * @param  {Key|Array<Key>} publicKeys            (optional) array of keys or single key, used to encrypt the message
+ * @param  {Key|Array<Key>} privateKeys           (optional) private keys for signing. If omitted message will not be signed
+ * @param  {String|Array<String>} passwords       (optional) array of passwords or a single password to encrypt the message
+ * @param  {Object} sessionKey                    (optional) session key in the form: { data:Uint8Array, algorithm:String }
+ * @param  {String} filename                      (optional) a filename for the literal data packet
+ * @param  {module:enums.compression} compression (optional) which compression algorithm to compress the message with, defaults to what is specified in config
+ * @param  {Boolean} armor                        (optional) if the return values should be ascii armored or the message/signature objects
+ * @param  {Boolean} detached                     (optional) if the signature should be detached (if true, signature will be added to returned object)
+ * @param  {Signature} signature                  (optional) a detached signature to add to the encrypted message
+ * @param  {Boolean} returnSessionKey             (optional) if the unencrypted session key should be added to returned object
+ * @param  {Boolean} wildcard                     (optional) use a key ID of 0 instead of the public key IDs
+ * @param  {Date} date                            (optional) override the creation date of the message and the message signature
+ * @param  {Object} fromUserId                    (optional) user ID to sign with, e.g. { name:'Steve Sender', email:'steve@openpgp.org' }
+ * @param  {Object} toUserId                      (optional) user ID to encrypt for, e.g. { name:'Robert Receiver', email:'robert@openpgp.org' }
+ * @returns {Promise<Object>}                      encrypted (and optionally signed message) in the form:
+ *                                                  {data: ASCII armored message if 'armor' is true,
+ *                                                  message: full Message object if 'armor' is false, signature: detached signature if 'detached' is true}
+ * @async
+ * @static
+ */
+export function encrypt(options: EncryptOptions): Promise<EncryptedMessage>;
 
-/** Signs message text and encrypts it
+/**
+ * Decrypts a message with the user's private key, a session key or a password. Either a private key,
+ *   a session key or a password must be specified.
+ * @param  {Message} message                  the message object with the encrypted data
+ * @param  {Key|Array<Key>} privateKeys       (optional) private keys with decrypted secret key data or session key
+ * @param  {String|Array<String>} passwords   (optional) passwords to decrypt the message
+ * @param  {Object|Array<Object>} sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String }
+ * @param  {Key|Array<Key>} publicKeys        (optional) array of public keys or single key, to verify signatures
+ * @param  {String} format                    (optional) return data format either as 'utf8' or 'binary'
+ * @param  {Signature} signature              (optional) detached signature for verification
+ * @param  {Date} date                        (optional) use the given date for verification instead of the current time
+ * @returns {Promise<Object>}             decrypted and verified message in the form:
+ *                                         { data:Uint8Array|String, filename:String, signatures:[{ keyid:String, valid:Boolean }] }
+ * @async
+ * @static
+ */
+export function decrypt(options: DecryptOptions): Promise<VerifiedMessage>;
 
-    @param publicKeys array of keys used to encrypt the message
-    @param privateKey private key with decrypted secret key data for signing
-    @param text private key with decrypted secret key data for signing
-    */
-export function signAndEncryptMessage(publicKeys: Array<key.Key>, privateKey: key.Key, text: string): Promise<string>;
-/** Signs message text and encrypts it
+/**
+ * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
+ * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
+ * @param  {Number} numBits          (optional) number of bits for RSA keys: 2048 or 4096.
+ * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+ * @param  {String} curve            (optional) elliptic curve for ECC keys:
+ *                                              curve25519, p256, p384, p521, secp256k1,
+ *                                              brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
+ * @param  {Date} date               (optional) override the creation date of the key and the key signatures
+ * @param  {Array<Object>} subkeys   (optional) options for each subkey, default to main key options. e.g. [{sign: true, passphrase: '123'}]
+ *                                              sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+ * @returns {Promise<Object>}         The generated key object in the form:
+ *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String }
+ * @async
+ * @static
+ */
+export function generateKey(options: KeyOptions): Promise<KeyPair>;
 
-    @param publicKeys single key used to encrypt the message
-    @param privateKey private key with decrypted secret key data for signing
-    @param text private key with decrypted secret key data for signing
-    */
-export function signAndEncryptMessage(publicKey: key.Key, privateKey: key.Key, text: string): Promise<string>;
+/**
+ * Reformats signature packets for a key and rewraps key object.
+ * @param  {Key} privateKey          private key to reformat
+ * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
+ * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+ * @returns {Promise<Object>}         The generated key object in the form:
+ *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String }
+ * @async
+ * @static
+ */
+export function reformatKey(options: {
+    privateKey: key.Key,
+    userIds?: UserId[],
+    passphrase?: string,
+    keyExpirationTime?: number,
+}): Promise<KeyPair>;
 
-/** Signs a cleartext message
-
-    @param privateKeys array of keys with decrypted secret key data to sign cleartext
-    @param text cleartext
-    */
-export function signClearMessage(privateKeys: Array<key.Key>, text: string): Promise<string>;
-/** Signs a cleartext message
-
-    @param privateKeys single key with decrypted secret key data to sign cleartext
-    @param text cleartext
-    */
-export function signClearMessage(privateKey: key.Key, text: string): Promise<string>;
-
-/** Verifies signatures of cleartext signed message
-
-    @param publicKeys array of keys to verify signatures
-    @param msg cleartext message object with signatures
-    */
-export function verifyClearSignedMessage(publicKeys: Array<key.Key>, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
-/** Verifies signatures of cleartext signed message
-
-    @param publicKeys single key to verify signatures
-    @param msg cleartext message object with signatures
-    */
-export function verifyClearSignedMessage(publicKey: key.Key, msg: cleartext.CleartextMessage): Promise<VerifiedMessage>;
+/**
+ * Unlock a private key with your passphrase.
+ * @param  {Key} privateKey                    the private key that is to be decrypted
+ * @param  {String|Array<String>} passphrase   the user's passphrase(s) chosen during key generation
+ * @returns {Promise<Object>}                  the unlocked key object in the form: { key:Key }
+ * @async
+ */
+export function decryptKey(options: {
+    privateKey: key.Key,
+    passphrase?: string | string[],
+}): Promise<KeyContainer>;
 
+export function encryptKey(options: {
+    privateKey: key.Key,
+    passphrase?: string
+}): Promise<KeyContainer>;
 
 export namespace armor {
     /** Armor an OpenPGP binary packet block
@@ -471,6 +584,14 @@ export namespace message {
         @param armoredText text to be parsed
      */
     function readArmored(armoredText: string): Message;
+
+    /**
+     * reads an OpenPGP message as byte array and returns a message object
+     * @param {Uint8Array} input   binary message
+     * @returns {Message}           new message object
+     * @static
+     */
+    function read(data: Uint8Array): Message;
 }
 
 export namespace packet {
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index fbe8a2e691..3bd3551d0b 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -2,11 +2,14 @@
 
 var options: openpgp.KeyOptions = {
     numBits: 2048,
-    userId: 'Jon Smith <jon.smith@example.org>',
+    userIds: [{
+        name: 'Jon Smith',
+        email: 'jon.smith@example.org',
+    }],
     passphrase: 'super long and hard to guess secret'
 };
 
-openpgp.generateKeyPair(options).then(function (keypair) {
+openpgp.generateKey(options).then(function (keypair) {
     // success
     var privkey = keypair.privateKeyArmored;
     var pubkey = keypair.publicKeyArmored;
@@ -18,14 +21,15 @@ openpgp.generateKeyPair(options).then(function (keypair) {
 var spubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
 var publicKey = openpgp.key.readArmored(spubkey);
 
-openpgp.encryptMessage(publicKey.keys, 'Hello, World!').then(function (pgpMessage) {
+openpgp.encrypt({
+    data: 'Hello, World!',
+    publicKeys: publicKey.keys
+}).then(function (pgpMessage) {
     // success
 }).catch(function (error) {
     // failure
 });
 
-
-
 var sprivkey = '-----BEGIN PGP PRIVATE KEY BLOCK ... END PGP PRIVATE KEY BLOCK-----';
 var privateKey = openpgp.key.readArmored(sprivkey).keys[0];
 privateKey.decrypt('passphrase');
@@ -33,7 +37,10 @@ privateKey.decrypt('passphrase');
 var pgpMessageStr = '-----BEGIN PGP MESSAGE ... END PGP MESSAGE-----';
 var pgpMessage = openpgp.message.readArmored(pgpMessageStr);
 
-openpgp.decryptMessage(privateKey, pgpMessage).then(function (plaintext) {
+openpgp.decrypt({
+    privateKeys: privateKey,
+    message: pgpMessage
+}).then(function (plaintext) {
     // success
 }).catch(function (error) {
     // failure
@@ -44,35 +51,9 @@ openpgp.decryptMessage(privateKey, pgpMessage).then(function (plaintext) {
 
 
 var keyoptions: openpgp.KeyOptions;
-var key= openpgp.key.generate(keyoptions);
-var keys: Array<openpgp.key.Key>;
-var message = openpgp.message.readArmored("");
-var cleartextmessage = openpgp.cleartext.readArmored("");
 var mpi: openpgp.crypto.Mpi;
 var mpis: Array<openpgp.crypto.Mpi>;
 
-
-openpgp.decryptAndVerifyMessage(key, key, "").then();
-openpgp.decryptAndVerifyMessage(key, keys, "").then();
-
-openpgp.decryptMessage(key, message).then();
-
-openpgp.encryptMessage(key, "").then();
-openpgp.encryptMessage(keys, "").then();
-
-openpgp.generateKeyPair(keyoptions).then(function (keypair) {
-    key = keypair.key;
-});
-
-openpgp.signAndEncryptMessage(key, key, "").then();
-openpgp.signAndEncryptMessage(keys, key, "").then();
-
-openpgp.signClearMessage(key, "").then();
-openpgp.signClearMessage(keys, "").then();
-
-openpgp.verifyClearSignedMessage(key, cleartextmessage);
-openpgp.verifyClearSignedMessage(keys, cleartextmessage);
-
 openpgp.armor.armor(openpgp.enums.armor.message, {}, 0, 1);
 openpgp.armor.dearmor("");
 

From 7f45ca974743972bfcf521ed51fc4c4a9a7dcb0d Mon Sep 17 00:00:00 2001
From: Bohdan Stupak <stupakbogdan@ukr.net>
Date: Sat, 2 Jun 2018 22:11:27 +0300
Subject: [PATCH 0965/1124] Fixing tslint errors

---
 types/jquery.nicescroll/index.d.ts            | 172 +++++++++---------
 .../jquery.nicescroll-tests.ts                |  18 +-
 types/jquery.nicescroll/tsconfig.json         |   2 +-
 types/jquery.nicescroll/tslint.json           |   4 +-
 4 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/types/jquery.nicescroll/index.d.ts b/types/jquery.nicescroll/index.d.ts
index 1b5b714cb8..8228ae5209 100644
--- a/types/jquery.nicescroll/index.d.ts
+++ b/types/jquery.nicescroll/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jquery.nicescroll 3.7.6
+// Type definitions for jquery.nicescroll 3.7
 // Project: https://nicescroll.areaaperta.com
 // Definitions by: Bohdan Stupak <https://github.com/Wkalmar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,98 +8,98 @@
 
 declare namespace JQueryNiceScroll {
     interface NiceScrollPage {
-        maxw: number
-        maxh: number
-        width: number
-        height: number
-        w: number
-        h: number
+        maxw: number;
+        maxh: number;
+        width: number;
+        height: number;
+        w: number;
+        h: number;
     }
-    
+
     interface NiceScroll {
-        show(): NiceScroll
-        hide(): NiceScroll
-        toggle(): NiceScroll
-        onResize(e?: Event, page?: NiceScrollPage): NiceScroll
-        resize(e?: Event, page?: NiceScrollPage): NiceScroll
-        remove(): void
-        stop(): NiceScroll
-        doScrollPos(x: number, y: number, spd: number): void
-        doScrollLeft(x: number, duration: number): void
-        doScrollTop(x: number, duration: number): void
+        show(): NiceScroll;
+        hide(): NiceScroll;
+        toggle(): NiceScroll;
+        onResize(e?: Event, page?: NiceScrollPage): NiceScroll;
+        resize(e?: Event, page?: NiceScrollPage): NiceScroll;
+        remove(): void;
+        stop(): NiceScroll;
+        doScrollPos(x: number, y: number, spd: number): void;
+        doScrollLeft(x: number, duration: number): void;
+        doScrollTop(x: number, duration: number): void;
     }
-    
+
     interface NiceScrollOptions {
-        zindex?: "auto" | number
-        cursoropacitymin?: number
-        cursoropacitymax?: number
-        cursorcolor?: string
-        cursorwidth?: string
-        cursorborder?: string
-        cursorborderradius?: string
-        scrollspeed?: number
-        mousescrollstep?: number
-        touchbehavior?: boolean
-        emulatetouch?: boolean
-        hwacceleration?: boolean
-        usetransition?: boolean
-        boxzoom?: boolean
-        dblclickzoom?: boolean
-        gesturezoom?: boolean
-        grabcursorenabled?: boolean
-        autohidemode?: "leave" | "scroll" | "cursor" | "hidden" | boolean
-        background?: string
-        iframeautoresize?: boolean
-        cursorminheight?: number
-        preservenativescrolling?: boolean
+        zindex?: "auto" | number;
+        cursoropacitymin?: number;
+        cursoropacitymax?: number;
+        cursorcolor?: string;
+        cursorwidth?: string;
+        cursorborder?: string;
+        cursorborderradius?: string;
+        scrollspeed?: number;
+        mousescrollstep?: number;
+        touchbehavior?: boolean;
+        emulatetouch?: boolean;
+        hwacceleration?: boolean;
+        usetransition?: boolean;
+        boxzoom?: boolean;
+        dblclickzoom?: boolean;
+        gesturezoom?: boolean;
+        grabcursorenabled?: boolean;
+        autohidemode?: "leave" | "scroll" | "cursor" | "hidden" | boolean;
+        background?: string;
+        iframeautoresize?: boolean;
+        cursorminheight?: number;
+        preservenativescrolling?: boolean;
         railoffset?: boolean | {
-            top?: number
-            left?: number
-        }
+            top?: number;
+            left?: number;
+        };
         railhoffset?: boolean  | {
-            top?: number
-            left?: number
-        }
-        bouncescroll?: boolean
-        spacebarenabled?: boolean
+            top?: number;
+            left?: number;
+        };
+        bouncescroll?: boolean;
+        spacebarenabled?: boolean;
         railpadding?: {
-          top: number
-          right: number
-          left: number
-          bottom: number
-        }
-        disableoutline?: boolean
-        horizrailenabled?: boolean
-        railalign?: "right" | "left" | "top" | "bottom"
-        railvalign?: "right" | "left" | "top" | "bottom"
-        enabletranslate3d?: boolean
-        enablemousewheel?: boolean
-        enablekeyboard?: boolean
-        smoothscroll?: boolean
-        sensitiverail?: boolean
-        enablemouselockapi?: boolean
-        cursorfixedheight?: number
-        directionlockdeadzone?: number
-        hidecursordelay?: number
-        nativeparentscrolling?: boolean
-        enablescrollonselection?: boolean
-        overflowx?: "auto" | "hidden" | "inherit" | "initial" | "overlay" | "scroll" | "unset" | "visible"
-        overflowy?: "auto" | "hidden" | "inherit" | "initial" | "overlay" | "scroll" | "unset" | "visible"
-        cursordragspeed?: number
-        rtlmode?: "auto" | boolean
-        cursordragontouch?: boolean
-        oneaxismousemode?: "auto" | boolean
-        scriptpath?: string
-        preventmultitouchscrolling?: boolean
-        disablemutationobserver?: boolean
-        enableobserver?: boolean
-        scrollbarid?: string
-        scrollCLass?: string
-    }  
+          top: number;
+          right: number;
+          left: number;
+          bottom: number;
+        };
+        disableoutline?: boolean;
+        horizrailenabled?: boolean;
+        railalign?: "right" | "left" | "top" | "bottom";
+        railvalign?: "right" | "left" | "top" | "bottom";
+        enabletranslate3d?: boolean;
+        enablemousewheel?: boolean;
+        enablekeyboard?: boolean;
+        smoothscroll?: boolean;
+        sensitiverail?: boolean;
+        enablemouselockapi?: boolean;
+        cursorfixedheight?: number;
+        directionlockdeadzone?: number;
+        hidecursordelay?: number;
+        nativeparentscrolling?: boolean;
+        enablescrollonselection?: boolean;
+        overflowx?: "auto" | "hidden" | "inherit" | "initial" | "overlay" | "scroll" | "unset" | "visible";
+        overflowy?: "auto" | "hidden" | "inherit" | "initial" | "overlay" | "scroll" | "unset" | "visible";
+        cursordragspeed?: number;
+        rtlmode?: "auto" | boolean;
+        cursordragontouch?: boolean;
+        oneaxismousemode?: "auto" | boolean;
+        scriptpath?: string;
+        preventmultitouchscrolling?: boolean;
+        disablemutationobserver?: boolean;
+        enableobserver?: boolean;
+        scrollbarid?: string;
+        scrollCLass?: string;
+    }
 }
 
 interface JQuery {
-    niceScroll(options?: JQueryNiceScroll.NiceScrollOptions) : JQueryNiceScroll.NiceScroll;
-    niceScroll(wrapper: string, options: JQueryNiceScroll.NiceScrollOptions) : JQueryNiceScroll.NiceScroll;
-    getNiceScroll(index?: number) : JQueryNiceScroll.NiceScroll;
-}
\ No newline at end of file
+    niceScroll(options?: JQueryNiceScroll.NiceScrollOptions): JQueryNiceScroll.NiceScroll;
+    niceScroll(wrapper: string, options: JQueryNiceScroll.NiceScrollOptions): JQueryNiceScroll.NiceScroll;
+    getNiceScroll(index?: number): JQueryNiceScroll.NiceScroll;
+}
diff --git a/types/jquery.nicescroll/jquery.nicescroll-tests.ts b/types/jquery.nicescroll/jquery.nicescroll-tests.ts
index 2d4599d8d6..f4362530f9 100644
--- a/types/jquery.nicescroll/jquery.nicescroll-tests.ts
+++ b/types/jquery.nicescroll/jquery.nicescroll-tests.ts
@@ -1,23 +1,23 @@
-//cases from documentation
+// cases from documentation
 // 1. Simple mode, it styles document scrollbar:
-$(function() {  
+$(() => {
     $("body").niceScroll();
 });
 
 // 2. Instance with object returned:
 let nice;
-$(function() {  
+$(() => {
     nice = $("body").niceScroll();
 });
 
 // 3. Style a DIV and change cursor color:
-$(function() {  
-    $("#thisdiv").niceScroll({cursorcolor:"#00F"});
+$(() => {
+    $("#thisdiv").niceScroll({cursorcolor: "#00F"});
 });
 
 // 4. DIV with "wrapper", formed by two divs, the first is the vieport, the latter is the content:
-$(function() {
-    $("#viewportdiv").niceScroll("#wrapperdiv",{cursorcolor:"#00F"});
+$(() => {
+    $("#viewportdiv").niceScroll("#wrapperdiv", {cursorcolor: "#00F"});
 });
 
 // 5. Get nicescroll object:
@@ -33,9 +33,9 @@ $("#mydiv").getNiceScroll().resize();
 $("#mydiv").getNiceScroll(0).doScrollLeft(1, 2); // Scroll X Axis
 $("#mydiv").getNiceScroll(0).doScrollTop(1, 14); // Scroll Y Axis
 
-//other cases
+// other cases
 $(".ui-grid-viewport").niceScroll({
     cursorcolor: "#fff",
     cursorwidth: "8px",
     autohidemode: "leave"
-});
\ No newline at end of file
+});
diff --git a/types/jquery.nicescroll/tsconfig.json b/types/jquery.nicescroll/tsconfig.json
index a5d8cb44a3..9d94444fc2 100644
--- a/types/jquery.nicescroll/tsconfig.json
+++ b/types/jquery.nicescroll/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/jquery.nicescroll/tslint.json b/types/jquery.nicescroll/tslint.json
index 8bc7a53d89..e60c15844f 100644
--- a/types/jquery.nicescroll/tslint.json
+++ b/types/jquery.nicescroll/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": "dtslint/dt.json",    
-}
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 95a21a21523c959362df64596f2f7aed386060c9 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 12:55:20 -0700
Subject: [PATCH 0966/1124] combine 2 Document interface declarations into 1

---
 types/office-js/index.d.ts | 111 ++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 09d19de4ed..0bb0bbf539 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -2038,6 +2038,60 @@ declare namespace Office {
          * @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?: SetSelectedDataOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get Project field (Ex. ProjectWebAccessURL).
+         * @param fieldId Project level fields.
+         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. 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 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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the current selected Resource's Id.
+         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the current selected Task's Id.
+         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the current selected View Type (Ex. Gantt) and View Name.
+         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. 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 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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. 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 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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Project documents only. Get the WSS Url and list name for the Tasks List, the MPP is synced too.
+         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * Provides information about the document that raised the SelectionChanged event.
@@ -4668,63 +4722,6 @@ declare namespace Office {
          */
         Timeline
     }
-    // Objects
-    interface Document {
-        /**
-         * Get Project field (Ex. ProjectWebAccessURL).
-         * @param fieldId Project level fields.
-         * @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?: 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 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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected Resource's Id.
-         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected Task's Id.
-         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the current selected View Type (Ex. Gantt) and View Name.
-         * @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?: 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 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?: 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 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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Get the WSS Url and list name for the Tasks List, the MPP is synced too.
-         * @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?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-    }
 }
 
 

From 126931b38a2e92fc14fd116a6b97a56b2678e21f Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 12:58:24 -0700
Subject: [PATCH 0967/1124] delete unused Index enum

---
 types/office-js/index.d.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 0bb0bbf539..544244033d 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1249,12 +1249,6 @@ declare namespace Office {
          */
         Index
     }
-    enum Index {
-        First,
-        Last,
-        Next,
-        Previous
-    }
     /**
      * Specifies whether to select (highlight) the location to navigate to (when using the Document.goToByIdAsync method).
      *

From cfbdc0c88dccc5e87168cebfdc3434339d591246 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:17:10 -0700
Subject: [PATCH 0968/1124] add param descriptions to Worksheet.copy method

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 544244033d..a23df780aa 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -9898,15 +9898,11 @@ declare namespace Excel {
          * Copy a worksheet and place it at the specified position. Return the copied worksheet.
          *
          * [Api set: ExcelApi 1.7]
+         * 
+         * @param positionType Specifies where to put the copy relative to the worksheet specified in relativeTo param. Can be Excel.WorksheetPositionType or string equivalent. Must not be Excel.WorksheetPositionType.none or "None".
+         * @param relativeTo Specifies the worksheet that is the basis for intepreting the positionType param. If not specified, the worksheet on which the copy() is called is assumed.
          */
-        copy(positionType?: Excel.WorksheetPositionType, relativeTo?: Excel.Worksheet): Excel.Worksheet;
-        /**
-         *
-         * Copy a worksheet and place it at the specified position. Return the copied worksheet.
-         *
-         * [Api set: ExcelApi 1.7]
-         */
-        copy(positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Excel.Worksheet): Excel.Worksheet;
+        copy(positionType?: Excel.WorksheetPositionType | string, relativeTo?: Excel.Worksheet): Excel.Worksheet;
         /**
          *
          * Deletes the worksheet from the workbook.

From 4030bb3310ae029514b781e380c061e7deebd073 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:39:10 -0700
Subject: [PATCH 0969/1124] add declaration for CustomXMLNodeType enum

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index a23df780aa..81255ee7de 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1110,6 +1110,44 @@ declare namespace Office {
          */
         ReadWrite
     }
+    /**
+     * Specifies the type of the XML node.
+     *
+     * @remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     */
+    enum CustomXMLNodeType {
+        /**
+         * The node is an attribute.
+         */
+        Attribute,
+        /**
+         * The node is CData.
+         */
+        CData,
+        /**
+         * The node is a comment.
+         */
+        NodeComment,
+        /**
+         * The node is an element.
+         */
+        Element,
+        /**
+         * The node is a Document element.
+         */
+        NodeDocument,
+        /**
+         * The node is a processing instruction.
+         */
+        ProcessingInstruction,
+        /**
+         * The node is text.
+         */
+        Text,
+    }
     /**
      * Specifies the kind of event that was raised. Returned by the type property of an EventNameEventArgs object.
      *

From 0db596b272001998a58714c80ee52b4271397e4c Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:44:12 -0700
Subject: [PATCH 0970/1124] Fix grammar of commerceAllowed description

---
 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 81255ee7de..a89677274c 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -413,7 +413,7 @@ declare namespace Office {
         */
         auth: Auth;
         /**
-         * True if developers can display, on the current platform, a UI in the add-in sell or upgrade; otherwise returns False.
+         * True, if the current platform allows the add-in to  display a UI for selling or upgrading; otherwise returns False.
          * 
          * @remarks
          * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.

From a9c07b88a9e4b767d2b5b230febf6d17de5f8236 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:47:11 -0700
Subject: [PATCH 0971/1124] typo in RangeCoordinates description

---
 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 a89677274c..77a65318b0 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -772,7 +772,7 @@ declare namespace Office {
          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.
+     * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 3, column: 4} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
      */
     interface RangeCoordinates {
         /**

From cb8cd31195a03f73e99b07bc55d7864089501383 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 13:50:14 -0700
Subject: [PATCH 0972/1124] remove columns property from
 AddBindingFromNamedItemOptions interface

---
 types/office-js/index.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 77a65318b0..05ffc588a9 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -805,10 +805,6 @@ declare namespace Office {
          * 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.
          */

From 349529dbe770f8d7b8e83c6e3be466dc22c3cf8e Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sat, 2 Jun 2018 14:14:50 -0700
Subject: [PATCH 0973/1124] strong type the Context.diagnostics and requirments
 properties

---
 types/office-js/index.d.ts | 65 +++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 05ffc588a9..9f8ea6d923 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -413,11 +413,11 @@ declare namespace Office {
         */
         auth: Auth;
         /**
-         * True, if the current platform allows the add-in to  display a UI for selling or upgrading; otherwise returns False.
-         * 
-         * @remarks
-         * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.
-         */
+        * True, if the current platform allows the add-in to display a UI for selling or upgrading; otherwise returns False.
+        * 
+        * @remarks
+        * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.
+        */
         commerceAllowed: boolean;
         /**
         * Gets the locale (language) specified by the user for editing the document or item.
@@ -426,20 +426,7 @@ declare namespace Office {
         /**
         * Gets information about the environment in which the add-in is running.
         */
-        diagnostics: {
-            /**
-            * Gets the Office application host in which the add-in is running.
-            */
-            host: HostType;
-            /**
-            * Gets the platform on which the add-in is running.
-            */
-            platform: PlatformType;
-            /**
-            * Gets the version of Office on which the add-in is running.
-            */
-            version: string;
-        };
+        diagnostics: ContextInformation;
         /**
         * Gets the locale (language) specified by the user for the UI of the Office host application.
         * @remarks
@@ -488,14 +475,7 @@ declare namespace Office {
         /**
         * 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; e.g., "1.4".
-             */
-            isSetSupported(name: string, minVersion?: number): boolean;
-        }
+        requirements: RequirmentSetSupport;
         /**
          * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
          *
@@ -605,6 +585,17 @@ declare namespace Office {
          */
         closeContainer(): void;
     }
+    /**
+     * Provides information about what Requirement Sets are supported in current environment.
+     */
+    interface RequirmentSetSupport {
+        /**
+        * 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; e.g., "1.4".
+        */
+       isSetSupported(name: string, minVersion?: number): boolean;
+}
     /**
      * Provides options for how a dialog is displayed.
      */
@@ -673,6 +664,23 @@ declare namespace Office {
          */
         asyncContext?: any
     }
+    /**
+     * Provides information about the environment in which the add-in is running.
+     */
+    interface ContextInformation {
+        /**
+        * Gets the Office application host in which the add-in is running.
+        */
+        host: Office.HostType;
+        /**
+        * Gets the platform on which the add-in is running.
+        */
+        platform: Office.PlatformType;
+        /**
+        * Gets the version of Office on which the add-in is running.
+        */
+        version: string;
+    }
     /**
      * Provides options for how to get the data in a binding.
      *
@@ -825,7 +833,7 @@ declare namespace Office {
         /**
          * 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
+        sampleData?: Office.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.
          */
@@ -993,7 +1001,6 @@ declare namespace Office {
          * - DialogEventReceived. Triggered when the dialog box has been closed or otherwise unloaded.
          */
         addEventHandler(eventType: Office.EventType, handler: Function): void;
-
     }
 }
 

From d3000065ecaefa4d5ad41165e695ae34ca518805 Mon Sep 17 00:00:00 2001
From: Andrew Codispoti <andrewcod749@gmail.com>
Date: Sat, 2 Jun 2018 19:37:05 -0400
Subject: [PATCH 0974/1124] Added a new type definition for the missing method
 getDateStr in react-native-datepicker.

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

diff --git a/types/react-native-datepicker/index.d.ts b/types/react-native-datepicker/index.d.ts
index ceb0e612aa..dfc8bd5b13 100644
--- a/types/react-native-datepicker/index.d.ts
+++ b/types/react-native-datepicker/index.d.ts
@@ -30,6 +30,7 @@ export interface DatePickerProps {
     placeholder?: string;
     modalOnResponderTerminationRequest?(e: any): boolean;
     is24Hour?: boolean;
+    getDateStr?: (date: Date) => string;
     style?: any;
     customStyles?: any;
     minuteInterval?: number;

From d6b994bccecbb3d77af4946cb4afc2d5a55940cd Mon Sep 17 00:00:00 2001
From: Ryan Adolf <ryanadolf123@gmail.com>
Date: Sat, 2 Jun 2018 23:23:13 -0700
Subject: [PATCH 0975/1124] Create scoped-http-client typings

---
 types/scoped-http-client/index.d.ts           | 69 +++++++++++++++++++
 .../scoped-http-client-tests.ts               | 61 ++++++++++++++++
 types/scoped-http-client/tsconfig.json        | 23 +++++++
 types/scoped-http-client/tslint.json          |  6 ++
 4 files changed, 159 insertions(+)
 create mode 100644 types/scoped-http-client/index.d.ts
 create mode 100644 types/scoped-http-client/scoped-http-client-tests.ts
 create mode 100644 types/scoped-http-client/tsconfig.json
 create mode 100644 types/scoped-http-client/tslint.json

diff --git a/types/scoped-http-client/index.d.ts b/types/scoped-http-client/index.d.ts
new file mode 100644
index 0000000000..bb5cfec285
--- /dev/null
+++ b/types/scoped-http-client/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for scoped-http-client 0.11
+// Project: https://github.com/technoweenie/node-scoped-http-client
+// Definitions by: Matt Perry <https://github.com/mattvperry>
+//                 Ryan Adolf <https://github.com/rianadon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { Agent, RequestOptions, IncomingMessage, ClientRequest } from "http";
+
+export type ScopeCallback = (scoped: ScopedClient) => void;
+export type RequestCallback = (err: any, request: ClientRequest) => void;
+export type ResponseCallback = (cb?: (err: any, response: IncomingMessage, body: string) => void) => ScopedClient;
+
+export interface Options extends RequestOptions {
+    encoding?: string;
+    httpAgent?: Agent|boolean;
+    httpsAgent?: Agent|boolean;
+    query?: any;
+    pathname?: string;
+    slashes?: any;
+    hash?: string;
+}
+
+export class ScopedClient {
+    constructor(url: string, options: Options);
+    fullPath(p: string): string;
+    scope(options: Options, callback?: ScopeCallback): ScopedClient;
+    scope(url: string, callback?: ScopeCallback): ScopedClient;
+    scope(url: string, options: Options, callback?: ScopeCallback): ScopedClient;
+    join(suffix: string): string;
+    path(p: string): ScopedClient;
+    query(key: any, value?: any): ScopedClient;
+    host(h: string): ScopedClient;
+    port(p: string|number): ScopedClient;
+    protocol(p: string): ScopedClient;
+    encoding(e?: string): ScopedClient;
+    timeout(time: any): ScopedClient;
+    auth(user?: string, pass?: string): ScopedClient;
+    header(name: string, value: string): ScopedClient;
+    headers(h: any): ScopedClient;
+
+    request(method: string, callback?: RequestCallback): ResponseCallback;
+    request(method: string, reqBody: string, callback?: RequestCallback): ResponseCallback;
+
+    get(callback?: RequestCallback): ResponseCallback;
+    get(reqBody: string, callback?: RequestCallback): ResponseCallback;
+
+    post(callback?: RequestCallback): ResponseCallback;
+    post(reqBody: string, callback?: RequestCallback): ResponseCallback;
+
+    patch(callback?: RequestCallback): ResponseCallback;
+    patch(reqBody: string, callback?: RequestCallback): ResponseCallback;
+
+    put(callback?: RequestCallback): ResponseCallback;
+    put(reqBody: string, callback?: RequestCallback): ResponseCallback;
+
+    delete(callback?: RequestCallback): ResponseCallback;
+    delete(reqBody: string, callback?: RequestCallback): ResponseCallback;
+
+    del(callback?: RequestCallback): ResponseCallback;
+    del(reqBody: string, callback?: RequestCallback): ResponseCallback;
+
+    head(callback?: RequestCallback): ResponseCallback;
+    head(reqBody: string, callback?: RequestCallback): ResponseCallback;
+}
+
+export function create(options: Options): ScopedClient;
+export function create(url?: string, options?: Options): ScopedClient;
diff --git a/types/scoped-http-client/scoped-http-client-tests.ts b/types/scoped-http-client/scoped-http-client-tests.ts
new file mode 100644
index 0000000000..d210bb2c91
--- /dev/null
+++ b/types/scoped-http-client/scoped-http-client-tests.ts
@@ -0,0 +1,61 @@
+import * as ScopedClient from "scoped-http-client";
+import { IncomingMessage } from "http";
+
+// Basic client
+let client = ScopedClient.create('https://api.github.com')
+    .header('accept', 'application/json')
+    .path('user/show/technoweenie')
+    .get()((err, resp, body) => {
+        body; // $ExpectType string
+    });
+
+// Setting the url through multiple steps
+client = ScopedClient.create()
+    .protocol('https')
+    .host('api.github.com')
+    .port(443)
+    .path('user/show/technoweenie')
+    .query('key', 'value')
+    .encoding('utf-8')
+    .header('X-Test-Header', 'value')
+    .get()(handler);
+
+// Scoping
+client.path('https://api.github.com');
+client.scope('users/technoweenie', (cli) => {
+    cli.get()((err, resp, body) => {
+        body; // $ExpectType string
+    });
+});
+
+function handler(err: Error, resp: IncomingMessage, body: string) {}
+
+// Other HTTP methods
+client.query({ login: 'technoweenie', token: '...' })
+    .scope('users/technoweenie', (cli) => {
+        cli.post('data')(handler);
+        cli.put('data')(handler);
+        cli.head()(handler);
+        cli.delete()(handler);
+        cli.del()(handler);
+        cli.patch()(handler);
+    });
+
+// Streaming post body
+client.post((err, req) => {
+    req.write("...");
+    req.write("...");
+})(handler);
+
+// HTTP Basic Authentication
+client
+    .auth('technoweenie', '...')
+    .get((err, req) => {});
+
+// Setting a timeout
+client = ScopedClient.create('http://10.255.255.1:9999');
+client.timeout(100);
+
+// Fetching client information
+client.join('suffix'); // $ExpectType string
+client.fullPath('path'); // $ExpectType string
diff --git a/types/scoped-http-client/tsconfig.json b/types/scoped-http-client/tsconfig.json
new file mode 100644
index 0000000000..5f05b72a3f
--- /dev/null
+++ b/types/scoped-http-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",
+        "scoped-http-client-tests.ts"
+    ]
+}
diff --git a/types/scoped-http-client/tslint.json b/types/scoped-http-client/tslint.json
new file mode 100644
index 0000000000..08b1465cd6
--- /dev/null
+++ b/types/scoped-http-client/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false
+    }
+}

From 70c27888b38575856c20673cc7f3506432f5ffc6 Mon Sep 17 00:00:00 2001
From: Jiaren Liu <jrliu@alauda.io>
Date: Sun, 3 Jun 2018 20:27:32 +0800
Subject: [PATCH 0976/1124] feat: add declaration file for koa-static-cache

---
 types/koa-static-cache/index.d.ts             | 40 ++++++++++++++++
 .../koa-static-cache-tests.ts                 | 46 +++++++++++++++++++
 types/koa-static-cache/tsconfig.json          | 23 ++++++++++
 types/koa-static-cache/tslint.json            |  1 +
 4 files changed, 110 insertions(+)
 create mode 100644 types/koa-static-cache/index.d.ts
 create mode 100644 types/koa-static-cache/koa-static-cache-tests.ts
 create mode 100644 types/koa-static-cache/tsconfig.json
 create mode 100644 types/koa-static-cache/tslint.json

diff --git a/types/koa-static-cache/index.d.ts b/types/koa-static-cache/index.d.ts
new file mode 100644
index 0000000000..ba5ed2d0e9
--- /dev/null
+++ b/types/koa-static-cache/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for koa-static-cache 5.1
+// Project: https://github.com/koajs/static-cache#readme
+// Definitions by: JounQin <https://github.com/JounQin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/**
+ * Static server for koa.
+ */
+
+import { Middleware } from 'koa';
+
+declare namespace staticCache {
+    interface Files {
+        [path: string]: Options;
+    }
+
+    interface Options {
+        dir?: string;
+        maxAge?: number;
+        cacheControl?: string;
+        buffer?: boolean;
+        gzip?: boolean;
+        usePrecompiledGzip?: boolean;
+        alias?: {};
+        prefix?: string;
+        dynamic?: boolean;
+        filter?: ((path: string) => boolean) | string[];
+        preload?: boolean;
+        files?: Files;
+    }
+}
+
+declare function staticCache(
+    dir: string | staticCache.Options,
+    options?: staticCache.Options | staticCache.Files,
+    files?: staticCache.Files
+): Middleware;
+
+export = staticCache;
diff --git a/types/koa-static-cache/koa-static-cache-tests.ts b/types/koa-static-cache/koa-static-cache-tests.ts
new file mode 100644
index 0000000000..0da8d5578f
--- /dev/null
+++ b/types/koa-static-cache/koa-static-cache-tests.ts
@@ -0,0 +1,46 @@
+import * as Koa from 'koa';
+import * as staticCache from 'koa-static-cache';
+
+const app = new Koa();
+
+app.use(staticCache('.'));
+
+app.use(
+    staticCache('.', {
+        maxAge: 0,
+        filter: ['']
+    })
+);
+
+const files: staticCache.Files = {};
+
+app.use(
+    staticCache(
+        '.',
+        {
+            maxAge: 0,
+            filter: path => !!path
+        },
+        files
+    )
+);
+
+files['/service-worker.js'].maxAge = 0;
+
+app.use(
+    staticCache({
+        dir: '.',
+        maxAge: 0,
+        files
+    })
+);
+
+app.use(
+    staticCache(
+        {
+            dir: '.',
+            maxAge: 0
+        },
+        files
+    )
+);
diff --git a/types/koa-static-cache/tsconfig.json b/types/koa-static-cache/tsconfig.json
new file mode 100644
index 0000000000..61082ed384
--- /dev/null
+++ b/types/koa-static-cache/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",
+        "koa-static-cache-tests.ts"
+    ]
+}
diff --git a/types/koa-static-cache/tslint.json b/types/koa-static-cache/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-static-cache/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 374b6dd963159bef5a5904c3f7a79ad7d156532a Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 19:42:59 +0700
Subject: [PATCH 0977/1124] Since 4.14.0 options added in reeq.range()

---
 types/express-serve-static-core/index.d.ts | 31 +++++++++++++---------
 types/express/express-tests.ts             |  4 +++
 types/express/index.d.ts                   |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index f8521d433d..f7c081fb74 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Express 4.11
+// Type definitions for Express 4.16
 // Project: http://expressjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 Michał Lytek <https://github.com/19majkel94>
@@ -23,6 +23,7 @@ declare global {
 
 import * as http from "http";
 import { EventEmitter } from "events";
+import { Options as RangeParserOptions } from "range-parser";
 
 export interface NextFunction {
     // tslint:disable-next-line callable-types (In ts2.1 it thinks the type alias has no call signatures)
@@ -283,21 +284,25 @@ export interface Request extends http.IncomingMessage, Express.Request {
     acceptsLanguages(...lang: string[]): string | false;
 
     /**
-     * Parse Range header field,
-     * capping to the given `size`.
+     * Parse Range header field, capping to the given `size`.
      *
-     * Unspecified ranges such as "0-" require
-     * knowledge of your resource length. In
-     * the case of a byte range this is of course
-     * the total number of bytes. If the Range
-     * header field is not given `null` is returned,
-     * `-1` when unsatisfiable, `-2` when syntactically invalid.
+     * Unspecified ranges such as "0-" require knowledge of your resource length. In
+     * the case of a byte range this is of course the total number of bytes. If the
+     * Range header field is not given `undefined` is returned, `-1` when unsatisfiable,
+     * and `-2` when syntactically invalid.
+     *
+     * When ranges are returned, the array has a "type" property which is the type of
+     * range that is required (most commonly, "bytes"). Each array element is an object
+     * with a "start" and "end" property for the portion of the range.
+     *
+     * The "combine" option can be set to `true` and overlapping & adjacent ranges
+     * will be combined into a single range.
+     *
+     * NOTE: remember that ranges are inclusive, so for example "Range: users=0-3"
+     * should respond with 4 users when available, not 3.
      *
-     * NOTE: remember that ranges are inclusive, so
-     * for example "Range: users=0-3" should respond
-     * with 4 users when available, not 3.
      */
-    range(size: number): RequestRanges|null|-1|-2;
+    range(size: number, options?: RangeParserOptions): RequestRanges|undefined|-1|-2;
 
     /**
      * Return an array of Accepted media types
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 137c70c8e8..7297692119 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -104,6 +104,9 @@ namespace express_tests {
             req.headers.existingHeader as string;
             req.headers.nonExistingHeader as any as undefined;
 
+            // Since 4.14.0 req.range() has options
+            req.range(2, { combine: true });
+
             res.send(req.query['token']);
         });
 
@@ -139,6 +142,7 @@ namespace express_tests {
  *                         *
  ***************************/
 import * as http from 'http';
+import { RequestRanges } from 'express-serve-static-core';
 
 namespace node_tests {
     {
diff --git a/types/express/index.d.ts b/types/express/index.d.ts
index 4e6ed8fcc1..81821ca98c 100644
--- a/types/express/index.d.ts
+++ b/types/express/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Express 4.11
+// Type definitions for Express 4.16
 // Project: http://expressjs.com
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From afeac2b7eb267f3a84b605edb4e161e7705676b3 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 19:46:45 +0700
Subject: [PATCH 0978/1124] Fix #24495 missing req.res, req.next and res.req

---
 types/express-serve-static-core/index.d.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index f7c081fb74..f4e4b5379c 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -455,6 +455,13 @@ export interface Request extends http.IncomingMessage, Express.Request {
     baseUrl: string;
 
     app: Application;
+
+    /**
+     * After middleware.init executed, Request will contain res and next properties
+     * See: express/lib/middleware/init.js
+     */
+    res?: Response;
+    next?: NextFunction;
 }
 
 export interface MediaType {
@@ -833,6 +840,12 @@ export interface Response extends http.ServerResponse, Express.Response {
      * @since 4.11.0
      */
     append(field: string, value?: string[]|string): Response;
+
+    /**
+     * After middleware.init executed, Response will contain req property
+     * See: express/lib/middleware/init.js
+     */
+    req?: Request;
 }
 
 export interface Handler extends RequestHandler { }

From e92ce1352a18e455ac309cff775ed5f2e5e6299e Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 19:56:10 +0700
Subject: [PATCH 0979/1124] Update test cases to test req.res, req.next,
 res.req

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

diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 7297692119..49d5acfd3c 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -131,6 +131,13 @@ namespace express_tests {
 
     app.use(router);
 
+    // Test req.res, req.next, res.req should exists after middleware.init
+    app.use((req, res) => {
+        req.res;
+        req.next;
+        res.req;
+    });
+
     app.listen(3000);
 
     const next: express.NextFunction = () => { };

From c2d945805a684d67295473791935f8c3b8fee0a8 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 20:13:54 +0700
Subject: [PATCH 0980/1124] Fix #18940 express app supports on mount event and
 mountpath property

---
 types/express-serve-static-core/index.d.ts | 16 ++++++++++++++++
 types/express/express-tests.ts             |  6 ++++++
 2 files changed, 22 insertions(+)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index f4e4b5379c..d1997d3b4b 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -1080,6 +1080,22 @@ export interface Application extends EventEmitter, IRouter, Express.Application
     _router: any;
 
     use: ApplicationRequestHandler<this>;
+
+    /**
+     * The mount event is fired on a sub-app, when it is mounted on a parent app.
+     * The parent app is passed to the callback function.
+     *
+     * NOTE:
+     * Sub-apps will:
+     *  - Not inherit the value of settings that have a default value. You must set the value in the sub-app.
+     *  - Inherit the value of settings with no default value.
+     */
+    on: (eventName: string, callback: (parent: Application) => void) => void;
+
+    /**
+     * The app.mountpath property contains one or more path patterns on which a sub-app was mounted.
+     */
+    mountpath: string|string[];
 }
 
 export interface Express extends Application {
diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts
index 49d5acfd3c..07bf2fc5c3 100644
--- a/types/express/express-tests.ts
+++ b/types/express/express-tests.ts
@@ -138,6 +138,12 @@ namespace express_tests {
         res.req;
     });
 
+    // Test on mount event
+    app.on('mount', (parent) => true);
+
+    // Test mountpath
+    const mountPath: string|string[] = app.mountpath;
+
     app.listen(3000);
 
     const next: express.NextFunction = () => { };

From ff6fb49f9e3d623d6e1c2848df7f1d48da5524b2 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Sun, 3 Jun 2018 20:21:04 +0700
Subject: [PATCH 0981/1124] Fix #18940 express app supports on mount event and
 mountpath property

---
 types/express-serve-static-core/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index d1997d3b4b..7603445b3b 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -302,7 +302,7 @@ export interface Request extends http.IncomingMessage, Express.Request {
      * should respond with 4 users when available, not 3.
      *
      */
-    range(size: number, options?: RangeParserOptions): RequestRanges|undefined|-1|-2;
+    range(size: number, options?: RangeParserOptions): RequestRanges | undefined | -1 | -2;
 
     /**
      * Return an array of Accepted media types
@@ -839,7 +839,7 @@ export interface Response extends http.ServerResponse, Express.Response {
      *
      * @since 4.11.0
      */
-    append(field: string, value?: string[]|string): Response;
+    append(field: string, value?: string[] | string): Response;
 
     /**
      * After middleware.init executed, Response will contain req property
@@ -1090,12 +1090,12 @@ export interface Application extends EventEmitter, IRouter, Express.Application
      *  - Not inherit the value of settings that have a default value. You must set the value in the sub-app.
      *  - Inherit the value of settings with no default value.
      */
-    on: (eventName: string, callback: (parent: Application) => void) => void;
+    on: (event: string, callback: (parent: Application) => void) => this;
 
     /**
      * The app.mountpath property contains one or more path patterns on which a sub-app was mounted.
      */
-    mountpath: string|string[];
+    mountpath: string | string[];
 }
 
 export interface Express extends Application {

From 8d935f62f677c2d317fae9830349a29614374fea Mon Sep 17 00:00:00 2001
From: Peter Keuter <github@peterkeuter.nl>
Date: Sun, 3 Jun 2018 20:07:50 +0200
Subject: [PATCH 0982/1124] Remove unnecessary LabelProps reference

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index a2e2024343..cee2cf3f21 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -164,7 +164,7 @@ export interface AreaProps extends EventAttributes, Partial<PresentationAttribut
     connectNulls?: boolean;
     activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
-    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any> | LabelProps['content'];
+    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any>;
     hide?: boolean;
     layout?: LayoutType;
     baseLine?: number | any[];
@@ -405,7 +405,7 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     width?: number;
     height?: number;
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
-    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'];
+    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     points?: Point[];
 }
 
@@ -438,8 +438,8 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
     label?: {
         offsetRadius: number;
-    } | LabelProps['content'] | React.ReactElement<any> | ContentRenderer<any> | boolean;
-    activeShape?: object |ContentRenderer<any> | React.ReactElement<any>;
+    } | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
     activeIndex?: number | number[];
 }
 
@@ -553,7 +553,7 @@ export interface RadarProps extends EventAttributes, Partial<PresentationAttribu
     shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
     activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
     dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
-    label?: object | React.ReactElement<any> | ContentRenderer<any> | LabelProps['content'] | boolean;
+    label?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
     legendType?: LegendType;
     hide?: boolean;
 }
@@ -592,7 +592,7 @@ export interface RadialBarProps extends EventAttributes, Partial<PresentationAtt
     maxBarSize?: number;
     data?: RadialBarData[];
     legendType?: LegendType;
-    label?: boolean | React.ReactElement<any> | LabelProps['content'] | object;
+    label?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
     background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
     hide?: boolean;
 }
@@ -839,7 +839,7 @@ export interface LabelProps {
     position?: PositionType;
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
-    content?: React.ReactElement<any> | ContentRenderer<Label>;
+    content?: React.ReactElement<any> | ContentRenderer<any>;
 }
 
 export type AxisDomain = string | number | ContentRenderer<any> | 'auto' | 'dataMin' | 'dataMax';

From 7cb2ad51dd22f7ef7f0848faa6b85e0da1c804cb Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sun, 3 Jun 2018 15:14:13 -0400
Subject: [PATCH 0983/1124] Types for JQuery Mouse Exit

---
 types/jquery-mouse-exit/index.d.ts            | 23 +++++++++++++++++
 .../jquery-mouse-exit-tests.ts                |  9 +++++++
 types/jquery-mouse-exit/tsconfig.json         | 25 +++++++++++++++++++
 types/jquery-mouse-exit/tslint.json           |  1 +
 4 files changed, 58 insertions(+)
 create mode 100644 types/jquery-mouse-exit/index.d.ts
 create mode 100644 types/jquery-mouse-exit/jquery-mouse-exit-tests.ts
 create mode 100644 types/jquery-mouse-exit/tsconfig.json
 create mode 100644 types/jquery-mouse-exit/tslint.json

diff --git a/types/jquery-mouse-exit/index.d.ts b/types/jquery-mouse-exit/index.d.ts
new file mode 100644
index 0000000000..f0ba17996e
--- /dev/null
+++ b/types/jquery-mouse-exit/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for jquery-mouse-exit 1.0
+// Project: https://github.com/makeup-jquery/jquery-mouse-exit
+// 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<{
+    delay: number;
+}>;
+
+export type FocusElements = Partial<{
+    lostFocus: HTMLElement;
+    gainedFocus: HTMLElement;
+}>;
+
+declare global {
+    interface JQuery {
+        mouseExit(options?: Options): JQuery;
+        on(event: 'mouseExit', handler: ((event: JQuery.Event<HTMLElement>, data: FocusElements) => void)): JQuery;
+    }
+}
diff --git a/types/jquery-mouse-exit/jquery-mouse-exit-tests.ts b/types/jquery-mouse-exit/jquery-mouse-exit-tests.ts
new file mode 100644
index 0000000000..7ae495ee1b
--- /dev/null
+++ b/types/jquery-mouse-exit/jquery-mouse-exit-tests.ts
@@ -0,0 +1,9 @@
+// init plugin
+$('#container').mouseExit({
+  delay: 500
+});
+
+// handle event
+$('#container').on('mouseExit', (e, data) => {
+  console.log(data.lostFocus, data.gainedFocus);
+});
diff --git a/types/jquery-mouse-exit/tsconfig.json b/types/jquery-mouse-exit/tsconfig.json
new file mode 100644
index 0000000000..a9bc588d0d
--- /dev/null
+++ b/types/jquery-mouse-exit/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-mouse-exit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-mouse-exit/tslint.json b/types/jquery-mouse-exit/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-mouse-exit/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 13cf35e543dd7454c2a1f1bae20de0c0ad9d13fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20Damgaard=20M=C3=B8ller?= <jakob@devinci.dk>
Date: Sun, 3 Jun 2018 21:41:48 +0200
Subject: [PATCH 0984/1124] Tests added to cover ValueFOrmat(d3.format("..."))

---
 types/nvd3/test/discreteBarChart.ts        | 1 +
 types/nvd3/test/multibarHorizontalChart.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/nvd3/test/discreteBarChart.ts b/types/nvd3/test/discreteBarChart.ts
index 2f31a29a0c..d9c8998fb1 100644
--- a/types/nvd3/test/discreteBarChart.ts
+++ b/types/nvd3/test/discreteBarChart.ts
@@ -48,6 +48,7 @@ namespace nvd3_test_discreteBarChart {
             //.staggerLabels(historicalBarChart[0].values.length > 8)
             .showValues(true)
             .duration(250)
+            .valueFormat(d3.format("d"))
             ;
 
         d3.select('#chart1 svg')
diff --git a/types/nvd3/test/multibarHorizontalChart.ts b/types/nvd3/test/multibarHorizontalChart.ts
index 748c83e10a..5bfc5d976f 100644
--- a/types/nvd3/test/multibarHorizontalChart.ts
+++ b/types/nvd3/test/multibarHorizontalChart.ts
@@ -136,6 +136,7 @@ namespace nvd3_test_multibarHorizontalChart {
             .barColor(d3.scale.category20().range())
             .duration(250)
             .margin({ left: 100 })
+            .valueFormat(d3.format("d"))
             .stacked(true);
 
         chart.yAxis.tickFormat(d3.format(',.2f'));

From b956900bc1554ef5b638257675e8bf4cd97d491c Mon Sep 17 00:00:00 2001
From: miZyind <mizyind@gmail.com>
Date: Mon, 4 Jun 2018 04:07:32 +0800
Subject: [PATCH 0985/1124] Upgrade to v5.x

---
 types/koa-webpack/index.d.ts           | 21 +++++---
 types/koa-webpack/koa-webpack-tests.ts | 69 +++++++++++++++-----------
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/types/koa-webpack/index.d.ts b/types/koa-webpack/index.d.ts
index 4f86fcd11f..951d8d58a2 100644
--- a/types/koa-webpack/index.d.ts
+++ b/types/koa-webpack/index.d.ts
@@ -1,30 +1,35 @@
-// Type definitions for koa-webpack 1.0
+// Type definitions for koa-webpack 5.x
 // Project: https://github.com/shellscape/koa-webpack#readme
 // Definitions by: Luka Maljic <https://github.com/malj>
+//                 Lee Benson <https://github.com/leebenson>
+//                 miZyind <https://github.com/miZyind>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import Koa = require('koa');
 import webpack = require('webpack');
 import webpackDevMiddleware = require('webpack-dev-middleware');
-import webpackHotMiddleware = require('webpack-hot-middleware');
-import connect = require('connect');
+import webpackHotClient = require('webpack-hot-client');
 
 declare function koaWebpack(
     options?: koaWebpack.Options
-): Koa.Middleware & koaWebpack.CombinedWebpackMiddleware;
+): Promise<Koa.Middleware & koaWebpack.CombinedWebpackMiddleware>;
 
 declare namespace koaWebpack {
     interface Options {
         compiler?: webpack.Compiler;
         config?: webpack.Configuration;
-        dev?: webpackDevMiddleware.Options;
-        hot?: webpackHotMiddleware.Options | boolean;
+        devMiddleware?: webpackDevMiddleware.Options;
+        hotClient?: webpackHotClient.Options | boolean;
     }
 
     interface CombinedWebpackMiddleware {
-        dev: connect.NextHandleFunction & webpackDevMiddleware.WebpackDevMiddleware;
-        hot: connect.NextHandleFunction & webpackHotMiddleware.EventStream;
+        devMiddleware: webpackDevMiddleware.WebpackDevMiddleware;
+        hotClient: {
+            close: () => void;
+            options: webpackHotClient.Options;
+            server: any;
+        };
     }
 }
 
diff --git a/types/koa-webpack/koa-webpack-tests.ts b/types/koa-webpack/koa-webpack-tests.ts
index 12062302de..de4990eea6 100644
--- a/types/koa-webpack/koa-webpack-tests.ts
+++ b/types/koa-webpack/koa-webpack-tests.ts
@@ -7,39 +7,50 @@ const config: webpack.Configuration = {};
 const compiler = webpack(config);
 
 // Using the middleware
-
-const middleware = koaWebpack({
+koaWebpack({
     compiler,
     config,
-    dev: {
-        lazy: true,
-        watchOptions: {
-            aggregateTimeout: 300,
-            poll: true,
-        },
-        publicPath: '/assets/',
+    // Reference: https://github.com/webpack/webpack-dev-middleware#options
+    devMiddleware: {
+        headers: { 'X-Custom-Header': 'yes' },
         index: 'index.html',
-        headers: {
-            'X-Custom-Header': 'yes'
-        },
-        stats: {
-            colors: true,
-        },
+        lazy: false,
+        logger: undefined,
+        logLevel: 'info',
+        // logTime: false,
+        // mimeTypes: null,
+        publicPath: '/assets/',
         reporter: null,
-        serverSideRender: false
+        serverSideRender: false,
+        stats: { context: process.cwd() },
+        watchOptions: { aggregateTimeout: 200 },
+        // writeToDisk: false
     },
-    hot: {
-        log: console.log.bind(console),
-        path: '/__what',
-        heartbeat: 2000
+    // Reference: https://github.com/webpack-contrib/webpack-hot-client#api
+    hotClient: {
+        allEntries: false,
+        autoConfigure: true,
+        host: 'localhost',
+        hmr: true,
+        https: false,
+        logLevel: 'info',
+        logTime: false,
+        port: 0,
+        reload: true,
+        server: undefined,
+        stats: { context: process.cwd() }
     }
-});
+})
+    .then((middleware) => {
+        app.use(middleware);
 
-app.use(middleware);
-
-// Accessing the underlying middleware
-
-middleware.dev.close();
-middleware.dev.invalidate();
-middleware.dev.waitUntilValid();
-middleware.hot.publish(null);
+        // Accessing the underlying middleware
+        middleware.devMiddleware.close();
+        middleware.devMiddleware.invalidate();
+        middleware.devMiddleware.waitUntilValid();
+        middleware.devMiddleware.getFilenameFromUrl('/public/index.html');
+        middleware.devMiddleware.fileSystem;
+        middleware.hotClient.close();
+        middleware.hotClient.options;
+        middleware.hotClient.server;
+    });

From e1d3592bb249a4f8a15f38ba75d023914ec0db50 Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Sun, 3 Jun 2018 17:41:51 -0700
Subject: [PATCH 0986/1124] Added axe-webdriverjs typings

---
 .../axe-webdriverjs/axe-webdriverjs-tests.ts  |  0
 types/axe-webdriverjs/index.d.ts              | 79 +++++++++++++++++++
 types/axe-webdriverjs/package.json            |  7 ++
 types/axe-webdriverjs/tsconfig.json           | 22 ++++++
 types/axe-webdriverjs/tslint.json             |  1 +
 5 files changed, 109 insertions(+)
 create mode 100644 types/axe-webdriverjs/axe-webdriverjs-tests.ts
 create mode 100644 types/axe-webdriverjs/index.d.ts
 create mode 100644 types/axe-webdriverjs/package.json
 create mode 100644 types/axe-webdriverjs/tsconfig.json
 create mode 100644 types/axe-webdriverjs/tslint.json

diff --git a/types/axe-webdriverjs/axe-webdriverjs-tests.ts b/types/axe-webdriverjs/axe-webdriverjs-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/axe-webdriverjs/index.d.ts b/types/axe-webdriverjs/index.d.ts
new file mode 100644
index 0000000000..d8e3979145
--- /dev/null
+++ b/types/axe-webdriverjs/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for axe-webdriverjs 2.0
+// Project: https://github.com/dequelabs/axe-webdriverjs#readme
+// Definitions by: My Self <https://github.com/JoshuaKGoldberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Result, RunOptions, Spec } from "axe-core";
+import { WebDriver } from "selenium-webdriver";
+
+export interface IAxeAnalysis {
+    inapplicable: Result[];
+    incomplete: Result[];
+    passes: Result[];
+    timestamp: string;
+    url: string;
+    violations: Result[];
+}
+
+export interface AxeBuilder {
+    (driver: WebDriver): AxeBuilder;
+    new (driver: WebDriver): AxeBuilder;
+
+    /**
+     * Includes a selector in analysis.
+     *
+     * @param selector   CSS selector of the element to include.
+     */
+    include(selector: string): this;
+
+    /**
+     * Excludes a selector from analysis.
+     *
+     * @param selector   CSS selector of the element to exclude.
+     */
+    exclude(selector: string): this;
+
+    /**
+     * Options to directly pass to `axe.run`.
+     *
+     * @param options   aXe options object.
+     * @remarks Will override any other configured options, including calls to `withRules` and `withTags`.
+     */
+    options(options: RunOptions): this;
+
+    /**
+     * Limits analysis to only the specified rules.
+     * 
+     * @param rules   Array of rule IDs, or a single rule ID as a string.
+     * @remarks Cannot be used with `withTags`.
+     */
+    withRules(rules: string | string[]): this;
+
+    /**
+     * Limist analysis to only the specified tags.  
+     *
+     * @param rules   Array of tags, or a single tag as a string
+     * @remarks Cannot be used with `withRules`.
+     */
+    withTags(tags: string | string[]): this;
+
+    /**
+     * Set the list of rules to skip when running an analysis
+     *
+     * @param rules   Array of rule IDs, or a single rule ID as a string
+     */
+    disableRules(rules: string | string[]): this;
+
+    /**
+     * Configures aXe before running analyze.
+     *
+     * @param config   aXe Configuration spec to use in analysis.
+     */
+    configure(config: Spec): this;
+
+    /**
+    * Perform analysis and retrieve results.
+    * @param callback   Function to execute when analysis completes.
+    */
+    analyze(callback: (results: IAxeAnalysis) => void): Promise<IAxeAnalysis>;
+}
diff --git a/types/axe-webdriverjs/package.json b/types/axe-webdriverjs/package.json
new file mode 100644
index 0000000000..5d94289f3b
--- /dev/null
+++ b/types/axe-webdriverjs/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/selenium-webdriver": "^3.0.0",
+        "axe-core": "^2.6.1"
+    }
+}
diff --git a/types/axe-webdriverjs/tsconfig.json b/types/axe-webdriverjs/tsconfig.json
new file mode 100644
index 0000000000..efa6dfcf98
--- /dev/null
+++ b/types/axe-webdriverjs/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",
+        "axe-webdriverjs-tests.ts"
+    ]
+}
diff --git a/types/axe-webdriverjs/tslint.json b/types/axe-webdriverjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/axe-webdriverjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a5c7386e2ed858e62c5591f53b78b6b9cdfd733f Mon Sep 17 00:00:00 2001
From: Oren Trutner <orentrutner@gmail.com>
Date: Thu, 24 May 2018 17:03:35 -0700
Subject: [PATCH 0987/1124] Add bin-pack typings

---
 types/bin-pack/bin-pack-tests.ts |  8 +++++
 types/bin-pack/index.d.ts        | 60 ++++++++++++++++++++++++++++++++
 types/bin-pack/tsconfig.json     | 23 ++++++++++++
 types/bin-pack/tslint.json       |  1 +
 4 files changed, 92 insertions(+)
 create mode 100644 types/bin-pack/bin-pack-tests.ts
 create mode 100644 types/bin-pack/index.d.ts
 create mode 100644 types/bin-pack/tsconfig.json
 create mode 100644 types/bin-pack/tslint.json

diff --git a/types/bin-pack/bin-pack-tests.ts b/types/bin-pack/bin-pack-tests.ts
new file mode 100644
index 0000000000..f913d53520
--- /dev/null
+++ b/types/bin-pack/bin-pack-tests.ts
@@ -0,0 +1,8 @@
+import * as pack from "bin-pack";
+
+// $ExpectType PackResult<{ width: number; height: number; }>
+const packResult = pack([
+    { width: 50, height: 50 },
+    { width: 25, height: 25 },
+    { width: 25, height: 20 }
+]);
diff --git a/types/bin-pack/index.d.ts b/types/bin-pack/index.d.ts
new file mode 100644
index 0000000000..0d3df98899
--- /dev/null
+++ b/types/bin-pack/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for bin-pack 1.0
+// Project: https://github.com/bryanburgers/bin-pack
+// Definitions by: Oren Trutner <https://github.com/orentrutner>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Packs objects that have a width and a height into as small of a square as
+ * possible, using a binary tree bin packing algorithm. After packing, each
+ * object is given an (x, y) coordinate of where it would be optimally packed.
+ * @param bins List of rectangular bins to pack
+ * @param options Packing options.  Use inPlace: true to modify the bins
+ *    argument in-place.
+ */
+declare function pack<T extends pack.Bin>(bins: T[], options?: pack.Options): pack.PackResult<T>;
+
+declare namespace pack {
+    /** Packing options. */
+    interface Options {
+        /** Use inPlace=true to add x,y fields to the bins argument. */
+        inPlace?: boolean;
+    }
+
+    /** Specifies the dimensions of a bin to pack. */
+    interface Bin {
+        width: number;
+        height: number;
+    }
+
+    /** Describes the location of a packed bin. */
+    interface PackedItem<T> {
+        /** X coordinate of the packed bin. */
+        x: number;
+
+        /** Y coordinate of the packed bin. */
+        y: number;
+
+        /** Width of the bin. */
+        width: number;
+
+        /** Height of the bin. */
+        height: number;
+
+        /** The original bin object. */
+        item: T;
+    }
+
+    /** The return value from the pack function. */
+    interface PackResult<T> {
+        /** Width of the bounding box around all bins. */
+        width: number;
+
+        /** Height of the bounding box around all bins. */
+        height: number;
+
+        /** List of packed bins. */
+        items: Array<PackedItem<T>>;
+    }
+}
+
+export = pack;
diff --git a/types/bin-pack/tsconfig.json b/types/bin-pack/tsconfig.json
new file mode 100644
index 0000000000..6c6a41a37a
--- /dev/null
+++ b/types/bin-pack/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",
+        "bin-pack-tests.ts"
+    ]
+}
diff --git a/types/bin-pack/tslint.json b/types/bin-pack/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bin-pack/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9cc10b303cc710b95b15fa608d84c447051c26a8 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Mon, 4 Jun 2018 11:57:15 +0700
Subject: [PATCH 0988/1124] Fixed bug in [@types/kraken-js] should not extends
 EventEmitter by itself as it is extended via Express Application

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

diff --git a/types/kraken-js/index.d.ts b/types/kraken-js/index.d.ts
index 0980e31eb1..c7aabc216b 100644
--- a/types/kraken-js/index.d.ts
+++ b/types/kraken-js/index.d.ts
@@ -5,12 +5,11 @@
 // TypeScript Version: 2.2
 
 import { Express } from 'express';
-import { EventEmitter } from 'events';
 
 declare function k(options?: k.Options | string): Express;
 
 declare namespace k {
-    interface Kraken extends Express, EventEmitter {
+    interface Kraken extends Express {
         kraken: Kraken;
     }
 

From 7c501b22e6e258f570d0eccdfbaa792653dd782d Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Mon, 4 Jun 2018 12:02:53 +0700
Subject: [PATCH 0989/1124] Add a contributor

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

diff --git a/types/kraken-js/index.d.ts b/types/kraken-js/index.d.ts
index c7aabc216b..3013938dd2 100644
--- a/types/kraken-js/index.d.ts
+++ b/types/kraken-js/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for krakenjs 2.2
 // Project: http://krakenjs.com
 // Definitions by: Timur Manyanov <https://github.com/darkwebdev>
+//                 Satana Charuwichitratana <https://github.com/micksatana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From d83700ed3bffad6b8831b03c2618f8496d918828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Sm=C3=B3=C5=82ka?=
 <msmolka@users.noreply.github.com>
Date: Mon, 4 Jun 2018 09:41:04 +0200
Subject: [PATCH 0990/1124] Replaced string with  "inline" | "incell" | "popup"

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

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index 95f6d5c6a0..8249153105 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -4046,7 +4046,7 @@ declare namespace kendo.ui {
         columnMenu?: boolean | GridColumnMenu;
         dataSource?: any|any|kendo.data.DataSource;
         detailTemplate?: string|Function;
-        editable?: boolean | string | GridEditable;
+        editable?: boolean | "inline" | "incell" | "popup" | GridEditable;
         excel?: GridExcel;
         filterable?: boolean | GridFilterable;
         groupable?: boolean | GridGroupable;

From 9d3e786e2903c364bb296949f624a9cd5152f2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Sm=C3=B3=C5=82ka?=
 <msmolka@users.noreply.github.com>
Date: Mon, 4 Jun 2018 09:44:43 +0200
Subject: [PATCH 0991/1124] Replaced boolean with false for CalendarOptions

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

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index 5da967f60b..7f4c865313 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -1848,7 +1848,7 @@ declare namespace kendo.ui {
         dates?: any;
         depth?: string;
         disableDates?: any|Function;
-        footer?: boolean|string|Function;
+        footer?: false | string | Function;
         format?: string;
         max?: Date;
         messages?: CalendarMessages;

From 5fbc378a2fcb0c591091c857695e8b3314da4735 Mon Sep 17 00:00:00 2001
From: Satana Charuwichitratana <micksatana@live.com>
Date: Mon, 4 Jun 2018 15:04:46 +0700
Subject: [PATCH 0992/1124] Move partial of req.range documents to range-parser

---
 types/express-serve-static-core/index.d.ts | 20 +++++++-------------
 types/range-parser/index.d.ts              | 11 +++++++++++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index 7603445b3b..96c4c233c2 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -23,7 +23,7 @@ declare global {
 
 import * as http from "http";
 import { EventEmitter } from "events";
-import { Options as RangeParserOptions } from "range-parser";
+import { Options as RangeParserOptions, Result as RangeParserResult, Ranges as RangeParserRanges } from "range-parser";
 
 export interface NextFunction {
     // tslint:disable-next-line callable-types (In ts2.1 it thinks the type alias has no call signatures)
@@ -175,7 +175,7 @@ export interface CookieOptions {
 
 export interface ByteRange { start: number; end: number; }
 
-export interface RequestRanges extends Array<ByteRange> { type: string; }
+export interface RequestRanges extends RangeParserRanges { }
 
 export type Errback = (err: Error) => void;
 
@@ -287,22 +287,16 @@ export interface Request extends http.IncomingMessage, Express.Request {
      * Parse Range header field, capping to the given `size`.
      *
      * Unspecified ranges such as "0-" require knowledge of your resource length. In
-     * the case of a byte range this is of course the total number of bytes. If the
-     * Range header field is not given `undefined` is returned, `-1` when unsatisfiable,
-     * and `-2` when syntactically invalid.
-     *
-     * When ranges are returned, the array has a "type" property which is the type of
-     * range that is required (most commonly, "bytes"). Each array element is an object
-     * with a "start" and "end" property for the portion of the range.
-     *
-     * The "combine" option can be set to `true` and overlapping & adjacent ranges
-     * will be combined into a single range.
+     * the case of a byte range this is of course the total number of bytes.
+     * If the Range header field is not given `undefined` is returned.
+     * If the Range header field is given, return value is a result of range-parser.
+     * See more ./types/range-parser/index.d.ts
      *
      * NOTE: remember that ranges are inclusive, so for example "Range: users=0-3"
      * should respond with 4 users when available, not 3.
      *
      */
-    range(size: number, options?: RangeParserOptions): RequestRanges | undefined | -1 | -2;
+    range(size: number, options?: RangeParserOptions): RangeParserRanges | RangeParserResult | undefined;
 
     /**
      * Return an array of Accepted media types
diff --git a/types/range-parser/index.d.ts b/types/range-parser/index.d.ts
index 5912777ec0..a1bcf4c9dc 100644
--- a/types/range-parser/index.d.ts
+++ b/types/range-parser/index.d.ts
@@ -3,6 +3,13 @@
 // Definitions by: Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/**
+ * Returns `-1` when unsatisfiable and `-2` when syntactically invalid.
+ *
+ * When ranges are returned, the array has a "type" property which is the type of
+ * range that is required (most commonly, "bytes"). Each array element is an object
+ * with a "start" and "end" property for the portion of the range.
+ */
 declare function RangeParser(size: number, str: string, options?: RangeParser.Options): RangeParser.Result | RangeParser.Ranges;
 
 declare namespace RangeParser {
@@ -14,6 +21,10 @@ declare namespace RangeParser {
         end: number;
     }
     interface Options {
+        /**
+         * The "combine" option can be set to `true` and overlapping & adjacent ranges
+         * will be combined into a single range.
+         */
         combine?: boolean;
     }
     const enum Result {

From b799d29dff1f761436e006c109933b7e86e6faac Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:02:16 -0400
Subject: [PATCH 0993/1124] (react-native-tab-view) Update types for 1.0

---
 types/react-native-tab-view/index.d.ts        | 344 +++++++++---------
 .../react-native-tab-view-tests.tsx           |  87 ++---
 2 files changed, 213 insertions(+), 218 deletions(-)

diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index 2c6546a628..a5a62f8270 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -1,237 +1,231 @@
-// Type definitions for react-native-tab-view 0.0
+// Type definitions for react-native-tab-view 1.0
 // Project: https://github.com/react-native-community/react-native-tab-view
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
+//                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import { PureComponent, ReactNode, ComponentType } from 'react'
-import {
-  Animated,
-  StyleProp,
-  ViewStyle,
-  EasingFunction
-} from 'react-native'
+import { PureComponent, ReactNode, ComponentType } from 'react';
+import { Animated, StyleProp, ViewStyle, EasingFunction } from 'react-native';
 
-export type Key = { key: string }
-export type RouteBase = Key & { testID?: string }
+export type Key = { key: string };
+export type RouteBase = Key & { testID?: string };
 
-export type Route<T extends RouteBase = RouteBase> = T
+export type Route<T extends RouteBase = RouteBase> = T;
 
 export type NavigationState<T extends Key> = {
-  index: number
-  routes: T[]
-}
+    index: number;
+    routes: T[];
+};
 
 export type Scene<T> = {
-  route: T
-  focused: boolean
-  index: number
-}
+    route: T;
+    focused: boolean;
+    index: number;
+};
 
 export type Layout = {
-  height: number
-  width: number
-}
+    height: number;
+    width: number;
+};
 
 export type SceneRendererProps<T extends RouteBase = RouteBase> = {
-  layout: Layout & {
-    measured: boolean
-  }
-  navigationState: NavigationState<T>
-  position: Animated.Value
-  jumpToIndex: (index: number) => void
-  getLastPosition: () => number
-  subscribe: (
-    event: SubscriptionName,
-    callback: () => void
-  ) => { remove: () => void }
-}
+    layout: Layout & {
+        measured: boolean;
+    };
+    navigationState: NavigationState<T>;
+    position: Animated.Value;
+    jumpTo: (key: string) => void;
+    getLastPosition: () => number;
+    subscribe: (
+        event: SubscriptionName,
+        callback: () => void
+    ) => { remove: () => void };
+};
 
-export type SubscriptionName = 'reset' | 'position'
+export type SubscriptionName = 'reset' | 'position';
 
 export type TransitionProps = {
-  progress: number
-}
+    progress: number;
+};
 
 export type NavigationTransitionSpec = {
-  duration?: number,
-  // An easing function from `Easing`.
-  easing?: EasingFunction,
-  // A timing function such as `Animated.timing`.
-  timing?: (value: Animated.Value, config: any) => any,
-}
+    duration?: number;
+    // An easing function from `Easing`.
+    easing?: EasingFunction;
+    // A timing function such as `Animated.timing`.
+    timing?: (value: Animated.Value, config: any) => any;
+};
 
 export type TransitionConfigurator = (
-  currentTransitionProps: TransitionProps,
-  nextTransitionProps: TransitionProps
-) => NavigationTransitionSpec
+    currentTransitionProps: TransitionProps,
+    nextTransitionProps: TransitionProps
+) => NavigationTransitionSpec;
 
 export type PagerProps = {
-  configureTransition?: TransitionConfigurator
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  swipeDistanceThreshold?: number
-  swipeVelocityThreshold?: number
-  children?: ReactNode
-}
+    configureTransition?: TransitionConfigurator;
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    swipeDistanceThreshold?: number;
+    swipeVelocityThreshold?: number;
+    children?: ReactNode;
+};
 
-export type TabViewAnimatedProps<
-  T extends RouteBase = RouteBase
-> = PagerProps & {
-  navigationState: NavigationState<T>
-  onIndexChange: (index: number) => void
-  onPositionChange?: (props: { value: number }) => void
-  initialLayout?: Layout
-  canJumpToTab?: (route: T) => boolean
-  renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode
-  renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode
-  renderHeader?: (props: SceneRendererProps<T>) => ReactNode
-  renderFooter?: (props: SceneRendererProps<T>) => ReactNode
-  lazy?: boolean
-  style?: StyleProp<ViewStyle>
-}
+export type TabViewProps<T extends RouteBase = RouteBase> = PagerProps & {
+    navigationState: NavigationState<T>;
+    tabBarPosition?: 'bottom' | 'top';
+    onIndexChange: (index: number) => void;
+    onPositionChange?: (props: { value: number }) => void;
+    initialLayout?: Layout;
+    canJumpToTab?: (route: T) => boolean;
+    renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode;
+    renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode;
+    renderTabBar?: (props: SceneRendererProps<T>) => ReactNode;
+    lazy?: boolean;
+    style?: StyleProp<ViewStyle>;
+};
 
-export class TabViewAnimated<T extends Route = Route> extends PureComponent<
-  TabViewAnimatedProps<T>,
-  any
+export class TabView<T extends Route = Route> extends PureComponent<
+    TabViewProps<T>,
+    any
 > {}
 
 export type GestureEvent = {
-  nativeEvent: {
-    changedTouches: any[]
-    identifier: number
-    locationX: number
-    locationY: number
-    pageX: number
-    pageY: number
-    target: number
-    timestamp: number
-    touches: any[]
-  }
-}
+    nativeEvent: {
+        changedTouches: any[];
+        identifier: number;
+        locationX: number;
+        locationY: number;
+        pageX: number;
+        pageY: number;
+        target: number;
+        timestamp: number;
+        touches: any[];
+    };
+};
 
 export type GestureState = {
-  stateID: number
-  moveX: number
-  moveY: number
-  x0: number
-  y0: number
-  dx: number
-  dy: number
-  vx: number
-  vy: number
-  numberActiveTouches: number
-}
+    stateID: number;
+    moveX: number;
+    moveY: number;
+    x0: number;
+    y0: number;
+    dx: number;
+    dy: number;
+    vx: number;
+    vy: number;
+    numberActiveTouches: number;
+};
 
-export type GestureHandler = (event: GestureEvent, state: GestureState) => void
+export type GestureHandler = (event: GestureEvent, state: GestureState) => void;
 
-export type TabViewPagerPanProps<
-  T extends RouteBase = RouteBase
-> = SceneRendererProps<T> & {
-  configureTransition?: TransitionConfigurator
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  swipeDistanceThreshold?: number
-  swipeVelocityThreshold?: number
-  onSwipeStart?: GestureHandler
-  onSwipeEnd?: GestureHandler
-  children?: ReactNode
-}
+export type PagerPanProps<T extends RouteBase = RouteBase> = SceneRendererProps<
+    T
+> & {
+    configureTransition?: TransitionConfigurator;
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    swipeDistanceThreshold?: number;
+    swipeVelocityThreshold?: number;
+    onSwipeStart?: GestureHandler;
+    onSwipeEnd?: GestureHandler;
+    children?: ReactNode;
+};
 
 export type DefaultTransitionSpec = {
-  timing: typeof Animated.spring
-  tension: 300
-  friction: 35
-}
+    timing: typeof Animated.spring;
+    tension: 300;
+    friction: 35;
+};
 
-export class TabViewPagerPan<T extends Route = Route> extends PureComponent<
-  TabViewPagerPanProps<T>,
-  void
+export class PagerPan<T extends Route = Route> extends PureComponent<
+    PagerPanProps<T>,
+    void
 > {
-  static defaultProps: {
-    configureTransition: () => DefaultTransitionSpec
-    initialLayout: {
-      height: 0
-      width: 0
-    }
-    swipeDistanceThreshold: 120
-    swipeVelocityThreshold: 0.25
-  }
+    static defaultProps: {
+        configureTransition: () => DefaultTransitionSpec;
+        initialLayout: {
+            height: 0;
+            width: 0;
+        };
+        swipeDistanceThreshold: 120;
+        swipeVelocityThreshold: 0.25;
+    };
 }
 
 export type ScrollEvent = {
-  nativeEvent: {
-    contentOffset: {
-      x: number
-      y: number
-    }
-  }
-}
+    nativeEvent: {
+        contentOffset: {
+            x: number;
+            y: number;
+        };
+    };
+};
 
-export type TabViewPagerScrollProps<
-  T extends RouteBase = RouteBase
+export type PagerScrollProps<
+    T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  children?: ReactNode
-}
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    children?: ReactNode;
+};
 
-export class TabViewPagerScroll<T extends Route = Route> extends PureComponent<
-  TabViewPagerScrollProps<T>,
-  any
+export class PagerScroll<T extends Route = Route> extends PureComponent<
+    PagerScrollProps<T>,
+    any
 > {}
 
 export type PageScrollEvent = {
-  nativeEvent: {
-    position: number
-    offset: number
-  }
-}
+    nativeEvent: {
+        position: number;
+        offset: number;
+    };
+};
 
-export type PageScrollState = 'dragging' | 'settling' | 'idle'
+export type PageScrollState = 'dragging' | 'settling' | 'idle';
 
-export type TabViewPagerAndroidProps<
-  T extends RouteBase = RouteBase
+export type PagerAndroidProps<
+    T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-  animationEnabled?: boolean
-  swipeEnabled?: boolean
-  children?: ReactNode
-}
+    animationEnabled?: boolean;
+    swipeEnabled?: boolean;
+    children?: ReactNode;
+};
 
-export class TabViewPagerAndroid<T extends Route = Route> extends PureComponent<
-  TabViewPagerAndroidProps<T>,
-  void
+export class PagerAndroid<T extends Route = Route> extends PureComponent<
+    PagerAndroidProps<T>,
+    void
 > {}
 
 export type IndicatorProps<
-  T extends RouteBase = RouteBase
+    T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-  width: Animated.Value
-}
+    width: Animated.Value;
+};
 
 export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
-  T
+    T
 > & {
-  scrollEnabled?: boolean
-  pressColor?: string
-  pressOpacity?: number
-  getLabelText?: (scene: Scene<T>) => string | undefined | null
-  renderLabel?: (scene: Scene<T>) => ReactNode
-  renderIcon?: (scene: Scene<T>) => ReactNode
-  renderBadge?: (scene: Scene<T>) => ReactNode
-  renderIndicator?: (props: IndicatorProps<T>) => ReactNode
-  onTabPress?: (scene: Scene<T>) => void
-  tabStyle?: StyleProp<ViewStyle>
-  indicatorStyle?: StyleProp<ViewStyle>
-  labelStyle?: StyleProp<ViewStyle>
-  style?: StyleProp<ViewStyle>
-}
+    scrollEnabled?: boolean;
+    pressColor?: string;
+    pressOpacity?: number;
+    getLabelText?: (scene: Scene<T>) => string | undefined | null;
+    renderLabel?: (scene: Scene<T>) => ReactNode;
+    renderIcon?: (scene: Scene<T>) => ReactNode;
+    renderBadge?: (scene: Scene<T>) => ReactNode;
+    renderIndicator?: (props: IndicatorProps<T>) => ReactNode;
+    onTabPress?: (scene: Scene<T>) => void;
+    tabStyle?: StyleProp<ViewStyle>;
+    indicatorStyle?: StyleProp<ViewStyle>;
+    labelStyle?: StyleProp<ViewStyle>;
+    style?: StyleProp<ViewStyle>;
+};
 
 export class TabBar<T extends Route = Route> extends PureComponent<
-  TabBarProps<T>,
-  any
+    TabBarProps<T>,
+    any
 > {}
 
 export function SceneMap(scenes: {
-  [key: string]: ComponentType<any>
-}): (props: { route: Route }) => ReactNode
+    [key: string]: ComponentType<any>;
+}): (props: { route: Route }) => ReactNode;
diff --git a/types/react-native-tab-view/react-native-tab-view-tests.tsx b/types/react-native-tab-view/react-native-tab-view-tests.tsx
index 97d8c09257..a3e53558ae 100644
--- a/types/react-native-tab-view/react-native-tab-view-tests.tsx
+++ b/types/react-native-tab-view/react-native-tab-view-tests.tsx
@@ -1,58 +1,59 @@
-import { PureComponent, Component } from 'react'
-import { View, StyleSheet } from 'react-native'
+import { PureComponent, Component } from 'react';
+import { View, StyleSheet } from 'react-native';
 import {
-  TabViewAnimated,
-  TabBar,
-  SceneMap,
-  TabBarProps,
-  RouteBase,
-} from 'react-native-tab-view'
+    TabView,
+    TabBar,
+    SceneMap,
+    TabBarProps,
+    RouteBase
+} from 'react-native-tab-view';
 
 const FirstRoute = () => (
-  <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
-)
+    <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
+);
 
 class SecondRoute extends Component {
-  render() {
-    return (
-      <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
-    );
-  }
+    render() {
+        return (
+            <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
+        );
+    }
 }
 
 class TabViewExample extends PureComponent {
-  state: { index: number; routes: Array<RouteBase & { title: string }> } = {
-    index: 0,
-    routes: [
-      { key: 'first', title: 'First' },
-      { key: 'second', title: 'Second' },
-    ],
-  }
+    state: { index: number; routes: Array<RouteBase & { title: string }> } = {
+        index: 0,
+        routes: [
+            { key: 'first', title: 'First' },
+            { key: 'second', title: 'Second' }
+        ]
+    };
 
-  _handleIndexChange = (index: number) => this.setState({ index })
+    _handleIndexChange = (index: number) => this.setState({ index });
 
-  _renderHeader = (props: TabBarProps) => <TabBar {...props} />
+    _renderTabBar = (props: TabBarProps) => <TabBar {...props} />;
 
-  _renderScene = SceneMap({
-    first: FirstRoute,
-    second: SecondRoute,
-  })
+    _renderScene = SceneMap({
+        first: FirstRoute,
+        second: SecondRoute
+    });
 
-  render() {
-    return (
-      <TabViewAnimated
-        style={styles.container}
-        navigationState={this.state}
-        renderScene={this._renderScene}
-        renderHeader={this._renderHeader}
-        onIndexChange={this._handleIndexChange}
-      />
-    )
-  }
+    render() {
+        return (
+            <TabView
+                style={styles.container}
+                navigationState={this.state}
+                renderScene={this._renderScene}
+                renderTabBar={this._renderTabBar}
+                tabBarPosition="top"
+                onIndexChange={this._handleIndexChange}
+            />
+        );
+    }
 }
 
 const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  },
-})
+    container: {
+        flex: 1
+    }
+});

From 298e6e8ef2cf4f340592e7c2a359d904be1484f5 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 04:32:45 -0400
Subject: [PATCH 0994/1124] (react-native-material-textfield) Add style prop

---
 .../index.d.ts                                | 22 +++++++++++++------
 .../react-native-material-textfield-tests.tsx |  8 ++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/types/react-native-material-textfield/index.d.ts b/types/react-native-material-textfield/index.d.ts
index 9b6c2941af..5f3ffc437f 100644
--- a/types/react-native-material-textfield/index.d.ts
+++ b/types/react-native-material-textfield/index.d.ts
@@ -1,11 +1,18 @@
 // Type definitions for react-native-material-textfield 0.12
 // Project: https://github.com/n4kz/react-native-material-textfield
 // Definitions by: Ville Venäläinen <https://github.com/mindhivefi>
+//                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.6
 
 import * as React from 'react';
-import { TextInputProps, TextStyle, ViewStyle, View } from 'react-native';
+import {
+    StyleProp,
+    TextInputProps,
+    TextStyle,
+    ViewStyle,
+    View
+} from 'react-native';
 
 export interface TextFieldProps extends TextInputProps {
     animationDuration?: number;
@@ -17,9 +24,10 @@ export interface TextFieldProps extends TextInputProps {
     labelPadding?: number;
     inputContainerPadding?: number;
 
-    labelTextStyle?: TextStyle;
-    titleTextStyle?: TextStyle;
-    affixTextStyle?: TextStyle;
+    style?: StyleProp<TextStyle>;
+    labelTextStyle?: StyleProp<TextStyle>;
+    titleTextStyle?: StyleProp<TextStyle>;
+    affixTextStyle?: StyleProp<TextStyle>;
 
     tintColor?: string;
     textColor?: string;
@@ -47,8 +55,8 @@ export interface TextFieldProps extends TextInputProps {
     prefix?: string;
     suffix?: string;
 
-    containerStyle?: ViewStyle;
-    inputContainerStyle?: ViewStyle;
+    containerStyle?: StyleProp<ViewStyle>;
+    inputContainerStyle?: StyleProp<ViewStyle>;
 
     onPress?(event: Event): void;
     onChangeText?(text: string): void;
diff --git a/types/react-native-material-textfield/react-native-material-textfield-tests.tsx b/types/react-native-material-textfield/react-native-material-textfield-tests.tsx
index 08b33e31d0..50fb2b166b 100644
--- a/types/react-native-material-textfield/react-native-material-textfield-tests.tsx
+++ b/types/react-native-material-textfield/react-native-material-textfield-tests.tsx
@@ -1,13 +1,15 @@
 import * as React from 'react';
-import { View, Text } from 'react-native';
+import { View } from 'react-native';
 import { TextField } from 'react-native-material-textfield';
 
-const Example = () =>
+const Example = () => (
     <View>
         <TextField
             label="Example"
             multiline
             placeholder="Text when field is empty"
             value="Initial value"
+            style={{ fontSize: 10 }}
         />
-    </View>;
+    </View>
+);

From b3228e51ad092d0f4adad983f0dd1002379edf39 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:10:57 -0400
Subject: [PATCH 0995/1124] Remove import from react-router-navigation

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

diff --git a/types/react-router-navigation/index.d.ts b/types/react-router-navigation/index.d.ts
index 120ffb0d82..0d74da3084 100644
--- a/types/react-router-navigation/index.d.ts
+++ b/types/react-router-navigation/index.d.ts
@@ -4,14 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Component, ReactNode, ReactElement, ComponentClass } from "react";
-import { StyleProp, ViewProps, ViewStyle, TextStyle } from "react-native";
-import { TabViewAnimated, TabViewPagerPan } from "react-native-tab-view";
-import { RouteProps } from "react-router-navigation-core";
+import { Component, ReactNode, ReactElement, ComponentClass } from 'react';
+import { StyleProp, ViewProps, ViewStyle, TextStyle } from 'react-native';
+import { RouteProps } from 'react-router-navigation-core';
 import {
     NavigationTransitionProps,
     NavigationTransitionSpec
-} from "react-navigation";
+} from 'react-navigation';
 
 /**
  * Navigation
@@ -80,7 +79,7 @@ export interface TabBarProps {
     // <BottomNavigation /> only:
     renderTabIcon?: (props: TabSubViewProps) => ReactNode;
     // <Tabs /> only:
-    tabBarPosition?: "top" | "bottom";
+    tabBarPosition?: 'top' | 'bottom';
     tabBarIndicatorStyle?: StyleProp<ViewStyle>;
 }
 

From 479df0e843349248397a3191ea9cfba9dd40515b Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:12:28 -0400
Subject: [PATCH 0996/1124] Update import to TabView

---
 .../react-router-navigation-core-tests.tsx        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
index 6d6d048886..08b63cd700 100644
--- a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
+++ b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
@@ -1,8 +1,8 @@
-import * as React from "react";
-import { View } from "react-native";
-import { TabStack, renderSubView } from "react-router-navigation-core";
-import { TabBarProps, TabProps } from "react-router-navigation";
-import { TabViewAnimated } from "react-native-tab-view";
+import * as React from 'react';
+import { View } from 'react-native';
+import { TabStack, renderSubView } from 'react-router-navigation-core';
+import { TabBarProps, TabProps } from 'react-router-navigation';
+import { TabView } from 'react-native-tab-view';
 
 type Props = TabBarProps & {
     children?: Array<React.ReactElement<TabProps>>;
@@ -24,7 +24,7 @@ class BottomNavigation extends React.Component<Props, State> {
                 render={props => {
                     const ownProps = { ...this.props, ...props };
                     return (
-                        <TabViewAnimated
+                        <TabView
                             {...props}
                             key={`transitioner_${this.state.key}`}
                             animationEnabled={false}
@@ -32,10 +32,11 @@ class BottomNavigation extends React.Component<Props, State> {
                                 sceneProps => <View />,
                                 ownProps
                             )}
-                            renderFooter={renderSubView(
+                            renderTabBar={renderSubView(
                                 sceneProps => <View />,
                                 ownProps
                             )}
+                            tabBarPosition="bottom"
                             renderScene={renderSubView(
                                 sceneProps => <View />,
                                 ownProps

From d3996bfe20efd23a70ba38bb720a7800c7e2c825 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 4 Jun 2018 05:35:06 -0400
Subject: [PATCH 0997/1124] Remove prettier spacing changes

---
 types/react-native-tab-view/index.d.ts        | 330 +++++++++---------
 .../react-native-tab-view-tests.tsx           |  88 ++---
 .../react-router-navigation-core-tests.tsx    |  10 +-
 types/react-router-navigation/index.d.ts      |  10 +-
 4 files changed, 222 insertions(+), 216 deletions(-)

diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index a5a62f8270..c761d80d14 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -4,228 +4,234 @@
 //                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
+import { PureComponent, ReactNode, ComponentType } from 'react'
+import {
+  Animated,
+  StyleProp,
+  ViewStyle,
+  EasingFunction
+} from 'react-native'
 
-import { PureComponent, ReactNode, ComponentType } from 'react';
-import { Animated, StyleProp, ViewStyle, EasingFunction } from 'react-native';
+export type Key = { key: string }
+export type RouteBase = Key & { testID?: string }
 
-export type Key = { key: string };
-export type RouteBase = Key & { testID?: string };
-
-export type Route<T extends RouteBase = RouteBase> = T;
+export type Route<T extends RouteBase = RouteBase> = T
 
 export type NavigationState<T extends Key> = {
-    index: number;
-    routes: T[];
-};
+  index: number
+  routes: T[]
+}
 
 export type Scene<T> = {
-    route: T;
-    focused: boolean;
-    index: number;
-};
+  route: T
+  focused: boolean
+  index: number
+}
 
 export type Layout = {
-    height: number;
-    width: number;
-};
+  height: number
+  width: number
+}
 
 export type SceneRendererProps<T extends RouteBase = RouteBase> = {
-    layout: Layout & {
-        measured: boolean;
-    };
-    navigationState: NavigationState<T>;
-    position: Animated.Value;
-    jumpTo: (key: string) => void;
-    getLastPosition: () => number;
-    subscribe: (
-        event: SubscriptionName,
-        callback: () => void
-    ) => { remove: () => void };
-};
+  layout: Layout & {
+    measured: boolean
+  }
+  navigationState: NavigationState<T>
+  position: Animated.Value
+  jumpTo: (key: string) => void
+  getLastPosition: () => number
+  subscribe: (
+    event: SubscriptionName,
+    callback: () => void
+  ) => { remove: () => void }
+}
 
-export type SubscriptionName = 'reset' | 'position';
+export type SubscriptionName = 'reset' | 'position'
 
 export type TransitionProps = {
-    progress: number;
-};
+  progress: number
+}
 
 export type NavigationTransitionSpec = {
-    duration?: number;
-    // An easing function from `Easing`.
-    easing?: EasingFunction;
-    // A timing function such as `Animated.timing`.
-    timing?: (value: Animated.Value, config: any) => any;
-};
+  duration?: number,
+  // An easing function from `Easing`.
+  easing?: EasingFunction,
+  // A timing function such as `Animated.timing`.
+  timing?: (value: Animated.Value, config: any) => any,
+}
 
 export type TransitionConfigurator = (
-    currentTransitionProps: TransitionProps,
-    nextTransitionProps: TransitionProps
-) => NavigationTransitionSpec;
+  currentTransitionProps: TransitionProps,
+  nextTransitionProps: TransitionProps
+) => NavigationTransitionSpec
 
 export type PagerProps = {
-    configureTransition?: TransitionConfigurator;
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    swipeDistanceThreshold?: number;
-    swipeVelocityThreshold?: number;
-    children?: ReactNode;
-};
+  configureTransition?: TransitionConfigurator
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  swipeDistanceThreshold?: number
+  swipeVelocityThreshold?: number
+  children?: ReactNode
+}
 
-export type TabViewProps<T extends RouteBase = RouteBase> = PagerProps & {
-    navigationState: NavigationState<T>;
-    tabBarPosition?: 'bottom' | 'top';
-    onIndexChange: (index: number) => void;
-    onPositionChange?: (props: { value: number }) => void;
-    initialLayout?: Layout;
-    canJumpToTab?: (route: T) => boolean;
-    renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode;
-    renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode;
-    renderTabBar?: (props: SceneRendererProps<T>) => ReactNode;
-    lazy?: boolean;
-    style?: StyleProp<ViewStyle>;
-};
+export type TabViewProps<
+  T extends RouteBase = RouteBase
+> = PagerProps & {
+  navigationState: NavigationState<T>
+  tabBarPosition?: 'bottom' | 'top'
+  onIndexChange: (index: number) => void
+  onPositionChange?: (props: { value: number }) => void
+  initialLayout?: Layout
+  canJumpToTab?: (route: T) => boolean
+  renderPager?: (props: SceneRendererProps<T> & PagerProps) => ReactNode
+  renderScene: (props: SceneRendererProps<T> & Scene<T>) => ReactNode
+  renderTabBar?: (props: SceneRendererProps<T>) => ReactNode
+  lazy?: boolean
+  style?: StyleProp<ViewStyle>
+}
 
 export class TabView<T extends Route = Route> extends PureComponent<
-    TabViewProps<T>,
-    any
+  TabViewProps<T>,
+  any
 > {}
 
 export type GestureEvent = {
-    nativeEvent: {
-        changedTouches: any[];
-        identifier: number;
-        locationX: number;
-        locationY: number;
-        pageX: number;
-        pageY: number;
-        target: number;
-        timestamp: number;
-        touches: any[];
-    };
-};
+  nativeEvent: {
+    changedTouches: any[]
+    identifier: number
+    locationX: number
+    locationY: number
+    pageX: number
+    pageY: number
+    target: number
+    timestamp: number
+    touches: any[]
+  }
+}
 
 export type GestureState = {
-    stateID: number;
-    moveX: number;
-    moveY: number;
-    x0: number;
-    y0: number;
-    dx: number;
-    dy: number;
-    vx: number;
-    vy: number;
-    numberActiveTouches: number;
-};
+  stateID: number
+  moveX: number
+  moveY: number
+  x0: number
+  y0: number
+  dx: number
+  dy: number
+  vx: number
+  vy: number
+  numberActiveTouches: number
+}
 
-export type GestureHandler = (event: GestureEvent, state: GestureState) => void;
+export type GestureHandler = (event: GestureEvent, state: GestureState) => void
 
-export type PagerPanProps<T extends RouteBase = RouteBase> = SceneRendererProps<
-    T
-> & {
-    configureTransition?: TransitionConfigurator;
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    swipeDistanceThreshold?: number;
-    swipeVelocityThreshold?: number;
-    onSwipeStart?: GestureHandler;
-    onSwipeEnd?: GestureHandler;
-    children?: ReactNode;
-};
+export type PagerPanProps<
+  T extends RouteBase = RouteBase
+> = SceneRendererProps<T> & {
+  configureTransition?: TransitionConfigurator
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  swipeDistanceThreshold?: number
+  swipeVelocityThreshold?: number
+  onSwipeStart?: GestureHandler
+  onSwipeEnd?: GestureHandler
+  children?: ReactNode
+}
 
 export type DefaultTransitionSpec = {
-    timing: typeof Animated.spring;
-    tension: 300;
-    friction: 35;
-};
+  timing: typeof Animated.spring
+  tension: 300
+  friction: 35
+}
 
 export class PagerPan<T extends Route = Route> extends PureComponent<
-    PagerPanProps<T>,
-    void
+  PagerPanProps<T>,
+  void
 > {
-    static defaultProps: {
-        configureTransition: () => DefaultTransitionSpec;
-        initialLayout: {
-            height: 0;
-            width: 0;
-        };
-        swipeDistanceThreshold: 120;
-        swipeVelocityThreshold: 0.25;
-    };
+  static defaultProps: {
+    configureTransition: () => DefaultTransitionSpec
+    initialLayout: {
+      height: 0
+      width: 0
+    }
+    swipeDistanceThreshold: 120
+    swipeVelocityThreshold: 0.25
+  }
 }
 
 export type ScrollEvent = {
-    nativeEvent: {
-        contentOffset: {
-            x: number;
-            y: number;
-        };
-    };
-};
+  nativeEvent: {
+    contentOffset: {
+      x: number
+      y: number
+    }
+  }
+}
 
 export type PagerScrollProps<
-    T extends RouteBase = RouteBase
+  T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    children?: ReactNode;
-};
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  children?: ReactNode
+}
 
 export class PagerScroll<T extends Route = Route> extends PureComponent<
-    PagerScrollProps<T>,
-    any
+PagerScrollProps<T>,
+  any
 > {}
 
 export type PageScrollEvent = {
-    nativeEvent: {
-        position: number;
-        offset: number;
-    };
-};
+  nativeEvent: {
+    position: number
+    offset: number
+  }
+}
 
-export type PageScrollState = 'dragging' | 'settling' | 'idle';
+export type PageScrollState = 'dragging' | 'settling' | 'idle'
 
 export type PagerAndroidProps<
-    T extends RouteBase = RouteBase
+  T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-    animationEnabled?: boolean;
-    swipeEnabled?: boolean;
-    children?: ReactNode;
-};
+  animationEnabled?: boolean
+  swipeEnabled?: boolean
+  children?: ReactNode
+}
 
 export class PagerAndroid<T extends Route = Route> extends PureComponent<
-    PagerAndroidProps<T>,
-    void
+  PagerAndroidProps<T>,
+  void
 > {}
 
 export type IndicatorProps<
-    T extends RouteBase = RouteBase
+  T extends RouteBase = RouteBase
 > = SceneRendererProps<T> & {
-    width: Animated.Value;
-};
+  width: Animated.Value
+}
 
 export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
-    T
+  T
 > & {
-    scrollEnabled?: boolean;
-    pressColor?: string;
-    pressOpacity?: number;
-    getLabelText?: (scene: Scene<T>) => string | undefined | null;
-    renderLabel?: (scene: Scene<T>) => ReactNode;
-    renderIcon?: (scene: Scene<T>) => ReactNode;
-    renderBadge?: (scene: Scene<T>) => ReactNode;
-    renderIndicator?: (props: IndicatorProps<T>) => ReactNode;
-    onTabPress?: (scene: Scene<T>) => void;
-    tabStyle?: StyleProp<ViewStyle>;
-    indicatorStyle?: StyleProp<ViewStyle>;
-    labelStyle?: StyleProp<ViewStyle>;
-    style?: StyleProp<ViewStyle>;
-};
+  scrollEnabled?: boolean
+  pressColor?: string
+  pressOpacity?: number
+  getLabelText?: (scene: Scene<T>) => string | undefined | null
+  renderLabel?: (scene: Scene<T>) => ReactNode
+  renderIcon?: (scene: Scene<T>) => ReactNode
+  renderBadge?: (scene: Scene<T>) => ReactNode
+  renderIndicator?: (props: IndicatorProps<T>) => ReactNode
+  onTabPress?: (scene: Scene<T>) => void
+  tabStyle?: StyleProp<ViewStyle>
+  indicatorStyle?: StyleProp<ViewStyle>
+  labelStyle?: StyleProp<ViewStyle>
+  style?: StyleProp<ViewStyle>
+}
 
 export class TabBar<T extends Route = Route> extends PureComponent<
-    TabBarProps<T>,
-    any
+  TabBarProps<T>,
+  any
 > {}
 
 export function SceneMap(scenes: {
-    [key: string]: ComponentType<any>;
-}): (props: { route: Route }) => ReactNode;
+  [key: string]: ComponentType<any>
+}): (props: { route: Route }) => ReactNode
diff --git a/types/react-native-tab-view/react-native-tab-view-tests.tsx b/types/react-native-tab-view/react-native-tab-view-tests.tsx
index a3e53558ae..a7530b9ec9 100644
--- a/types/react-native-tab-view/react-native-tab-view-tests.tsx
+++ b/types/react-native-tab-view/react-native-tab-view-tests.tsx
@@ -1,59 +1,59 @@
-import { PureComponent, Component } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { PureComponent, Component } from 'react'
+import { View, StyleSheet } from 'react-native'
 import {
-    TabView,
-    TabBar,
-    SceneMap,
-    TabBarProps,
-    RouteBase
-} from 'react-native-tab-view';
+  TabView,
+  TabBar,
+  SceneMap,
+  TabBarProps,
+  RouteBase,
+} from 'react-native-tab-view'
 
 const FirstRoute = () => (
-    <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
-);
+  <View style={[styles.container, { backgroundColor: '#ff4081' }]} />
+)
 
 class SecondRoute extends Component {
-    render() {
-        return (
-            <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
-        );
-    }
+  render() {
+    return (
+      <View style={[styles.container, { backgroundColor: '#673ab7' }]} />
+    );
+  }
 }
 
 class TabViewExample extends PureComponent {
-    state: { index: number; routes: Array<RouteBase & { title: string }> } = {
-        index: 0,
-        routes: [
-            { key: 'first', title: 'First' },
-            { key: 'second', title: 'Second' }
-        ]
-    };
+  state: { index: number; routes: Array<RouteBase & { title: string }> } = {
+    index: 0,
+    routes: [
+      { key: 'first', title: 'First' },
+      { key: 'second', title: 'Second' },
+    ],
+  }
 
-    _handleIndexChange = (index: number) => this.setState({ index });
+  _handleIndexChange = (index: number) => this.setState({ index })
 
-    _renderTabBar = (props: TabBarProps) => <TabBar {...props} />;
+  _renderTabBar = (props: TabBarProps) => <TabBar {...props} />
 
-    _renderScene = SceneMap({
-        first: FirstRoute,
-        second: SecondRoute
-    });
+  _renderScene = SceneMap({
+    first: FirstRoute,
+    second: SecondRoute,
+  })
 
-    render() {
-        return (
-            <TabView
-                style={styles.container}
-                navigationState={this.state}
-                renderScene={this._renderScene}
-                renderTabBar={this._renderTabBar}
-                tabBarPosition="top"
-                onIndexChange={this._handleIndexChange}
-            />
-        );
-    }
+  render() {
+    return (
+      <TabView
+        style={styles.container}
+        navigationState={this.state}
+        renderScene={this._renderScene}
+        renderTabBar={this._renderTabBar}
+        tabBarPosition="top"
+        onIndexChange={this._handleIndexChange}
+      />
+    )
+  }
 }
 
 const styles = StyleSheet.create({
-    container: {
-        flex: 1
-    }
-});
+  container: {
+    flex: 1,
+  },
+})
diff --git a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
index 08b63cd700..e99fffdc77 100644
--- a/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
+++ b/types/react-router-navigation-core/react-router-navigation-core-tests.tsx
@@ -1,8 +1,8 @@
-import * as React from 'react';
-import { View } from 'react-native';
-import { TabStack, renderSubView } from 'react-router-navigation-core';
-import { TabBarProps, TabProps } from 'react-router-navigation';
-import { TabView } from 'react-native-tab-view';
+import * as React from "react";
+import { View } from "react-native";
+import { TabStack, renderSubView } from "react-router-navigation-core";
+import { TabBarProps, TabProps } from "react-router-navigation";
+import { TabView } from "react-native-tab-view";
 
 type Props = TabBarProps & {
     children?: Array<React.ReactElement<TabProps>>;
diff --git a/types/react-router-navigation/index.d.ts b/types/react-router-navigation/index.d.ts
index 0d74da3084..e43f08e652 100644
--- a/types/react-router-navigation/index.d.ts
+++ b/types/react-router-navigation/index.d.ts
@@ -4,13 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Component, ReactNode, ReactElement, ComponentClass } from 'react';
-import { StyleProp, ViewProps, ViewStyle, TextStyle } from 'react-native';
-import { RouteProps } from 'react-router-navigation-core';
+import { Component, ReactNode, ReactElement, ComponentClass } from "react";
+import { StyleProp, ViewProps, ViewStyle, TextStyle } from "react-native";
+import { RouteProps } from "react-router-navigation-core";
 import {
     NavigationTransitionProps,
     NavigationTransitionSpec
-} from 'react-navigation';
+} from "react-navigation";
 
 /**
  * Navigation
@@ -79,7 +79,7 @@ export interface TabBarProps {
     // <BottomNavigation /> only:
     renderTabIcon?: (props: TabSubViewProps) => ReactNode;
     // <Tabs /> only:
-    tabBarPosition?: 'top' | 'bottom';
+    tabBarPosition?: "top" | "bottom";
     tabBarIndicatorStyle?: StyleProp<ViewStyle>;
 }
 

From 38e7ac8c4312956d0163e5509c9c09718da1fc82 Mon Sep 17 00:00:00 2001
From: Frederick-S <mao_xiaodan@hotmail.com>
Date: Mon, 4 Jun 2018 19:09:54 +0800
Subject: [PATCH 0998/1124] Add "useFontCache" and "useGlobalCache" to
 SVGOutputProcessor

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

diff --git a/types/mathjax/index.d.ts b/types/mathjax/index.d.ts
index 8c0dc99e1a..aaf4a6109c 100644
--- a/types/mathjax/index.d.ts
+++ b/types/mathjax/index.d.ts
@@ -1030,6 +1030,17 @@ declare namespace MathJax {
         * they were MathML, you might need to set this to true.
         */
         addMMLclasses?: boolean;
+        /*This controls whether the SVG output uses <use> elements to re-use font paths rather than repeat paths every
+        * time. If useGlobalCache (see below) is set to false, this will still reduce duplication of paths while keeping
+        * each SVG self-contained.
+        */
+        useFontCache?: boolean;
+        /*When set to true the SVG Output stores paths (corresponding to “fonts” in the SVG output) in a global SVG
+        * object using <defs> elements so that it can re-use them in all equations via <use> elements (much like a font
+        * file allows re-use of characters across the document). While set to true by default, it will have no effect if
+        * useFontCache is set to false.
+        */
+        useGlobalCache?: boolean;
         /*EqnChunk is the number of equations that will be typeset before they appear on screen. Larger values make for
         * less visual flicker as the equations are drawn, but also mean longer delays before the reader sees anything.
         */

From a57a6639d01603ec9c645fb44cb4855d7fad18bf Mon Sep 17 00:00:00 2001
From: Daniel Munday <mundaymeister@gmail.com>
Date: Mon, 4 Jun 2018 12:14:52 +0100
Subject: [PATCH 0999/1124] Improve typings for helmet

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

diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index a78e768688..0162912d99 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -20,6 +20,7 @@ declare namespace helmet {
         ieNoOpen?: boolean,
         noCache?: boolean,
         noSniff?: boolean,
+        referrerPolicy?: boolean | IHelmetReferrerPolicyConfiguration,
         xssFilter?: boolean | IHelmetXssFilterConfiguration,
         expectCt?: boolean | IHelmetExpectCtConfiguration,
     }

From 85c6e0995b38136454ff44483ef6ae7ed54ba548 Mon Sep 17 00:00:00 2001
From: Frederick-S <mao_xiaodan@hotmail.com>
Date: Mon, 4 Jun 2018 20:15:49 +0800
Subject: [PATCH 1000/1124] Test added properties for MathJax

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

diff --git a/types/mathjax/mathjax-tests.ts b/types/mathjax/mathjax-tests.ts
index 619a8fc591..755e3bc4bd 100644
--- a/types/mathjax/mathjax-tests.ts
+++ b/types/mathjax/mathjax-tests.ts
@@ -57,4 +57,11 @@ MathJax.Hub.Config({
   "HTML-CSS": { linebreaks: { automatic: true } },
   CommonHTML: { linebreaks: { automatic: true } },
          SVG: { linebreaks: { automatic: true } }
-});
\ No newline at end of file
+});
+
+MathJax.Hub.Config({
+    SVG: {
+        useFontCache: true,
+        useGlobalCache: true
+    }
+})

From 270e304ab614062f54fa943fb205f3f30fd50c20 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <dcfinlinson@gmail.com>
Date: Mon, 4 Jun 2018 08:32:19 -0600
Subject: [PATCH 1001/1124] Fix other Navigation methods

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

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 511fcc1083..fdb6504e96 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4361,26 +4361,26 @@ declare namespace Xrm {
          * @param alertStrings The strings to be used in the alert dialog.
          * @param alertOptions The height and width options for alert dialog
          */
-        openAlertDialog(alertStrings: Navigation.AlertStrings, alertOptions: Navigation.DialogSizeOptions): Async.PromiseLike<any>;
+        openAlertDialog(alertStrings: Navigation.AlertStrings, alertOptions?: Navigation.DialogSizeOptions): Async.PromiseLike<any>;
 
         /**
          * Displays a confirmation dialog box containing a message and two buttons.
          * @param confirmStrings The strings to be used in the confirm dialog.
          * @param confirmOptions The height and width options for alert dialog
          */
-        openConfirmDialog(confirmStrings: Navigation.ConfirmStrings, confirmOptions: Navigation.DialogSizeOptions): Async.PromiseLike<Navigation.ConfirmResult>;
+        openConfirmDialog(confirmStrings: Navigation.ConfirmStrings, confirmOptions?: Navigation.DialogSizeOptions): Async.PromiseLike<Navigation.ConfirmResult>;
 
         /**
          * Displays an error dialog.
          * @param confirmStrings The strings to be used in the confirm dialog.
          * @param confirmOptions The height and width options for alert dialog
          */
-        openConfirmDialog(errorOptions: Navigation.ErrorDialogOptions): Async.PromiseLike<any>;
+        openErrorDialog(errorOptions: Navigation.ErrorDialogOptions): Async.PromiseLike<any>;
 
         /**
          * Opens a file.
          */
-        openFile(file: Navigation.FileDetails, openFileOptions: XrmEnum.OpenFileOptions): void;
+        openFile(file: Navigation.FileDetails, openFileOptions?: XrmEnum.OpenFileOptions): void;
 
         /**
          * Opens an entity form or a quick create form.

From 2705342d4033c068da1f1ec982b46cbb7d0ee12a Mon Sep 17 00:00:00 2001
From: Klaus Kopruch <klaus.kopruch@materna.de>
Date: Mon, 4 Jun 2018 16:34:36 +0200
Subject: [PATCH 1002/1124] [yup] fix return types of validate and validateSync

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

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 3b45b3fcaa..243cb985c1 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -37,8 +37,8 @@ export interface Schema<T> {
     meta(): any;
     describe(): SchemaDescription;
     concat(schema: this): this;
-    validate(value: T, options?: ValidateOptions): Promise<ValidationError | T>;
-    validateSync(value: T, options?: ValidateOptions): ValidationError | T;
+    validate(value: T, options?: ValidateOptions): Promise<T>;
+    validateSync(value: T, options?: ValidateOptions): T;
     isValid(value: T, options?: any): Promise<boolean>;
     isValidSync(value: T, options?: any): boolean;
     cast(value: any, options?: any): T;
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 0ce88a6c66..871df0e8e0 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -307,7 +307,7 @@ const testObject: MyInterface = {
     arrayField: ["hi"],
 };
 
-typedSchema.validateSync(testObject); // $ExpectType ValidationError | MyInterface
+typedSchema.validateSync(testObject); // $ExpectType MyInterface
 
 // $ExpectError
 yup.object<MyInterface>({

From b36e585c8ad0888e55f63c197e3f923c3bd38112 Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 4 Jun 2018 16:40:08 +0200
Subject: [PATCH 1003/1124] imperium: Update library to support commonJS module

---
 types/imperium/index.d.ts    | 23 ++++++++++++++++++++---
 types/imperium/tsconfig.json |  1 +
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index f6765eea93..d3f4205c05 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -16,6 +16,26 @@ interface RoleParams {
     [key: string]: string;
 }
 
+export const context: string[];
+export const roles: Roles;
+
+// Add new role with specific ImperiumGetAcl
+export function role(roleName: string, getAcl?: GetAcl): Role;
+
+// Check if user has role(s) act like as an OR
+export function is(roleNames: string | string[]): Promise<express.RequestHandler>;
+
+// Check if current user can do action(s)
+export function can(actionS: string | string[] | Action | Action[]): Promise<express.RequestHandler>;
+
+export function evaluateRouteActions(req: express.Request, action: Action[], context: Context): Actions;
+
+export function evaluateRouteAction(req: express.Request, expr: string, key: string, context: Context): string;
+
+export function evaluateUserActions(req: express.Request, roles: Role[]): Promise<Action[]>;
+
+export function evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
+
 export class Imperium {
     constructor()
 
@@ -76,6 +96,3 @@ export class Role {
 export class UnauthorizedError extends Error {
     constructor(message: string, status: number, context: any)
 }
-
-declare const init: Imperium;
-export default init;
diff --git a/types/imperium/tsconfig.json b/types/imperium/tsconfig.json
index c8563caffe..caaa7b74ce 100644
--- a/types/imperium/tsconfig.json
+++ b/types/imperium/tsconfig.json
@@ -9,6 +9,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "esModuleInterop": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From c0934c470f101ae29e331af41c1f22e8a5932773 Mon Sep 17 00:00:00 2001
From: Joey Jan <OverFlow636@users.noreply.github.com>
Date: Mon, 4 Jun 2018 11:01:56 -0400
Subject: [PATCH 1004/1124] react-native: add getRunnable method to AppRegistry
 (#26213)

* add getRunnable method to AppRegistry

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 168db34cc5..ef574ec807 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -479,6 +479,8 @@ export namespace AppRegistry {
     function runApplication(appKey: string, appParameters: any): void;
 
     function registerHeadlessTask(appKey: string, task: TaskProvider): void;
+
+    function getRunnable(appKey: string): Runnable | undefined;
 }
 
 export interface LayoutAnimationTypes {

From 7e1a49f0b06650995db4e7c6c3dbc466aa5c50c2 Mon Sep 17 00:00:00 2001
From: Gaetan SENN <gaetan.senn@gmail.com>
Date: Mon, 4 Jun 2018 18:19:29 +0200
Subject: [PATCH 1005/1124] imperium: Fix typescript errors

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

diff --git a/types/imperium/index.d.ts b/types/imperium/index.d.ts
index d3f4205c05..67eace244e 100644
--- a/types/imperium/index.d.ts
+++ b/types/imperium/index.d.ts
@@ -8,11 +8,11 @@
 
 import express = require('express');
 
-type GetAcl = (req: express.Request) => Promise<boolean> | Promise<object>;
-type Actions = string[] | string;
-type Context = Array<'params' | 'query' | 'headers' | 'body'>;
+export type GetAcl = (req: express.Request) => Promise<boolean> | Promise<object>;
+export type Actions = string[] | string;
+export type Context = Array<'params' | 'query' | 'headers' | 'body'>;
 // Can contain when key that is evaluated during route action
-interface RoleParams {
+export interface RoleParams {
     [key: string]: string;
 }
 
@@ -62,16 +62,16 @@ export class Imperium {
     evaluateUserAction(action: RoleParams, context: { [key: string]: string[] }): { [key: string]: string[] };
 }
 
-interface Roles {
+export interface Roles {
     [key: string]: RoleActions;
 }
 
-interface RoleActions {
+export interface RoleActions {
     actions: Action[];
     getAcl?: GetAcl;
 }
 
-interface Action {
+export interface Action {
     action: string;
     [key: string]: string;
 }

From 85d3c44357c98f26d77364621046f165b22351c1 Mon Sep 17 00:00:00 2001
From: Jinwoo Lee <jinwoo@google.com>
Date: Fri, 1 Jun 2018 11:28:04 -0700
Subject: [PATCH 1006/1124] node: add `argv0` as one of options for `spawn` and
 `spawnSync`

It is documented for `spawn` in
https://nodejs.org/dist/latest-v10.x/docs/api/child_process.html#child_process_child_process_spawn_command_args_options

It's not documented for `spawnSync`, but since `spawnSync` uses the same
function (normalizeSpawnArguments) for normalizing the options, it
should be there too:
https://github.com/nodejs/node/blob/master/lib/child_process.js#L545
---
 types/node/index.d.ts    | 2 ++
 types/node/node-tests.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index def335cf3c..f7519cb076 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2178,6 +2178,7 @@ declare module "child_process" {
     }
 
     export interface SpawnOptions {
+        argv0?: string;
         cwd?: string;
         env?: any;
         stdio?: any;
@@ -2320,6 +2321,7 @@ declare module "child_process" {
     export function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
 
     export interface SpawnSyncOptions {
+        argv0?: string;
         cwd?: string;
         input?: string | Buffer;
         stdio?: any;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 52ec31af07..740ad1f61a 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2097,8 +2097,10 @@ namespace child_process_tests {
         childProcess.exec("echo test");
         childProcess.exec("echo test", { windowsHide: true });
         childProcess.spawn("echo", ["test"], { windowsHide: true });
+        childProcess.spawn("echo", ["test"], { windowsHide: true, argv0: "echo-test" });
         childProcess.spawnSync("echo test");
         childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
+        childProcess.spawnSync("echo test", {windowsVerbatimArguments: false, argv0: "echo-test"});
     }
 
     {

From 10f01d18d90f31b631769aac2be67225e0e297c2 Mon Sep 17 00:00:00 2001
From: Ryan Adolf <ryanadolf123@gmail.com>
Date: Mon, 4 Jun 2018 09:35:22 -0700
Subject: [PATCH 1007/1124] Remove unified-signatures option from tslint

---
 types/scoped-http-client/index.d.ts  | 1 +
 types/scoped-http-client/tslint.json | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/scoped-http-client/index.d.ts b/types/scoped-http-client/index.d.ts
index bb5cfec285..4ac7772029 100644
--- a/types/scoped-http-client/index.d.ts
+++ b/types/scoped-http-client/index.d.ts
@@ -26,6 +26,7 @@ export class ScopedClient {
     constructor(url: string, options: Options);
     fullPath(p: string): string;
     scope(options: Options, callback?: ScopeCallback): ScopedClient;
+    // tslint:disable-next-line unified-signatures
     scope(url: string, callback?: ScopeCallback): ScopedClient;
     scope(url: string, options: Options, callback?: ScopeCallback): ScopedClient;
     join(suffix: string): string;
diff --git a/types/scoped-http-client/tslint.json b/types/scoped-http-client/tslint.json
index 08b1465cd6..f93cf8562a 100644
--- a/types/scoped-http-client/tslint.json
+++ b/types/scoped-http-client/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "unified-signatures": false
-    }
+    "extends": "dtslint/dt.json"
 }

From e8b5a873e053261db904d89c4e101727b8c4396f Mon Sep 17 00:00:00 2001
From: Brian Crowell <brian@fluggo.com>
Date: Mon, 4 Jun 2018 11:40:05 -0500
Subject: [PATCH 1008/1124] elasticsearch: Fix the _source parameter on mget

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

diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 3236a181a1..35b4e39798 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -206,7 +206,8 @@ client.mget({
   index: 'myindex',
   type: 'mytype',
   body: {
-    ids: [1, 2, 3]
+    ids: [1, 2, 3],
+    _source: ['test']
   }
 }, (error, response) => {
   // ...
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 7973b598ab..2cfd14f689 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -465,7 +465,7 @@ export interface MGetParams extends GenericParams {
     preference?: string;
     realtime?: boolean;
     refresh?: boolean;
-    source?: NameList;
+    _source?: NameList;
     _sourceExclude?: NameList;
     _sourceInclude?: NameList;
     index?: string;

From d7fa07ae582bfdf0f4a98b4c026d4b9f8160b2ce Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Mon, 4 Jun 2018 10:43:53 -0700
Subject: [PATCH 1009/1124] Create typings for react-native-custom-tabs

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

diff --git a/types/react-native-custom-tabs/index.d.ts b/types/react-native-custom-tabs/index.d.ts
new file mode 100644
index 0000000000..6b41fd9b62
--- /dev/null
+++ b/types/react-native-custom-tabs/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for react-native-custom-tabs 0.1
+// Project: https://github.com/droibit/react-native-custom-tabs/pull/28
+// Definitions by: Phil Nova <https://github.com/philnova>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Animations {
+  startEnter: string;
+  startExit: string;
+  endEnter: string;
+  endExit: string;
+}
+
+export interface CustomTabsOptions {
+  toolbarColor?: string;
+  enableUrlBarHiding?: boolean;
+  showPageTitle?: boolean;
+  enableDefaultShare?: boolean;
+  animations?: Animations;
+  headers?: any;
+}
+
+export function openURL(url: string, options?: CustomTabsOptions): Promise<boolean>;
diff --git a/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts b/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
new file mode 100644
index 0000000000..86dad3b3ee
--- /dev/null
+++ b/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
@@ -0,0 +1,10 @@
+import * as ReactNativeCustomTabs from 'react-native-custom-tabs';
+
+const rnt: ReactNativeCustomTabs.CustomTabsOptions = {
+  toolbarColor: 'blue',
+  enableUrlBarHiding: false,
+  showPageTitle: true,
+  enableDefaultShare: true,
+};
+
+const url: Promise<boolean> = ReactNativeCustomTabs.openURL('testurl.com', rnt);
diff --git a/types/react-native-custom-tabs/tsconfig.json b/types/react-native-custom-tabs/tsconfig.json
new file mode 100644
index 0000000000..fcbc50b580
--- /dev/null
+++ b/types/react-native-custom-tabs/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",
+      "react-native-custom-tabs-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/react-native-custom-tabs/tslint.json b/types/react-native-custom-tabs/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-native-custom-tabs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 6ddc57f14d431f54aa17a5c92427c62b08cb3fe6 Mon Sep 17 00:00:00 2001
From: Mark Yao <markyao@asana.com>
Date: Thu, 31 May 2018 15:41:13 -0700
Subject: [PATCH 1010/1124] Add T=Element defaults

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 9107ac61ec..27a76a9a08 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -547,7 +547,7 @@ declare namespace React {
     // Event System
     // ----------------------------------------------------------------------
 
-    interface SyntheticEvent<T> {
+    interface SyntheticEvent<T = Element> {
         bubbles: boolean;
         /**
          * A reference to the element on which the event listener is registered.
@@ -575,40 +575,40 @@ declare namespace React {
         type: string;
     }
 
-    interface ClipboardEvent<T> extends SyntheticEvent<T> {
+    interface ClipboardEvent<T = Element> extends SyntheticEvent<T> {
         clipboardData: DataTransfer;
         nativeEvent: NativeClipboardEvent;
     }
 
-    interface CompositionEvent<T> extends SyntheticEvent<T> {
+    interface CompositionEvent<T = Element> extends SyntheticEvent<T> {
         data: string;
         nativeEvent: NativeCompositionEvent;
     }
 
-    interface DragEvent<T> extends MouseEvent<T> {
+    interface DragEvent<T = Element> extends MouseEvent<T> {
         dataTransfer: DataTransfer;
         nativeEvent: NativeDragEvent;
     }
 
-    interface FocusEvent<T> extends SyntheticEvent<T> {
+    interface FocusEvent<T = Element> extends SyntheticEvent<T> {
         nativeEvent: NativeFocusEvent;
         relatedTarget: EventTarget;
         target: EventTarget & T;
     }
 
     // tslint:disable-next-line:no-empty-interface
-    interface FormEvent<T> extends SyntheticEvent<T> {
+    interface FormEvent<T = Element> extends SyntheticEvent<T> {
     }
 
-    interface InvalidEvent<T> extends SyntheticEvent<T> {
+    interface InvalidEvent<T = Element> extends SyntheticEvent<T> {
         target: EventTarget & T;
     }
 
-    interface ChangeEvent<T> extends SyntheticEvent<T> {
+    interface ChangeEvent<T = Element> extends SyntheticEvent<T> {
         target: EventTarget & T;
     }
 
-    interface KeyboardEvent<T> extends SyntheticEvent<T> {
+    interface KeyboardEvent<T = Element> extends SyntheticEvent<T> {
         altKey: boolean;
         charCode: number;
         ctrlKey: boolean;
@@ -630,7 +630,7 @@ declare namespace React {
         which: number;
     }
 
-    interface MouseEvent<T> extends SyntheticEvent<T> {
+    interface MouseEvent<T = Element> extends SyntheticEvent<T> {
         altKey: boolean;
         button: number;
         buttons: number;
@@ -651,7 +651,7 @@ declare namespace React {
         shiftKey: boolean;
     }
 
-    interface TouchEvent<T> extends SyntheticEvent<T> {
+    interface TouchEvent<T = Element> extends SyntheticEvent<T> {
         altKey: boolean;
         changedTouches: TouchList;
         ctrlKey: boolean;
@@ -666,13 +666,13 @@ declare namespace React {
         touches: TouchList;
     }
 
-    interface UIEvent<T> extends SyntheticEvent<T> {
+    interface UIEvent<T = Element> extends SyntheticEvent<T> {
         detail: number;
         nativeEvent: NativeUIEvent;
         view: AbstractView;
     }
 
-    interface WheelEvent<T> extends MouseEvent<T> {
+    interface WheelEvent<T = Element> extends MouseEvent<T> {
         deltaMode: number;
         deltaX: number;
         deltaY: number;
@@ -680,14 +680,14 @@ declare namespace React {
         nativeEvent: NativeWheelEvent;
     }
 
-    interface AnimationEvent<T> extends SyntheticEvent<T> {
+    interface AnimationEvent<T = Element> extends SyntheticEvent<T> {
         animationName: string;
         elapsedTime: number;
         nativeEvent: NativeAnimationEvent;
         pseudoElement: string;
     }
 
-    interface TransitionEvent<T> extends SyntheticEvent<T> {
+    interface TransitionEvent<T = Element> extends SyntheticEvent<T> {
         elapsedTime: number;
         nativeEvent: NativeTransitionEvent;
         propertyName: string;
@@ -700,21 +700,21 @@ declare namespace React {
 
     type EventHandler<E extends SyntheticEvent<any>> = { bivarianceHack(event: E): void }["bivarianceHack"];
 
-    type ReactEventHandler<T> = EventHandler<SyntheticEvent<T>>;
+    type ReactEventHandler<T = Element> = EventHandler<SyntheticEvent<T>>;
 
-    type ClipboardEventHandler<T> = EventHandler<ClipboardEvent<T>>;
-    type CompositionEventHandler<T> = EventHandler<CompositionEvent<T>>;
-    type DragEventHandler<T> = EventHandler<DragEvent<T>>;
-    type FocusEventHandler<T> = EventHandler<FocusEvent<T>>;
-    type FormEventHandler<T> = EventHandler<FormEvent<T>>;
-    type ChangeEventHandler<T> = EventHandler<ChangeEvent<T>>;
-    type KeyboardEventHandler<T> = EventHandler<KeyboardEvent<T>>;
-    type MouseEventHandler<T> = EventHandler<MouseEvent<T>>;
-    type TouchEventHandler<T> = EventHandler<TouchEvent<T>>;
-    type UIEventHandler<T> = EventHandler<UIEvent<T>>;
-    type WheelEventHandler<T> = EventHandler<WheelEvent<T>>;
-    type AnimationEventHandler<T> = EventHandler<AnimationEvent<T>>;
-    type TransitionEventHandler<T> = EventHandler<TransitionEvent<T>>;
+    type ClipboardEventHandler<T = Element> = EventHandler<ClipboardEvent<T>>;
+    type CompositionEventHandler<T = Element> = EventHandler<CompositionEvent<T>>;
+    type DragEventHandler<T = Element> = EventHandler<DragEvent<T>>;
+    type FocusEventHandler<T = Element> = EventHandler<FocusEvent<T>>;
+    type FormEventHandler<T = Element> = EventHandler<FormEvent<T>>;
+    type ChangeEventHandler<T = Element> = EventHandler<ChangeEvent<T>>;
+    type KeyboardEventHandler<T = Element> = EventHandler<KeyboardEvent<T>>;
+    type MouseEventHandler<T = Element> = EventHandler<MouseEvent<T>>;
+    type TouchEventHandler<T = Element> = EventHandler<TouchEvent<T>>;
+    type UIEventHandler<T = Element> = EventHandler<UIEvent<T>>;
+    type WheelEventHandler<T = Element> = EventHandler<WheelEvent<T>>;
+    type AnimationEventHandler<T = Element> = EventHandler<AnimationEvent<T>>;
+    type TransitionEventHandler<T = Element> = EventHandler<TransitionEvent<T>>;
 
     //
     // Props / DOM Attributes

From f3952aa7fe7397c739ed07327c60f8303c6b9eaa Mon Sep 17 00:00:00 2001
From: Mark Yao <markyao@asana.com>
Date: Mon, 4 Jun 2018 12:08:23 -0700
Subject: [PATCH 1011/1124] empty commit


From 342e47182a782ef3c601cdd7406b31c9e6222a5d Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Mon, 4 Jun 2018 12:40:59 -0700
Subject: [PATCH 1012/1124] Fix project link

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

diff --git a/types/react-native-custom-tabs/index.d.ts b/types/react-native-custom-tabs/index.d.ts
index 6b41fd9b62..ed74ff4303 100644
--- a/types/react-native-custom-tabs/index.d.ts
+++ b/types/react-native-custom-tabs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for react-native-custom-tabs 0.1
-// Project: https://github.com/droibit/react-native-custom-tabs/pull/28
+// Project: https://github.com/droibit/react-native-custom-tabs
 // Definitions by: Phil Nova <https://github.com/philnova>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 

From d03b3c368beae60ca9cb883d7d03c06dfbf2c387 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 4 Jun 2018 13:53:31 -0700
Subject: [PATCH 1013/1124] Outlook Recurrence Preview APIs

---
 types/office-js/index.d.ts | 568 +++++++++++++++++++++++++++++++++++--
 1 file changed, 540 insertions(+), 28 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index e75ac54b2c..c69e98cbaa 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -487,9 +487,42 @@ declare namespace Office {
         name: string;
     }
     export namespace AddinCommands {
+        /**
+         * The event object is passed as a parameter to add-in functions invoked by UI-less command buttons. The object allows the add-in to identify which button was clicked and to signal the host that it has completed its processing.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * 
+         * Hosts: Excel, Outlook, PowerPoint, Word
+         * 
+         * Add-in type: Content, task pane, Outlook
+         * 
+         * Minimum permission level: Restricted
+         *
+         * Applicable Outlook mode: Compose or Read
+         */
         export interface Event {
             
-            completed(): void;
+            /**
+             * Indicates that the add-in has completed processing that was triggered by an add-in command button or event handler.
+             * 
+             * This method must be called at the end of a function which was invoked by an add-in command defined with an Action element with an xsi:type attribute set to ExecuteFunction. Calling this method signals the host client that the function is complete and that it can clean up any state involved with invoking the function. For example, if the user closes Outlook before this method is called, Outlook will warn that a function is still executing.
+             * 
+             * This method must be called in an event handler added via Office.context.mailbox.addHandlerAsync after completing processing of the event.
+             * 
+             * [Api set: Mailbox 1.3]
+             *
+             * @remarks
+             * 
+             * Minimum permission level: Restricted
+             *
+             * Applicable Outlook mode: Compose or read
+             * 
+             * @param options Optional. An object literal that contains one or more of the following properties.
+             *        allowEvent: A boolean value. When the completed method is used to signal completion of an event handler, this value indicates of the handled event should continue execution or be canceled. For example, an add-in that handles the ItemSend event can set allowEvent = false to cancel sending of the message.
+             */
+            completed(options?: any): void;
         }
     }
     /**
@@ -575,9 +608,12 @@ declare namespace Office {
          */
         asyncContext?: any
     }
+    /**
+     * The Office Auth namespace, Office.context.auth, provides a method that allows the Office host to obtain and access the add-in token. Indirectly, enable the add-in to access the signed-in user's Microsoft Graph data without requiring the user to sign in a second time.
+     */
     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.
+        * Calls the Azure Active Directory V 2.0 endpoint to get an access token to your add-in's web application. Allows add-ins to identify users. Server side code can use this token to access Microsoft Graph for the add-in's web application by using the ["on behalf of" OAuth flow](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of).
         *
         * @remarks
         * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
@@ -1120,6 +1156,14 @@ declare namespace Office {
          * Triggers when a customXmlPart node was replaced
          */
         NodeReplaced,
+        /**
+         * The recurrence pattern of the selected series has changed.
+         */
+        RecurrencePatternChanged,
+        /**
+         * Triggers when a Resource selection happens in Project.
+         */
+        ResourceSelectionChanged,
         /**
          * A Settings.settingsChanged event was raised.
          */
@@ -1128,10 +1172,6 @@ declare namespace Office {
          * Triggers when a Task selection happens in Project.
          */
         TaskSelectionChanged,
-        /**
-         * Triggers when a Resource selection happens in Project.
-         */
-        ResourceSelectionChanged,
         /**
          * Triggers when a View selection happens in Project.
          */
@@ -5516,8 +5556,35 @@ declare namespace Office {
             
         }
 
+        /**
+         * Specifies the type of recurrence.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
         enum RecurrenceType {
-
+            /**
+             * Daily.
+             */
+            Daily = "daily",
+            /**
+             * Weekday.
+             */
+            Weekday = "weekday",
+            /**
+             * Weekly.
+             */
+            Weekly = "weekly",
+            /**
+             * Monthly.
+             */
+            Monthly = "monthly",
+            /**
+             * Yearly.
+             */
+            Yearly = "yearly"
         }
         /**  
          * Specifies the type of response to a meeting invitation.
@@ -6355,6 +6422,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          * 
          * @remarks
+         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Compose
@@ -6365,6 +6433,43 @@ declare namespace Office {
     }
 
     interface Appointment extends Item {
+        /**
+         * Gets or sets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. Read and compose modes for appointment items. Read mode for meeting request items.
+         * 
+         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance in a series. null is returned for single appointments and meeting requests of single appointments. undefined is returned for messages that are not meeting requests.
+         * 
+         * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
+         * 
+         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single appointment and NOT a part of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        recurrence: Recurrence;
+
+        /**
+         * Gets the id of the series that an instance belongs to.
+         * 
+         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. However, in iOS and Android, the seriesId returns the REST ID of the parent item.
+         * 
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. The seriesId property is not identical to the Outlook IDs 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](https://docs.microsoft.com/outlook/add-ins/use-rest-api).
+         * 
+         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests and returns undefined for any other items that are not meeting requests.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        seriesId: string;
     }
     interface AppointmentCompose extends Appointment, ItemCompose {
         /**
@@ -6795,6 +6900,47 @@ declare namespace Office {
          * Applicable Outlook mode: Compose or read
          */
         notificationMessages: NotificationMessages;
+
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @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:EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @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 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:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
+
        /**
         * Asynchronously loads custom properties for this add-in on the selected item.
         *
@@ -6814,6 +6960,46 @@ declare namespace Office {
         * @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;
+
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
+        * 
+         * [Api set: Mailbox Preview]
+         *
+         * @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 removeHandlerAsync.
+         * @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.
+        */
+       removeHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
+        * 
+         * [Api set: Mailbox Preview]
+         *
+         * @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 removeHandlerAsync.
+         * @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.
+        */
+       removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
     }
     interface ItemCompose extends Item {
         /**
@@ -7562,6 +7748,40 @@ declare namespace Office {
          *        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 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).
+         * 
+         * 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
+         *
+         * 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;
+        /**
+         * 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).
+         * 
+         * 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
+         *
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: 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. 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(callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the entities found in the selected item.
          *
@@ -7757,6 +7977,22 @@ declare namespace Office {
          * Applicable Outlook mode: Compose or read
          */
         cc: Recipients;
+        /**
+         * Gets the email address of the sender of a message.
+         *
+         * 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.
+         *
+         * The from property returns a From object that provides a method to get the from value.
+         *
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Read
+         */
+        from: From;
         /**
          * 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.
          *
@@ -7800,12 +8036,14 @@ declare namespace Office {
          */
         cc: EmailAddressDetails[];
         /**
-         * Gets the email address of the sender of a message. Read mode only.
+         * Gets the email address of the sender of a message.
          *
          * 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.
-         *
+         * 
+         * The from property returns an EmailAddressDetails object.
+         * 
          * [Api set: Mailbox 1.0]
          *
          * @remarks
@@ -8073,7 +8311,7 @@ declare namespace Office {
          * 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 & ItemCompose & ItemRead & MessageRead & MessageCompose & AppointmentRead & AppointmentCompose;
         /**
          * Gets the URL of the REST endpoint for this email account.
          *
@@ -9055,7 +9293,111 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          */
-        recurrenceTimeZone: RecurrenceTimeZone;
+        recurrenceTimeZone: MailboxEnums.RecurrenceTimeZone;
+
+        /**
+         * Gets or sets the type of the recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        recurrenceType: MailboxEnums.RecurrenceType;
+
+        /**
+         * This object enables you to manage the start and end dates of the recurring appointment series and the usual start and end times of instances. **This object is not in UTC time.** Instead, it is set in the time zone specified by the recurrenceTimeZone value or defaulted to the item's time zone.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        seriesTime: SeriesTime;
+
+        /**
+         * Returns the current recurrence object of an appointment series.
+         * 
+         * This method returns the entire recurrence object for the appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @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.
+         */
+        getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+
+        /**
+         * Returns the current recurrence object of an appointment series.
+         * 
+         * This method returns the entire recurrence object for the appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @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, asyncResult, which is an AsyncResult object.
+         */
+        getAsync(callback?: (result: AsyncResult) => void): void;
+
+        /**
+         * Sets the recurrence pattern of an appointment series.
+         * 
+         * Note: setAsync should only be available for series items and not instance items.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidEndTime - The appointment end time is before its start time.
+         * 
+         * @param recurrencePattern A recurrence 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, asyncResult, which is an AsyncResult object.
+         */
+        setAsync(recurrencePattern: Recurrence, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+
+        /**
+         * Sets the recurrence pattern of an appointment series.
+         * 
+         * Note: setAsync should only be available for series items and not instance items.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidEndTime - The appointment end time is before its start time.
+         * 
+         * @param recurrencePattern A recurrence object.
+         * @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.
+         */
+        setAsync(recurrencePattern: Recurrence, callback?: (result: AsyncResult) => void): void;
     }
 
     /**
@@ -9100,23 +9442,6 @@ declare namespace Office {
         firstDayOfWeek: MailboxEnums.Days;
     }
 
-    /**
-     * Represents the time zone applied to the recurrence.
-     * 
-     * Note: If you include the offset but it is not valid given the name, then the offset is ignored.
-     * 
-     * [Api set: Mailbox Preview]
-     * 
-     * @remarks
-     * 
-     * Minimum permission level: ReadItem
-     * 
-     * Applicable Outlook mode: Compose or read
-     */
-    export interface RecurrenceTimeZone {
-        name: 
-    }
-
     export interface ReplyFormAttachment {
         type: string;
         name: string;
@@ -9211,6 +9536,193 @@ declare namespace Office {
         set(name: string, value: any): void;
     }
 
+    /**
+     * The SeriesTime object provides methods to get and set the dates and times of appointments in a recurring series and get the dates and times of meeting requests in a recurring series.
+     * 
+     * [Api set: Mailbox Preview]
+     *
+     * @remarks
+     * Minimum permission level: ReadItem
+     *
+     * Applicable Outlook mode: Compose or read
+     */
+    interface SeriesTime {
+        /**
+         * Gets the duration in minutes of a usual instance in a recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Compose or read
+         */
+        getDuration(): number;
+
+        /**
+         * Gets the end date of a recurrence pattern in the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD"
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Compose or read
+         */
+        getEndDate(): string;
+
+        /**
+         * Gets the end time of a usual appointment or meeting request instance of a recurrence pattern in whichever time zone that the user or add-in set the recurrence pattern using the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format: "THH:mm:ss:mmm"
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Compose or read
+         */
+        getEndTime(): string;
+
+        /**
+         * Gets the start date of a recurrence pattern in the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD"
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Compose or read
+         */
+        getStartDate(): string;
+
+        /**
+         * Gets the start time of a usual appointment instance of a recurrence pattern in whichever time zone that the user/add-in set the recurrence pattern using the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format: "THH:mm:ss:mmm"
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadItem
+         *
+         * Applicable Outlook mode: Compose or read
+         */
+        getStartTime(): string;
+
+        /**
+         * Sets the duration of all appointments in a recurrence pattern. This will also change the end time of the recurrence pattern.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * @param minutes The length of the appointment in minutes.
+         */
+        setDuration(minutes: number): void;
+
+        /**
+         * Sets the end date of a recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: Invalid date format - The date is not in an acceptable format.
+         * 
+         * @param year The year value of the end date.
+         * @param month The month value of the end date. Valid range is 0-11 where 0 represents the 1st month and 11 represents the 12th month.
+         * @param day The day value of the end date.
+         */
+        setEndDate(year: number, month: number, day: number): void;
+
+        /**
+         * Sets the end date of a recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: Invalid date format - The date is not in an acceptable format.
+         * 
+         * @param date End date of the recurring appointment series represented in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD".
+         */
+        setEndDate(date: string): void;
+
+        /**
+         * Sets the start date of a recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: Invalid date format - The date is not in an acceptable format.
+         * 
+         * @param year The year value of the start date.
+         * @param month The month value of the start date. Valid range is 0-11 where 0 represents the 1st month and 11 represents the 12th month.
+         * @param day The day value of the start date.
+         */
+        setStartDate(year:number, month:number, day:number): void;
+
+        /**
+         * Sets the start date of a recurring appointment series.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: Invalid date format - The date is not in an acceptable format.
+         * 
+         * @param date Start date of the recurring appointment series represented in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD".
+         */
+        setStartDate(date:string): void;
+
+        /**
+         * Sets the start time of all instances of a recurring appointment series in whichever time zone the recurrence pattern is set (the item's time zone is used by default).
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: Invalid time format - The time is not in an acceptable format.
+         * 
+         * @param hours The hour value of the start time. Valid range: 0-24.
+         * @param minutes The minute value of the start time. Valid range: 0-59.
+         */
+        setStartTime(hours: number, minutes: number): void;
+
+        /**
+         * Sets the start time of all instances of a recurring appointment series in whichever time zone the recurrence pattern is set (the item's time zone is used by default).
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         *
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: Invalid time format - The time is not in an acceptable format.
+         * 
+         * @param time Start time of all instances represented by standard datetime string format: "THH:mm:ss:mmm".
+         */
+        setStartTime(time: string): void;
+    }
+
     /**
      * Provides methods to get and set the subject of an appointment or message in an Outlook add-in.
      *

From c10e4285872d981fba311c07fe7b81c68478bc3b Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Mon, 4 Jun 2018 14:50:11 -0700
Subject: [PATCH 1014/1124] Office.js typo fix

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 9f8ea6d923..8e62f6d8f8 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -475,7 +475,7 @@ declare namespace Office {
         /**
         * Provides a method for determining what requirement sets are supported on the current host and platform.
         */
-        requirements: RequirmentSetSupport;
+        requirements: RequirementSetSupport;
         /**
          * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
          *
@@ -588,7 +588,7 @@ declare namespace Office {
     /**
      * Provides information about what Requirement Sets are supported in current environment.
      */
-    interface RequirmentSetSupport {
+    interface RequirementSetSupport {
         /**
         * Check if the specified requirement set is supported by the host Office application.
         * @param name - Set name; e.g., "MatrixBindings".

From 1923e12cb727594a37185c92587e2fe9915ecb93 Mon Sep 17 00:00:00 2001
From: Stephen Bird <bird@deako.com>
Date: Mon, 4 Jun 2018 17:24:11 -0700
Subject: [PATCH 1015/1124] Add StackActions

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 90f440d006..ef4904c11f 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -260,6 +260,30 @@ export interface NavigationInitAction extends NavigationInitActionPayload {
   type: 'Navigation/INIT';
 }
 
+export interface NavigationReplaceActionPayload {
+    key: string;
+    routeName: string;
+    params?: NavigationParams;
+    action?: NavigationNavigateAction;
+}
+
+export interface NavigationReplaceAction {
+    type: 'Navigation/REPLACE';
+    key: string;
+    routeName: string;
+    params?: NavigationParams;
+    action?: NavigationNavigateAction;
+}
+
+export interface NavigationCompleteTransitionActionPayload {
+    key?: string;
+}
+
+export interface NavigationCompleteTransitionAction {
+    type: 'Navigation/COMPLETE_TRANSITION';
+    key: string;
+}
+
 export interface NavigationResetActionPayload {
   index: number;
   key?: string | null;
@@ -298,6 +322,21 @@ export interface NavigationPopToTopAction
   type: 'Navigation/POP_TO_TOP';
 }
 
+export interface NavigationPushActionPayload {
+    routeName: string;
+    params?: NavigationParams;
+    action?: NavigationNavigateAction;
+    key?: string;
+}
+
+export interface NavigationPushAction {
+    type: 'Navigation/PUSH';
+    routeName: string;
+    params?: NavigationParams;
+    action?: NavigationNavigateAction;
+    key?: string;
+}
+
 export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
@@ -921,6 +960,34 @@ export namespace NavigationActions {
   ): NavigationPopToTopAction;
 }
 
+/**
+ * StackActions
+ */
+export namespace StackActions {
+    const POP: 'Navigation/POP';
+    const POP_TO_TOP: 'Navigation/POP_TO_TOP';
+    const PUSH: 'Navigation/PUSH';
+    const RESET: 'Navigation/RESET';
+    const REPLACE: 'Navigation/REPLACE';
+    const COMPLETE_TRANSITION: 'Navigation/COMPLETE_TRANSITION';
+
+    function pop(options: NavigationPopActionPayload): NavigationPopAction;
+    function popToTop(
+        options: NavigationPopToTopActionPayload
+    ): NavigationPopToTopAction;
+
+    function push(options: NavigationPushActionPayload): NavigationPushAction;
+    function reset(options: NavigationResetActionPayload): NavigationResetAction;
+
+    function replace(
+        options: NavigationReplaceActionPayload
+    ): NavigationReplaceAction;
+
+    function completeTransition(
+        payload: NavigationCompleteTransitionActionPayload
+    ): NavigationCompleteTransitionAction;
+}
+
 /**
  * Transitioner
  * @desc From react-navigation/src/views/Transitioner.js

From 41a22c965c6b6fb2eab73f40d01afd5613278613 Mon Sep 17 00:00:00 2001
From: JounQin <admin@1stg.me>
Date: Tue, 5 Jun 2018 09:34:43 +0800
Subject: [PATCH 1016/1124] Update koa-static-cache-tests.ts

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

diff --git a/types/koa-static-cache/koa-static-cache-tests.ts b/types/koa-static-cache/koa-static-cache-tests.ts
index 0da8d5578f..1906c0bc25 100644
--- a/types/koa-static-cache/koa-static-cache-tests.ts
+++ b/types/koa-static-cache/koa-static-cache-tests.ts
@@ -1,5 +1,5 @@
-import * as Koa from 'koa';
-import * as staticCache from 'koa-static-cache';
+import Koa = require('koa');
+import staticCache = require('koa-static-cache');
 
 const app = new Koa();
 

From 8bccf6cb2cae6f721107b25f0ce511a24b04b51e Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Mon, 4 Jun 2018 22:25:06 -0400
Subject: [PATCH 1017/1124] add reach router types

---
 types/reach__router/index.d.ts              | 142 ++++++++++++++++++++
 types/reach__router/reach__router-tests.tsx |  26 ++++
 types/reach__router/tsconfig.json           |  20 +++
 types/reach__router/tslint.json             |   1 +
 4 files changed, 189 insertions(+)
 create mode 100644 types/reach__router/index.d.ts
 create mode 100644 types/reach__router/reach__router-tests.tsx
 create mode 100644 types/reach__router/tsconfig.json
 create mode 100644 types/reach__router/tslint.json

diff --git a/types/reach__router/index.d.ts b/types/reach__router/index.d.ts
new file mode 100644
index 0000000000..869329ef23
--- /dev/null
+++ b/types/reach__router/index.d.ts
@@ -0,0 +1,142 @@
+// Type definitions for @reach/router 1.0
+// Project: https://github.com/reach/router
+// Definitions by: Kingdaro <https://github.com/kingdaro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+export type WindowLocation = Window["location"];
+
+export interface History {
+    readonly location: string;
+    readonly transitioning: boolean;
+    listen: (listener: HistoryListener) => HistoryUnsubscribe;
+    navigate: NavigateFn;
+}
+
+export type HistoryListener = () => void;
+export type HistoryUnsubscribe = () => void;
+
+export class Router extends React.Component<RouterProps> {}
+
+export interface RouterProps {
+    basepath?: string;
+    primary?: boolean;
+    location?: WindowLocation;
+}
+
+export type RouteComponentProps<TParams = {}> = Partial<TParams> & {
+    path?: string;
+    default?: boolean;
+    location?: WindowLocation;
+    navigate?: NavigateFn;
+    uri?: string;
+};
+
+export type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type AnchorProps = Omit<
+    React.DetailedHTMLProps<
+        React.AnchorHTMLAttributes<HTMLAnchorElement>,
+        HTMLAnchorElement
+    >,
+    "href" // remove href, as it's ignored by the router
+>;
+
+export interface LinkProps<TState> extends AnchorProps {
+    to?: string;
+    replace?: boolean;
+    getProps?: (props: LinkGetProps) => {};
+    state?: TState;
+}
+
+export interface LinkGetProps {
+    isCurrent: boolean;
+    isPartiallyCurrent: boolean;
+    href: string;
+    location: WindowLocation;
+}
+
+export class Link<TState> extends React.Component<LinkProps<TState>> {}
+
+export interface RedirectProps {
+    from?: string;
+    to: string;
+    noThrow?: boolean;
+}
+
+export class Redirect extends React.Component<RedirectProps> {}
+
+export interface MatchProps<TParams> {
+    path: string;
+    children: MatchRenderFn<TParams>;
+}
+
+export type MatchRenderFn<TParams> = (
+    props: MatchRenderProps<TParams>,
+) => React.ReactNode;
+
+export interface MatchRenderProps<TParams> {
+    match: null | { uri: string; path: string } & TParams;
+    location: WindowLocation;
+    navigate: NavigateFn;
+}
+
+export class Match<TParams> extends React.Component<MatchProps<TParams>> {}
+
+export type NavigateFn = (to: string, options?: NavigateOptions<{}>) => void;
+
+export interface NavigateOptions<TState> {
+    state?: TState;
+    replace?: boolean;
+}
+
+export class Location extends React.Component<LocationContext> {}
+
+export interface LocationProviderProps {
+    history: History;
+    children?: React.ReactNode | LocationProviderRenderFn;
+}
+
+export type LocationProviderRenderFn = (
+    context: LocationContext,
+) => React.ReactNode;
+
+export interface LocationContext {
+    location: WindowLocation;
+    navigate: NavigateFn;
+}
+
+export class LocationProvider extends React.Component<LocationProviderProps> {}
+
+export interface ServerLocationProps {
+    url: string;
+}
+
+export class ServerLocation extends React.Component<ServerLocationProps> {}
+
+export const navigate: NavigateFn;
+
+export interface HistorySource {
+    readonly location: WindowLocation;
+    addEventListener(name: string, listener: (event: Event) => void): void;
+    removeEventListener(name: string, listener: (event: Event) => void): void;
+    history: {
+        readonly state: any;
+        pushState(state: any, title: string, uri: string): void;
+        replaceState(state: any, title: string, uri: string): void;
+    };
+}
+
+export function createHistory(source: HistorySource): History;
+
+export function createMemorySource(initialPath: string): HistorySource;
+
+export interface RedirectRequest {
+    uri: string;
+}
+
+export function isRedirect(error: any): error is RedirectRequest;
+
+export function redirectTo(uri: string): void;
diff --git a/types/reach__router/reach__router-tests.tsx b/types/reach__router/reach__router-tests.tsx
new file mode 100644
index 0000000000..f20b11483f
--- /dev/null
+++ b/types/reach__router/reach__router-tests.tsx
@@ -0,0 +1,26 @@
+import { Link, RouteComponentProps, Router } from "@reach/router";
+import * as React from "react";
+import { render } from "react-dom";
+
+interface DashParams {
+    id: string;
+}
+
+const Home = (props: RouteComponentProps) => <div>Home</div>;
+
+const Dash = (props: RouteComponentProps<DashParams>) => (
+    <div>Dash for item ${props.id}</div>
+);
+
+const NotFound = (props: RouteComponentProps) => <div>Route not found</div>;
+
+render(
+    <Router>
+        <Home path="/" />
+        <Dash path="/default/:id" />
+        <NotFound default />
+
+        <Link to="/somepath" rel="noopener noreferrer" target="_blank" />
+    </Router>,
+    document.getElementById("app-root"),
+);
diff --git a/types/reach__router/tsconfig.json b/types/reach__router/tsconfig.json
new file mode 100644
index 0000000000..ba13d27ded
--- /dev/null
+++ b/types/reach__router/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["dom", "es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "paths": {
+            "@reach/router": ["reach__router"]
+        }
+    },
+    "files": ["index.d.ts", "reach__router-tests.tsx"]
+}
diff --git a/types/reach__router/tslint.json b/types/reach__router/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/reach__router/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0f89c402b206f442a9a3100435a4d335f017bdef Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Mon, 4 Jun 2018 22:29:54 -0400
Subject: [PATCH 1018/1124] @reach/router: enable strict flags in tsconfig

---
 types/react/tsconfig.json | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/types/react/tsconfig.json b/types/react/tsconfig.json
index 4ee84e7a7c..1f13e030e8 100644
--- a/types/react/tsconfig.json
+++ b/types/react/tsconfig.json
@@ -7,20 +7,16 @@
     ],
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
-        "noImplicitThis": false,
+        "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "jsx": "preserve"
     }
-}
\ No newline at end of file
+}

From ed64b074deeef74ed8b170f82b553bac1e7b0f16 Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Mon, 4 Jun 2018 22:36:11 -0400
Subject: [PATCH 1019/1124] undo accidental changes to react

---
 types/react/tsconfig.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/types/react/tsconfig.json b/types/react/tsconfig.json
index 1f13e030e8..2bc92c4894 100644
--- a/types/react/tsconfig.json
+++ b/types/react/tsconfig.json
@@ -7,13 +7,17 @@
     ],
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
-        "noImplicitThis": true,
+        "noImplicitThis": false,
         "strictNullChecks": true,
-        "strictFunctionTypes": true,
+        "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,

From 9b0e0aabfb90b91e84f68bcf61022442f43e98d7 Mon Sep 17 00:00:00 2001
From: Claas Ahlrichs <claasahl@gmail.com>
Date: Tue, 5 Jun 2018 06:53:06 +0200
Subject: [PATCH 1020/1124] added "value" parameter to "valueProcessors" and
 "attrValueProcessors"

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

diff --git a/types/xml2js/index.d.ts b/types/xml2js/index.d.ts
index 248f29814b..1875399e23 100644
--- a/types/xml2js/index.d.ts
+++ b/types/xml2js/index.d.ts
@@ -34,7 +34,7 @@ export interface Options {
     async?: boolean;
     attrkey?: string;
     attrNameProcessors?: Array<(name: string) => any>;
-    attrValueProcessors?: Array<(name: string) => any>;
+    attrValueProcessors?: Array<(value: string, name: string) => any>;
     charkey?: string;
     charsAsChildren?: boolean;
     childkey?: string;
@@ -52,7 +52,7 @@ export interface Options {
     tagNameProcessors?: Array<(name: string) => any>;
     trim?: boolean;
     validator?: Function;
-    valueProcessors?: Array<(name: string) => any>;
+    valueProcessors?: Array<(value: string, name: string) => any>;
     xmlns?: boolean;
 }
 

From b690765c2810437775129c8d4c8bbc5319398392 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <muntyan@fastmail.fm>
Date: Mon, 4 Jun 2018 22:16:27 -0700
Subject: [PATCH 1021/1124] Type definitions for motor-hat module

---
 types/motor-hat/index.d.ts         | 553 +++++++++++++++++++++++++++++
 types/motor-hat/motor-hat-tests.ts |  15 +
 types/motor-hat/tsconfig.json      |  23 ++
 types/motor-hat/tslint.json        |   1 +
 4 files changed, 592 insertions(+)
 create mode 100644 types/motor-hat/index.d.ts
 create mode 100644 types/motor-hat/motor-hat-tests.ts
 create mode 100644 types/motor-hat/tsconfig.json
 create mode 100644 types/motor-hat/tslint.json

diff --git a/types/motor-hat/index.d.ts b/types/motor-hat/index.d.ts
new file mode 100644
index 0000000000..7e3de98395
--- /dev/null
+++ b/types/motor-hat/index.d.ts
@@ -0,0 +1,553 @@
+// Type definitions for motor-hat 2.0
+// Project: http://www.github.com/jcane86/motor-hat
+// Definitions by: Yevgen Muntyan <https://github.com/muntyan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export type Direction = 'fwd' | 'back';
+
+type Callback = (err?: Error, result?: any) => void;
+
+export interface PinDefinitionObject {
+    /**
+     * Pin number of the PWM output
+     */
+    PWM: number;
+
+    /**
+     * Pin number of the first coil output
+     */
+    IN1: number;
+
+    /**
+     * Pin number of the second coil output
+     */
+    IN2: number;
+}
+
+export type PinDefinition = PinDefinitionObject | number[];
+
+export interface DCOptions {
+    /**
+     * PWM Interface Object
+     */
+    pwm: object;
+
+    /**
+     * Pin definition for the motor
+     */
+    pins: PinDefinition;
+
+    speed?: number;
+    frequency?: number;
+}
+
+/**
+ * DC Controller Object
+ */
+export interface DC {
+    /**
+     * Initialize the DC controller instance.
+     * Synchronous overload.
+     */
+    init(): this;
+
+    /**
+     * Initialize the DC controller instance.
+     * Asynchronous overload.
+     *
+     * @param   cb      Node style callback for asynch initialization
+     */
+    init(cb: Callback): void;
+
+    /**
+     * Starts the motor in the desired direction.
+     *
+     * @param   dir     Direction of movement.
+     * @param   cb      Node style callback. Gets called with cb(err, result) after completion.
+     */
+    run(dir: Direction, cb: Callback): void;
+
+    /**
+     * Starts the motor in the desired direction.
+     *
+     * @param   dir     Direction of movement.
+     */
+    runSync(dir: Direction): void;
+
+    /**
+     * Stops the motor.
+     * Doesn't actually brake the motor, just stops applying voltage to it.
+     *
+     * @param   cb      Node style callback. Gets called with cb(err, result) after completion.
+     */
+    stop(cb: Callback): void;
+
+    /**
+     * Stops the motor.
+     * Doesn't actually brake the motor, just stops applying voltage to it.
+     */
+    stopSync(): void;
+
+    /**
+     * Sets DC motor speed.
+     * The speed can be set as a percentage, from 0% to 100%. To change the actual top speed,
+     * the actual voltage supplied to the motor needs to be controlled by hardware (get a higher
+     * voltage source).
+     *
+     * @param   speed   Relative speed. 0% to 100%.
+     * @param   cb      Node style callback. Gets called with cb(err, result) after completion.
+     */
+    setSpeed(speed: number, cb: Callback): void;
+
+    /**
+     * Sets DC motor speed.
+     * The speed can be set as a percentage, from 0% to 100%. To change the actual top speed,
+     * the actual voltage supplied to the motor needs to be controlled by hardware (get a higher
+     * voltage source).
+     *
+     * @param   speed   Relative speed. 0% to 100%.
+     */
+    setSpeedSync(speed: number): void;
+
+    /**
+     * Sets the PWM frequency for the DC motor.
+     * This setting affects the frequency at which the PWM chip will work to command the DC motor.
+     *
+     * @param   freq    PWM Frequency in Hz.
+     * @param   cb      Node style callback. Gets called with cb(err, result) after completion.
+     */
+    setFrequency(freq: number, cb: Callback): void;
+
+    /**
+     * Sets the PWM frequency for the DC motor.
+     * This setting affects the frequency at which the PWM chip will work to command the DC motor.
+     *
+     * @param   freq    PWM Frequency in Hz.
+     */
+    setFrequencySync(freq: number): void;
+}
+
+/**
+ * Servo controller initialization options
+ */
+export interface ServoOptions {
+    /**
+     * PWM Interface Object
+     */
+    pwm: object;
+
+    /**
+     * Servo controller pin. Which pin (0 to 15) is the servo connected to?
+     */
+    pin: number;
+
+    /**
+     * Duration in ms of pulse at position 0
+     */
+    min?: number;
+
+    /**
+     * Duration in ms of pulse at position 100
+     */
+    max?: number;
+
+    /**
+     * PWM Controller frequency for the servo
+     */
+    freq?: number;
+}
+
+/**
+ * Servo Controller Object
+ */
+export interface Servo {
+    /**
+     * Move Servo to desired position.
+     *
+     * @param   pos     Relative position (0% to 100%).
+     */
+    moveTo(pos: number): void;
+
+    /**
+     * Calibrate the limits for the servolib
+     *
+     * @param   freq    The update freq in Hz
+     * @param   min     The min. pulse in ms
+     * @param   max     The max. pulse in ms
+     */
+    calibrate(freq: number, min: number, max: number): void;
+}
+
+/**
+ * Stepper controller initialization options
+ */
+export interface StepperOptions {
+    /**
+     * PWM Interface Object
+     */
+    pwm: object;
+
+    /**
+     * Pin definition for the motor
+     */
+    pins: {
+        /**
+         * Pin definition for winding 1 of the stepper
+         */
+        W1: PinDefinition;
+
+        /**
+         * Pin definition for winding 2 of the stepper
+         */
+        W2: PinDefinition;
+    };
+
+    /**
+     * Steps per revolution of the stepper motor
+     */
+    steps?: number;
+
+    /**
+     * number of microsteps per step
+     */
+    microsteps?: 8 | 16;
+
+    /**
+     * PWM Controller frequency for the stepper
+     */
+    frequency?: number;
+
+    /**
+     * Stepping style
+     */
+    style?: 'single' | 'double' | 'interleaved' | 'microstep';
+
+    current?: number;
+
+    /**
+     * Pulses per second
+     */
+    pps?: number;
+
+    /**
+     * Revolutions per minute
+     */
+    rpm?: number;
+
+    /**
+     * Steps per second
+     */
+    sps?: number;
+}
+
+export interface StepResult {
+    /**
+     * Performed steps
+     */
+    steps: number;
+
+    /**
+     * Direction of steps performed
+     */
+    dir: Direction;
+
+    /**
+     * Time in ms taken to perform the steps
+     */
+    duration: number;
+
+    /**
+     * Number of steps retried
+     */
+    retried: number;
+}
+
+export interface StepSyncResult {
+    /**
+     * Performed steps
+     */
+    steps: number;
+
+    /**
+     * Direction of steps performed
+     */
+    dir: Direction;
+
+    /**
+     * Time in ms taken to perform the steps
+     */
+    duration: number;
+}
+
+/**
+ * Stepper motor speed for step().
+ */
+export interface StepperSpeed {
+    /**
+     * Speed in steps per second
+     */
+    sps?: number;
+
+    /**
+     * Speed in pulses per second (pulses can be steps, microsteps, etc)
+     */
+    pps?: number;
+
+    /**
+     * Speed in revolutions per minute
+     */
+    rpm?: number;
+}
+
+/**
+ * Stepper motor controller
+ */
+export interface Stepper {
+    readonly options: StepperOptions;
+
+    /**
+     * Initialize the Stepeper controller instance.
+     * Synchronous overload.
+     *
+     * @returns Returns init'd Stepper controller object (self)
+     */
+    init(): this;
+
+    /**
+     * Initialize the Stepeper controller instance.
+     * Synchronous overload.
+     *
+     * @param   cb      Node style callback for asynch initialization
+     */
+    init(cb: (err: null, self: Stepper) => void): void;
+
+    /**
+     * Perform arbitrary number of steps asynchronously.
+     * Configuration as stepping style, speed, etc should have been set previously.
+     *
+     * @param   dir     Direction of movement
+     * @param   steps   Number of steps.
+     * @param   cb      Node style callback. cb(err, result).
+     */
+    step(
+        dir: Direction,
+        steps: number,
+        cb: (err?: Error, result?: StepResult) => void
+    ): void;
+
+    /**
+     * Perform arbitrary number of steps synchronously.
+     * Configuration as stepping style, speed, etc should have been set previously.
+     *
+     * @param   dir     Direction of movement
+     * @param   steps   Number of steps.
+     * @returns The result of the action.
+     */
+    stepSync(dir: Direction, steps: number): StepSyncResult;
+
+    /**
+     * Perform one step asynchronously.
+     * Configuration as stepping style, speed, etc should have been set previously.
+     *
+     * @param   dir     Direction of movement
+     * @param   cb      Node style callback. cb(err, result).
+     */
+    oneStep(dir: Direction, cb: (err?: Error, result?: any) => void): void;
+
+    /**
+     * Perform one step synchronously.
+     * Configuration as stepping style, speed, etc should have been set previously.
+     *
+     * @param   dir     Direction of movement
+     */
+    oneStepSync(dir: Direction): void;
+
+    /**
+     * Release the stepper motor asynchronously.
+     *
+     * Stops applying current to the motor coils.
+     *
+     * @param   cb      Node style callback
+     */
+    release(cb: (err?: Error, result?: any) => void): void;
+
+    /**
+     * Release the stepper motor synchronously.
+     * Stops applying current to the motor coils.
+     */
+    releaseSync(): void;
+
+    /**
+     * Set the current rate at which to supply the steps.
+     * Provide a number from 0 to 1 and the current will be reduced proportionally
+     *
+     * @param   current Current rate, from 0 to 1.
+     */
+    setCurrent(current: number): void;
+
+    /**
+     * Set stepping style.
+     *
+     * @param   style   Stepping style.
+     */
+    setStyle(style: 'single' | 'double' | 'interleaved' | 'microstep'): void;
+
+    /**
+     * Set PWM Controller working frequency asynchronously.
+     *
+     * @param   freq    PWM frequency.
+     * @param   cb      Node style callback. cb(err, result).
+     */
+    setFrequency(freq: number, cb: (err?: Error, result?: any) => void): void;
+
+    /**
+     * Set PWM Controller working frequency synchronously.
+     *
+     * @param   freq    PWM frequency.
+     */
+    setFrequencySync(freq: number): void;
+
+    /**
+     * Set desired number of microsteps per step.
+     * (Used for microstepping)
+     *
+     * @param   ms      Microsteps per step
+     */
+    setMicrosteps(ms: 8 | 16): void;
+
+    /**
+     * Set number of steps per revolution for motor.
+     *
+     * @param   steps   Number of steps per revolution for stepper motor.
+     */
+    setSteps(steps: number): void;
+
+    /**
+     * Set motor speed for step().
+     */
+    setSpeed(speed: StepperSpeed): void;
+}
+
+export interface MotorPins {
+    readonly PWM: number;
+    readonly IN2: number;
+    readonly IN1: number;
+}
+
+/**
+ * motorHat controller
+ *
+ * Needs to be initialized with init().
+ */
+export interface MotorHat {
+    readonly pins: {
+        M1: MotorPins;
+        M2: MotorPins;
+        M3: MotorPins;
+        M4: MotorPins;
+    };
+
+    /**
+     * Array of initialized Servo controllers
+     */
+    readonly servos: ReadonlyArray<Servo>;
+
+    /**
+     * Array of initialized Stepper controllers
+     */
+    readonly steppers: ReadonlyArray<Stepper>;
+
+    /**
+     * Array of initialized DC controllers
+     */
+    readonly dcs: ReadonlyArray<DC>;
+
+    /**
+     * Creates a servo motor controller.
+     * Pass in an options object to generate an uninitialized ServoLib object.
+     */
+    servo(opts: ServoOptions): Servo;
+
+    /**
+     * Creates a stepper motor controller.
+     * Pass in an options object to generate an uninitialized StepperLib object.
+     */
+    stepper(opts: StepperOptions): Stepper;
+
+    /**
+     * Creates a new DC motor controller
+     * Pass in an options object to generate an uninitialized DCLib object
+     */
+    dc(opts: DCOptions): DC;
+
+    /**
+     * Initialize the motorHat library instance.
+     * Synchronous overload.
+     *
+     * Instantiates the individual Motor/Servo/Stepper controllers and initializes them.
+     *
+     * @returns     Returns initialized motorHat object (self)
+     */
+    init(): MotorHat;
+
+    /**
+     * Initialize the motorHat library instance.
+     * Asynchronous overload.
+     *
+     * Instantiates the individual Motor/Servo/Stepper controllers and initializes them.
+     * Returns initialized motorHat object (self) in second parameter to callback if callback
+     * provided, to enable chaining.
+     *
+     * @param   cb  Node style callback for asynch initialization
+     */
+    init(cb: Callback): void;
+}
+
+export type Motor = 'M1' | 'M2' | 'M3' | 'M4';
+
+export interface MotorHatOptions {
+    /**
+     * i2c address of the PWM chip on the MotorHat.
+     *
+     * * 0x6F for knockoff HATs.
+     *
+     * * 0x60 for official AdaFruit HATs??
+     */
+    address?: number;
+
+    /**
+     * i2c driver devfile number. Varies by RaspBerry version.
+     * Should be automatically detected.
+     */
+    busnum?: number;
+
+    /**
+     * Definition of the stepper motors connected to the HAT.
+     * At most 2 steppers, each motor is represented by either an object of the form
+     * { W1: winding, W2: winding }. Each winding should be one of following: 'M1', 'M2', 'M3',
+     * 'M4' depending on the port the stepper is connected to. Correct example: { W1: 'M3', W2: 'M1' }
+     */
+    steppers?: ReadonlyArray<{ W1: Motor; W2: Motor }>;
+
+    /**
+     * Definition of the DC motors connected to the HAT.
+     * At most 4 DCs, each should be one of following: 'M1', 'M2', 'M3', 'M4' depending on
+     * port the motor is connected to.
+     */
+    dcs?: ReadonlyArray<Motor>;
+
+    /**
+     * Definition of the servos connected to the HAT.
+     * List of the channels that have servos connected to them. 0 to 15.
+     */
+    servos?: ReadonlyArray<number>;
+}
+
+/**
+ * Creates a new MotorHat controller
+ *
+ * Pass in an options object to generate an uninitialized MotorHat object.
+ */
+declare function motorhat(options: MotorHatOptions): MotorHat;
+export default motorhat;
diff --git a/types/motor-hat/motor-hat-tests.ts b/types/motor-hat/motor-hat-tests.ts
new file mode 100644
index 0000000000..ee55bfde37
--- /dev/null
+++ b/types/motor-hat/motor-hat-tests.ts
@@ -0,0 +1,15 @@
+import createMotorHat, { DC, Motor, MotorHat } from 'motor-hat';
+
+function test() {
+    const motors: Motor[] = ['M1', 'M2'];
+    const motorHat: MotorHat = createMotorHat({
+        dcs: motors,
+        servos: [1, 2, 3],
+        steppers: [{ W1: 'M3', W2: 'M1' }],
+        address: 0x60,
+    }).init();
+    const dcL: DC = motorHat.dcs[0];
+    const dcR: DC = motorHat.dcs[1];
+    dcL.run('fwd', () => {});
+    dcR.setSpeed(50, (err) => {});
+}
diff --git a/types/motor-hat/tsconfig.json b/types/motor-hat/tsconfig.json
new file mode 100644
index 0000000000..61630aed4a
--- /dev/null
+++ b/types/motor-hat/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",
+        "motor-hat-tests.ts"
+    ]
+}
diff --git a/types/motor-hat/tslint.json b/types/motor-hat/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/motor-hat/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ebcb84149445bd02f026ccdfe4abb2e75d0a9c0f Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 5 Jun 2018 08:51:44 +0200
Subject: [PATCH 1022/1124] Chrome Apps: Doc update

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

diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index ad452faceb..957c409a4f 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -15,8 +15,8 @@
 ////////////////////
 /**
  * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features. This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features. In order to get feature states the extension must request accessibilityFeatures.read permission. For modifying feature state, the extension needs accessibilityFeatures.modify permission. Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
- * Availability: Since Chrome 37.
- * Permissions: "accessibilityFeatures.read"
+ * @since Availability: Since Chrome 37.
+ * Permissions: "accessibilityFeatures.read" (For read access); "accessibilityFeatures.modify" (For modifications; Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.)
  * Important: This API works only on Chrome OS.
  */
 declare namespace chrome {

From 73a28dd5087adb2af84301a5cc787b07b47bedd2 Mon Sep 17 00:00:00 2001
From: Nikolai Ommundsen <post@niikoo.net>
Date: Tue, 5 Jun 2018 08:54:45 +0200
Subject: [PATCH 1023/1124] Fixed tsconfig in chrome definitions

---
 types/chrome/tsconfig.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/types/chrome/tsconfig.json b/types/chrome/tsconfig.json
index 5056b221ad..210a759648 100644
--- a/types/chrome/tsconfig.json
+++ b/types/chrome/tsconfig.json
@@ -20,11 +20,6 @@
     "files": [
         "index.d.ts",
         "chrome-cast/index.d.ts",
-<<<<<<< HEAD
         "test/index.ts"
-=======
-        "test/index.ts",
-        "test/chrome-app.ts"
->>>>>>> 3880e40c72fd987cfb539c75e9798cee27a7255b
     ]
 }

From ebbf6dd54d48ac42444e2e7605af19cd2a168c76 Mon Sep 17 00:00:00 2001
From: Adrien Coffre <ext-adrien.coffre@here.com>
Date: Tue, 5 Jun 2018 09:21:42 +0200
Subject: [PATCH 1024/1124] ThreeJS : Add null types to scene #fog and
 #overrideMaterial.

---
 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 e6fe90fd2f..3ad1568409 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6287,12 +6287,12 @@ export class Scene extends Object3D {
     /**
      * A fog instance defining the type of fog that affects everything rendered in the scene. Default is null.
      */
-    fog: IFog;
+    fog: IFog | null;
 
     /**
      * If not null, it will force everything in the scene to be rendered with that material. Default is null.
      */
-    overrideMaterial: Material;
+    overrideMaterial: Material | null;
     autoUpdate: boolean;
     background: any;
 

From ed9c24354d2290e1603f9dadb736cb2033bbac21 Mon Sep 17 00:00:00 2001
From: Bart Haalstra <bart.haalstra@prowise.com>
Date: Tue, 5 Jun 2018 09:30:21 +0200
Subject: [PATCH 1025/1124] Make stream a function. Add password to buffer

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

diff --git a/types/unzipper/index.d.ts b/types/unzipper/index.d.ts
index 8b5f7140e2..034fb5b099 100644
--- a/types/unzipper/index.d.ts
+++ b/types/unzipper/index.d.ts
@@ -97,8 +97,8 @@ export interface CentralDirectory {
             offsetToLocalFileHeader: number;
             path: string;
             comment: string;
-            stream: Entry;
-            buffer: () => Promise<Buffer>;
+            stream: (password?: string) => Entry;
+            buffer: (password?: string) => Promise<Buffer>;
         }
     ];
 }

From e5b8409ea123adc3c3ea27d601d7674c9af1a49b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Flodrops?= <clement.flodrops@gmail.com>
Date: Tue, 5 Jun 2018 12:48:44 +0200
Subject: [PATCH 1026/1124] Add basic types for vue-color

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

diff --git a/types/vue-color/index.d.ts b/types/vue-color/index.d.ts
new file mode 100644
index 0000000000..8c85b6238d
--- /dev/null
+++ b/types/vue-color/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for vue-color 2.4
+// Project: https://github.com/xiaokaike/vue-color#readme
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import Vue from 'vue';
+
+export const version: string;
+export class Compact extends Vue {}
+export class Material extends Vue {}
+export class Slider extends Vue {}
+export class Swatches extends Vue {}
+export class Photoshop extends Vue {}
+export class Sketch  extends Vue {}
+export class Chrome extends Vue {}
+
+// those exports aren't specified in the documentation but still exported.
+// export class Grayscale extends Vue {}
+// export class Alpha  extends Vue {}
+// export class Checkboard  extends Vue {}
+// export class EditableInput  extends Vue {}
+// export class Hue  extends Vue {}
+// export class Saturation extends Vue {}
+// export class ColorMixin extends Vue {}
diff --git a/types/vue-color/package.json b/types/vue-color/package.json
new file mode 100644
index 0000000000..faefc1b2f7
--- /dev/null
+++ b/types/vue-color/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "vue": ">=2.0.0"
+  }
+}
diff --git a/types/vue-color/tsconfig.json b/types/vue-color/tsconfig.json
new file mode 100644
index 0000000000..afb844324c
--- /dev/null
+++ b/types/vue-color/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-color-tests.ts"
+    ]
+}
diff --git a/types/vue-color/tslint.json b/types/vue-color/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vue-color/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vue-color/vue-color-tests.ts b/types/vue-color/vue-color-tests.ts
new file mode 100644
index 0000000000..7b1ab0e394
--- /dev/null
+++ b/types/vue-color/vue-color-tests.ts
@@ -0,0 +1,37 @@
+import Vue from 'vue';
+import {
+    Material,
+    Compact,
+    Swatches,
+    Slider,
+    Sketch,
+    Chrome,
+    Photoshop
+} from 'vue-color';
+
+const colors = '#194d33';
+
+new Vue({
+    el: '#app',
+    components: {
+        'material-picker': Material,
+        'compact-picker': Compact,
+        'swatches-picker': Swatches,
+        'slider-picker': Slider,
+        'sketch-picker': Sketch,
+        'chrome-picker': Chrome,
+        'photoshop-picker': Photoshop
+    },
+    template: `
+        <material-picker v-model="colors"></material-picker>
+        <compact-picker v-model="colors"></compact-picker>
+        <swatches-picker v-model="colors"></swatches-picker>
+        <slider-picker v-model="colors"></slider-picker>
+        <sketch-picker v-model="colors"></sketch-picker>
+        <chrome-picker v-model="colors"></chrome-picker>
+        <photoshop-picker v-model="colors"></photoshop-picker>
+    `,
+    data() {
+        return { colors };
+    }
+});

From 678f5b39df13c264e558de1743e266dae7f527b4 Mon Sep 17 00:00:00 2001
From: MosheF <moshef@wix.com>
Date: Tue, 5 Jun 2018 13:56:25 +0300
Subject: [PATCH 1027/1124] Copy file from 26 Add MediaLibrary

---
 types/expo/expo-tests.tsx     |    5 +-
 types/expo/index.d.ts         |  100 +-
 types/expo/v26/expo-tests.tsx |  780 +++++++++
 types/expo/v26/index.d.ts     | 2854 +++++++++++++++++++++++++++++++++
 types/expo/v26/tsconfig.json  |   25 +
 types/expo/v26/tslint.json    |    7 +
 6 files changed, 3768 insertions(+), 3 deletions(-)
 create mode 100644 types/expo/v26/expo-tests.tsx
 create mode 100644 types/expo/v26/index.d.ts
 create mode 100644 types/expo/v26/tsconfig.json
 create mode 100644 types/expo/v26/tslint.json

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index fd0d7ad973..beda910b8b 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -37,7 +37,8 @@ import {
     Calendar,
     MailComposer,
     Location,
-    Updates
+    Updates,
+    MediaLibrary
 } from 'expo';
 
 const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
@@ -777,4 +778,4 @@ async () => {
     if (bundleFetchResult.isNew) {
         console.log(bundleFetchResult.manifest);
     }
-};
+};
\ No newline at end of file
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 4e7a0ebdb3..56e037bd75 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2729,7 +2729,7 @@ export namespace Calendar {
 }
 // #endregion
 
-// #region Calendar
+// #region MailComposer
 /**
  * An API to compose mails using OS specific UI.
  */
@@ -2852,3 +2852,101 @@ export namespace Updates {
      */
     function reloadFromCache(): void;
 }
+
+// #region MediaLibrary
+/**
+ * Provides access to user's media library
+ * Requires Permissions.CAMERA_ROLL permissions.
+ */
+
+
+export namespace MediaLibrary {
+  function createAssetAsync(localUri: string): Promise<Asset>;
+  function getAssetsAsync(options: GetAssetsOptions): Promise<GetAssetsResult>;
+  function getAssetInfoAsync(asset: string | Asset): Promise<Asset>;
+  function deleteAssetsAsync(asset: string | Asset[]): Promise<boolean>;
+  function getAlbumsAsync(): Promise<Album[]>;
+  function getAlbumAsync(albumName: string): Promise<Album|null>;
+  function createAlbumAsync(albumName: string, asset: string | Asset): Promise<Album>;
+  function addAssetsToAlbumAsync(assets: Asset[], album: string | Album, copyAssets?: boolean /* default true */): Promise<boolean>;
+  function removeAssetsFromAlbumAsync(assets: Asset[], album: string | Album): Promise<boolean>;
+  // ios only
+  function getMomentsAsync(): Promise<Album[]>;
+
+  enum MediaType {
+    audio = 'audio',
+    photo = 'photo',
+    video = 'video',
+    unknow = 'unknow'
+  }
+
+  enum SortBy {
+    default = 'default',
+    id = 'id',
+    creationTime = 'creationTime',
+    modificationTime = 'modificationTime',
+    mediaType = 'mediaType',
+    width = 'width',
+    height = 'height',
+    duration = 'duration'
+  }
+
+  // region Asset
+  interface AssetAndroid {
+    albumId: string;
+  }
+
+  interface AssetIos {
+    mediaSubtypes: MediaType[];
+    orientation: number;
+    isFavorite: boolean;
+  }
+
+  interface Asset extends AssetAndroid, AssetIos {
+    id: string;
+    filename: string;
+    uri: string;
+    mediaType: string;
+    width: number;
+    height: number;
+    creationTime: number;
+    modificationTime: number;
+    duration: number;
+    localUri: string;
+    location: object;
+    exif: object;
+  }
+  //#endregion
+
+  // #region Album
+  interface AlbumIos {
+    type: string;
+    startTime: number;
+    endTime: number;
+    approximateLocation: Location.LocationProps;
+    locationNames: string[];
+  }
+
+  interface Album extends AlbumIos {
+    id: string;
+    title: string;
+    assetCount: number;
+  }
+  // #endregion
+
+  interface GetAssetsOptions {
+    first?: number;
+    after?: string;
+    album?: string | Album;
+    sortBy?: SortBy;
+    mediaType?: MediaType;
+  }
+
+  interface GetAssetsResult {
+    assets: Asset[];
+    endCursor: string;
+    hasNextPage: boolean;
+    totalCount: number;
+  }
+}
+// #endregion
\ No newline at end of file
diff --git a/types/expo/v26/expo-tests.tsx b/types/expo/v26/expo-tests.tsx
new file mode 100644
index 0000000000..fd0d7ad973
--- /dev/null
+++ b/types/expo/v26/expo-tests.tsx
@@ -0,0 +1,780 @@
+import * as React from 'react';
+import { Text } from 'react-native';
+
+import {
+    Accelerometer,
+    AdMobAppEvent,
+    AdMobBanner,
+    AdMobInterstitial,
+    AdMobRewarded,
+    Amplitude,
+    Asset,
+    AuthSession,
+    Audio,
+    AppLoading,
+    BarCodeScanner,
+    BlurViewProps,
+    BlurView,
+    Brightness,
+    Camera,
+    CameraObject,
+    DocumentPicker,
+    Facebook,
+    FacebookAds,
+    FileSystem,
+    ImagePicker,
+    ImageManipulator,
+    FaceDetector,
+    Svg,
+    IntentLauncherAndroid,
+    KeepAwake,
+    LinearGradient,
+    Permissions,
+    PublisherBanner,
+    registerRootComponent,
+    ScreenOrientation,
+    SQLite,
+    Calendar,
+    MailComposer,
+    Location,
+    Updates
+} from 'expo';
+
+const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
+    latitude: 0,
+    longitude: 0
+});
+
+Accelerometer.addListener((obj) => {
+    obj.x;
+    obj.y;
+    obj.z;
+});
+Accelerometer.removeAllListeners();
+Accelerometer.setUpdateInterval(1000);
+
+() => (
+    <AdMobBanner
+        bannerSize="leaderboard"
+        adUnitID="ca-app-pub-3940256099942544/6300978111"
+        testDeviceID="EMULATOR"
+        didFailToReceiveAdWithError={(error: string) => console.log(error)}
+        style={{ flex: 1 }}
+    />
+);
+
+() => (
+    <PublisherBanner
+        bannerSize="leaderboard"
+        adUnitID="ca-app-pub-3940256099942544/6300978111"
+        testDeviceID="EMULATOR"
+        didFailToReceiveAdWithError={(error: string) => console.log(error)}
+        onAdMobDispatchAppEvent={(event: AdMobAppEvent) => console.log(event)}
+        style={{ flex: 1 }}
+    />
+);
+
+AdMobInterstitial.setAdUnitID('ca-app-pub-3940256099942544/1033173712'); // Test ID, Replace with your-admob-unit-id
+AdMobInterstitial.setTestDeviceID('EMULATOR');
+async () => {
+    await AdMobInterstitial.requestAdAsync();
+    await AdMobInterstitial.showAdAsync();
+};
+
+AdMobRewarded.setAdUnitID('ca-app-pub-3940256099942544/1033173712'); // Test ID, Replace with your-admob-unit-id
+AdMobRewarded.setTestDeviceID('EMULATOR');
+async () => {
+    await AdMobRewarded.requestAdAsync();
+    await AdMobRewarded.showAdAsync();
+};
+
+Amplitude.initialize('key');
+Amplitude.setUserId('userId');
+Amplitude.setUserProperties({key: 1});
+Amplitude.clearUserProperties();
+Amplitude.logEvent('name');
+Amplitude.logEventWithProperties('event', {key: 'value'});
+Amplitude.setGroup('type', ['value']);
+
+const asset = Asset.fromModule(1);
+asset.downloadAsync();
+Asset.loadAsync(1);
+Asset.loadAsync([1, 2, 3]);
+const asset1 = new Asset({
+    uri: 'uri',
+    type: 'type',
+    name: 'name',
+    hash: 'hash',
+    width: 122,
+    height: 122
+});
+
+const url = AuthSession.getRedirectUrl();
+AuthSession.dismiss();
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: 'url2'
+}).then(result => {
+    switch (result.type) {
+        case 'success':
+            result.event;
+            result.params;
+            break;
+        case 'error':
+            result.errorCode;
+            result.params;
+            result.event;
+            break;
+        case 'dismissed':
+        case 'cancel':
+            result.type;
+            break;
+    }
+});
+AuthSession.startAsync({
+    authUrl: 'url1',
+    returnUrl: undefined
+});
+
+Audio.setAudioModeAsync({
+    shouldDuckAndroid: false,
+    playsInSilentModeIOS: true,
+    interruptionModeIOS: 2,
+    interruptionModeAndroid: 1,
+    allowsRecordingIOS: true
+});
+Audio.setIsEnabledAsync(true);
+
+Audio.INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS === 0;
+Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_IOS_DUCK_OTHERS === 2;
+
+Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX === 1;
+Audio.INTERRUPTION_MODE_ANDROID_DUCK_OTHERS === 2;
+
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP === 1;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4 === 2;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB === 3;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB === 4;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF === 5;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS === 6;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP === 7;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS === 8;
+Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM === 9;
+
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT === 0;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB === 1;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB === 2;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC === 3;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC === 4;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD === 5;
+Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS === 6;
+
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM === 'lpcm';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3 === 'ac-3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3 === 'cac3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4 === 'ima4';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC === 'aac ';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP === 'celp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC === 'hvxc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ === 'twvq';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3 === 'MAC3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6 === 'MAC6';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW === 'ulaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW === 'alaw';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN === 'QDMC';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2 === 'QDM2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM === 'Qclp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1 === '.mp1';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2 === '.mp2';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3 === '.mp3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS === 'alac';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE === 'aach';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD === 'aacl';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD === 'aace';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR === 'aacf';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2 === 'aacg';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2 === 'aacp';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL === 'aacs';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR === 'samr';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB === 'sawb';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE === 'AUDB';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC === 'ilbc';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA === 0x6d730011;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM === 0x6d730031;
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3 === 'aes3';
+Audio.RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3 === 'ec-3';
+
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN === 0;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW === 0x20;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM === 0x40;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH === 0x60;
+Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX === 0x7f;
+
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT === 0;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE === 1;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED === 2;
+Audio.RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE === 3;
+
+Audio.RECORDING_OPTIONS_PRESET_HIGH_QUALITY;
+Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY;
+async () => {
+    const result = await Audio.Sound.create({uri: 'uri'}, {
+        volume: 0.5,
+        rate: 0.6
+    }, null, true);
+
+    const sound = result.sound;
+    const status = result.status;
+
+    if (!status.isLoaded) {
+        status.error;
+    } else {
+        status.didJustFinish;
+        // etc.
+    }
+
+    const _status = await sound.getStatusAsync();
+    await sound.loadAsync({uri: 'uri'});
+};
+
+() => (
+    <AppLoading
+        startAsync={() => Promise.resolve()}
+        onFinish={() => {}}
+        onError={(error) => console.log(error)} />
+);
+() => (
+    <AppLoading />
+);
+
+const barcodeReadCallback = () => {};
+() => (
+    <BarCodeScanner
+        type="front"
+        torchMode="off"
+        barCodeTypes={[BarCodeScanner.Constants.BarCodeType.aztec]}
+        onBarCodeRead={barcodeReadCallback} />
+);
+
+() => (
+    <BlurView
+        tint="dark"
+        intensity={2} />
+);
+
+async () => {
+    await Brightness.setBrightnessAsync(.6);
+    await Brightness.setSystemBrightnessAsync(.7);
+    const br1 = await Brightness.getBrightnessAsync();
+    const br2 = await Brightness.getSystemBrightnessAsync();
+};
+
+Camera.Constants.AutoFocus;
+Camera.Constants.Type;
+Camera.Constants.FlashMode;
+Camera.Constants.WhiteBalance;
+Camera.Constants.VideoQuality;
+Camera.Constants.BarCodeType;
+() => {
+    return(<Camera ref={(component: any) => {
+        if (component) {
+            component.recordAsync();
+        }
+    }} />);
+};
+
+async () => {
+    const result = await DocumentPicker.getDocumentAsync();
+
+    if (result.type === 'success') {
+        result.name;
+        result.uri;
+        result.size;
+    }
+};
+
+async () => {
+    const { type, expires, token } = await Facebook.logInWithReadPermissionsAsync("appId");
+};
+
+() => (
+    <FacebookAds.BannerView
+        type="large"
+        placementId="str"
+        onPress={() => {}}
+        onError={() => {}} />
+);
+
+async () => {
+    const info = await FileSystem.getInfoAsync('file');
+
+    info.exists;
+    info.isDirectory;
+
+    if (info.exists) {
+        info.md5;
+        info.uri;
+        info.size;
+        info.modificationTime;
+    }
+
+    const string: string = await FileSystem.readAsStringAsync('file');
+    await FileSystem.writeAsStringAsync('file', 'content');
+    await FileSystem.deleteAsync('file');
+    await FileSystem.moveAsync({ from: 'from', to: 'to'});
+    await FileSystem.copyAsync({ from: 'from', to: 'to' });
+    await FileSystem.makeDirectoryAsync('dir');
+    const dirs: string[] = await FileSystem.readDirectoryAsync('dir');
+    const result = await FileSystem.downloadAsync('from', 'to');
+
+    result.headers;
+    result.status;
+    result.uri;
+    result.md5;
+};
+
+async () => {
+    // Video test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.duration;
+        result.type;
+    }
+};
+
+async () => {
+    // Image test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Images,
+        base64: true,
+        aspect: [4, 3],
+        quality: 1,
+        exif: true,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.exif;
+        result.base64;
+        result.type;
+    }
+};
+
+async () => {
+    const result = await ImageManipulator.manipulate('url', {
+        rotate: 90
+    }, {
+        compress: 0.5
+    });
+
+    result.height;
+    result.uri;
+    result.width;
+};
+
+FaceDetector.Constants.Mode.fast;
+FaceDetector.Constants.Mode.accurate;
+FaceDetector.Constants.Landmarks.all;
+FaceDetector.Constants.Landmarks.none;
+FaceDetector.Constants.Classifications.all;
+FaceDetector.Constants.Classifications.none;
+async () => {
+    const result = await FaceDetector.detectFaces('url', {
+        mode: FaceDetector.Constants.Mode.fast,
+        detectLandmarks: FaceDetector.Constants.Landmarks.all,
+        runClassifications: FaceDetector.Constants.Classifications.none
+    });
+
+    result.faces[0];
+};
+
+() => (
+    <Svg width={100} height={50}>
+        <Svg.Rect
+            x={25}
+            y={5}
+            width={150}
+            height={50}
+            fill='rgb(0,0,255)'
+            strokeWidth={3}
+            stroke='rgb(0,0,0)'
+        />
+        <Svg.Circle
+            cx={50}
+            cy={50}
+            r={50}
+            fill="pink"
+        />
+        <Svg.Ellipse
+            cx={55}
+            cy={55}
+            rx={50}
+            ry={30}
+            stroke="purple"
+            strokeWidth={2}
+            fill="yellow"
+        />
+        <Svg.Line
+            x1={0}
+            y1={0}
+            x2={100}
+            y2={100}
+            stroke="red"
+            strokeWidth={2}
+        />
+        <Svg.Polygon
+            points="40,5 70,80 25,95"
+            fill="lime"
+            stroke="purple"
+            strokeWidth={1}
+        />
+        <Svg.Polyline
+            points="10,10 20,12 30,20 40,60 60,70 95,90"
+            fill="none"
+            stroke="black"
+            strokeWidth={3}
+        />
+        <Svg.Text
+            fill="none"
+            stroke="purple"
+            fontSize={20}
+            fontWeight="bold"
+            x={100}
+            y={20}
+            textAnchor="middle"
+        >
+            STROKED TEXT
+        </Svg.Text>
+        <Svg.Defs>
+            <Svg.Path
+                id="path"
+                d=""
+            />
+        </Svg.Defs>
+        <Svg.G y={20}>
+            <Svg.Text fill="blue"        >
+                <Svg.TextPath href="#path" startOffset="-10%">
+                    We go up and down,
+                    <Svg.TSpan fill="red" dy="5,5,5">then up again</Svg.TSpan>
+                </Svg.TextPath>
+            </Svg.Text>
+            <Svg.Path
+                d=""
+                fill="none"
+                stroke="red"
+                strokeWidth={1}
+            />
+        </Svg.G>
+        <Svg.Use href="#shape" x="20" y="0" />
+        <Svg.Symbol id="symbol" viewBox="0 0 150 110" width="100" height="50">
+            <Svg.Circle cx="50" cy="50" r="40" strokeWidth="8" stroke="red" fill="red"/>
+            <Svg.Circle cx="90" cy="60" r="40" strokeWidth="8" stroke="green" fill="white"/>
+        </Svg.Symbol>
+        <Svg.Defs>
+            <Svg.ClipPath id="clip">
+                <Svg.Circle cx="50%" cy="50%" r="40%"/>
+            </Svg.ClipPath>
+            <Svg.RadialGradient id="grad" cx="50%" cy="50%" rx="50%" ry="50%" fx="50%" fy="50%" gradientUnits="userSpaceOnUse">
+                <Svg.Stop
+                    offset="0%"
+                    stopColor="#ff0"
+                    stopOpacity="1"
+                />
+            </Svg.RadialGradient>
+            <Svg.LinearGradient id="grad" x1="0" y1="0" x2="170" y2="0">
+                <Svg.Stop offset="1" stopColor="red" stopOpacity="1" />
+            </Svg.LinearGradient>
+        </Svg.Defs>
+    </Svg>
+);
+
+IntentLauncherAndroid.ACTION_ACCESSIBILITY_SETTINGS === 'android.settings.ACCESSIBILITY_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_REDACTION === 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+IntentLauncherAndroid.ACTION_CONDITION_PROVIDER_SETTINGS === 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_LISTENER_SETTINGS === 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_PRINT_SETTINGS === 'android.settings.ACTION_PRINT_SETTINGS';
+IntentLauncherAndroid.ACTION_ADD_ACCOUNT_SETTINGS === 'android.settings.ADD_ACCOUNT_SETTINGS';
+IntentLauncherAndroid.ACTION_AIRPLANE_MODE_SETTINGS === 'android.settings.AIRPLANE_MODE_SETTINGS';
+IntentLauncherAndroid.ACTION_APN_SETTINGS === 'android.settings.APN_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DETAILS_SETTINGS === 'android.settings.APPLICATION_DETAILS_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_DEVELOPMENT_SETTINGS === 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_APPLICATION_SETTINGS === 'android.settings.APPLICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_NOTIFICATION_SETTINGS === 'android.settings.APP_NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_APP_OPS_SETTINGS === 'android.settings.APP_OPS_SETTINGS';
+IntentLauncherAndroid.ACTION_BATTERY_SAVER_SETTINGS === 'android.settings.BATTERY_SAVER_SETTINGS';
+IntentLauncherAndroid.ACTION_BLUETOOTH_SETTINGS === 'android.settings.BLUETOOTH_SETTINGS';
+IntentLauncherAndroid.ACTION_CAPTIONING_SETTINGS === 'android.settings.CAPTIONING_SETTINGS';
+IntentLauncherAndroid.ACTION_CAST_SETTINGS === 'android.settings.CAST_SETTINGS';
+IntentLauncherAndroid.ACTION_DATA_ROAMING_SETTINGS === 'android.settings.DATA_ROAMING_SETTINGS';
+IntentLauncherAndroid.ACTION_DATE_SETTINGS === 'android.settings.DATE_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_INFO_SETTINGS === 'android.settings.DEVICE_INFO_SETTINGS';
+IntentLauncherAndroid.ACTION_DEVICE_NAME === 'android.settings.DEVICE_NAME';
+IntentLauncherAndroid.ACTION_DISPLAY_SETTINGS === 'android.settings.DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_DREAM_SETTINGS === 'android.settings.DREAM_SETTINGS';
+IntentLauncherAndroid.ACTION_HARD_KEYBOARD_SETTINGS === 'android.settings.HARD_KEYBOARD_SETTINGS';
+IntentLauncherAndroid.ACTION_HOME_SETTINGS === 'android.settings.HOME_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS === 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS === 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SETTINGS === 'android.settings.INPUT_METHOD_SETTINGS';
+IntentLauncherAndroid.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS === 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+IntentLauncherAndroid.ACTION_INTERNAL_STORAGE_SETTINGS === 'android.settings.INTERNAL_STORAGE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCALE_SETTINGS === 'android.settings.LOCALE_SETTINGS';
+IntentLauncherAndroid.ACTION_LOCATION_SOURCE_SETTINGS === 'android.settings.LOCATION_SOURCE_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_APPLICATIONS_SETTINGS === 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+IntentLauncherAndroid.ACTION_MANAGE_DEFAULT_APPS_SETTINGS === 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+IntentLauncherAndroid.ACTION_MEMORY_CARD_SETTINGS === 'android.settings.MEMORY_CARD_SETTINGS';
+IntentLauncherAndroid.ACTION_MONITORING_CERT_INFO === 'android.settings.MONITORING_CERT_INFO';
+IntentLauncherAndroid.ACTION_NETWORK_OPERATOR_SETTINGS === 'android.settings.NETWORK_OPERATOR_SETTINGS';
+IntentLauncherAndroid.ACTION_NFCSHARING_SETTINGS === 'android.settings.NFCSHARING_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_PAYMENT_SETTINGS === 'android.settings.NFC_PAYMENT_SETTINGS';
+IntentLauncherAndroid.ACTION_NFC_SETTINGS === 'android.settings.NFC_SETTINGS';
+IntentLauncherAndroid.ACTION_NIGHT_DISPLAY_SETTINGS === 'android.settings.NIGHT_DISPLAY_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS === 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_NOTIFICATION_SETTINGS === 'android.settings.NOTIFICATION_SETTINGS';
+IntentLauncherAndroid.ACTION_PAIRING_SETTINGS === 'android.settings.PAIRING_SETTINGS';
+IntentLauncherAndroid.ACTION_PRIVACY_SETTINGS === 'android.settings.PRIVACY_SETTINGS';
+IntentLauncherAndroid.ACTION_QUICK_LAUNCH_SETTINGS === 'android.settings.QUICK_LAUNCH_SETTINGS';
+IntentLauncherAndroid.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS === 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+IntentLauncherAndroid.ACTION_SECURITY_SETTINGS === 'android.settings.SECURITY_SETTINGS';
+IntentLauncherAndroid.ACTION_SETTINGS === 'android.settings.SETTINGS';
+IntentLauncherAndroid.ACTION_SHOW_ADMIN_SUPPORT_DETAILS === 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+IntentLauncherAndroid.ACTION_SHOW_INPUT_METHOD_PICKER === 'android.settings.SHOW_INPUT_METHOD_PICKER';
+IntentLauncherAndroid.ACTION_SHOW_REGULATORY_INFO === 'android.settings.SHOW_REGULATORY_INFO';
+IntentLauncherAndroid.ACTION_SHOW_REMOTE_BUGREPORT_DIALOG === 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+IntentLauncherAndroid.ACTION_SOUND_SETTINGS === 'android.settings.SOUND_SETTINGS';
+IntentLauncherAndroid.ACTION_STORAGE_MANAGER_SETTINGS === 'android.settings.STORAGE_MANAGER_SETTINGS';
+IntentLauncherAndroid.ACTION_SYNC_SETTINGS === 'android.settings.SYNC_SETTINGS';
+IntentLauncherAndroid.ACTION_SYSTEM_UPDATE_SETTINGS === 'android.settings.SYSTEM_UPDATE_SETTINGS';
+IntentLauncherAndroid.ACTION_TETHER_PROVISIONING_UI === 'android.settings.TETHER_PROVISIONING_UI';
+IntentLauncherAndroid.ACTION_TRUSTED_CREDENTIALS_USER === 'android.settings.TRUSTED_CREDENTIALS_USER';
+IntentLauncherAndroid.ACTION_USAGE_ACCESS_SETTINGS === 'android.settings.USAGE_ACCESS_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_INSERT === 'android.settings.USER_DICTIONARY_INSERT';
+IntentLauncherAndroid.ACTION_USER_DICTIONARY_SETTINGS === 'android.settings.USER_DICTIONARY_SETTINGS';
+IntentLauncherAndroid.ACTION_USER_SETTINGS === 'android.settings.USER_SETTINGS';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_AIRPLANE_MODE === 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE === 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+IntentLauncherAndroid.ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE === 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+IntentLauncherAndroid.ACTION_VOICE_INPUT_SETTINGS === 'android.settings.VOICE_INPUT_SETTINGS';
+IntentLauncherAndroid.ACTION_VPN_SETTINGS === 'android.settings.VPN_SETTINGS';
+IntentLauncherAndroid.ACTION_VR_LISTENER_SETTINGS === 'android.settings.VR_LISTENER_SETTINGS';
+IntentLauncherAndroid.ACTION_WEBVIEW_SETTINGS === 'android.settings.WEBVIEW_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_IP_SETTINGS === 'android.settings.WIFI_IP_SETTINGS';
+IntentLauncherAndroid.ACTION_WIFI_SETTINGS === 'android.settings.WIFI_SETTINGS';
+IntentLauncherAndroid.ACTION_WIRELESS_SETTINGS === 'android.settings.WIRELESS_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_AUTOMATION_SETTINGS === 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EVENT_RULE_SETTINGS === 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS === 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_PRIORITY_SETTINGS === 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS === 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+IntentLauncherAndroid.ACTION_ZEN_MODE_SETTINGS === 'android.settings.ZEN_MODE_SETTINGS';
+
+KeepAwake.activate();
+KeepAwake.deactivate();
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        start={[1, 1]} />
+);
+
+() => (
+    <LinearGradient
+        colors={['#fff']}
+        style={{ flex: 1 }} />
+);
+
+Permissions.CAMERA === 'camera';
+Permissions.CAMERA_ROLL === 'cameraRoll';
+Permissions.AUDIO_RECORDING === 'audioRecording';
+Permissions.CONTACTS === 'contacts';
+Permissions.NOTIFICATIONS === 'remoteNotifications';
+Permissions.REMOTE_NOTIFICATIONS === 'remoteNotifications';
+Permissions.SYSTEM_BRIGHTNESS === 'systemBrightness';
+Permissions.USER_FACING_NOTIFICATIONS === 'userFacingNotifications';
+Permissions.REMINDERS === 'reminders';
+async () => {
+    const result = await Permissions.askAsync(Permissions.CAMERA);
+
+    result.status === 'granted';
+    result.status === 'denied';
+    result.status === 'undetermined';
+
+    result.expires === 'never';
+};
+
+ScreenOrientation.Orientation.ALL;
+ScreenOrientation.allow(ScreenOrientation.Orientation.ALL);
+
+class __TestEntry__ extends React.Component {
+    render() {
+        return(
+            <Text>test</Text>
+        );
+    }
+}
+registerRootComponent(__TestEntry__);
+
+Calendar.EntityTypes.EVENT === 'event';
+Calendar.EntityTypes.REMINDER === 'reminder';
+
+Calendar.CalendarType.LOCAL === 'local';
+Calendar.CalendarType.CALDAV === 'caldav';
+Calendar.CalendarType.EXCHANGE === 'exchange';
+Calendar.CalendarType.SUBSCRIBED === 'subscribed';
+Calendar.CalendarType.BIRTHDAYS === 'birthdays';
+
+async () => {
+    const result = await Calendar.getCalendarsAsync(Calendar.EntityTypes.EVENT);
+    result.length;
+
+    const calendar = result[0];
+    calendar.id === '';
+    calendar.title === '';
+    calendar.sourceId === '';
+    calendar.type === Calendar.CalendarType.BIRTHDAYS;
+    calendar.color === '';
+    calendar.entityType === Calendar.EntityTypes.EVENT;
+    calendar.allowsModifications === true;
+    calendar.allowedAvailabilities === [''];
+    calendar.isPrimary === true;
+    calendar.name === '';
+    calendar.ownerAccount === '';
+    calendar.timeZone === '';
+    calendar.allowedReminders === [''];
+    calendar.allowedAttendeeTypes === [''];
+    calendar.isVisible === false;
+    calendar.isSynced === false;
+    calendar.accessLevel === Calendar.CalendarAccessLevel.CONTRIBUTOR;
+
+    if (calendar.source) {
+        calendar.source.id === '';
+        calendar.source.type === '';
+        calendar.source.name === '';
+        calendar.source.isLocalAccount === false;
+    }
+
+    const id1 =  await Calendar.createCalendarAsync({
+        accessLevel: Calendar.CalendarAccessLevel.EDITOR
+    });
+
+    id1 === '';
+
+    const id2 = await Calendar.updateCalendarAsync('1234', {
+        isVisible: false
+    });
+
+    id2 === '';
+
+    const id3 = await Calendar.updateCalendarAsync('1234', null);
+
+    await Calendar.deleteCalendarAsync('1234');
+
+    const events = await Calendar.getEventsAsync(
+        ['123', '124'],
+        new Date(),
+        new Date()
+    );
+
+    const event1 = events[0];
+
+    event1.accessLevel === Calendar.EventAccessLevel.CONFIDENTIAL;
+    event1.alarms === [];
+    event1.allDay === true;
+    event1.availability === Calendar.Availability.FREE;
+    event1.calendarId === '';
+    event1.creationDate === '';
+    event1.endDate === '';
+    event1.endTimeZone === '';
+    event1.guestsCanInviteOthers === true;
+    event1.guestsCanModify === true;
+    event1.guestsCanSeeGuests === false;
+    event1.id === '';
+    event1.instanceId === '';
+    event1.isDetached === false;
+
+    const event2 = await Calendar.getEventAsync('123', {
+        futureEvents: true
+    });
+
+    const eventId1 = await Calendar.createEventAsync('123');
+
+    const eventId2 = await Calendar.updateEventAsync('1234');
+
+    await Calendar.deleteEventAsync('1234');
+
+    const attendees = await Calendar.getAttendeesForEventAsync('123');
+
+    const aId1 = await Calendar.createAttendeeAsync('123');
+
+    const aId2 = await Calendar.updateAttendeeAsync('123');
+
+    await Calendar.deleteAttendeeAsync('123');
+
+    const reminders = await Calendar.getRemindersAsync(['123']);
+
+    const reminder = await Calendar.getReminderAsync('123');
+
+    const remId1 = await Calendar.createReminderAsync('123');
+
+    const remId2 = await Calendar.updateReminderAsync('123');
+
+    await Calendar.deleteReminderAsync('123');
+
+    const sources = await Calendar.getSourcesAsync();
+
+    const source = await Calendar.getSourceAsync('123');
+
+    Calendar.openEventInCalendar('123');
+};
+
+async () => {
+    const result = await MailComposer.composeAsync({
+        subject: 'sss'
+    });
+
+    result.status === 'saved';
+};
+
+async () => {
+    const updateEventListener: Updates.UpdateEventListener = ({ type, manifest, message }) => {
+        switch (type) {
+            case Updates.EventType.DOWNLOAD_STARTED:
+            case Updates.EventType.DOWNLOAD_PROGRESS:
+            case Updates.EventType.DOWNLOAD_FINISHED:
+            case Updates.EventType.NO_UPDATE_AVAILABLE:
+            case Updates.EventType.ERROR:
+                return true;
+        }
+    };
+
+    Updates.reload();
+
+    Updates.reloadFromCache();
+
+    Updates.addListener(updateEventListener);
+
+    const updateCheckResult = await Updates.checkForUpdateAsync();
+
+    if (updateCheckResult.isAvailable) {
+        console.log(updateCheckResult.manifest);
+    }
+
+    Updates.fetchUpdateAsync(updateEventListener);
+
+    const bundleFetchResult = await Updates.fetchUpdateAsync();
+
+    if (bundleFetchResult.isNew) {
+        console.log(bundleFetchResult.manifest);
+    }
+};
diff --git a/types/expo/v26/index.d.ts b/types/expo/v26/index.d.ts
new file mode 100644
index 0000000000..4e7a0ebdb3
--- /dev/null
+++ b/types/expo/v26/index.d.ts
@@ -0,0 +1,2854 @@
+// Type definitions for expo 26.0
+// Project: https://github.com/expo/expo-sdk
+// Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
+//                 Martynas Kadiša <https://github.com/martynaskadisa>
+//                 Jan Aagaard <https://github.com/janaagaard75>
+//                 Sergio Sánchez <https://github.com/ssanchezmarc>
+//                 Fernando Helwanger <https://github.com/fhelwanger>
+//                 Umidbek Karimov <https://github.com/umidbekkarimov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { EventSubscription } from 'fbemitter';
+import { Component, ComponentClass, Ref, ComponentType } from 'react';
+import {
+    ColorPropType,
+    ImageRequireSource,
+    ImageURISource,
+    NativeEventEmitter,
+    ViewProps,
+    ViewStyle,
+    Permission,
+    StyleProp
+} from 'react-native';
+
+export type Axis = number;
+export type BarCodeReadCallback = (params: { type: string; data: string; }) => void;
+export type FloatFromZeroToOne = 0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1;
+export type Md5 = string;
+export type Orientation = 'portrait' | 'landscape';
+export type RequireSource = ImageRequireSource;
+export type ResizeModeContain = 'contain';
+export type ResizeModeCover = 'cover';
+export type ResizeModeStretch = 'stretch';
+export type URISource = ImageURISource;
+
+export interface HashMap { [key: string]: any; }
+
+/** Access the device accelerometer sensor(s) to respond to changes in acceleration in 3d space. */
+export namespace Accelerometer {
+    interface AccelerometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param listener A callback that is invoked when an accelerometer update is available. When invoked, the listener is provided a single argumument that is an object containing keys x, y, z.
+     * @returns An EventSubscription object that you can call remove() on when you would like to unsubscribe the listener.
+     */
+    function addListener(listener: (obj: AccelerometerObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /**
+     * Subscribe for updates to the accelerometer.
+     * @param intervalMs Desired interval in milliseconds between accelerometer updates.
+     */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Admob
+ */
+export type AdMobBannerSize =
+    | 'banner'
+    | 'largeBanner'
+    | 'mediumRectangle'
+    | 'fullBanner'
+    | 'leaderboard'
+    | 'smartBannerPortrait'
+    | 'smartBannerLandscape';
+export interface AdMobBannerProperties extends ViewProps {
+    bannerSize?: AdMobBannerSize;
+    adUnitID?: string;
+    testDeviceID?: string;
+    didFailToReceiveAdWithError?(errorDescription: string): void;
+    adViewDidReceiveAd?(): void;
+    adViewWillPresentScreen?(): void;
+    adViewWillDismissScreen?(): void;
+    adViewDidDismissScreen?(): void;
+    adViewWillLeaveApplication?(): void;
+}
+
+export class AdMobBanner extends Component<AdMobBannerProperties> { }
+export interface AdMobAppEvent {
+    name: string;
+    info: string;
+}
+export interface PublisherBannerProperties extends AdMobBannerProperties {
+    onAdMobDispatchAppEvent?(event: AdMobAppEvent): void;
+}
+export class PublisherBanner extends Component<PublisherBannerProperties> { }
+
+export type AdMobInterstitialEmptyEvent =
+    | 'interstitialDidLoad'
+    | 'interstitialDidOpen'
+    | 'interstitialDidClose'
+    | 'interstitialWillLeaveApplication';
+export type AdMobInterstitialEvent = AdMobInterstitialEmptyEvent | 'interstitialDidFailToLoad';
+export namespace AdMobInterstitial {
+    function setAdUnitID(id: string): void;
+    function setTestDeviceID(id: string): void;
+    function requestAdAsync(): Promise<void>;
+    function showAdAsync(): Promise<void>;
+    function dismissAdAsync(): Promise<void>;
+    function getIsReadyAsync(): Promise<boolean>;
+    function addEventListener(event: 'interstitialDidFailToLoad', handler: (error: string) => void): void;
+    function addEventListener(event: AdMobInterstitialEmptyEvent, handler: () => void): void;
+    function removeEventListener(event: 'interstitialDidFailToLoad', handler: (error: string) => void): void;
+    function removeEventListener(event: AdMobInterstitialEmptyEvent, handler: () => void): void;
+    function removeAllListeners(): void;
+}
+
+export type AdMobRewardedEmptyEvent =
+    | 'rewardedVideoDidLoad'
+    | 'rewardedVideoDidOpen'
+    | 'rewardedVideoDidStart'
+    | 'rewardedVideoDidClose'
+    | 'rewardedVideoWillLeaveApplication';
+export type AdMobRewardedEvent = AdMobRewardedEmptyEvent | 'rewardedVideoDidRewardUser' | 'rewardedVideoDidFailToLoad';
+export namespace AdMobRewarded {
+    function setAdUnitID(id: string): void;
+    function setTestDeviceID(id: string): void;
+    function requestAdAsync(): Promise<void>;
+    function showAdAsync(): Promise<void>;
+    function dismissAdAsync(): Promise<void>;
+    function getIsReadyAsync(): Promise<boolean>;
+    function addEventListener(event: 'rewardedVideoDidRewardUser', handler: (type: string, amount: number) => void): void;
+    function addEventListener(event: 'rewardedVideoDidFailToLoad', handler: (error: string) => void): void;
+    function addEventListener(event: AdMobRewardedEmptyEvent, handler: () => void): void;
+    function removeEventListener(event: 'rewardedVideoDidRewardUser', handler: (type: string, amount: number) => void): void;
+    function removeEventListener(event: 'rewardedVideoDidFailToLoad', handler: (error: string) => void): void;
+    function removeEventListener(event: AdMobRewardedEmptyEvent, handler: () => void): void;
+    function removeAllListeners(): void;
+}
+
+/**
+ * Provides access to Amplitude mobile analytics which basically lets you log various events to the Cloud. This module wraps Amplitude’s iOS and Android SDKs.
+ *
+ * Note: Session tracking may not work correctly when running Experiences in the main Expo app. It will work correctly if you create a standalone app.
+ */
+export namespace Amplitude {
+    /** Initializes Amplitude with your Amplitude API key. */
+    function initialize(apiKey: string): void;
+
+    /** Assign a user ID to the current user. If you don’t have a system for user IDs you don’t need to call this. */
+    function setUserId(userId: string): void;
+
+    /** Set properties for the current user. */
+    function setUserProperties(userProperties: HashMap): void;
+
+    /** Clear properties set by `setUserProperties()`. */
+    function clearUserProperties(): void;
+
+    /** Log an event to Amplitude. */
+    function logEvent(eventName: string): void;
+
+    /** Log an event to Amplitude with custom properties. */
+    function logEventWithProperties(
+        eventName: string,
+
+        /** A map of custom properties. */
+        properties: HashMap
+    ): void;
+
+    /** Add the current user to a group. */
+    function setGroup(
+        /** The group name, e.g. `'sports'`. */
+        groupType: string,
+
+        /** An array of group names, e.g. `['tennis', 'soccer']`. */
+        groupNames: string[]
+    ): void;
+}
+
+// #region AppLoading
+/** The following props are recommended, but optional for the sake of backwards compatibility (they were introduced in SDK21). If you do not provide any props, you are responsible for coordinating loading assets, handling errors, and updating state to unmount the `AppLoading` component. */
+export interface AppLoadingProps {
+    /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
+    startAsync?: () => Promise<void>;
+
+    /** Required if you provide `startAsync`. Called when `startAsync` resolves or rejects. This should be used to set state and unmount the `AppLoading` component. */
+    onFinish?: () => void;
+
+    /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
+    onError?: (error: Error) => void;
+}
+
+/**
+ * A React component that tells Expo to keep the app loading screen open if it is the first and only component rendered in your app. When it is removed, the loading screen will disappear and your app will be visible.
+ *
+ * This is incredibly useful to let you download and cache fonts, logo and icon images and other assets that you want to be sure the user has on their device for an optimal experience before rendering they start using the app.
+ */
+export class AppLoading extends Component<AppLoadingProps> { }
+// #endregion AppLoading
+
+/** This module provides an interface to Expo’s asset system. An asset is any file that lives alongside the source code of your app that the app needs at runtime. Examples include images, fonts and sounds. Expo’s asset system integrates with React Native’s, so that you can refer to files with require('path/to/file'). This is how you refer to static image files in React Native for use in an Image component, for example. */
+export class Asset {
+    constructor({ name, type, hash, uri, width, height }: {
+        name: string;
+        type: string;
+        hash: string;
+        uri: string;
+        width?: number;
+        height?: number;
+    });
+
+    /** The MD5 hash of the asset’s data. */
+    hash: Md5;
+
+    /** The name of the asset file without the extension. Also without the part from @ onward in the filename (used to specify scale factor for images). */
+    name: string;
+
+    /** The extension of the asset filename. */
+    type: string;
+
+    /** A URI that points to the asset’s data on the remote server. When running the published version of your app, this refers to the the location on Expo’s asset server where Expo has stored your asset. When running the app from XDE during development, this URI points to XDE’s server running on your computer and the asset is served directly from your computer. */
+    uri: string;
+
+    /** If the asset has been downloaded (by calling `downloadAsync()`), the `file://` URI pointing to the local file on the device that contains the asset data. */
+    localUri: string;
+
+    /** If the asset is an image, the width of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    width?: number;
+
+    /** If the asset is an image, the height of the image data divided by the scale factor. The scale factor is the number after `@` in the filename, or `1` if not present. */
+    height?: number;
+
+    downloading: boolean;
+    downloaded: boolean;
+    downloadCallbacks: Array<{ resolve: () => any, reject: (e?: any) => any }>;
+
+    /** Downloads the asset data to a local file in the device’s cache directory. Once the returned promise is fulfilled without error, the localUri field of this asset points to a local file containing the asset data. The asset is only downloaded if an up-to-date local file for the asset isn’t already present due to an earlier download. */
+    downloadAsync(): Promise<void>;
+
+    /** Returns the `Expo.Asset` instance representing an asset given its module. */
+    static fromModule(module: RequireSource): Asset;
+
+    /**
+     * A helper that wraps `Expo.Asset.fromModule(module).downloadAsync` for convenience.
+     * @param moduleIds An array of `require('path/to/file')`. Can also be just one module without an Array.
+     */
+    static loadAsync(module: RequireSource[] | RequireSource): Promise<void>;
+}
+
+/**
+ * Provides basic sample playback and recording.
+ *
+ * Note that Expo does not yet support backgrounding, so audio is not available to play in the background of your experience. Audio also automatically stops if headphones / bluetooth audio devices are disconnected.
+ */
+export namespace Audio {
+    enum InterruptionModeIos {
+        /** This is the default option. If this option is set, your experience’s audio is mixed with audio playing in background apps. */
+        INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS = 0,
+
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_IOS_DO_NOT_MIX = 1,
+
+        /** If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_IOS_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_IOS_MIX_WITH_OTHERS: 0;
+    const INTERRUPTION_MODE_IOS_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_IOS_DUCK_OTHERS: 2;
+
+    enum InterruptionModeAndroid {
+        /** If this option is set, your experience’s audio interrupts audio from other apps. */
+        INTERRUPTION_MODE_ANDROID_DO_NOT_MIX = 1,
+
+        /** This is the default option. If this option is set, your experience’s audio lowers the volume ("ducks") of audio from other apps while your audio plays. */
+        INTERRUPTION_MODE_ANDROID_DUCK_OTHERS = 2
+    }
+
+    const INTERRUPTION_MODE_ANDROID_DO_NOT_MIX: 1;
+    const INTERRUPTION_MODE_ANDROID_DUCK_OTHERS: 2;
+
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_THREE_GPP: 1;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4: 2;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_NB: 3;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AMR_WB: 4;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADIF: 5;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_AAC_ADTS: 6;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_RTP_AVP: 7;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG2TS: 8;
+    const RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_WEBM: 9;
+
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_DEFAULT: 0;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_NB: 1;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AMR_WB: 2;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC: 3;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_HE_AAC: 4;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC_ELD: 5;
+    const RECORDING_OPTION_ANDROID_AUDIO_ENCODER_VORBIS: 6;
+
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_LINEARPCM: 'lpcm';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AC3: 'ac-3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_60958AC3: 'cac3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLEIMA4: 'ima4';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC: 'aac ';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4CELP: 'celp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4HVXC: 'hvxc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4TWINVQ: 'twvq';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE3: 'MAC3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MACE6: 'MAC6';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ULAW: 'ulaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ALAW: 'alaw';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN: 'QDMC';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QDESIGN2: 'QDM2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_QUALCOMM: 'Qclp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER1: '.mp1';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER2: '.mp2';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEGLAYER3: '.mp3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_APPLELOSSLESS: 'alac';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE: 'aach';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_LD: 'aacl';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD: 'aace';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_SBR: 'aacf';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_ELD_V2: 'aacg';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_HE_V2: 'aacp';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MPEG4AAC_SPATIAL: 'aacs';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR: 'samr';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AMR_WB: 'sawb';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AUDIBLE: 'AUDB';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ILBC: 'ilbc';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_DVIINTELIMA: 0x6d730011;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_MICROSOFTGSM: 0x6d730031;
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_AES3: 'aes3';
+    const RECORDING_OPTION_IOS_OUTPUT_FORMAT_ENHANCEDAC3: 'ec-3';
+
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MIN: 0;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_LOW: 0x20;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MEDIUM: 0x40;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_HIGH: 0x60;
+    const RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX: 0x7f;
+
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_CONSTANT: 0;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_LONG_TERM_AVERAGE: 1;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE_CONSTRAINED: 2;
+    const RECORDING_OPTION_IOS_BIT_RATE_STRATEGY_VARIABLE: 3;
+
+    type RecordingStatus = {
+        canRecord: false,
+        isDoneRecording: false
+    } | {
+        canRecord: true,
+        isRecording: boolean,
+        durationMillis: number
+    } | {
+        canRecord: false,
+        isDoneRecording: true,
+        durationMillis: number
+    };
+
+    const RECORDING_OPTIONS_PRESET_HIGH_QUALITY: RecordingOptions;
+    const RECORDING_OPTIONS_PRESET_LOW_QUALITY: RecordingOptions;
+
+    interface RecordingOptions {
+        android: {
+            extension: string;
+            outputFormat: number;
+            audioEncoder: number;
+            sampleRate?: number;
+            numberOfChannels?: number;
+            bitRate?: number;
+            maxFileSize?: number;
+        };
+        ios: {
+            extension: string;
+            outputFormat?: string | number;
+            audioQuality: number;
+            sampleRate: number;
+            numberOfChannels: number;
+            bitRate: number;
+            bitRateStrategy?: number;
+            bitDepthHint?: number;
+            linearPCMBitDepth?: number;
+            linearPCMIsBigEndian?: boolean;
+            linearPCMIsFloat?: boolean;
+        };
+    }
+
+    interface AudioMode {
+        /** Boolean selecting if your experience’s audio should play in silent mode on iOS. This value defaults to `false`. */
+        playsInSilentModeIOS: boolean;
+
+        /** Boolean selecting if recording is enabled on iOS. This value defaults to `false`. NOTE: when this flag is set to true, playback may be routed to the phone receiver instead of to the speaker. */
+        allowsRecordingIOS: boolean;
+
+        /** Enum selecting how your experience’s audio should interact with the audio from other apps on iOS. */
+        interruptionModeIOS: InterruptionModeIos;
+
+        /** Boolean selecting if your experience’s audio should automatically be lowered in volume ("duck") if audio from another app interrupts your experience. This value defaults to true. If false, audio from other apps will pause your audio. */
+        shouldDuckAndroid: boolean;
+
+        /** an enum selecting how your experience’s audio should interact with the audio from other apps on Android: */
+        interruptionModeAndroid: InterruptionModeAndroid;
+    }
+
+    function setIsEnabledAsync(value: boolean): Promise<void>;
+    function setAudioModeAsync(mode: AudioMode): Promise<void>;
+
+    /** This class represents a sound corresponding to an Asset or URL. */
+    class Sound extends PlaybackObject {
+        constructor();
+
+        /**
+         * Creates and loads a sound from source, with optional `initialStatus`, `onPlaybackStatusUpdate`, and `downloadFirst`.
+         *
+         * @returns A `Promise` that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: The newly created and loaded Sound object.
+         * - `status`: The PlaybackStatus of the Sound object. See the AV documentation for further information.
+         */
+        static create(
+            /**
+             * The source of the sound. The following forms are supported:
+             *
+             * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to an audio file on the web.
+             * - `require('path/to/file')` for an audio file asset in the source code directory.
+             * - An `Expo.Asset` object for an audio file asset.
+             */
+            source: PlaybackSource,
+
+            /** The initial intended PlaybackStatusToSet of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter PlaybackStatus. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null,
+
+            /** If set to true, the system will attempt to download the resource to the device before loading. This value defaults to `true`. Note that at the moment, this will only work for `source`s of the form `require('path/to/file')` or `Asset` objects. */
+            downloadFirst?: boolean
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+
+    class Recording {
+        constructor();
+
+        /** Gets the `status` of the `Recording`. */
+        getStatusAsync(): Promise<RecordingStatus>;
+
+        /** Sets a function to be called regularly with the `status` of the `Recording`. */
+        setOnRecordingStatusUpdate(onRecordingStatusUpdate?: (status: RecordingStatus) => void): void;
+
+        /** Sets the interval with which onRecordingStatusUpdate is called while the recording can record. This value defaults to 500 milliseconds. */
+        setProgressUpdateInterval(progressUpdateIntervalMillis: number): void;
+
+        /** Loads the recorder into memory and prepares it for recording. This must be called before calling `startAsync()`. This method can only be called if the `Recording` instance has never yet been prepared. */
+        prepareToRecordAsync(
+            /** Options for the recording, including sample rate, bitrate, channels, format, encoder, and extension. If no options are passed to `prepareToRecordAsync()`, the recorder will be created with options `Expo.Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY`. */
+            options?: RecordingOptions
+        ): Promise<RecordingStatus>;
+
+        /** Begins recording. This method can only be called if the `Recording` has been prepared. */
+        startAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Pauses recording. This method can only be called if the Recording has been prepared.
+         *
+         * NOTE: This is only available on Android API version 24 and later.
+         */
+        pauseAsync(): Promise<RecordingStatus>;
+
+        /** Stops the recording and deallocates the recorder from memory. This reverts the Recording instance to an unprepared state, and another Recording instance must be created in order to record again. This method can only be called if the `Recording` has been prepared. */
+        stopAndUnloadAsync(): Promise<RecordingStatus>;
+
+        /**
+         * Gets the local URI of the Recording. Note that this will only succeed once the Recording is prepared to record.
+         *
+         * @returns A string with the local URI of the `Recording`, or `null` if the `Recording` is not prepared to record.
+         */
+        getURI(): string | null | undefined;
+
+        /**
+         * Creates and loads a new `Sound` object to play back the `Recording`. Note that this will only succeed once the `Recording` is done recording (once `stopAndUnloadAsync()` has been called).
+         *
+         * @returns A Promise that is rejected if creation failed, or fulfilled with the following dictionary if creation succeeded:
+         * - `sound`: the newly created and loaded Sound object.
+         * - `status`: the PlaybackStatus of the Sound object.
+         */
+        createNewLoadedSound(
+            /** The initial intended `PlaybackStatusToSet` of the sound, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. */
+            initialStatus?: PlaybackStatusToSet,
+
+            /** A function taking a single parameter `PlaybackStatus`. This value defaults to `null` if no parameter is passed. */
+            onPlaybackStatusUpdate?: ((status: PlaybackStatus) => void) | null
+        ): Promise<{ sound: Sound, status: PlaybackStatus }>;
+    }
+}
+
+/**
+ * AuthSession
+ */
+export namespace AuthSession {
+    type StartAsyncResponse = {
+        type: 'cancel';
+    } | {
+        type: 'dismissed';
+    } | {
+        type: 'success';
+        params: HashMap;
+        event: HashMap;
+    } | {
+        type: 'error';
+        params: HashMap;
+        errorCode: string;
+        event: HashMap;
+    };
+
+    function startAsync(options: { authUrl: string; returnUrl?: string; }): Promise<StartAsyncResponse>;
+    function dismiss(): void;
+    function getRedirectUrl(): string;
+}
+
+// #region AV
+/**
+ * AV
+ */
+export type PlaybackStatus = {
+    isLoaded: false;
+    androidImplementation?: string;
+
+    /** Populated exactly once when an error forces the object to unload. */
+    error?: string;
+} | {
+    isLoaded: true;
+    androidImplementation?: string;
+    uri: string;
+    progressUpdateIntervalMillis: number;
+    durationMillis?: number;
+    positionMillis: number;
+    playableDurationMillis?: number;
+    shouldPlay: boolean;
+    isPlaying: boolean;
+    isBuffering: boolean;
+    rate: number;
+    shouldCorrectPitch: boolean;
+    volume: number;
+    isMuted: boolean;
+    isLooping: boolean;
+
+    /** True exactly once when the track plays to finish. */
+    didJustFinish: boolean;
+};
+
+export interface PlaybackStatusToSet {
+    androidImplementation?: string;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: FloatFromZeroToOne;
+    shouldCorrectPitch?: boolean;
+    volume?: FloatFromZeroToOne;
+    isMuted?: boolean;
+    isLooping?: boolean;
+}
+
+export type PlaybackSource = RequireSource | { uri: string } | Asset;
+
+export class PlaybackObject {
+    /**
+     * Gets the `PlaybackStatus` of the `playbackObject`.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject`.
+     */
+    getStatusAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Loads the media from source into memory and prepares it for playing. This must be called before calling setStatusAsync() or any of the convenience set status methods. This method can only be called if the playbackObject is in an unloaded state.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is loaded, or rejects if loading failed. The `Promise` will also reject if the `playbackObject` was already loaded. See below for details on `PlaybackStatus`.
+     */
+    loadAsync(
+        /**
+         * The source of the media. The following forms are supported:
+         * - A dictionary of the form `{ uri: 'http://path/to/file' }` with a network URL pointing to a media file on the web.
+         * - `require('path/to/file')` for a media file asset in the source code directory.
+         * - An `Expo.Asset object` for a media file asset.
+         */
+        source: PlaybackSource,
+
+        /** The initial intended `PlaybackStatusToSet` of the `playbackObject`, whose values will override the default initial playback status. This value defaults to `{}` if no parameter is passed. See below for details on `PlaybackStatusToSet` and the default initial playback status. */
+        initialStatus?: PlaybackStatusToSet,
+
+        /** If set to `true`, the system will attempt to download the resource to the device before loading. This value defaults to true. Note that at the moment, this will only work for sources of the form `require('path/to/file')` or `Expo.Asset` objects. */
+        downloadFirst?: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false })`. */
+    pauseAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the `isPlaying` and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: true, positionMillis: millis })`.
+     *
+     * Playback may not start immediately after calling this function for reasons such as buffering. Make sure to update your UI based on the isPlaying and `isBuffering` properties of the `PlaybackStatus`.
+     */
+    playFromPositionAsync(
+        /** The desired position of playback in milliseconds. */
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Replays the item. When using `playFromPositionAsync(0)` the item is seeked to the position at `0` ms. On iOS this method uses internal implementation of the player and is able to play the item from the beginning immediately.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed.
+     */
+    replayAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isLooping: value })`. */
+    setIsLoopingAsync(
+        /** A boolean describing if the media should play once (`false`) or loop indefinitely (`true`). */
+        isLooping: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ isMuted: value })`. */
+    setIsMutedAsync(
+        /**  A boolean describing if the audio of this media should be muted. */
+        isMuted: boolean
+    ): Promise<PlaybackStatus>;
+
+    /**
+     * Sets a function to be called regularly with the `PlaybackStatus` of the `playbackObject`. See below for details on `PlaybackStatus` and an example use case of this function.
+     *
+     * `onPlaybackStatusUpdate` will be called whenever a call to the API for this `playbackObject` completes (such as `setStatusAsync()`, `getStatusAsync()`, or `unloadAsync()`), and will also be called at regular intervals while the media is in the loaded state. Set `progressUpdateIntervalMillis` via `setStatusAsync()` or `setProgressUpdateIntervalAsync()` to modify the interval with which `onPlaybackStatusUpdate` is called while loaded.
+     */
+    setOnPlaybackStatusUpdate(
+        /** A function taking a single parameter `PlaybackStatus`. */
+        onPlaybackStatusUpdate?: (status: PlaybackStatus) => void
+    ): void;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis })`. */
+    setPositionAsync(
+        positionMillis: number,
+
+        /** This is equivalent to `playbackObject.setStatusAsync({ positionMillis: millis, seekMillisToleranceBefore: toleranceMillisBefore, seekMillisToleranceAfter: toleranceMillisAfter })`. The tolerances are used only on iOS. */
+        tolerances?: {
+            toleranceMillisBefore: number,
+            toleranceMillisAfter: number
+        }
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ progressUpdateIntervalMillis: millis })`. */
+    setProgressUpdateIntervalAsync(
+        /** The new minimum interval in milliseconds between calls of `onPlaybackStatusUpdate`. */
+        progressUpdateIntervalMillis: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ rate: value, shouldCorrectPitch: shouldCorrectPitch })`. */
+    setRateAsync(
+        /** The desired playback rate of the media. This value must be between `0.0` and `32.0`. Only available on Android API version 23 and later and iOS. */
+        rate: number,
+
+        /** A boolean describing if we should correct the pitch for a changed rate. If set to `true`, the pitch of the audio will be corrected (so a rate different than `1.0` will timestretch the audio). */
+        shouldCorrectPitch: boolean
+    ): Promise<PlaybackStatus>;
+
+    /** Sets a new `PlaybackStatusToSet` on the `playbackObject`. This method can only be called if the media has been loaded. Return a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once the new status has been set successfully, or rejects if setting the new status failed. */
+    setStatusAsync(
+        /** The new `PlaybackStatusToSet` of the `playbackObject`, whose values will override the current playback status. */
+        status: PlaybackStatusToSet
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ volume: value })`. */
+    setVolumeAsync(
+        /** A number between `0.0` (silence) and `1.0` (maximum volume). */
+        volume: number
+    ): Promise<PlaybackStatus>;
+
+    /** This is equivalent to `playbackObject.setStatusAsync({ shouldPlay: false, positionMillis: 0 })`. */
+    stopAsync(): Promise<PlaybackStatus>;
+
+    /**
+     * Unloads the media from memory. `loadAsync()` must be called again in order to be able to play the media.
+     *
+     * Returns a `Promise` that is fulfilled with the `PlaybackStatus` of the `playbackObject` once it is unloaded, or rejects if unloading failed. See below for details on `PlaybackStatus`.
+     */
+    unloadAsync(): Promise<PlaybackStatus>;
+}
+// #endregion
+
+// #region BarCodeScanner
+/**
+ * BarCodeScanner
+ */
+export interface BarCodeScannerProps extends ViewProps {
+    type?: 'front' | 'back';
+    torchMode?: 'on' | 'off';
+    barCodeTypes?: string[];
+    onBarCodeRead?: BarCodeReadCallback;
+}
+
+export class BarCodeScanner extends Component<BarCodeScannerProps> {
+    static Constants: {
+        TorchMode: {
+            on: string;
+            off: string
+        }
+    } & CameraConstants;
+}
+// #endregion
+
+// #region BlurView
+/**
+ * BlurView
+ */
+export interface BlurViewProps extends ViewProps {
+    tint: 'light' | 'default' | 'dark';
+    intensity: number;
+}
+export class BlurView extends Component<BlurViewProps> { }
+// #endregion
+
+/**
+ * Brightness
+ */
+export namespace Brightness {
+    function setBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+    function getBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function getSystemBrightnessAsync(): Promise<FloatFromZeroToOne>;
+    function setSystemBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+}
+
+// #region Camera
+/**
+ * Camera
+ */
+export interface PictureOptions {
+    quality?: number;
+}
+
+export interface PictureResponse {
+    uri: string;
+    width: number;
+    height: number;
+    exif: string;
+    base64: string;
+}
+
+export interface RecordingOptions {
+    quality?: string | number;
+    maxDuration?: number;
+    maxFileSize?: number;
+}
+
+export class CameraObject {
+    takePictureAsync(options?: PictureOptions): Promise<PictureResponse>;
+    recordAsync(options: RecordingOptions): Promise<{ uri: string; }>;
+    stopRecording(): void;
+    getSupportedRatiosAsync(): Promise<string[]>; // Android only
+}
+
+export interface CameraProps extends ViewProps {
+    zoom?: FloatFromZeroToOne;
+    ratio?: string;
+    focusDepth?: FloatFromZeroToOne;
+    type?: string | number;
+    onCameraReady?: () => void;
+    onBarCodeRead?: BarCodeReadCallback;
+    faceDetectionMode?: number;
+    flashMode?: string | number;
+    barCodeTypes?: Array<string | number>;
+    whiteBalance?: string | number;
+    faceDetectionLandmarks?: number;
+    autoFocus?: string | number | boolean;
+    faceDetectionClassifications?: number;
+    onMountError?: () => void;
+    onFacesDetected?: (options: { faces: TrackedFaceFeature[] }) => void;
+    ref?: Ref<CameraObject>;
+}
+
+export interface CameraConstants {
+    readonly Type: string;
+    readonly FlashMode: string;
+    readonly AutoFocus: string;
+    readonly WhiteBalance: string;
+    readonly VideoQuality: string;
+    readonly BarCodeType: {
+        aztec: string;
+        codabar: string;
+        code39: string;
+        code93: string;
+        code128: string;
+        code138: string;
+        code39mod43: string;
+        datamatrix: string;
+        ean13: string;
+        ean8: string;
+        interleaved2of5: string;
+        itf14: string;
+        maxicode: string;
+        pdf417: string;
+        rss14: string;
+        rssexpanded: string;
+        upc_a: string;
+        upc_e: string;
+        upc_ean: string;
+        qr: string;
+    };
+}
+
+export class Camera extends Component<CameraProps> {
+    static readonly Constants: CameraConstants;
+}
+// #endregion
+
+/**
+ * Constants
+ */
+export namespace Constants {
+    const appOwnership: 'expo' | 'standalone' | 'guest';
+    const expoVersion: string;
+    const deviceId: string;
+    const deviceName: string;
+    const deviceYearClass: number;
+    const isDevice: boolean;
+
+    interface Platform {
+        ios?: {
+            platform: string;
+            model: string;
+            userInterfaceIdiom: string;
+            buildNumber: string;
+        };
+        android?: {
+            versionCode: string;
+        };
+    }
+    const platform: Platform;
+    const sessionId: string;
+    const statusBarHeight: number;
+    const systemFonts: string[];
+
+    interface Manifest {
+        name: string;
+        description?: string;
+        slug?: string;
+        sdkVersion?: string;
+        version?: string;
+        orientation?: Orientation;
+        primaryColor?: string;
+        privacy?: 'public' | 'unlisted';
+        scheme?: string;
+        icon?: string;
+        platforms?: string[];
+        githubUrl?: string;
+        notification?: {
+            icon?: string,
+            color?: string,
+            androidMode?: 'default' | 'collapse',
+            androidCollapsedTitle?: string
+        };
+        loading?: {
+            icon?: string,
+            exponentIconColor?: 'white' | 'blue',
+            exponentIconGrayscale?: 1 | 0,
+            backgroundImage?: string,
+            backgroundColor?: string,
+            hideExponentText?: boolean
+        };
+        appKey?: string;
+        androidStatusBar?: {
+            barStyle?: 'lignt-content' | 'dark-content',
+            backgroundColor?: string
+        };
+        androidShowExponentNotificationInShellApp?: boolean;
+        extra?: {
+            [propName: string]: any
+        };
+        rnCliPath?: any;
+        entryPoint?: string;
+        packagerOpts?: {
+            hostType?: string,
+            dev?: boolean,
+            strict?: boolean,
+            minify?: boolean,
+            urlType?: string,
+            urlRandomness?: string,
+            lanType?: string,
+            [propName: string]: any
+        };
+        ignoreNodeModulesValidation?: any;
+        nodeModulesPath?: string;
+        ios?: {
+            bundleIdentifier?: string,
+            buildNumber?: string,
+            config?: {
+                usesNonExemptEncryption?: boolean,
+                googleSignIn?: {
+                    reservedClientId: string
+                }
+            },
+            supportsTablet?: boolean,
+            infoPlist?: any
+        };
+        android?: {
+            package?: string,
+            versionCode?: string,
+            config?: {
+                fabric?: {
+                    apiKey: string,
+                    buildSecret: string
+                },
+                googleMaps?: {
+                    apiKey: string
+                },
+                googleSignIn?: {
+                    apiKey: string,
+                    certificateHash: string
+                }
+            }
+        };
+        facebookScheme?: any;
+        facebookAppId?: string;
+        facebookDisplayName?: string;
+        splash?: {
+            backgroundColor?: string;
+            resizeMode?: ResizeModeContain | ResizeModeCover;
+            image?: string;
+        };
+        assetBundlePatterns?: string[];
+        releaseChannel: string;
+        [propName: string]: any;
+    }
+    const manifest: Manifest;
+    const linkingUri: string;
+}
+
+/**
+ * Contacts
+ */
+export namespace Contacts {
+    type PhoneNumbers = 'phoneNumbers';
+    type Emails = 'emails';
+    type Addresses = 'addresses';
+    type Image = 'image';
+    type Thumbnail = 'thumbnail';
+    type Note = 'note';
+    type Birthday = 'birthday';
+    type NonGregorianBirthday = 'nonGregorianBirthday';
+    type NamePrefix = 'namePrefix';
+    type NameSuffix = 'nameSuffix';
+    type PhoneticFirstName = 'phoneticFirstName';
+    type PhoneticMiddleName = 'phoneticMiddleName';
+    type PhoneticLastName = 'phoneticLastName';
+    type SocialProfiles = 'socialProfiles';
+    type InstantMessageAddresses = 'instantMessageAddresses';
+    type UrlAddresses = 'urlAddresses';
+    type Dates = 'dates';
+    type Relationships = 'relationships';
+
+    const PHONE_NUMBERS: PhoneNumbers;
+    const EMAILS: Emails;
+    const ADDRESSES: Addresses;
+    const IMAGE: Image;
+    const THUMBNAIL: Thumbnail;
+    const NOTE: Note;
+    const BIRTHDAY: Birthday;
+    const NON_GREGORIAN_BIRTHDAY: NonGregorianBirthday;
+    const NAME_PREFIX: NamePrefix;
+    const NAME_SUFFIX: NameSuffix;
+    const PHONETIC_FIRST_NAME: PhoneticFirstName;
+    const PHONETIC_MIDDLE_NAME: PhoneticMiddleName;
+    const PHONETIC_LAST_NAME: PhoneticLastName;
+    const SOCIAL_PROFILES: SocialProfiles;
+    const IM_ADDRESSES: InstantMessageAddresses;
+    const URLS: UrlAddresses;
+    const DATES: Dates;
+    const RELATIONSHIPS: Relationships;
+
+    type FieldType = PhoneNumbers | Emails | Addresses | Image | Thumbnail |
+        Note | Birthday | NonGregorianBirthday | NamePrefix | NameSuffix |
+        PhoneticFirstName | PhoneticMiddleName | PhoneticLastName | SocialProfiles |
+        InstantMessageAddresses | UrlAddresses | Dates | Relationships;
+
+    interface Options {
+        pageSize?: number;
+        pageOffset?: number;
+        fields?: FieldType[];
+    }
+
+    interface Contact {
+        id: string;
+        contactType: string;
+        name: string;
+        firstName?: string;
+        middleName?: string;
+        lastName?: string;
+        previousLastName?: string;
+        namePrefix?: string;
+        nameSuffix?: string;
+        nickname?: string;
+        phoneticFirstName?: string;
+        phoneticMiddleName?: string;
+        phoneticLastName?: string;
+        emails?: Array<{
+            email?: string;
+            primary?: boolean;
+            label: string;
+            id: string;
+        }>;
+        phoneNumbers?: Array<{
+            number?: string;
+            primary?: boolean;
+            digits?: string;
+            countryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        addresses?: Array<{
+            street?: string;
+            city?: string;
+            country?: string;
+            region?: string;
+            neighborhood?: string;
+            postalCode?: string;
+            poBox?: string;
+            isoCountryCode?: string;
+            label: string;
+            id: string;
+        }>;
+        socialProfiles?: Array<{
+            service?: string;
+            localizedProfile?: string;
+            url?: string;
+            username?: string;
+            userId?: string;
+            label: string;
+            id: string;
+        }>;
+        instantMessageAddresses?: Array<{
+            service?: string;
+            username?: string;
+            localizedService?: string;
+            label: string;
+            id: string;
+        }>;
+        urls?: {
+            label: string;
+            url?: string;
+            id: string;
+        };
+        company?: string;
+        jobTitle?: string;
+        department?: string;
+        imageAvailable?: boolean;
+        image?: {
+            uri?: string;
+        };
+        thumbnail?: {
+            uri?: string;
+        };
+        note?: string;
+        dates?: Array<{
+            day?: number;
+            month?: number;
+            year?: number;
+            id: string;
+            label: string;
+        }>;
+        relationships?: Array<{
+            label: string;
+            name?: string;
+            id: string;
+        }>;
+    }
+
+    interface Response {
+        data: Contact[];
+        total: number;
+        hasNextPage: boolean;
+        hasPreviousPage: boolean;
+    }
+
+    function getContactsAsync(options: Options): Promise<Response>;
+    function getContactByIdAsync(options: { id?: string; fields?: FieldType[] }): Promise<Contact>;
+}
+
+/**
+ * DocumentPicker
+ */
+export namespace DocumentPicker {
+    interface Options {
+        type?: string;
+    }
+
+    type Response = {
+        type: 'success';
+        uri: string;
+        name: string;
+        size: number;
+    } | {
+        type: 'cancel';
+    };
+
+    function getDocumentAsync(options?: Options): Promise<Response>;
+}
+
+/**
+ * ErrorRecovery
+ */
+export namespace ErrorRecovery {
+    function setRecoveryProps(props: HashMap): void;
+}
+
+/**
+ * Facebook
+ */
+export namespace Facebook {
+    interface Options {
+        permissions?: string[];
+        behavior?: 'web' | 'native' | 'browser' | 'system';
+    }
+    interface Response {
+        type: 'cancel' | 'success';
+        token?: string;
+        expires?: number;
+    }
+    function logInWithReadPermissionsAsync(appId: string, options?: Options): Promise<Response>;
+}
+
+/**
+ * Facebook Ads
+ */
+export namespace FacebookAds {
+    /**
+     * Interstitial Ads
+     */
+    namespace InterstitialAdManager {
+        function showAd(placementId: string): Promise<boolean>;
+    }
+
+    /**
+     * Native Ads
+     */
+    type MediaCachePolicy = 'none' | 'icon' | 'image' | 'all';
+    class NativeAdsManager {
+        constructor(placementId: string, numberOfAdsToRequest?: number);
+        disableAutoRefresh(): void;
+        setMediaCachePolicy(cachePolicy: MediaCachePolicy): void;
+    }
+
+    function withNativeAd(component: Component<{
+        icon?: string;
+        coverImage?: string;
+        title?: string;
+        subtitle?: string;
+        description?: string;
+        callToActionText?: string;
+        socialContext?: string;
+    }>): Component<{ adsManager: NativeAdsManager }, { ad: any, canRequestAds: boolean }>;
+
+    /**
+     * Banner View
+     */
+    type AdType = 'large' | 'rectangle' | 'standard';
+
+    interface BannerViewProps {
+        type: AdType;
+        placementId: string;
+        onPress: () => void;
+        onError: () => void;
+    }
+
+    class BannerView extends Component<BannerViewProps> { }
+
+    /**
+     * Ad Settings
+     */
+    namespace AdSettings {
+        const currentDeviceHash: string;
+        function addTestDevice(device: string): void;
+        function clearTestDevices(): void;
+        type SDKLogLevel = 'none' | 'debug' | 'verbose' | 'warning' | 'error' | 'notification';
+        function setLogLevel(logLevel: SDKLogLevel): void;
+        function setIsChildDirected(isDirected: boolean): void;
+        function setMediationService(mediationService: string): void;
+        function setUrlPrefix(urlPrefix: string): void;
+    }
+}
+
+/**
+ * FaceDetector
+ */
+export interface Point {
+    x: Axis;
+    y: Axis;
+}
+
+export interface FaceFeature {
+    bounds: {
+        size: {
+            width: number;
+            height: number;
+        },
+        origin: Point;
+    };
+    smilingProbability?: number;
+    leftEarPosition?: Point;
+    rightEarPosition?: Point;
+    leftEyePosition?: Point;
+    leftEyeOpenProbability?: number;
+    rightEyePosition?: Point;
+    rightEyeOpenProbability?: number;
+    leftCheekPosition?: Point;
+    rightCheekPosition?: Point;
+    leftMouthPosition?: Point;
+    mouthPosition?: Point;
+    rightMouthPosition?: Point;
+    bottomMouthPosition?: Point;
+    noseBasePosition?: Point;
+    yawAngle?: number;
+    rollAngle?: number;
+}
+
+export interface TrackedFaceFeature extends FaceFeature {
+    faceID?: number;
+}
+
+export namespace FaceDetector {
+    interface DetectFaceResult {
+        faces: FaceFeature[];
+        image: {
+            uri: string;
+            width: number;
+            height: number;
+            orientation: number;
+        };
+    }
+    interface Mode {
+        fast: 'fast';
+        accurate: 'accurate';
+    }
+    interface _Shared {
+        all: 'all';
+        none: 'none';
+    }
+    type Landmarks = _Shared;
+    type Classifications = _Shared;
+    interface _Constants {
+        Mode: Mode;
+        Landmarks: Landmarks;
+        Classifications: Classifications;
+    }
+
+    const Constants: _Constants;
+
+    interface DetectionOptions {
+        mode?: keyof Mode;
+        detectLandmarks?: keyof Landmarks;
+        runClassifications?: keyof Classifications;
+    }
+
+    function detectFaces(uri: string, options?: DetectionOptions): Promise<DetectFaceResult>;
+}
+/**
+ * FileSystem
+ */
+export namespace FileSystem {
+    type FileInfo = {
+        exists: true;
+        isDirectory: boolean;
+        uri: string;
+        size: number;
+        modificationTime: number;
+        md5?: Md5;
+    } | {
+        exists: false;
+        isDirectory: false;
+    };
+
+    interface DownloadResult {
+        uri: string;
+        status: number;
+        headers: { [name: string]: string };
+        md5?: Md5;
+    }
+
+    const documentDirectory: string;
+    const cacheDirectory: string;
+
+    function getInfoAsync(fileUri: string, options?: { md5?: string, size?: boolean; }): Promise<FileInfo>;
+    function readAsStringAsync(fileUri: string): Promise<string>;
+    function writeAsStringAsync(fileUri: string, contents: string): Promise<void>;
+    function deleteAsync(fileUri: string, options?: { idempotent: boolean; }): Promise<void>;
+    function moveAsync(options: { from: string, to: string; }): Promise<void>;
+    function copyAsync(options: { from: string, to: string; }): Promise<void>;
+    function makeDirectoryAsync(dirUri: string, options?: { intermediates: boolean }): Promise<void>;
+    function readDirectoryAsync(dirUri: string): Promise<string[]>;
+    function downloadAsync(uri: string, fileUri: string, options?: { md5?: boolean; }): Promise<DownloadResult>;
+    function createDownloadResumable(
+        uri: string,
+        fileUri: string,
+        options?: DownloadOptions,
+        callback?: (totalBytesWritten: number, totalBytesExpectedToWrite: number) => void,
+        resumeData?: string | null
+    ): DownloadResumable;
+
+    interface PauseResult {
+        url: string;
+        fileUri: string;
+        options: { md5: boolean; };
+        resumeData: string;
+    }
+
+    interface DownloadOptions {
+        md5?: boolean;
+        headers?: { [name: string]: string };
+    }
+
+    interface DownloadProgressData {
+        totalBytesWritten: number;
+        totalBytesExpectedToWrite: number;
+    }
+
+    type DownloadProgressCallback = (data: DownloadProgressData) => void;
+
+    class DownloadResumable {
+        constructor(
+            url: string,
+            fileUri: string,
+            options: DownloadOptions,
+            callback?: DownloadProgressCallback,
+            resumeData?: string
+        );
+
+        downloadAsync(): Promise<DownloadResult>;
+        pauseAsync(): Promise<PauseResult>;
+        resumeAsync(): Promise<DownloadResult>;
+        savable(): PauseResult;
+    }
+}
+
+/** Use TouchID/FaceID (iOS) or the Fingerprint API (Android) to authenticate the user with a fingerprint scan. */
+export namespace Fingerprint {
+    type FingerprintAuthenticationResult = {
+        success: true
+    } | {
+        success: false,
+
+        /** Error code in the case where authentication fails. */
+        error: string
+    };
+
+    /** Determine whether the Fingerprint scanner is available on the device. */
+    function hasHardwareAsync(): Promise<boolean>;
+
+    /** Determine whether the device has saved fingerprints to use for authentication. */
+    function isEnrolledAsync(): Promise<boolean>;
+
+    /**
+     * Attempts to authenticate via Fingerprint. Android: When using the fingerprint module on Android, you need to provide a UI component to prompt the user to scan their fingerprint, as the OS has no default alert for it.
+     *
+     * @param promptMessage A message that is shown alongside the TouchID/FaceID prompt. (iOS only)
+     */
+    function authenticateAsync(promptMessageIOS?: string): Promise<FingerprintAuthenticationResult>;
+
+    /** Cancels the fingerprint authentication flow. (Android only) */
+    function cancelAuthenticate(): void;
+}
+
+/**
+ * Font
+ */
+export namespace Font {
+    interface FontMap {
+        [name: string]: RequireSource;
+    }
+
+    function loadAsync(name: string, url: string): Promise<void>;
+    function loadAsync(map: FontMap): Promise<void>;
+}
+
+// #region GLView
+/**
+ * GLView
+ */
+export interface GLViewProps extends ViewProps {
+    onContextCreate(): void;
+    msaaSamples: number;
+}
+
+export class GLView extends Component<GLViewProps, { msaaSamples: number }> { }
+// #endregion
+
+/**
+ * Google
+ */
+export namespace Google {
+    interface LogInConfig {
+        androidClientId?: string;
+        androidStandaloneAppClientId?: string;
+        iosClientId?: string;
+        iosStandaloneAppClientId?: string;
+        webClientId?: string;
+        behavior?: 'system' | 'web';
+        scopes?: string[];
+    }
+
+    type LogInResult = {
+        type: 'cancel';
+    } | {
+        type: 'success';
+        accessToken: string;
+        idToken?: string;
+        refreshToken?: string;
+        serverAuthCode?: string;
+        user: {
+            id: string;
+            name: string;
+            givenName: string;
+            familyName: string;
+            photoUrl?: string;
+            email?: string;
+        }
+    };
+
+    function logInAsync(config: LogInConfig): Promise<LogInResult>;
+}
+
+/** Access the device gyroscope sensor to respond to changes in rotation in 3d space. */
+export namespace Gyroscope {
+    interface GyroscopeObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    /** A callback that is invoked when an gyroscope update is available. */
+    function addListener(listener: (obj: GyroscopeObject) => any): EventSubscription;
+
+    /** Remove all listeners. */
+    function removeAllListeners(): void;
+
+    /** Subscribe for updates to the gyroscope. */
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * ImageManipulator
+ */
+export namespace ImageManipulator {
+    interface ImageResult {
+        uri: string;
+        width: number;
+        height: number;
+        base64?: string;
+    }
+
+    interface SaveOptions {
+        base64?: boolean;
+        compress?: FloatFromZeroToOne;
+        format?: 'jpeg' | 'png';
+    }
+
+    interface CropParameters {
+        originX: number;
+        originY: number;
+        width: number;
+        height: number;
+    }
+
+    interface ImageManipulationOptions {
+        resize?: { width?: number; height?: number };
+        rotate?: number;
+        flip?: { vertical?: boolean; horizontal?: boolean };
+        crop?: CropParameters;
+    }
+
+    function manipulate(uri: string, actions: ImageManipulationOptions, saveOptions?: SaveOptions): Promise<ImageResult>;
+}
+
+/**
+ * Image Picker
+ */
+export namespace ImagePicker {
+    interface ImageInfo {
+        uri: string;
+        width: number;
+        height: number;
+        type: 'video' | 'image';
+        base64?: string;
+        exif?: object;
+        duration?: number;
+    }
+
+    type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
+
+    interface _MediaTypeOptions {
+        All: 'All';
+        Videos: 'Videos';
+        Images: 'Images';
+    }
+
+    const MediaTypeOptions: _MediaTypeOptions;
+
+    interface ImageLibraryOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+        base64?: boolean;
+        exif?: boolean;
+        mediaTypes?: keyof _MediaTypeOptions;
+    }
+
+    function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
+
+    interface CameraOptions {
+        allowsEditing?: boolean;
+        aspect?: [number, number];
+        quality?: number;
+    }
+
+    function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
+}
+
+/**
+ * IntentLauncherAndroid
+ */
+export namespace IntentLauncherAndroid {
+    const ACTION_ACCESSIBILITY_SETTINGS: 'android.settings.ACCESSIBILITY_SETTINGS';
+    const ACTION_APP_NOTIFICATION_REDACTION: 'android.settings.ACTION_APP_NOTIFICATION_REDACTION';
+    const ACTION_CONDITION_PROVIDER_SETTINGS: 'android.settings.ACTION_CONDITION_PROVIDER_SETTINGS';
+    const ACTION_NOTIFICATION_LISTENER_SETTINGS: 'android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS';
+    const ACTION_PRINT_SETTINGS: 'android.settings.ACTION_PRINT_SETTINGS';
+    const ACTION_ADD_ACCOUNT_SETTINGS: 'android.settings.ADD_ACCOUNT_SETTINGS';
+    const ACTION_AIRPLANE_MODE_SETTINGS: 'android.settings.AIRPLANE_MODE_SETTINGS';
+    const ACTION_APN_SETTINGS: 'android.settings.APN_SETTINGS';
+    const ACTION_APPLICATION_DETAILS_SETTINGS: 'android.settings.APPLICATION_DETAILS_SETTINGS';
+    const ACTION_APPLICATION_DEVELOPMENT_SETTINGS: 'android.settings.APPLICATION_DEVELOPMENT_SETTINGS';
+    const ACTION_APPLICATION_SETTINGS: 'android.settings.APPLICATION_SETTINGS';
+    const ACTION_APP_NOTIFICATION_SETTINGS: 'android.settings.APP_NOTIFICATION_SETTINGS';
+    const ACTION_APP_OPS_SETTINGS: 'android.settings.APP_OPS_SETTINGS';
+    const ACTION_BATTERY_SAVER_SETTINGS: 'android.settings.BATTERY_SAVER_SETTINGS';
+    const ACTION_BLUETOOTH_SETTINGS: 'android.settings.BLUETOOTH_SETTINGS';
+    const ACTION_CAPTIONING_SETTINGS: 'android.settings.CAPTIONING_SETTINGS';
+    const ACTION_CAST_SETTINGS: 'android.settings.CAST_SETTINGS';
+    const ACTION_DATA_ROAMING_SETTINGS: 'android.settings.DATA_ROAMING_SETTINGS';
+    const ACTION_DATE_SETTINGS: 'android.settings.DATE_SETTINGS';
+    const ACTION_DEVICE_INFO_SETTINGS: 'android.settings.DEVICE_INFO_SETTINGS';
+    const ACTION_DEVICE_NAME: 'android.settings.DEVICE_NAME';
+    const ACTION_DISPLAY_SETTINGS: 'android.settings.DISPLAY_SETTINGS';
+    const ACTION_DREAM_SETTINGS: 'android.settings.DREAM_SETTINGS';
+    const ACTION_HARD_KEYBOARD_SETTINGS: 'android.settings.HARD_KEYBOARD_SETTINGS';
+    const ACTION_HOME_SETTINGS: 'android.settings.HOME_SETTINGS';
+    const ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS: 'android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS';
+    const ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS: 'android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS';
+    const ACTION_INPUT_METHOD_SETTINGS: 'android.settings.INPUT_METHOD_SETTINGS';
+    const ACTION_INPUT_METHOD_SUBTYPE_SETTINGS: 'android.settings.INPUT_METHOD_SUBTYPE_SETTINGS';
+    const ACTION_INTERNAL_STORAGE_SETTINGS: 'android.settings.INTERNAL_STORAGE_SETTINGS';
+    const ACTION_LOCALE_SETTINGS: 'android.settings.LOCALE_SETTINGS';
+    const ACTION_LOCATION_SOURCE_SETTINGS: 'android.settings.LOCATION_SOURCE_SETTINGS';
+    const ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_APPLICATIONS_SETTINGS: 'android.settings.MANAGE_APPLICATIONS_SETTINGS';
+    const ACTION_MANAGE_DEFAULT_APPS_SETTINGS: 'android.settings.MANAGE_DEFAULT_APPS_SETTINGS';
+    const ACTION_MEMORY_CARD_SETTINGS: 'android.settings.MEMORY_CARD_SETTINGS';
+    const ACTION_MONITORING_CERT_INFO: 'android.settings.MONITORING_CERT_INFO';
+    const ACTION_NETWORK_OPERATOR_SETTINGS: 'android.settings.NETWORK_OPERATOR_SETTINGS';
+    const ACTION_NFCSHARING_SETTINGS: 'android.settings.NFCSHARING_SETTINGS';
+    const ACTION_NFC_PAYMENT_SETTINGS: 'android.settings.NFC_PAYMENT_SETTINGS';
+    const ACTION_NFC_SETTINGS: 'android.settings.NFC_SETTINGS';
+    const ACTION_NIGHT_DISPLAY_SETTINGS: 'android.settings.NIGHT_DISPLAY_SETTINGS';
+    const ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS: 'android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS';
+    const ACTION_NOTIFICATION_SETTINGS: 'android.settings.NOTIFICATION_SETTINGS';
+    const ACTION_PAIRING_SETTINGS: 'android.settings.PAIRING_SETTINGS';
+    const ACTION_PRIVACY_SETTINGS: 'android.settings.PRIVACY_SETTINGS';
+    const ACTION_QUICK_LAUNCH_SETTINGS: 'android.settings.QUICK_LAUNCH_SETTINGS';
+    const ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS: 'android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS';
+    const ACTION_SECURITY_SETTINGS: 'android.settings.SECURITY_SETTINGS';
+    const ACTION_SETTINGS: 'android.settings.SETTINGS';
+    const ACTION_SHOW_ADMIN_SUPPORT_DETAILS: 'android.settings.SHOW_ADMIN_SUPPORT_DETAILS';
+    const ACTION_SHOW_INPUT_METHOD_PICKER: 'android.settings.SHOW_INPUT_METHOD_PICKER';
+    const ACTION_SHOW_REGULATORY_INFO: 'android.settings.SHOW_REGULATORY_INFO';
+    const ACTION_SHOW_REMOTE_BUGREPORT_DIALOG: 'android.settings.SHOW_REMOTE_BUGREPORT_DIALOG';
+    const ACTION_SOUND_SETTINGS: 'android.settings.SOUND_SETTINGS';
+    const ACTION_STORAGE_MANAGER_SETTINGS: 'android.settings.STORAGE_MANAGER_SETTINGS';
+    const ACTION_SYNC_SETTINGS: 'android.settings.SYNC_SETTINGS';
+    const ACTION_SYSTEM_UPDATE_SETTINGS: 'android.settings.SYSTEM_UPDATE_SETTINGS';
+    const ACTION_TETHER_PROVISIONING_UI: 'android.settings.TETHER_PROVISIONING_UI';
+    const ACTION_TRUSTED_CREDENTIALS_USER: 'android.settings.TRUSTED_CREDENTIALS_USER';
+    const ACTION_USAGE_ACCESS_SETTINGS: 'android.settings.USAGE_ACCESS_SETTINGS';
+    const ACTION_USER_DICTIONARY_INSERT: 'android.settings.USER_DICTIONARY_INSERT';
+    const ACTION_USER_DICTIONARY_SETTINGS: 'android.settings.USER_DICTIONARY_SETTINGS';
+    const ACTION_USER_SETTINGS: 'android.settings.USER_SETTINGS';
+    const ACTION_VOICE_CONTROL_AIRPLANE_MODE: 'android.settings.VOICE_CONTROL_AIRPLANE_MODE';
+    const ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE: 'android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE';
+    const ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE: 'android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE';
+    const ACTION_VOICE_INPUT_SETTINGS: 'android.settings.VOICE_INPUT_SETTINGS';
+    const ACTION_VPN_SETTINGS: 'android.settings.VPN_SETTINGS';
+    const ACTION_VR_LISTENER_SETTINGS: 'android.settings.VR_LISTENER_SETTINGS';
+    const ACTION_WEBVIEW_SETTINGS: 'android.settings.WEBVIEW_SETTINGS';
+    const ACTION_WIFI_IP_SETTINGS: 'android.settings.WIFI_IP_SETTINGS';
+    const ACTION_WIFI_SETTINGS: 'android.settings.WIFI_SETTINGS';
+    const ACTION_WIRELESS_SETTINGS: 'android.settings.WIRELESS_SETTINGS';
+    const ACTION_ZEN_MODE_AUTOMATION_SETTINGS: 'android.settings.ZEN_MODE_AUTOMATION_SETTINGS';
+    const ACTION_ZEN_MODE_EVENT_RULE_SETTINGS: 'android.settings.ZEN_MODE_EVENT_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_EXTERNAL_RULE_SETTINGS: 'android.settings.ZEN_MODE_EXTERNAL_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_PRIORITY_SETTINGS: 'android.settings.ZEN_MODE_PRIORITY_SETTINGS';
+    const ACTION_ZEN_MODE_SCHEDULE_RULE_SETTINGS: 'android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS';
+    const ACTION_ZEN_MODE_SETTINGS: 'android.settings.ZEN_MODE_SETTINGS';
+
+    function startActivityAsync(activity: string, data?: HashMap): Promise<boolean>;
+}
+
+/**
+ * KeepAwake
+ */
+export class KeepAwake extends Component {
+    static activate(): void;
+    static deactivate(): void;
+}
+
+// #region LinearGradient
+/**
+ * LinearGradient
+ */
+export interface LinearGradientProps {
+    colors: string[];
+    start?: [number, number];
+    end?: [number, number];
+    locations?: number[];
+    style?: StyleProp<ViewStyle>;
+}
+
+export class LinearGradient extends Component<LinearGradientProps> { }
+// #endregion
+
+/**
+ * Location
+ */
+export namespace Location {
+    interface LocationOptions {
+        enableHighAccuracy?: boolean;
+        timeInterval?: number;
+        distanceInterval?: number;
+    }
+
+    interface LocationProps {
+        latitude: number;
+        longitude: number;
+    }
+
+    interface Coords extends LocationProps {
+        altitude: number;
+        accuracy: number;
+    }
+
+    interface LocationData {
+        coords: {
+            heading: number;
+            speed: number
+        } & Coords;
+        timestamp: number;
+    }
+
+    interface ProviderStatus {
+        locationServicesEnabled: boolean;
+        gpsAvailable?: boolean;
+        networkAvailable?: boolean;
+        passiveAvailable?: boolean;
+    }
+
+    interface HeadingStatus {
+        magHeading: number;
+        trueHeading: number;
+        accuracy: number;
+    }
+
+    interface GeocodeData {
+        city: string;
+        street: string;
+        region: string;
+        postalCode: string;
+        country: string;
+        name: string;
+    }
+
+    type LocationCallback = (data: LocationData) => void;
+
+    function getCurrentPositionAsync(options: LocationOptions): Promise<LocationData>;
+    function watchPositionAsync(options: LocationOptions, callback: LocationCallback): EventSubscription;
+    function getProviderStatusAsync(): Promise<ProviderStatus>;
+    function getHeadingAsync(): Promise<HeadingStatus>;
+    function watchHeadingAsync(callback: (status: HeadingStatus) => void): EventSubscription;
+    function geocodeAsync(address: string): Promise<Coords>;
+    function reverseGeocodeAsync(location: LocationProps): Promise<GeocodeData[]>;
+    function setApiKey(key: string): void;
+}
+
+/**
+ * Magnetometer
+ */
+export namespace Magnetometer {
+    interface MagnetometerObject {
+        x: Axis;
+        y: Axis;
+        z: Axis;
+    }
+
+    function addListener(listener: (obj: MagnetometerObject) => any): EventSubscription;
+    function removeAllListeners(): void;
+    function setUpdateInterval(intervalMs: number): void;
+}
+
+/**
+ * Notifications
+ */
+export namespace Notifications {
+    interface Notification {
+        origin: 'selected' | 'received';
+        data: any;
+        remote: boolean;
+        isMultiple: boolean;
+    }
+
+    interface LocalNotification {
+        title: string;
+        body?: string;
+        data?: any;
+        ios?: {
+            sound?: boolean
+        };
+        android?: {
+            sound?: boolean;
+            icon?: string;
+            color?: string;
+            priority?: 'min' | 'low' | 'high' | 'max';
+            sticky?: boolean;
+            vibrate?: boolean | number[];
+            link?: string;
+        };
+    }
+
+    type LocalNotificationId = string | number;
+
+    function addListener(listener: (notification: Notification) => any): EventSubscription;
+    function getExpoPushTokenAsync(): Promise<string>;
+    function presentLocalNotificationAsync(localNotification: LocalNotification): Promise<LocalNotificationId>;
+    function scheduleLocalNotificationAsync(
+        localNotification: LocalNotification,
+        schedulingOptions: { time: Date | number, repeat?: 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year' }
+    ): Promise<LocalNotificationId>;
+    function dismissNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function dismissAllNotificationsAsync(): Promise<void>;
+    function cancelScheduledNotificationAsync(localNotificationId: LocalNotificationId): Promise<void>;
+    function cancelAllScheduledNotificationsAsync(): Promise<void>;
+    function getBadgeNumberAsync(): Promise<number>;
+    function setBadgeNumberAsync(number: number): Promise<void>;
+}
+
+/**
+ * Pedometer
+ */
+export namespace Pedometer {
+    function isAvailableAsync(): Promise<boolean>;
+    function getStepCountAsync(start: Date, end: Date): Promise<{ steps: number; }>;
+    function watchStepCount(callback: (params: { steps: number; }) => void): EventSubscription;
+}
+
+/**
+ * Permissions
+ */
+export namespace Permissions {
+    type PermissionType = 'audioRecording' | 'calendar' |
+    'cameraRoll' | 'camera' | 'contacts' | 'location' | 'reminders' |
+    'remoteNotifications' | 'systemBrightness' | 'userFacingNotifications';
+    type PermissionStatus = 'undetermined' | 'granted' | 'denied';
+    type PermissionExpires = 'never';
+
+    interface PermissionDetailsLocationIOS {
+        scope: 'whenInUse' | 'always';
+    }
+
+    interface PermissionDetailsLocationAndroid {
+        scope: 'fine' | 'coarse' | 'none';
+    }
+
+    interface PermissionResponse {
+        status: PermissionStatus;
+        expires: PermissionExpires;
+        ios?: PermissionDetailsLocationIOS;
+        android?: PermissionDetailsLocationAndroid;
+    }
+
+    function getAsync(type: PermissionType): Promise<PermissionResponse>;
+    function askAsync(type: PermissionType): Promise<PermissionResponse>;
+
+    type RemoteNotificationPermission = 'remoteNotifications';
+
+    const AUDIO_RECORDING: 'audioRecording';
+    const CALENDAR: 'calendar';
+    const CAMERA_ROLL: 'cameraRoll';
+    const CAMERA: 'camera';
+    const CONTACTS: 'contacts';
+    const LOCATION: 'location';
+    const NOTIFICATIONS: RemoteNotificationPermission;
+    const REMINDERS = 'reminders';
+    const REMOTE_NOTIFICATIONS: RemoteNotificationPermission;
+    const SYSTEM_BRIGHTNESS: 'systemBrightness';
+    const USER_FACING_NOTIFICATIONS = 'userFacingNotifications';
+}
+
+/**
+ * Register Root Component
+ */
+export function registerRootComponent(component: ComponentType): void;
+
+/**
+ * ScreenOrientation
+ */
+export namespace ScreenOrientation {
+    interface Orientations {
+        ALL: 'ALL';
+        ALL_BUT_UPSIDE_DOWN: 'ALL_BUT_UPSIDE_DOWN';
+        PORTRAIT: 'PORTRAIT';
+        PORTRAIT_UP: 'PORTRAIT_UP';
+        PORTRAIT_DOWN: 'PORTRAIT_DOWN';
+        LANDSCAPE: 'LANDSCAPE';
+        LANDSCAPE_LEFT: 'LANDSCAPE_LEFT';
+        LANDSCAPE_RIGHT: 'LANDSCAPE_RIGHT';
+    }
+
+    const Orientation: Orientations;
+
+    function allow(orientation: keyof Orientations): void;
+}
+
+/**
+ * SecureStore
+ */
+export namespace SecureStore {
+    interface SecureStoreOptions {
+        keychainService?: string;
+        keychainAccessible?: number;
+    }
+
+    function setItemAsync(key: string, value: string, options?: SecureStoreOptions): Promise<void>;
+    function getItemAsync(key: string, options?: SecureStoreOptions): Promise<string | null>;
+    function deleteItemAsync(key: string, options?: SecureStoreOptions): Promise<void>;
+}
+
+/**
+ * Segment
+ */
+export namespace Segment {
+    function initialize(keys: {
+        androidWriteKey: string;
+        iosWriteKey: string;
+    }): void;
+    function identify(userId: string): void;
+    function identifyWithTraits(userId: string, traits: object): void;
+    function track(event: string): void;
+    function reset(): void;
+    function trackWithProperties(event: string, properties: object): void;
+    function screen(screenName: string): void;
+    function screenWithProperties(screenName: string, properties: object): void;
+    function flush(): void;
+}
+
+/**
+ * Speech
+ */
+export namespace Speech {
+    interface SpeechOptions {
+        language?: string;
+        pitch?: number;
+        rate?: number;
+        onStart?: () => void;
+        onStopped?: () => void;
+        onDone?: () => void;
+        onError?: (error: string) => void;
+    }
+
+    function speak(text: string, options?: SpeechOptions): void;
+    function stop(): void;
+    function isSpeakingAsync(): Promise<boolean>;
+
+    /** Available on iOS only */
+    function pause(): void;
+
+    /** Available on iOS only */
+    function resume(): void;
+}
+
+/**
+ * SQLite
+ */
+export namespace SQLite {
+    type Error = any;
+
+    interface Database {
+        transaction(
+            callback: (transaction: Transaction) => any,
+            error?: (error: Error) => any,     // TODO def of error
+            success?: () => any
+        ): void;
+    }
+
+    interface Transaction {
+        executeSql(
+            sqlStatement: string,
+            arguments?: string[] | number[],
+            success?: (transaction: Transaction, resultSet: ResultSet) => any,
+            error?: (transaction: Transaction, error: Error) => any
+        ): void;
+    }
+
+    interface ResultSet {
+        insertId: number;
+        rowAffected: number;
+        rows: {
+            length: number;
+            item: (index: number) => any;
+            _array: HashMap[];
+        };
+    }
+
+    function openDatabase(
+        name: string | {
+            name: string,
+            version?: string,
+            description?: string,
+            size?: number,
+            callback?: () => any
+        },
+        version?: string,
+        description?: string,
+        size?: number,
+        callback?: () => any
+    ): any;
+}
+
+// #region Svg
+/**
+ * Svg
+ */
+export interface SvgCommonProps {
+    fill?: string;
+    fillOpacity?: number | string;
+    fillRule?: 'nonzero' | 'evenodd';
+    opacity?: number | string;
+    stroke?: string;
+    strokeWidth?: number | string;
+    strokeOpacity?: number | string;
+    strokeLinecap?: string;
+    strokeLineJoin?: string;
+    strokeDasharray?: any[];
+    strokeDashoffset?: any;
+    x?: number | string;
+    y?: number | string;
+    rotate?: number | string;
+    rotation?: number | string;
+    scale?: number | string;
+    origin?: number | string;
+    originX?: number | string;
+    originY?: number | string;
+    id?: string;
+    disabled?: boolean;
+    onPress?: () => any;
+    onPressIn?: () => any;
+    onPressOut?: () => any;
+    onLongPress?: () => any;
+    delayPressIn?: number;
+    delayPressOut?: number;
+    delayLongPress?: number;
+}
+
+export interface SvgRectProps extends SvgCommonProps {
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgCircleProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    r: number | string;
+}
+
+export interface SvgEllipseProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+}
+
+export interface SvgLineProps extends SvgCommonProps {
+    x1: number | string;
+    y1: number | string;
+    x2: number | string;
+    y2: number | string;
+}
+
+export interface SvgPolyProps extends SvgCommonProps {
+    points: string;
+}
+
+export interface SvgPathProps extends SvgCommonProps {
+    d: string;
+}
+
+export interface SvgTextProps extends SvgCommonProps {
+    textAnchor?: string;
+    fontSize?: number | string;
+    fontWeight?: string;
+}
+
+export interface SvgTSpanProps extends SvgTextProps {
+    dx?: string;
+    dy?: string;
+}
+
+export interface SvgTextPathProps extends SvgCommonProps {
+    href?: string;
+    startOffset?: string;
+}
+
+export interface SvgUseProps extends SvgCommonProps {
+    href: string;
+    x: number | string;
+    y: number | string;
+}
+
+export interface SvgSymbolProps extends SvgCommonProps {
+    viewBox: string;
+    width: number | string;
+    height: number | string;
+}
+
+export interface SvgLinearGradientProps extends SvgCommonProps {
+    x1: number | string;
+    x2: number | string;
+    y1: number | string;
+    y2: number | string;
+}
+
+export interface SvgRadialGradientProps extends SvgCommonProps {
+    cx: number | string;
+    cy: number | string;
+    rx: number | string;
+    ry: number | string;
+    fx: number | string;
+    fy: number | string;
+    gradientUnits?: string;
+}
+
+export interface SvgStopProps extends SvgCommonProps {
+    offset?: string;
+    stopColor?: string;
+    stopOpacity?: string;
+}
+
+export class Svg extends Component<{ width: number, height: number, viewBox?: string }> {
+    static Circle: ComponentClass<SvgCircleProps>;
+    static ClipPath: ComponentClass<SvgCommonProps>;
+    static Defs: ComponentClass;
+    static Ellipse: ComponentClass<SvgEllipseProps>;
+    static G: ComponentClass<SvgCommonProps>;
+    static Line: ComponentClass<SvgLineProps>;
+    static LinearGradient: ComponentClass<SvgLinearGradientProps>;
+    static Path: ComponentClass<SvgPathProps>;
+    static Polygon: ComponentClass<SvgPolyProps>;
+    static Polyline: ComponentClass<SvgPolyProps>;
+    static RadialGradient: ComponentClass<SvgRadialGradientProps>;
+    static Rect: ComponentClass<SvgRectProps>;
+    static Stop: ComponentClass<SvgStopProps>;
+    static Symbol: ComponentClass<SvgSymbolProps>;
+    static Text: ComponentClass<SvgTextProps>;
+    static TextPath: ComponentClass<SvgTextPathProps>;
+    static TSpan: ComponentClass<SvgTSpanProps>;
+    static Use: ComponentClass<SvgUseProps>;
+}
+// #endregion
+
+/**
+ * Take Snapshot
+ */
+export function takeSnapshotAsync(
+    view?: (number | React.ReactElement<any>),
+    options?: {
+        width?: number,
+        height?: number,
+        format?: 'png' | 'jpg' | 'jpeg' | 'webm',
+        quality?: number,
+        result?: 'file' | 'base64' | 'data-uri',
+    }
+): Promise<string>;
+
+/** Helpful utility functions that don’t fit anywhere else, including some localization and internationalization methods. */
+export namespace Util {
+    /** Returns the current device country code. */
+    function getCurrentDeviceCountryAsync(): Promise<string>;
+
+    /** Returns the current device locale as a string. */
+    function getCurrentLocaleAsync(): Promise<string>;
+
+    /** Returns the current device time zone name. */
+    function getCurrentTimeZoneAsync(): Promise<string>;
+
+    /** Reloads the current experience. This will fetch and load the newest available JavaScript supported by the device’s Expo environment. This is useful for triggering an update of your experience if you have published a new version. */
+    function reload(): void;
+
+    /** _Android only_. Invokes a callback when a new version of your app is successfully downloaded in the background. */
+    function addNewVersionListenerExperimental(listener: (event: {
+        manifest: object;
+    }) => void): { remove(): void; };
+}
+
+// #region Video
+/**
+ * Expo Video
+ */
+export interface NaturalSize {
+    width: number;
+    height: number;
+    orientation: Orientation;
+}
+
+export interface ReadyForDisplayEvent {
+    naturalSize: NaturalSize;
+    status: PlaybackStatus;
+}
+
+export enum FullscreenUpdateVariants {
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT = 0,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT = 1,
+    IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS = 2,
+    IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS = 3
+}
+
+export interface FullscreenUpdateEvent {
+    fullscreenUpdate: FullscreenUpdateVariants;
+    status: PlaybackStatus;
+}
+
+export interface VideoProps {
+    source?: PlaybackSource | null;
+    posterSource?: URISource | RequireSource;
+
+    resizeMode?: ResizeModeContain | ResizeModeCover | ResizeModeStretch;
+    useNativeControls?: boolean;
+    usePoster?: boolean;
+
+    onPlaybackStatusUpdate?: (status: PlaybackStatus) => void;
+    onReadyForDisplay?: (event: ReadyForDisplayEvent) => void;
+    onIOSFullscreenUpdate?: (event: FullscreenUpdateEvent) => void;
+
+    onLoadStart?: () => void;
+    onLoad?: (status: PlaybackStatus) => void;
+    onError?: (error: string) => void;
+
+    status?: PlaybackStatusToSet;
+    progressUpdateIntervalMillis?: number;
+    positionMillis?: number;
+    shouldPlay?: boolean;
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    volume?: number;
+    isMuted?: boolean;
+    isLooping?: boolean;
+
+    scaleX?: number;
+    scaleY?: number;
+    translateX?: number;
+    translateY?: number;
+    rotation?: number;
+    ref?: Ref<PlaybackObject>;
+}
+
+export interface VideoState {
+    showPoster: boolean;
+}
+
+export class Video extends Component<VideoProps, VideoState> {
+    static RESIZE_MODE_CONTAIN: ResizeModeContain;
+    static RESIZE_MODE_COVER: ResizeModeCover;
+    static RESIZE_MODE_STRETCH: ResizeModeStretch;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_PRESENT;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_WILL_DISMISS;
+    static IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS: FullscreenUpdateVariants.IOS_FULLSCREEN_UPDATE_PLAYER_DID_DISMISS;
+}
+// #endregion
+
+/**
+ * Web Browser
+ */
+export namespace WebBrowser {
+    function openBrowserAsync(url: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<{ type: 'cancelled' | 'dismissed' }>;
+    function dismissBrowser(): Promise<{ type: 'dismissed' }>;
+}
+
+// #region Calendar
+/**
+ * Calendar
+ *
+ * Provides an API for interacting with the device’s system calendars, events, reminders, and associated records.
+ */
+export namespace Calendar {
+    interface Calendar {
+        /** Internal ID that represents this calendar on the device */
+        id?: string;
+
+        /** Visible name of the calendar */
+        title?: string;
+
+        sourceId?: string; // iOS
+
+        /** Object representing the source to be used for the calendar */
+        source?: Source;
+
+        /** Type of calendar this object represents */
+        type?: CalendarType; // iOS
+
+        /** Color used to display this calendar’s events */
+        color?: string;
+
+        /** Whether the calendar is used in the Calendar or Reminders OS app */
+        entityType?: EntityTypes; // iOS
+
+        /** Boolean value that determines whether this calendar can be modified */
+        allowsModifications?: boolean;
+
+        /** Availability types that this calendar supports */
+        allowedAvailabilities?: Availability[];
+
+        /** Boolean value indicating whether this is the device’s primary calendar */
+        isPrimary?: boolean; // Android
+
+        /** Internal system name of the calendar */
+        name?: string; // Android
+
+        /** Name for the account that owns this calendar */
+        ownerAccount?: string; // Android
+
+        /** Time zone for the calendar	 */
+        timeZone?: string; // Android
+
+        /** Alarm methods that this calendar supports */
+        allowedReminders?: AlarmMethod[]; // Android
+
+        /** Attendee types that this calendar supports */
+        allowedAttendeeTypes?: AttendeeType[]; // Android
+
+        /** Indicates whether the OS displays events on this calendar */
+        isVisible?: boolean; // Android
+
+        /** Indicates whether this calendar is synced and its events stored on the device */
+        isSynced?: boolean; // Android
+
+        /** Level of access that the user has for the calendar */
+        accessLevel?: CalendarAccessLevel; // Android
+    }
+
+    interface Source {
+        /** Internal ID that represents this source on the device */
+        id?: string; // iOS only ??
+
+        /** Type of account that owns this calendar */
+        type?: string;
+
+        /** Name for the account that owns this calendar */
+        name?: string;
+
+        /** Whether this source is the local phone account */
+        isLocalAccount?: boolean; // Android
+    }
+
+    interface Event {
+        /** Internal ID that represents this event on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this event */
+        calendarId?: string;
+
+        /** Visible name of the event */
+        title?: string;
+
+        /** Location field of the event	 */
+        location?: string;
+
+        /** Date when the event record was created */
+        creationDate?: string; // iOS
+
+        /** Date when the event record was last modified */
+        lastModifiedDate?: string; // iOS
+
+        /** Time zone the event is scheduled in */
+        timeZone?: string;
+
+        /** Time zone for the event end time */
+        endTimeZone?: string; // Android
+
+        /** URL for the event */
+        url?: string; // iOS
+
+        /** Description or notes saved with the event */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated reminders to the user */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeating events. Null for one-time events. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the time when the event starts */
+        startDate?: string;
+
+        /** Date object or string representing the time when the event ends */
+        endDate?: string;
+
+        /** For recurring events, the start date for the first (original) instance of the event */
+        originalStartDate?: string; // iOS
+
+        /** Boolean value indicating whether or not the event is a detached (modified) instance of a recurring event */
+        isDetached?: boolean; // iOS
+
+        /** Whether the event is displayed as an all-day event on the calendar */
+        allDay?: boolean;
+
+        /** The availability setting for the event */
+        availability?: Availability; // Availability
+
+        /** Status of the event */
+        status?: EventStatus; // Status
+
+        /** Organizer of the event, as an Attendee object */
+        organizer?: string; // Organizer - iOS
+
+        /** Email address of the organizer of the event */
+        organizerEmail?: string; // Android
+
+        /** User’s access level for the event */
+        accessLevel?: EventAccessLevel; // Android,
+
+        /** Whether invited guests can modify the details of the event */
+        guestsCanModify?: boolean; // Android,
+
+        /** Whether invited guests can invite other guests */
+        guestsCanInviteOthers?: boolean; // Android
+
+        /** Whether invited guests can see other guests */
+        guestsCanSeeGuests?: boolean; // Android
+
+        /** For detached (modified) instances of recurring events, the ID of the original recurring event */
+        originalId?: string; // Android
+
+        /** For instances of recurring events, volatile ID representing this instance; not guaranteed to always refer to the same instance */
+        instanceId?: string; // Android
+    }
+
+    interface Attendee {
+        /** Internal ID that represents this attendee on the device */
+        id?: string; // Android
+
+        /** Indicates whether or not this attendee is the current OS user */
+        isCurrentUser?: boolean; // iOS
+
+        /** Displayed name of the attendee */
+        name?: string;
+
+        /** Role of the attendee at the event */
+        role?: AttendeeRole;
+
+        /** Status of the attendee in relation to the event */
+        status?: AttendeeStatus;
+
+        /** Type of the attendee */
+        type?: AttendeeType;
+
+        /** URL for the attendee */
+        url?: string; // iOS
+
+        /** Email address of the attendee */
+        email?: string; // Android
+    }
+
+    interface Reminder {
+        /** Internal ID that represents this reminder on the device */
+        id?: string;
+
+        /** ID of the calendar that contains this reminder */
+        calendarId?: string;
+
+        /** Visible name of the reminder */
+        title?: string;
+
+        /** Location field of the reminder */
+        location?: string;
+
+        /** Date when the reminder record was created */
+        creationDate?: string;
+
+        /** Date when the reminder record was last modified */
+        lastModifiedDate?: string;
+
+        /** Time zone the reminder is scheduled in */
+        timeZone?: string;
+
+        /** URL for the reminder */
+        url?: string;
+
+        /** Description or notes saved with the reminder */
+        notes?: string;
+
+        /** Array of Alarm objects which control automated alarms to the user about the task */
+        alarms?: Alarm[];
+
+        /** Object representing rules for recurring or repeated reminders. Null for one-time tasks. */
+        recurrenceRule?: RecurrenceRule;
+
+        /** Date object or string representing the start date of the reminder task */
+        startDate?: string;
+
+        /** Date object or string representing the time when the reminder task is due */
+        dueDate?: string;
+
+        /** Indicates whether or not the task has been completed */
+        completed?: boolean;
+
+        /** Date object or string representing the date of completion, if completed is true */
+        completionDate?: string;
+    }
+
+    interface Alarm {
+        /** Date object or string representing an absolute time the alarm should occur; overrides relativeOffset and structuredLocation if specified alongside either */
+        absoluteDate?: string; // iOS
+
+        /** Number of minutes from the startDate of the calendar item that the alarm should occur; use negative values to have the alarm occur before the startDate */
+        relativeOffset?: string;
+        structuredLocation?: {
+            // iOS
+            title?: string;
+            proximity?: string; // Proximity
+            radius?: number;
+            coords?: {
+                latitude?: number;
+                longitude?: number;
+            };
+        };
+
+        /** Method of alerting the user that this alarm should use; on iOS this is always a notification */
+        method?: AlarmMethod; // Method, Android
+    }
+
+    interface RecurrenceRule {
+        /** How often the calendar item should recur */
+        frequency: Frequency; // Frequency
+
+        /** Interval at which the calendar item should recur. For example, an interval: 2 with frequency: DAILY would yield an event that recurs every other day. Defaults to 1 . */
+        interval?: number;
+
+        /** Date on which the calendar item should stop recurring; overrides occurrence if both are specified */
+        endDate?: string;
+
+        /** Number of times the calendar item should recur before stopping */
+        occurrence?: number;
+    }
+
+    enum EntityTypes {
+        EVENT = 'event',
+        REMINDER = 'reminder',
+    }
+
+    enum CalendarType {
+        LOCAL = 'local',
+        CALDAV = 'caldav',
+        EXCHANGE = 'exchange',
+        SUBSCRIBED = 'subscribed',
+        BIRTHDAYS = 'birthdays'
+    }
+
+    enum Availability {
+        NOT_SUPPORTED = 'notSupported', // iOS
+        BUSY = 'busy',
+        FREE = 'free',
+        TENTATIVE = 'tentative',
+        UNAVAILABLE = 'unavailable' // iOS
+    }
+
+    enum AlarmMethod {
+        ALARM = 'alarm',
+        ALERT = 'alert',
+        EMAIL = 'email',
+        SMS = 'sms',
+        DEFAULT = 'default',
+    }
+
+    enum AttendeeType {
+        UNKNOWN = 'unknown', // iOS
+        PERSON = 'person', // iOS
+        ROOM = 'room', // iOS
+        GROUP = 'group', // iOS
+        RESOURCE = 'resource',
+        OPTIONAL = 'optional', // Android
+        REQUIRED = 'required', // Android
+        NONE = 'none' // Android
+    }
+
+    enum CalendarAccessLevel {
+        CONTRIBUTOR = 'contributor',
+        EDITOR = 'editor',
+        FREEBUSY = 'freebusy',
+        OVERRIDE = 'override',
+        OWNER = 'owner',
+        READ = 'read',
+        RESPOND = 'respond',
+        ROOT = 'root',
+        NONE = 'none'
+    }
+
+    enum EventAccessLevel {
+        CONFIDENTIAL = 'confidential',
+        PRIVATE = 'private',
+        PUBLIC = 'public',
+        DEFAULT = 'default'
+    }
+
+    enum EventStatus {
+        NONE = 'none',
+        CONFIRMED = 'confirmed',
+        TENTATIVE = 'tentative',
+        CANCELED = 'canceled'
+    }
+
+    enum AttendeeRole {
+        UNKNOWN = 'unknown', // iOS
+        REQUIRED = 'required', // iOS
+        OPTIONAL = 'optional', // iOS
+        CHAIR = 'chair', // iOS
+        NON_PARTICIPANT = 'nonParticipant', // iOS
+        ATTENDEE = 'attendee', // Android
+        ORGANIZER = 'organizer', // Android
+        PERFORMER = 'performer', // Android
+        SPEAKER = 'speaker', // Android
+        NONE = 'none' // Android
+    }
+
+    enum AttendeeStatus {
+        UNKNOWN = 'unknown', // iOS
+        PENDING = 'pending', // iOS
+        ACCEPTED = 'accepted',
+        DECLINED = 'declined',
+        TENTATIVE = 'tentative',
+        DELEGATED = 'delegated', // iOS
+        COMPLETED = 'completed', // iOS
+        IN_PROCESS = 'inProcess', // iOS
+        INVITED = 'invited', // Android
+        NONE = 'none' // Android
+    }
+
+    enum Frequency {
+        DAILY = 'daily',
+        WEEKLY = 'weekly',
+        MONTHLY = 'monthly',
+        YEARLY = 'yearly'
+    }
+
+    enum ReminderStatus {
+        COMPLETED = 'completed',
+        INCOMPLETE = 'incomplete'
+    }
+
+    interface RecurringEventOptions {
+        futureEvents?: boolean;
+        instanceStartDate?: string;
+    }
+
+    /** Gets an array of calendar objects with details about the different calendars stored on the device. */
+    function getCalendarsAsync(
+        /** (iOS only) Not required, but if defined, filters the returned calendars to a specific entity type.  */
+        entityType?: EntityTypes
+    ): Promise<Calendar[]>;
+
+    /** Creates a new calendar on the device, allowing events to be added later and displayed. */
+    function createCalendarAsync(details: Calendar): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateCalendarAsync(id: string, details?: Calendar | null): Promise<string>;
+
+    /** Deletes an existing calendar and all associated events/reminders/attendees from the device. Use with caution. */
+    function deleteCalendarAsync(id: string): Promise<void>;
+
+    /** Returns all events in a given set of calendars over a specified time period. */
+    function getEventsAsync(
+        /** Array of IDs of calendars to search for events in. Required. */
+        calendarIds: string[],
+
+        /** Beginning of time period to search for events in. Required. */
+        startDate: Date,
+
+        /** End of time period to search for events in. Required. */
+        endDate: Date
+    ): Promise<Event[]>;
+
+    /** Returns a specific event selected by ID. If a specific instance of a recurring event is desired, the start date of this instance must also be provided, as instances of recurring events do not have their own unique and stable IDs on either iOS or Android. */
+    function getEventAsync(
+        /** ID of the event to return. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<Event>;
+
+    /** Creates a new event on the specified calendar. */
+    function createEventAsync(
+        /** ID of the calendar to create this event in. Required. */
+        calendarId: string,
+        details?: Event
+    ): Promise<string>;
+
+    /** Updates the provided details of an existing calendar stored on the device. To remove a property, explicitly set it to null in details */
+    function updateEventAsync(
+        /** ID of the event to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Event | null,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<string>;
+
+    /** Deletes an existing event from the device. Use with caution. */
+    function deleteEventAsync(
+        /** ID of the event to be deleted. Required. */
+        id: string,
+
+        /** A map of options for recurring events */
+        recurringEventOptions?: RecurringEventOptions
+    ): Promise<void>;
+
+    /** Gets all attendees for a given event (or instance of a recurring event). */
+    function getAttendeesForEventAsync(
+        /** ID of the event to return attendees for. Required. */
+        eventId: string,
+
+        /** A map of options for recurring events */
+        recurrentEventOptions?: RecurringEventOptions
+    ): Promise<Attendee[]>;
+
+    /** Available on Android only. Creates a new attendee record and adds it to the specified event. Note that if eventId specifies a recurring event, this will add the attendee to every instance of the event. */
+    function createAttendeeAsync(
+        /**  ID of the event to add this attendee to. Required. */
+        eventId: string,
+
+        /** A map of details for the attendee to be created  */
+        details?: Attendee
+    ): Promise<string>;
+
+    /** Available on Android only. Updates an existing attendee record. To remove a property, explicitly set it to null in details. */
+    function updateAttendeeAsync(
+        /** ID of the attendee record to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated  */
+        details?: Attendee | null
+    ): Promise<string>;
+
+    /** Available on Android only. Deletes an existing attendee record from the device. Use with caution. */
+    function deleteAttendeeAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. Returns a list of reminders matching the provided criteria. */
+    function getRemindersAsync(
+        /**  Array of IDs of calendars to search for reminders in. Required. */
+        calendarIds: string[],
+
+        status?: ReminderStatus,
+
+        /** Beginning of time period to search for reminders in. Required if status is defined. */
+        startDate?: Date,
+
+        /** End of time period to search for reminders in. Required if status is defined. */
+        endDate?: Date
+    ): Promise<Reminder[]>;
+
+    /** Available on iOS only. Returns a specific reminder selected by ID. */
+    function getReminderAsync(id: string): Promise<Reminder>;
+
+    /** Available on iOS only. Creates a new reminder on the specified calendar. */
+    function createReminderAsync(
+        /** ID of the calendar to create this reminder in. Required. */
+        calendarId: string,
+
+        /** A map of details for the reminder to be created */
+        details?: Reminder
+    ): Promise<string>;
+
+    /** Available on iOS only. Updates the provided details of an existing reminder stored on the device. To remove a property, explicitly set it to null in details. */
+    function updateReminderAsync(
+        /** ID of the reminder to be updated. Required. */
+        id: string,
+
+        /** A map of properties to be updated */
+        details?: Reminder | null
+    ): Promise<string>;
+
+    /** Available on iOS only. Deletes an existing reminder from the device. Use with caution. */
+    function deleteReminderAsync(id: string): Promise<void>;
+
+    /** Available on iOS only. */
+    function getSourcesAsync(): Promise<Source[]>;
+
+    /** Available on iOS only. Returns a specific source selected by ID. */
+    function getSourceAsync(id: string): Promise<Source>;
+
+    /** Available on Android only. Sends an intent to open the specified event in the OS Calendar app. */
+    function openEventInCalendar(
+        /** ID of the event to open. Required. */
+        id: string
+    ): void;
+}
+// #endregion
+
+// #region Calendar
+/**
+ * An API to compose mails using OS specific UI.
+ */
+export namespace MailComposer {
+    interface ComposeOptions {
+        /** An array of e-mail addressess of the recipients. */
+        recipients?: string[];
+
+        /** An array of e-mail addressess of the CC recipients. */
+        ccRecipients?: string[];
+
+        /** An array of e-mail addressess of the BCC recipients. */
+        bccRecipients?: string[];
+
+        /** Subject of the mail. */
+        subject?: string;
+
+        /** Body of the mail. */
+        body?: string;
+
+        /** Whether the body contains HTML tags so it could be formatted properly. Not working perfectly on Android. */
+        isHtml?: boolean;
+
+        /** An array of app’s internal file uris to attach. */
+        attachments?: string[];
+    }
+
+    /** Resolves to a promise with object containing status field that could be either sent, saved or cancelled. Android does not provide such info so it always resolves to sent. */
+    function composeAsync(
+        /** A map defining the data to fill the mail */
+        options: ComposeOptions
+    ): Promise<{ status: 'sent' | 'saved' | 'cancelled' }>;
+}
+// #endregion
+
+export namespace Updates {
+    namespace EventType {
+        /** A new update is available and has started downloading. */
+        type DownloadStart = 'downloadStart';
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        type DownloadProgress = 'downloadProgress';
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        type DownloadFinished = 'downloadFinished';
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        type NoUpdateAvailable = 'noUpdateAvailable';
+        /** An error occurred trying to fetch the latest update. */
+        type Error = 'error';
+
+        /** A new update is available and has started downloading. */
+        const DOWNLOAD_STARTED: DownloadStart;
+        /** A new update is currently being downloaded and will be stored in the device's cache. */
+        const DOWNLOAD_PROGRESS: DownloadProgress;
+        /** A new update has finished downloading and is now stored in the device's cache. */
+        const DOWNLOAD_FINISHED: DownloadFinished;
+        /** No updates are available, and the most up-to-date bundle of this experience is already running. */
+        const NO_UPDATE_AVAILABLE: NoUpdateAvailable;
+        /** An error occurred trying to fetch the latest update. */
+        const ERROR: Error;
+    }
+
+    interface UpdateCheck {
+        /** True if an update is available, false if you're already running the most up-to-date JS bundle. */
+        isAvailable: boolean;
+        /** If `isAvailable` is true, the manifest of the available update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+    }
+
+    interface UpdateBundle {
+        /** True if the fetched bundle is new (i.e. a different version that the what's currently running). */
+        isNew: boolean;
+        /** Manifest of the fetched update. */
+        manifest: Constants.Manifest;
+    }
+
+    /** An object that is passed into each event listener when a new version is available. */
+    interface UpdateEvent {
+        /** Type of the event */
+        type: EventType.DownloadStart
+            | EventType.DownloadProgress
+            | EventType.DownloadFinished
+            | EventType.NoUpdateAvailable
+            | EventType.Error;
+        /** If `type === Expo.Updates.EventType.DOWNLOAD_FINISHED`, the manifest of the newly downloaded update. Undefined otherwise. */
+        manifest?: Constants.Manifest;
+        /** If `type === Expo.Updates.EventType.ERROR`, the error message. Undefined otherwise. */
+        message?: string;
+    }
+
+    type UpdateEventListener = (event: UpdateEvent) => any;
+
+    /**
+     * Invokes a callback when updates-related events occur,
+     * either on the initial app load or as a result of a call to `Expo.Updates.fetchUpdateAsync`.
+     */
+    function addListener(listener: UpdateEventListener): EventSubscription;
+
+    /**
+     * Check if a new published version of your project is available.
+     * Does not actually download the update.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function checkForUpdateAsync(): Promise<UpdateCheck>;
+
+    /**
+     * Downloads the most recent published version of your experience to the device's local cache.
+     * Rejects if `updates.enabled` is `false` in app.json.
+     */
+    function fetchUpdateAsync(listener?: UpdateEventListener): Promise<UpdateBundle>;
+
+    /**
+     * Immediately reloads the current experience.
+     * This will use your app.json updates configuration to fetch and load the newest available JS supported by the device's Expo environment.
+     * This is useful for triggering an update of your experience if you have published a new version.
+     */
+    function reload(): void;
+
+    /**
+     * Immediately reloads the current experience using the most recent cached version.
+     * This is useful for triggering an update of your experience if you have published and already downloaded a new version.
+     */
+    function reloadFromCache(): void;
+}
diff --git a/types/expo/v26/tsconfig.json b/types/expo/v26/tsconfig.json
new file mode 100644
index 0000000000..7711f49776
--- /dev/null
+++ b/types/expo/v26/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo-tests.tsx"
+    ]
+}
diff --git a/types/expo/v26/tslint.json b/types/expo/v26/tslint.json
new file mode 100644
index 0000000000..8270136207
--- /dev/null
+++ b/types/expo/v26/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "void-return": false,
+        "max-line-length": false
+    }
+}

From c4a72bc3ffe73e483de6cee21455eb4c23315610 Mon Sep 17 00:00:00 2001
From: Ryan Clark <ryan@ryanclark.me>
Date: Tue, 5 Jun 2018 15:08:03 +0200
Subject: [PATCH 1028/1124] Add typings for git-branch

---
 types/git-branch/git-branch-tests.ts | 14 ++++++++++++++
 types/git-branch/index.d.ts          | 15 +++++++++++++++
 types/git-branch/tsconfig.json       | 23 +++++++++++++++++++++++
 types/git-branch/tslint.json         |  1 +
 4 files changed, 53 insertions(+)
 create mode 100644 types/git-branch/git-branch-tests.ts
 create mode 100644 types/git-branch/index.d.ts
 create mode 100644 types/git-branch/tsconfig.json
 create mode 100644 types/git-branch/tslint.json

diff --git a/types/git-branch/git-branch-tests.ts b/types/git-branch/git-branch-tests.ts
new file mode 100644
index 0000000000..4b02cb5da3
--- /dev/null
+++ b/types/git-branch/git-branch-tests.ts
@@ -0,0 +1,14 @@
+import gitBranch = require('git-branch');
+
+gitBranch()
+  .then((name) => {});
+
+gitBranch('cwd')
+  .then((name) => {});
+
+gitBranch.sync();
+gitBranch.sync('cwd');
+
+gitBranch((err, name) => {});
+
+gitBranch('cwd', (err, name) => {});
diff --git a/types/git-branch/index.d.ts b/types/git-branch/index.d.ts
new file mode 100644
index 0000000000..a1cecc9691
--- /dev/null
+++ b/types/git-branch/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for git-branch 2.0
+// Project: https://github.com/jonschlinkert/git-branch
+// Definitions by: Ryan Clark <https://github.com/rynclark>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export = GitBranch;
+
+declare function GitBranch(cwd?: string): Promise<string>;
+declare function GitBranch(cwd?: string, callback?: (err: null | string, name: string) => void): void;
+declare function GitBranch(callback?: (err: null | string, name: string) => void): void;
+
+declare namespace GitBranch {
+  function sync(cwd?: string): string;
+}
diff --git a/types/git-branch/tsconfig.json b/types/git-branch/tsconfig.json
new file mode 100644
index 0000000000..0ed27223a0
--- /dev/null
+++ b/types/git-branch/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",
+    "git-branch-tests.ts"
+  ]
+}
diff --git a/types/git-branch/tslint.json b/types/git-branch/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/git-branch/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fc4c90a49e5b56c07ecfed7f6006588ab1e97720 Mon Sep 17 00:00:00 2001
From: Daniel Herman <dherman@factset.com>
Date: Mon, 4 Jun 2018 17:34:16 -0400
Subject: [PATCH 1029/1124] fix(prettier): add missing getFileInfo APIs

---
 types/prettier/index.d.ts        | 19 ++++++++++++++++++-
 types/prettier/prettier-tests.ts | 10 ++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index fd20fdd167..7d6621d69b 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for prettier 1.12
+// Type definitions for prettier 1.13
 // Project: https://github.com/prettier/prettier
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -290,6 +290,23 @@ export interface SupportInfo {
     options: SupportOption[];
 }
 
+export interface FileInfoOptions {
+    ignorePath?: string;
+    withNodeModules?: boolean;
+    plugins?: string[];
+}
+
+export interface FileInfoResult {
+    ignored: boolean;
+    inferredParser: string | null;
+}
+
+export function getFileInfo(filePath: string, options?: FileInfoOptions): Promise<FileInfoResult>;
+
+export namespace getFileInfo {
+    function sync(filePath: string, options?: FileInfoOptions): FileInfoResult;
+}
+
 /**
  * Returns an object representing the parsers, languages and file types Prettier supports.
  * If `version` is provided (e.g. `"1.5.0"`), information for that version will be returned,
diff --git a/types/prettier/prettier-tests.ts b/types/prettier/prettier-tests.ts
index 47edb63ce9..21326e21d7 100644
--- a/types/prettier/prettier-tests.ts
+++ b/types/prettier/prettier-tests.ts
@@ -24,6 +24,16 @@ prettier.resolveConfig('path/to/somewhere').then(options => {
     }
 });
 
+if (prettier.getFileInfo.sync('./tsconfig.json').inferredParser !== 'json') {
+    throw new Error('Bad parser');
+}
+
+prettier.getFileInfo('./tsconfig.json').then((result) => {
+  if (result.inferredParser !== 'json') {
+      throw new Error('Bad parser');
+  }
+});
+
 // $ExpectError
 prettier.resolveConfig();
 

From f249612c49539e5d067820070bd5c3f9e2c4afdc Mon Sep 17 00:00:00 2001
From: Giorgio Garasto <mail@dabolus.app>
Date: Tue, 5 Jun 2018 15:40:10 +0200
Subject: [PATCH 1030/1124] Make some types more specific

---
 types/node-telegram-bot-api/index.d.ts        | 139 +++++++++++++-----
 .../node-telegram-bot-api-tests.ts            |   2 +-
 2 files changed, 103 insertions(+), 38 deletions(-)

diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
index 47d50223d2..a312e52577 100644
--- a/types/node-telegram-bot-api/index.d.ts
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -28,6 +28,18 @@ declare namespace TelegramBot {
         callback(msg: Message): void;
     }
 
+    type ChatType = 'private' | 'group' | 'supergroup' | 'channel';
+
+    type ChatAction = 'typing' | 'upload_photo' | 'record_video' | 'upload_video' | 'record_audio' | 'upload_audio' | 'upload_document' | 'find_location' | 'record_video_note' | 'upload_video_note';
+
+    type ChatMemberStatus = 'creator' | 'administrator' | 'member' | 'restricted' | 'left' | 'kicked';
+
+    type DocumentMimeType = 'application/pdf' | 'application/zip';
+
+    type MessageEntityType = 'mention' | 'hashtag' | 'bot_command' | 'url' | 'email' | 'bold' | 'italic' | 'code' | 'pre' | 'text_link' | 'text_mention';
+
+    type ParseMode = 'Markdown' | 'HTML';
+
     /// METHODS OPTIONS ///
     interface PollingOptions {
         interval?: string | number;
@@ -85,7 +97,7 @@ declare namespace TelegramBot {
     }
 
     interface SendMessageOptions extends SendBasicOptions {
-        parse_mode?: string;
+        parse_mode?: ParseMode;
         disable_web_page_preview?: boolean;
     }
 
@@ -197,7 +209,7 @@ declare namespace TelegramBot {
     }
 
     interface EditMessageTextOptions extends EditMessageCaptionOptions {
-        parse_mode?: string;
+        parse_mode?: ParseMode;
         disable_web_page_preview?: boolean;
     }
 
@@ -274,7 +286,7 @@ declare namespace TelegramBot {
 
     interface Chat {
         id: number;
-        type: string;
+        type: ChatType;
         title?: string;
         username?: string;
         first_name?: string;
@@ -329,7 +341,7 @@ declare namespace TelegramBot {
     }
 
     interface MessageEntity {
-        type: string;
+        type: MessageEntityType;
         offset: number;
         length: number;
         url?: string;
@@ -372,16 +384,25 @@ declare namespace TelegramBot {
         mime_type?: string;
     }
 
-    interface InputMediaPhoto {
-        type: string;
+    interface InputMediaBase {
         media: string;
-        fileOptions?: {
-            filename: string;
-            contentType: string;
-        };
+        caption?: string;
+        parse_mode?: ParseMode;
     }
 
-    type InputMediaVideo = InputMediaPhoto;
+    interface InputMediaPhoto extends InputMediaBase {
+        type: 'photo';
+    }
+
+    interface InputMediaVideo extends InputMediaBase {
+        type: 'video';
+        width?: number;
+        height?: number;
+        duration?: number;
+        supports_streaming?: boolean;
+    }
+
+    type InputMedia = InputMediaPhoto | InputMediaVideo;
 
     interface VideoNote extends FileBase {
         length: number;
@@ -471,7 +492,7 @@ declare namespace TelegramBot {
 
     interface ChatMember {
         user: User;
-        status: string;
+        status: ChatMemberStatus;
         until_date?: number;
         can_be_edited?: boolean;
         can_change_info?: boolean;
@@ -521,13 +542,13 @@ declare namespace TelegramBot {
         offset: string;
     }
 
-    interface InlineQueryResult {
-        type: string;
+    interface InlineQueryResultBase {
         id: string;
         reply_markup?: InlineKeyboardMarkup;
     }
 
-    interface InlineQueryResultArticle extends InlineQueryResult {
+    interface InlineQueryResultArticle extends InlineQueryResultBase {
+        type: 'article';
         title: string;
         input_message_content: InputMessageContent;
         url?: string;
@@ -538,7 +559,8 @@ declare namespace TelegramBot {
         thumb_height?: number;
     }
 
-    interface InlineQueryResultPhoto extends InlineQueryResult {
+    interface InlineQueryResultPhoto extends InlineQueryResultBase {
+        type: 'photo';
         photo_url: string;
         thumb_url: string;
         photo_width?: number;
@@ -549,7 +571,8 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultGif extends InlineQueryResult {
+    interface InlineQueryResultGif extends InlineQueryResultBase {
+        type: 'gif';
         gif_url: string;
         gif_width?: number;
         gif_height?: number;
@@ -560,7 +583,8 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultMpeg4Gif extends InlineQueryResult {
+    interface InlineQueryResultMpeg4Gif extends InlineQueryResultBase {
+        type: 'mpeg4_gif';
         mpeg4_url: string;
         mpeg4_width?: number;
         mpeg4_height?: number;
@@ -571,7 +595,8 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultVideo extends InlineQueryResult {
+    interface InlineQueryResultVideo extends InlineQueryResultBase {
+        type: 'video';
         video_url: string;
         mime_type: string;
         thumb_url: string;
@@ -584,7 +609,8 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultAudio extends InlineQueryResult {
+    interface InlineQueryResultAudio extends InlineQueryResultBase {
+        type: 'audio';
         audio_url: string;
         title: string;
         caption?: string;
@@ -593,7 +619,8 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultVoice extends InlineQueryResult {
+    interface InlineQueryResultVoice extends InlineQueryResultBase {
+        type: 'voice';
         voice_url: string;
         title: string;
         caption?: string;
@@ -601,7 +628,8 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultDocument extends InlineQueryResult {
+    interface InlineQueryResultDocument extends InlineQueryResultBase {
+        type: 'document';
         title: string;
         caption?: string;
         document_url: string;
@@ -613,7 +641,7 @@ declare namespace TelegramBot {
         thumb_height?: number;
     }
 
-    interface InlineQueryResultLocation extends InlineQueryResult {
+    interface InlineQueryResultLocationBase extends InlineQueryResultBase {
         latitude: number;
         longitude: number;
         title: string;
@@ -623,12 +651,18 @@ declare namespace TelegramBot {
         thumb_height?: number;
     }
 
-    interface InlineQueryResultVenue extends InlineQueryResultLocation {
+    interface InlineQueryResultLocation extends InlineQueryResultLocationBase {
+        type: 'location';
+    }
+
+    interface InlineQueryResultVenue extends InlineQueryResultLocationBase {
+        type: 'venue';
         address: string;
         foursquare_id?: string;
     }
 
-    interface InlineQueryResultContact extends InlineQueryResult {
+    interface InlineQueryResultContact extends InlineQueryResultBase {
+        type: 'contact';
         phone_number: string;
         first_name: string;
         last_name?: string;
@@ -638,11 +672,13 @@ declare namespace TelegramBot {
         thumb_height?: number;
     }
 
-    interface InlineQueryResultGame extends InlineQueryResult {
+    interface InlineQueryResultGame extends InlineQueryResultBase {
+        type: 'game';
         game_short_name: string;
     }
 
-    interface InlineQueryResultCachedPhoto extends InlineQueryResult {
+    interface InlineQueryResultCachedPhoto extends InlineQueryResultBase {
+        type: 'photo';
         photo_file_id: string;
         title?: string;
         description?: string;
@@ -650,26 +686,30 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultCachedGif extends InlineQueryResult {
+    interface InlineQueryResultCachedGif extends InlineQueryResultBase {
+        type: 'gif';
         gif_file_id: string;
         title?: string;
         caption?: string;
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultCachedMpeg4Gif extends InlineQueryResult {
+    interface InlineQueryResultCachedMpeg4Gif extends InlineQueryResultBase {
+        type: 'mpeg4_gif';
         mpeg4_file_id: string;
         title?: string;
         caption?: string;
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultCachedSticker extends InlineQueryResult {
+    interface InlineQueryResultCachedSticker extends InlineQueryResultBase {
+        type: 'sticker';
         sticker_file_id: string;
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultCachedDocument extends InlineQueryResult {
+    interface InlineQueryResultCachedDocument extends InlineQueryResultBase {
+        type: 'document';
         title: string;
         document_file_id: string;
         description?: string;
@@ -677,7 +717,8 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultCachedVideo extends InlineQueryResult {
+    interface InlineQueryResultCachedVideo extends InlineQueryResultBase {
+        type: 'video';
         video_file_id: string;
         title: string;
         description?: string;
@@ -685,24 +726,48 @@ declare namespace TelegramBot {
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultCachedVoice extends InlineQueryResult {
+    interface InlineQueryResultCachedVoice extends InlineQueryResultBase {
+        type: 'voice';
         voice_file_id: string;
         title: string;
         caption?: string;
         input_message_content?: InputMessageContent;
     }
 
-    interface InlineQueryResultCachedAudio extends InlineQueryResult {
+    interface InlineQueryResultCachedAudio extends InlineQueryResultBase {
+        type: 'audio';
         audio_file_id: string;
         caption?: string;
         input_message_content?: InputMessageContent;
     }
 
+    type InlineQueryResult =
+        InlineQueryResultCachedAudio |
+        InlineQueryResultCachedDocument |
+        InlineQueryResultCachedGif |
+        InlineQueryResultCachedMpeg4Gif |
+        InlineQueryResultCachedPhoto |
+        InlineQueryResultCachedSticker |
+        InlineQueryResultCachedVideo |
+        InlineQueryResultCachedVoice |
+        InlineQueryResultArticle |
+        InlineQueryResultAudio |
+        InlineQueryResultContact |
+        InlineQueryResultGame |
+        InlineQueryResultDocument |
+        InlineQueryResultGif |
+        InlineQueryResultLocation |
+        InlineQueryResultMpeg4Gif |
+        InlineQueryResultPhoto |
+        InlineQueryResultVenue |
+        InlineQueryResultVideo |
+        InlineQueryResultVoice;
+
     type InputMessageContent = object;
 
     interface InputTextMessageContent extends InputMessageContent {
         message_text: string;
-        parse_mode?: string;
+        parse_mode?: ParseMode;
         disable_web_page_preview?: boolean;
     }
 
@@ -863,7 +928,7 @@ 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>;
+    sendMediaGroup(chatId: number | string, media: TelegramBot.InputMedia[], options?: TelegramBot.SendMediaGroupOptions): Promise<TelegramBot.Message | Error>;
 
     sendSticker(chatId: number | string, sticker: string | Stream | Buffer, options?: TelegramBot.SendStickerOptions): Promise<TelegramBot.Message | Error>;
 
@@ -873,7 +938,7 @@ declare class TelegramBot extends EventEmitter {
 
     sendVoice(chatId: number | string, voice: string | Stream | Buffer, options?: TelegramBot.SendVoiceOptions): Promise<TelegramBot.Message | Error>;
 
-    sendChatAction(chatId: number | string, action: string): Promise<boolean | Error>;
+    sendChatAction(chatId: number | string, action: TelegramBot.ChatAction): Promise<boolean | Error>;
 
     kickChatMember(chatId: number | string, userId: string): Promise<boolean | Error>;
 
diff --git a/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
index dcd8adc238..b4b09485cb 100644
--- a/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
+++ b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
@@ -32,7 +32,7 @@ MyTelegramBot.sendSticker(1234, 'sticker/path', { reply_to_message_id: 5678 });
 MyTelegramBot.sendVideo(1234, 'video/path', { caption: 'Foo' });
 MyTelegramBot.sendVideoNote(1234, 'video/path', { disable_notification: true });
 MyTelegramBot.sendVoice(1234, 'voice/path', { caption: 'Foo' });
-MyTelegramBot.sendChatAction(1234, 'ACTION!');
+MyTelegramBot.sendChatAction(1234, 'typing');
 MyTelegramBot.kickChatMember(1234, 'myUserID');
 MyTelegramBot.unbanChatMember(1234, 'myUserID');
 MyTelegramBot.restrictChatMember(1234, 'myUserID', { can_add_web_page_previews: true });

From c979a2227bc8b4e3fa72f234bc513f65be9197b2 Mon Sep 17 00:00:00 2001
From: Giorgio Garasto <mail@dabolus.app>
Date: Tue, 5 Jun 2018 16:06:01 +0200
Subject: [PATCH 1031/1124] Convert arrays in function calls to ReadonlyArrays

---
 types/node-telegram-bot-api/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
index a312e52577..32f4ae8d85 100644
--- a/types/node-telegram-bot-api/index.d.ts
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -918,7 +918,7 @@ declare class TelegramBot extends EventEmitter {
 
     sendMessage(chatId: number | string, text: string, options?: TelegramBot.SendMessageOptions): Promise<TelegramBot.Message | Error>;
 
-    answerInlineQuery(inlineQueryId: string, results: TelegramBot.InlineQueryResult[], options?: TelegramBot.AnswerInlineQueryOptions): Promise<boolean | Error>;
+    answerInlineQuery(inlineQueryId: string, results: ReadonlyArray<TelegramBot.InlineQueryResult>, options?: TelegramBot.AnswerInlineQueryOptions): Promise<boolean | Error>;
 
     forwardMessage(chatId: number | string, fromChatId: number | string, messageId: number | string, options?: TelegramBot.ForwardMessageOptions): Promise<TelegramBot.Message | Error>;
 
@@ -928,7 +928,7 @@ 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: TelegramBot.InputMedia[], options?: TelegramBot.SendMediaGroupOptions): Promise<TelegramBot.Message | Error>;
+    sendMediaGroup(chatId: number | string, media: ReadonlyArray<TelegramBot.InputMedia>, options?: TelegramBot.SendMediaGroupOptions): Promise<TelegramBot.Message | Error>;
 
     sendSticker(chatId: number | string, sticker: string | Stream | Buffer, options?: TelegramBot.SendStickerOptions): Promise<TelegramBot.Message | Error>;
 
@@ -1025,8 +1025,8 @@ declare class TelegramBot extends EventEmitter {
 
     deleteMessage(chatId: number | string, messageId: string, options?: any): Promise<boolean | Error>;
 
-    sendInvoice(chatId: number | string, title: string, description: string, payload: string, providerToken: string, startParameter: string, currency: string, prices: TelegramBot.LabeledPrice[],
-                options?: TelegramBot.SendInvoiceOptions): Promise<TelegramBot.Message | Error>;
+    sendInvoice(chatId: number | string, title: string, description: string, payload: string, providerToken: string, startParameter: string, currency: string,
+                prices: ReadonlyArray<TelegramBot.LabeledPrice>, options?: TelegramBot.SendInvoiceOptions): Promise<TelegramBot.Message | Error>;
 
     answerShippingQuery(shippingQueryId: string, ok: boolean, options?: TelegramBot.AnswerShippingQueryOptions): Promise<boolean | Error>;
 

From 9ca390fae35f3f793a410f9c1c430ce292b1c09e Mon Sep 17 00:00:00 2001
From: Roman Charugin <rcharugin@degiro.nl>
Date: Tue, 5 Jun 2018 17:59:33 +0300
Subject: [PATCH 1032/1124] Added typings for nuka-carousel react component

---
 types/nuka-carousel/index.d.ts              | 270 ++++++++++++++++++++
 types/nuka-carousel/nuka-carousel-tests.tsx |  54 ++++
 types/nuka-carousel/tsconfig.json           |  25 ++
 types/nuka-carousel/tslint.json             |   3 +
 4 files changed, 352 insertions(+)
 create mode 100644 types/nuka-carousel/index.d.ts
 create mode 100644 types/nuka-carousel/nuka-carousel-tests.tsx
 create mode 100644 types/nuka-carousel/tsconfig.json
 create mode 100644 types/nuka-carousel/tslint.json

diff --git a/types/nuka-carousel/index.d.ts b/types/nuka-carousel/index.d.ts
new file mode 100644
index 0000000000..b06403e703
--- /dev/null
+++ b/types/nuka-carousel/index.d.ts
@@ -0,0 +1,270 @@
+// Type definitions for nuka-carousel 4.2
+// Project: https://github.com/FormidableLabs/nuka-carousel
+// Definitions by: Roman Charugin <https://github.com/Romic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+export default class Carousel extends React.Component<CarouselProps, CarouselState> {}
+
+export type CellAlignProp = 'left' | 'center' | 'right';
+
+export type HeightModeProp = 'first' | 'current' | 'max';
+
+export type SlidesToScrollProp = number | 'auto';
+
+export type SlideWidthProp = string | number;
+
+export interface SlideRenderControlProps {
+  /**
+   * Current slide index
+   */
+  currentSlide: number;
+  /**
+   * Total amount of slides
+   */
+  slideCount: number;
+  /**
+   * Current frame width (px)
+   */
+  frameWidth: number;
+  /**
+   * Current slide width (px)
+   */
+  slideWidth: number;
+  /**
+   * Slides to scroll at once
+   */
+  slidesToScroll: number;
+  /**
+   * Space between slides, as an integer, but reflected as px
+   */
+  cellSpacing: number;
+  /**
+   * Slides to show at once
+   */
+  slidesToShow: number;
+  /**
+   * Infinite mode enabled
+   */
+  wrapAround: boolean;
+  /**
+   * Go to the next slide method
+   */
+  nextSlide: () => void;
+  /**
+   * Go to the previous slide method
+   */
+  previousSlide: () => void;
+  /**
+   * Go to X slide method
+   * @param index Slide's index to go
+   */
+  goToSlide: (index: number) => void;
+}
+
+export type RenderControl = (props: SlideRenderControlProps) => JSX.Element;
+
+export interface CarouselProps {
+  /**
+   * Hook to be called after a slide is changed
+   * @param prevSlide Index of the previous slide
+   */
+  afterSlide?: (prevSlide: number) => void;
+  /**
+   * Autoplay mode active
+   * @default false
+   */
+  autoplay?: boolean;
+  /**
+   * Interval for autoplay iteration (ms)
+   * @default 3000
+   */
+  autoplayInterval?: number;
+  /**
+   * Hook to be called before a slide is changed
+   * @param currentSlide Index of the current slide
+   * @param endSlide Index of the last slide
+   */
+  beforeSlide?: (currentSlide: number, endSlide: number) => void;
+  /**
+   * When displaying more than one slide,
+   * sets which position to anchor the current slide to
+   */
+  cellAlign?: CellAlignProp;
+  /**
+   * Space between slides, as an integer, but reflected as px
+   */
+  cellSpacing?: number;
+  /**
+   * Additional className
+   */
+  className?: string;
+  /**
+   * Enable mouse swipe/dragging
+   */
+  dragging?: boolean;
+  /**
+   * Animation easing function
+   * @see https://github.com/d3/d3-ease
+   */
+  easing?: string;
+  /**
+   * Animation easing function when swipe exceeds edge
+   * @see https://github.com/d3/d3-ease
+   */
+  edgeEasing?: string;
+  /**
+   * Used to set overflow style property on slider frame
+   * @default 'hidden'
+   */
+  frameOverflow?: string;
+  /**
+   * Used to set the margin of the slider frame.
+   * Accepts any string dimension value such as "0px 20px" or "500px"
+   * @example '0px 20px'
+   * @example '500px'
+   */
+  framePadding?: string;
+  /**
+   * Change the height of the slides based either on the first slide,
+   * the current slide, or the maximum height of all slides.
+   */
+  heightMode?: HeightModeProp;
+  /**
+   * Initial height of the slides (px)
+   */
+  initialSlideHeight?: number;
+  /**
+   * Initial width of the slides (px)
+   */
+  initialSlideWidth?: number;
+  /**
+   * Window onResize callback
+   */
+  onResize?: () => void;
+  /**
+   * Function for rendering top left control
+   */
+  renderTopLeftControls?: RenderControl;
+  /**
+   * Function for rendering top center control
+   */
+  renderTopCenterControls?: RenderControl;
+  /**
+   * Function for rendering top right control
+   */
+  renderTopRightControls?: RenderControl;
+  /**
+   * Function for rendering center left control
+   */
+  renderCenterLeftControls?: RenderControl;
+  /**
+   * Function for rendering center center control
+   */
+  renderCenterCenterControls?: RenderControl;
+  /**
+   * Function for rendering center right control
+   */
+  renderCenterRightControls?: RenderControl;
+  /**
+   * Function for rendering bottom left control
+   */
+  renderBottomLeftControls?: RenderControl;
+  /**
+   * Function for rendering bottom center control
+   */
+  renderBottomCenterControls?: RenderControl;
+  /**
+   * Function for rendering bottom right control
+   */
+  renderBottomRightControls?: RenderControl;
+  /**
+   * Manually set the index of the slide to be shown
+   */
+  slideIndex?: number;
+  /**
+   * Slides to scroll at once. Set to "auto"
+   * to always scroll the current number of visible slides
+   */
+  slidesToScroll?: SlidesToScrollProp;
+  /**
+   * Slides to show at once
+   */
+  slidesToShow?: number;
+  /**
+   * Manually set slideWidth
+   * @example '20px'
+   * @example 0.8
+   */
+  slideWidth?: SlideWidthProp;
+  /**
+   * Animation duration
+   */
+  speed?: number;
+  /**
+   * Enable touch swipe/dragging
+   */
+  swiping?: boolean;
+  /**
+   * Enable the slides to transition vertically
+   */
+  vertical?: boolean;
+  /**
+   * Used to hardcode the slider width
+   * @example '80%'
+   * @example '500px'
+   */
+  width?: string;
+  /**
+   * Sets infinite wrapAround mode
+   * @default false
+   */
+  wrapAround?: boolean;
+}
+
+export interface CarouselState {
+  /**
+   * Current slide index
+   */
+  currentSlide: number;
+  /**
+   * Is dragging enabled
+   */
+  dragging: boolean;
+  /**
+   * Current frame width
+   */
+  frameWidth: number;
+  /**
+   * Current left value
+   */
+  left: number;
+  /**
+   * Total amount of slides
+   */
+  slideCount: number;
+  /**
+   * Slides to scroll at once
+   */
+  slidesToScroll: number;
+  /**
+   * Current slide width
+   */
+  slideWidth: SlideWidthProp;
+  /**
+   * Current top value
+   */
+  top: number;
+  /**
+   * Easing function name
+   */
+  easing: string;
+  /**
+   * Is infinite mode enabled
+   */
+  isWrappingAround: boolean;
+  wrapToIndex: boolean;
+  resetWrapAroundPosition: boolean;
+}
diff --git a/types/nuka-carousel/nuka-carousel-tests.tsx b/types/nuka-carousel/nuka-carousel-tests.tsx
new file mode 100644
index 0000000000..03df5e6251
--- /dev/null
+++ b/types/nuka-carousel/nuka-carousel-tests.tsx
@@ -0,0 +1,54 @@
+import * as React from 'react';
+import { render } from 'react-dom';
+
+import Carousel, { CarouselProps } from 'nuka-carousel';
+
+const props: CarouselProps = {
+	afterSlide: () => {},
+	autoplay: true,
+	autoplayInterval: 5000,
+	beforeSlide: () => {},
+	cellAlign: 'center',
+	cellSpacing: 500,
+	dragging: true,
+	easing: 'easePoly',
+	edgeEasing: 'easePolyInOut',
+	framePadding: '100px',
+	heightMode: 'max',
+	initialSlideHeight: 200,
+	initialSlideWidth: 500,
+	onResize: () => {},
+	renderTopLeftControls: () => <button />,
+	renderTopCenterControls: () => <button />,
+	renderTopRightControls: () => <button />,
+	renderCenterLeftControls: () => <button />,
+	renderCenterCenterControls: () => <button />,
+	renderCenterRightControls: () => <button />,
+	renderBottomLeftControls: () => <button />,
+	renderBottomCenterControls: () => <button />,
+	renderBottomRightControls: () => <button />,
+	slideIndex: 2,
+	slidesToScroll: 'auto',
+	slidesToShow: 1,
+	slideWidth: 0.8,
+	speed: 2000,
+	swiping: true,
+	vertical: false,
+	width: '500px',
+	wrapAround: false
+};
+
+class CarouselComponent extends React.Component {
+	render() {
+		return (
+			<Carousel {...props}>
+				<img src="http://placehold.it/1000x400/ffffff/c0392b/&text=slide1" />
+				<img src="http://placehold.it/1000x400/ffffff/c0392b/&text=slide2" />
+				<img src="http://placehold.it/1000x400/ffffff/c0392b/&text=slide3" />
+				<img src="http://placehold.it/1000x400/ffffff/c0392b/&text=slide4" />
+				<img src="http://placehold.it/1000x400/ffffff/c0392b/&text=slide5" />
+				<img src="http://placehold.it/1000x400/ffffff/c0392b/&text=slide6" />
+			</Carousel>
+		);
+	}
+}
diff --git a/types/nuka-carousel/tsconfig.json b/types/nuka-carousel/tsconfig.json
new file mode 100644
index 0000000000..240c9965c5
--- /dev/null
+++ b/types/nuka-carousel/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",
+        "nuka-carousel-tests.tsx"
+    ]
+}
diff --git a/types/nuka-carousel/tslint.json b/types/nuka-carousel/tslint.json
new file mode 100644
index 0000000000..88c47d4c54
--- /dev/null
+++ b/types/nuka-carousel/tslint.json
@@ -0,0 +1,3 @@
+{
+	  "extends": "dtslint/dt.json"
+}

From 5a56dd22ba237b83d76ec1e95f2fad1e3f670095 Mon Sep 17 00:00:00 2001
From: Abraham White <abelincoln.white@gmail.com>
Date: Tue, 5 Jun 2018 10:20:39 -0600
Subject: [PATCH 1033/1124] Remove unused type parameter

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

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 9759d67a9d..fcf614eb92 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -114,13 +114,13 @@ export abstract class BaseConnection extends EventEmitter {
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     describe$: {
         /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
-        <T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
+        (type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): DescribeSObjectResult;
         clear(): void;
     }
-    describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    describe(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
     describeGlobal$: {
         /** Returns a value from the cache if it exists, otherwise calls Connection.describeGlobal */
-        <T>(callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
+        (callback?: (err: Error, result: DescribeGlobalResult) => void): DescribeGlobalResult;
         clear(): void;
     }
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;

From 132999ada60e9c7bc48a27c7f3aa9a80cda98253 Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Mon, 4 Jun 2018 17:55:18 -0600
Subject: [PATCH 1034/1124] Wildcard for axios dependency version

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

diff --git a/types/axios-token-interceptor/package.json b/types/axios-token-interceptor/package.json
index bd5a40b16d..4f244abbfd 100644
--- a/types/axios-token-interceptor/package.json
+++ b/types/axios-token-interceptor/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "axios": "^0.16.2"
+        "axios": "*"
     }
 }

From e02a423e30ff3baa3eb334aa22b82dea8119079b Mon Sep 17 00:00:00 2001
From: Shane Fitzpatrick <fitzpasd@gmail.com>
Date: Tue, 5 Jun 2018 09:50:28 -0700
Subject: [PATCH 1035/1124] react-native: Add event for TextInput onFocus and
 onBlur

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index ef574ec807..eaa2dcccfc 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1078,6 +1078,12 @@ export type ReturnKeyTypeAndroid = "none" | "previous";
 export type ReturnKeyTypeIOS = "default" | "google" | "join" | "route" | "yahoo" | "emergency-call";
 export type ReturnKeyTypeOptions = ReturnKeyType | ReturnKeyTypeAndroid | ReturnKeyTypeIOS
 
+export interface TextInputFocusEventData {
+    target: number,
+    text: string,
+    eventCount: number
+}
+
 /**
  * @see https://facebook.github.io/react-native/docs/textinput.html#props
  */
@@ -1159,7 +1165,7 @@ export interface TextInputProps
     /**
      * Callback that is called when the text input is blurred
      */
-    onBlur?: () => void;
+    onBlur?: (e: NativeSyntheticEvent<TextInputFocusEventData>) => void;
 
     /**
      * Callback that is called when the text input's text changes.
@@ -1198,7 +1204,7 @@ export interface TextInputProps
     /**
      * Callback that is called when the text input is focused
      */
-    onFocus?: () => void;
+    onFocus?: (e: NativeSyntheticEvent<TextInputFocusEventData>) => void;
 
     /**
      * Callback that is called when the text input selection is changed.

From 55fc8a351019272f8fd4e3ec72ac66ccfeedbf81 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <muntyan@fastmail.fm>
Date: Tue, 5 Jun 2018 10:40:47 -0700
Subject: [PATCH 1036/1124] More type-safe typings for bleno module.

Define types for callbacks and properties; define Bleno as a class extending EventEmitter,
so we don't have to explicitly define EventEmitter methods.
---
 types/bleno/bleno-tests.ts | 268 ++++++++++++++++++++++++++++++++++++-
 types/bleno/index.d.ts     | 183 ++++++++++++++-----------
 types/bleno/tslint.json    |   3 +-
 3 files changed, 371 insertions(+), 83 deletions(-)

diff --git a/types/bleno/bleno-tests.ts b/types/bleno/bleno-tests.ts
index bd4b6971ee..7ea037587c 100644
--- a/types/bleno/bleno-tests.ts
+++ b/types/bleno/bleno-tests.ts
@@ -1,4 +1,7 @@
 import * as Bleno from 'bleno';
+// can also import these types as if they were exported from the module
+// tslint:disable-next-line:no-duplicate-imports
+import { Characteristic, Descriptor, PrimaryService } from 'bleno';
 
 export class EchoCharacteristic extends Bleno.Characteristic {
   _value: any;
@@ -46,7 +49,7 @@ Bleno.on('stateChange', (state: string) => {
 });
 
 const characteristic = new EchoCharacteristic();
-Bleno.on('advertisingStart', (error: string) => {
+Bleno.on('advertisingStart', (error?: Error | null) => {
   if (!error) {
     Bleno.setServices(
       [new Bleno.PrimaryService({uuid: 'ec00', characteristics: [ characteristic ] })],
@@ -54,3 +57,266 @@ Bleno.on('advertisingStart', (error: string) => {
     );
   }
 });
+
+const SERVICE_UUID = '87B1E448-1C07-4957-B7D3-017DF4EE3863';
+const CONTROL_CHAR_UUID = '87B1E448-1C07-4957-B7D3-017DF4EE3864';
+const STATUS_CHAR_UUID = '87B1E448-1C07-4957-B7D3-017DF4EE3866';
+
+class StatusCharacteristic extends Characteristic {
+    constructor() {
+        super({
+            uuid: 'STATUS_CHAR_UUID',
+            properties: ['read'],
+            descriptors: [
+                new Descriptor({
+                    uuid: '2901',
+                    value: Buffer.from('Status'),
+                }),
+            ],
+        });
+    }
+
+    onReadRequest(
+        offset: number,
+        callback: (result: number, data?: Buffer) => void
+    ) {
+        try {
+            const data = Buffer.from('status ok');
+            callback(Characteristic.RESULT_SUCCESS, data.slice(offset));
+        } catch (error) {
+            callback(Characteristic.RESULT_UNLIKELY_ERROR);
+        }
+    }
+}
+
+class ControlCharacteristic extends Characteristic {
+    private readonly callback: (data: Buffer) => void;
+
+    constructor(onWriteRequestCb: (data: Buffer) => void) {
+        super({
+            uuid: CONTROL_CHAR_UUID,
+            properties: ['write'],
+            descriptors: [
+                new Descriptor({
+                    uuid: '2901',
+                    value: Buffer.from('test characteristic'),
+                }),
+            ],
+        });
+        this.callback = onWriteRequestCb;
+    }
+
+    onWriteRequest(
+        data: Buffer,
+        offset: number,
+        withoutResponse: any,
+        callback: (result: number) => void
+    ): void {
+        if (offset > 0) {
+            this.callback(data.slice(offset));
+        } else {
+            this.callback(data);
+        }
+        callback(this.RESULT_SUCCESS);
+    }
+}
+
+export class BluetoothController {
+    private isAdvertising: boolean;
+
+    constructor() {
+        this.isAdvertising = false;
+        this.setup();
+    }
+
+    toString(): string {
+        return '<Control>';
+    }
+
+    dispose(callback: () => void) {
+        if (this.isAdvertising) {
+            Bleno.stopAdvertising(callback);
+        } else {
+            callback();
+        }
+    }
+
+    private setup() {
+      Bleno.on('stateChange', (state: string) => {
+            console.log('bluetooth', `stateChange: ${state}, address = ${Bleno.address}`);
+
+            if (state === 'poweredOn') {
+              Bleno.startAdvertising('device', [SERVICE_UUID]);
+            } else {
+              Bleno.stopAdvertising();
+            }
+        });
+
+        Bleno.on('accept', (clientAddress: string) => {
+          console.log('bluetooth', `accept, client: ${clientAddress}`);
+          Bleno.updateRssi();
+        });
+
+        Bleno.on('disconnect', (clientAddress: string) => {
+          console.log('bluetooth', `disconnect, client: ${clientAddress}`);
+        });
+
+        Bleno.on('rssiUpdate', (rssi: number) => {
+            console.log('bluetooth', `rssiUpdate: ${rssi}`);
+        });
+
+        Bleno.on('mtuChange', (mtu: number) => {
+          console.log('bluetooth', `mtuChange: ${mtu}`);
+        });
+
+        Bleno.on('advertisingStart', (error?: Error | null) => {
+          console.log('bluetooth', `advertisingStart: ${error ? error : 'success'}`);
+            if (!error) {
+                this.isAdvertising = true;
+                Bleno.setServices([
+                    new PrimaryService({
+                        uuid: SERVICE_UUID,
+                        characteristics: [
+                            new ControlCharacteristic((data) => {
+                                this.onWriteRequest(data);
+                            }),
+                            new StatusCharacteristic(),
+                        ],
+                    }),
+                ]);
+            }
+        });
+
+        Bleno.on('advertisingStop', () => {
+            this.isAdvertising = false;
+            console.log('bluetooth', 'advertisingStop');
+        });
+
+        Bleno.on('servicesSet', (error?: Error | null) => {
+          console.log('bluetooth', `servicesSet: ${error ? error : 'success'}`);
+        });
+    }
+
+    private onWriteRequest(data: Buffer) {
+      console.log(data.toString('hex'));
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// code from bleno's README
+//
+
+// tslint:disable-next-line:no-duplicate-imports
+import * as bleno from 'bleno';
+
+function test1() {
+  const name = 'name';
+  const serviceUuids = ['fffffffffffffffffffffffffffffff0'];
+
+  bleno.startAdvertising(name);
+  bleno.startAdvertising(name, serviceUuids);
+  bleno.startAdvertising(name, serviceUuids, (error) => {});
+}
+
+function test2() {
+  const uuid = 'e2c56db5dffb48d2b060d0f5a71096e0';
+  const major = 0; // 0x0000 - 0xffff
+  const minor = 0; // 0x0000 - 0xffff
+  const measuredPower = -59; // -128 - 127
+
+  bleno.startAdvertisingIBeacon(uuid, major, minor, measuredPower);
+  bleno.startAdvertisingIBeacon(uuid, major, minor, measuredPower, (error) => {});
+}
+
+function test3() {
+  const scanData = new Buffer(''); // maximum 31 bytes
+  const advertisementData = new Buffer(''); // maximum 31 bytes
+
+  bleno.startAdvertisingWithEIRData(advertisementData);
+  bleno.startAdvertisingWithEIRData(advertisementData, (error) => {});
+  bleno.startAdvertisingWithEIRData(advertisementData, scanData, (error) => {});
+}
+
+function test4() {
+  bleno.stopAdvertising();
+  bleno.stopAdvertising(() => {});
+}
+
+function test5() {
+  const service = new PrimaryService({uuid: '0000'});
+  const services = [
+    service
+  ];
+
+ bleno.setServices(services);
+ bleno.setServices(services, (error) => {});
+}
+
+function test6() {
+  bleno.disconnect(); // Linux only
+}
+
+function test7() {
+  bleno.updateRssi(); // not available in OS X 10.9
+  bleno.updateRssi((error, rssi) => {}); // not available in OS X 10.9
+}
+
+function test8() {
+  const PrimaryService = bleno.PrimaryService;
+
+  const primaryService = new PrimaryService({
+      uuid: 'fffffffffffffffffffffffffffffff0', // or 'fff0' for 16-bit
+      characteristics: [
+          // see Characteristic for data type
+      ]
+  });
+}
+
+function test9() {
+  const Characteristic = bleno.Characteristic;
+
+  const characteristic = new Characteristic({
+      uuid: 'fffffffffffffffffffffffffffffff1', // or 'fff1' for 16-bit
+      properties: ['read'], // can be a combination of 'read', 'write', 'writeWithoutResponse', 'notify', 'indicate'
+      secure: ['notify'], // enable security for properties, can be a combination of 'read', 'write', 'writeWithoutResponse', 'notify', 'indicate'
+      value: null, // optional static value, must be of type Buffer - for read only characteristics
+      descriptors: [
+          // see Descriptor for data type
+          new Descriptor({uuid: '0000'})
+      ],
+      onReadRequest: null, // optional read request handler, function(offset, callback) { ... }
+      onWriteRequest: null, // optional write request handler, function(data, offset, withoutResponse, callback) { ...}
+      onSubscribe: null, // optional notify/indicate subscribe handler, function(maxValueSize, updateValueCallback) { ...}
+      onUnsubscribe: null, // optional notify/indicate unsubscribe handler, function() { ...}
+      onNotify: null, // optional notify sent handler, function() { ...}
+      onIndicate: null // optional indicate confirmation received handler, function() { ...}
+  });
+}
+
+function test10() {
+  Characteristic.RESULT_SUCCESS;
+  Characteristic.RESULT_INVALID_OFFSET;
+  Characteristic.RESULT_INVALID_ATTRIBUTE_LENGTH;
+  Characteristic.RESULT_UNLIKELY_ERROR;
+}
+
+function test11() {
+  const Descriptor = bleno.Descriptor;
+
+  const descriptor = new Descriptor({
+      uuid: '2901',
+      value: 'value' // static value, must be of type Buffer or string if set
+  });
+}
+
+function test12() {
+  bleno.on('stateChange', (state: string) => {});
+  bleno.on('advertisingStart', (error?: Error | null) => {});
+  bleno.on('advertisingStartError', (error: Error) => {});
+  bleno.on('advertisingStop', () => {});
+  bleno.on('servicesSet', (error?: Error | null) => {});
+  bleno.on('servicesSetError', (error: Error) => {});
+  bleno.on('accept', (clientAddress) => {}); // not available on OS X 10.9
+  bleno.on('disconnect', (clientAddress) => {}); // Linux only
+  bleno.on('rssiUpdate', (rssi) => {}); // not available on OS X 10.9
+}
diff --git a/types/bleno/index.d.ts b/types/bleno/index.d.ts
index a59e394a84..0dee37c9ed 100644
--- a/types/bleno/index.d.ts
+++ b/types/bleno/index.d.ts
@@ -3,126 +3,147 @@
 // Definitions by: Manuel Francisco Naranjo <naranjo.manuel@gmail.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export class Characteristic {
-    uuid: any;
-    properties: any;
-    secure: any;
-    value: any;
-    descriptors: any;
+/// <reference types="node" />
 
-    constructor(options: any);
+type State = 'poweredOn' | 'poweredOff' | 'unauthorized' | 'unsupported' | 'unknown' | 'resetting';
+
+type Property = 'read' | 'write' | 'indicate' | 'notify' | 'writeWithoutResponse';
+
+interface CharacteristicOptions {
+    uuid: string;
+    properties?: ReadonlyArray<Property> | null;
+    secure?: ReadonlyArray<Property> | null;
+    value?: Buffer | null;
+    descriptors?: ReadonlyArray<Descriptor> | null;
+    onIndicate?: (() => void) | null;
+    onNotify?: (() => void) | null;
+    onReadRequest?: ((
+        offset: number,
+        callback: (result: number, data?: Buffer) => void
+    ) => void) | null;
+    onSubscribe?: ((maxValueSize: number, updateValueCallback: any) => void) | null;
+    onUnsubscribe?: (() => void) | null;
+    onWriteRequest?: ((
+        data: Buffer,
+        offset: number,
+        withoutResponse: boolean,
+        callback: (result: number) => void
+    ) => void) | null;
+}
+
+declare class Characteristic {
+    uuid: string;
+    properties: ReadonlyArray<Property>;
+    secure: ReadonlyArray<Property>;
+    value: Buffer | null;
+    descriptors: ReadonlyArray<Descriptor>;
+
+    constructor(options: CharacteristicOptions);
 
     onIndicate(): void;
 
     onNotify(): void;
 
-    onReadRequest(offset: any, callback: any): void;
+    onReadRequest(offset: number, callback: (result: number, data?: Buffer) => void): void;
 
-    onSubscribe(maxValueSize: any, updateValueCallback: any): void;
+    onSubscribe(maxValueSize: number, updateValueCallback: any): void;
 
     onUnsubscribe(): void;
 
-    onWriteRequest(data: any, offset: any, withoutResponse: any, callback: any): void;
+    onWriteRequest(data: Buffer, offset: number, withoutResponse: boolean, callback: (result: number) => void): void;
 
-    toString(): any;
+    toString(): string;
 
-    static RESULT_ATTR_NOT_LONG: number;
+    readonly RESULT_ATTR_NOT_LONG: number;
 
-    static RESULT_INVALID_ATTRIBUTE_LENGTH: number;
+    readonly RESULT_INVALID_ATTRIBUTE_LENGTH: number;
 
-    static RESULT_INVALID_OFFSET: number;
+    readonly RESULT_INVALID_OFFSET: number;
 
-    static RESULT_SUCCESS: number;
+    readonly RESULT_SUCCESS: number;
 
-    static RESULT_UNLIKELY_ERROR: number;
+    readonly RESULT_UNLIKELY_ERROR: number;
+
+    static readonly RESULT_ATTR_NOT_LONG: number;
+
+    static readonly RESULT_INVALID_ATTRIBUTE_LENGTH: number;
+
+    static readonly RESULT_INVALID_OFFSET: number;
+
+    static readonly RESULT_SUCCESS: number;
+
+    static readonly RESULT_UNLIKELY_ERROR: number;
 }
 
-export class Descriptor {
-    uuid: any;
-    value: any;
-
-    constructor(options: any);
-
-    toString(): any;
+interface DescriptorOptions {
+    uuid: string;
+    value?: Buffer | string | null;
 }
 
-export class PrimaryService {
-    uuid: any;
-    characteristics: any;
+declare class Descriptor {
+    uuid: string;
+    value: Buffer;
 
-    constructor(options: any);
+    constructor(options: DescriptorOptions);
 
-    toString(): any;
+    toString(): string;
 }
 
-export const address: string;
+interface PrimaryServiceOptions {
+    uuid: string;
+    characteristics?: ReadonlyArray<Characteristic> | null;
+}
 
-export const domain: any;
+declare class PrimaryService {
+    uuid: string;
+    characteristics: ReadonlyArray<Characteristic>;
 
-export const mtu: number;
+    constructor(options: PrimaryServiceOptions);
 
-export const platform: string;
+    toString(): string;
+}
 
-export const rssi: number;
+interface Bleno extends NodeJS.EventEmitter {
+    readonly Characteristic: typeof Characteristic;
+    readonly Descriptor: typeof Descriptor;
+    readonly PrimaryService: typeof PrimaryService;
 
-export const state: string;
+    readonly address: string;
 
-export function addListener(type: any, listener: any): any;
+    readonly mtu: number;
 
-export function disconnect(): void;
+    readonly platform: string;
 
-export function emit(type: any, ...args: any[]): any;
+    readonly rssi: number;
 
-export function eventNames(): any;
+    readonly state: State;
 
-export function getMaxListeners(): any;
+    disconnect(): void;
 
-export function listenerCount(type: any): any;
+    setServices(services: ReadonlyArray<PrimaryService>, callback?: (arg: Error | undefined | null) => void): void;
 
-export function listeners(type: any): any;
+    startAdvertising(name: string, serviceUuids?: ReadonlyArray<string>, callback?: (arg: Error | undefined | null) => void): void;
 
-export function on(type: any, listener: any): any;
+    startAdvertisingIBeacon(uuid: string, major: number, minor: number, measuredPower: number, callback?: (arg: Error | undefined | null) => void): void;
 
-export function onAccept(clientAddress: any): void;
+    startAdvertisingWithEIRData(advertisementData: Buffer, callback?: (arg: Error | undefined | null) => void): void;
+    startAdvertisingWithEIRData(advertisementData: Buffer, scanData: Buffer, callback?: (arg: Error | undefined | null) => void): void;
 
-export function onAddressChange(address: any): void;
+    stopAdvertising(callback?: () => void): void;
 
-export function onAdvertisingStart(error: any): void;
+    updateRssi(callback?: (err: null, rssi: number) => void): void;
 
-export function onAdvertisingStop(): void;
+    on(event: 'stateChange', cb: (state: State) => void): this;
+    on(event: 'accept', cb: (address: string) => void): this;
+    on(event: 'mtuChange', cb: (mtu: number) => void): this;
+    on(event: 'disconnect', cb: (clientAddress: string) => void): this;
+    on(event: 'advertisingStart', cb: (err?: Error | null) => void): this;
+    on(event: 'advertisingStartError', cb: (err: Error) => void): this;
+    on(event: 'advertisingStop', cb: () => void): this;
+    on(event: 'servicesSet', cb: (err?: Error | null) => void): this;
+    on(event: 'servicesSetError', cb: (err: Error) => void): this;
+    on(event: 'rssiUpdate', cb: (rssi: number) => void): this;
+}
 
-export function onDisconnect(clientAddress: any): void;
-
-export function onMtuChange(mtu: any): void;
-
-export function onPlatform(platform: any): void;
-
-export function onRssiUpdate(rssi: any): void;
-
-export function onServicesSet(error: any): void;
-
-export function onStateChange(state: any): void;
-
-export function once(type: any, listener: any): any;
-
-export function prependListener(type: any, listener: any): any;
-
-export function prependOnceListener(type: any, listener: any): any;
-
-export function removeAllListeners(type: any, ...args: any[]): any;
-
-export function removeListener(type: any, listener: any): any;
-
-export function setMaxListeners(n: any): any;
-
-export function setServices(services: any, callback: any): void;
-
-export function startAdvertising(name: any, serviceUuids: any, callback: any): void;
-
-export function startAdvertisingIBeacon(uuid: any, major: any, minor: any, measuredPower: any, callback: any): void;
-
-export function startAdvertisingWithEIRData(advertisementData: any, scanData: any, callback: any): void;
-
-export function stopAdvertising(callback: any): void;
-
-export function updateRssi(callback: any): void;
+declare const bleno: Bleno;
+export = bleno;
diff --git a/types/bleno/tslint.json b/types/bleno/tslint.json
index 26bcea6634..0f5eeaf557 100644
--- a/types/bleno/tslint.json
+++ b/types/bleno/tslint.json
@@ -1,6 +1,7 @@
 {
 	"extends": "dtslint/dt.json",
 	"rules": {
-		"dt-header": false
+		"dt-header": false,
+		"unified-signatures": false
 	}
 }

From 6b431cf55b8dde05e8be3c122f996178e6ac0724 Mon Sep 17 00:00:00 2001
From: Shini Ko <shini.ko@shopify.com>
Date: Tue, 5 Jun 2018 15:09:13 -0400
Subject: [PATCH 1037/1124] Add typing for method in libphonenumber

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

diff --git a/types/google-libphonenumber/index.d.ts b/types/google-libphonenumber/index.d.ts
index dd73c56790..52d2208c8f 100644
--- a/types/google-libphonenumber/index.d.ts
+++ b/types/google-libphonenumber/index.d.ts
@@ -112,6 +112,7 @@ declare namespace libphonenumber {
 
     export class PhoneNumberUtil {
         static getInstance(): PhoneNumberUtil
+        extractCountryCode(fullNumber: any, nationalNumber: any): number;
         format(phoneNumber: PhoneNumber, format: PhoneNumberFormat): string;
         formatOutOfCountryCallingNumber(phoneNumber: PhoneNumber, regionDialingFrom?: string): string;
         getNddPrefixForRegion(regionCode?: string, stripNonDigits?: boolean): string | undefined;

From 6cfd95fb7fe0a931c8161656bf4e9a2ea95a9e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Tue, 5 Jun 2018 20:44:13 +0200
Subject: [PATCH 1038/1124] nodegit: Fix return type of Commit#amend

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

diff --git a/types/nodegit/commit.d.ts b/types/nodegit/commit.d.ts
index 5c9a82bf70..11ab938130 100644
--- a/types/nodegit/commit.d.ts
+++ b/types/nodegit/commit.d.ts
@@ -21,7 +21,7 @@ export class Commit {
     static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Commit>;
     static createWithSignature(repo: Repository, commitContent: string, signature: string, signatureField: string): Promise<Oid>;
 
-    amend(updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree): Oid;
+    amend(updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree): Promise<Oid>;
     author(): Signature;
     committer(): Signature;
 
diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index e6d95ba83e..d1afcd6ea4 100644
--- a/types/nodegit/index.d.ts
+++ b/types/nodegit/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for nodegit 0.18
+// Type definitions for nodegit 0.22
 // Project: https://github.com/nodegit/nodegit
-// Definitions by: Dolan Miu <https://github.com/dolanmiu>
+// Definitions by: Dolan Miu <https://github.com/dolanmiu>, Tobias Nießen <https://github.com/tniessen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export { AnnotatedCommit } from './annotated-commit';
diff --git a/types/nodegit/nodegit-tests.ts b/types/nodegit/nodegit-tests.ts
index 00d988d77f..1732844d1c 100644
--- a/types/nodegit/nodegit-tests.ts
+++ b/types/nodegit/nodegit-tests.ts
@@ -11,6 +11,7 @@ Git.Repository.init("path", 0).then((repository) => {
 const repo = new Git.Repository();
 const id = new Git.Oid();
 const ref = new Git.Reference();
+const tree = new Git.Tree();
 
 // AnnotatedCommit Tests
 
@@ -52,6 +53,11 @@ Git.Branch.lookup(repo, "branch_name", Git.Branch.BRANCH.LOCAL).then((reference)
     // Use reference
 });
 
+repo.getCommit("0123456789abcdef0123456789abcdef").then((commit) => {
+  const sig = Git.Signature.now('John Doe', 'jd@example.com');
+  const newCommit: Promise<Git.Oid> = commit.amend('ref', sig, sig, 'utf8', 'message', tree);
+});
+
 const signature = Git.Signature.now("name", "email");
 signature.name();
 signature.email();

From c1120c28c753b8e3e65d85d8cb95394c6af96edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=81aziuk?= <tlaziuk@gmail.com>
Date: Tue, 5 Jun 2018 21:37:12 +0200
Subject: [PATCH 1039/1124] koa-webpack v5

---
 types/koa-webpack/index.d.ts           | 16 ++++++++------
 types/koa-webpack/koa-webpack-tests.ts | 30 +++++++++++++++-----------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/types/koa-webpack/index.d.ts b/types/koa-webpack/index.d.ts
index 4f86fcd11f..79bd913ef4 100644
--- a/types/koa-webpack/index.d.ts
+++ b/types/koa-webpack/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for koa-webpack 1.0
-// Project: https://github.com/shellscape/koa-webpack#readme
+// Type definitions for koa-webpack 5.0
+// Project: https://github.com/shellscape/koa-webpack
 // Definitions by: Luka Maljic <https://github.com/malj>
+//                 Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -12,19 +13,20 @@ import connect = require('connect');
 
 declare function koaWebpack(
     options?: koaWebpack.Options
-): Koa.Middleware & koaWebpack.CombinedWebpackMiddleware;
+): Promise<Koa.Middleware & koaWebpack.CombinedWebpackMiddleware>;
 
 declare namespace koaWebpack {
     interface Options {
         compiler?: webpack.Compiler;
         config?: webpack.Configuration;
-        dev?: webpackDevMiddleware.Options;
-        hot?: webpackHotMiddleware.Options | boolean;
+        devMiddleware?: webpackDevMiddleware.Options;
+        hotClient?: webpackHotMiddleware.Options | boolean;
     }
 
     interface CombinedWebpackMiddleware {
-        dev: connect.NextHandleFunction & webpackDevMiddleware.WebpackDevMiddleware;
-        hot: connect.NextHandleFunction & webpackHotMiddleware.EventStream;
+        devMiddleware: connect.NextHandleFunction & webpackDevMiddleware.WebpackDevMiddleware;
+        hotClient: connect.NextHandleFunction & webpackHotMiddleware.EventStream;
+        close(callback?: () => any): void;
     }
 }
 
diff --git a/types/koa-webpack/koa-webpack-tests.ts b/types/koa-webpack/koa-webpack-tests.ts
index 12062302de..fb36247d90 100644
--- a/types/koa-webpack/koa-webpack-tests.ts
+++ b/types/koa-webpack/koa-webpack-tests.ts
@@ -8,10 +8,10 @@ const compiler = webpack(config);
 
 // Using the middleware
 
-const middleware = koaWebpack({
+koaWebpack({
     compiler,
     config,
-    dev: {
+    devMiddleware: {
         lazy: true,
         watchOptions: {
             aggregateTimeout: 300,
@@ -28,18 +28,24 @@ const middleware = koaWebpack({
         reporter: null,
         serverSideRender: false
     },
-    hot: {
+    hotClient: {
         log: console.log.bind(console),
         path: '/__what',
         heartbeat: 2000
     }
+}).then((middleware) => {
+    app.use(middleware);
+
+    // Accessing the underlying middleware
+
+    middleware.devMiddleware.close();
+    middleware.devMiddleware.invalidate();
+    middleware.devMiddleware.waitUntilValid();
+    middleware.hotClient.publish(null);
+
+    return middleware;
+}).then((middleware) => {
+    // close the middleware
+
+    middleware.close();
 });
-
-app.use(middleware);
-
-// Accessing the underlying middleware
-
-middleware.dev.close();
-middleware.dev.invalidate();
-middleware.dev.waitUntilValid();
-middleware.hot.publish(null);

From 060d8517069139bd0557ddea5818811cc4be9afe Mon Sep 17 00:00:00 2001
From: Stephanie Roy <sroy3@coveo.com>
Date: Tue, 5 Jun 2018 15:40:50 -0400
Subject: [PATCH 1040/1124] Added types for react-infinite-scroll-component

---
 .../index.d.ts                                | 107 ++++++++++++++++++
 .../react-infinite-scroll-component-tests.tsx |  14 +++
 .../tsconfig.json                             |  22 ++++
 .../tslint.json                               |   1 +
 4 files changed, 144 insertions(+)
 create mode 100644 types/react-infinite-scroll-component/index.d.ts
 create mode 100644 types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
 create mode 100644 types/react-infinite-scroll-component/tsconfig.json
 create mode 100644 types/react-infinite-scroll-component/tslint.json

diff --git a/types/react-infinite-scroll-component/index.d.ts b/types/react-infinite-scroll-component/index.d.ts
new file mode 100644
index 0000000000..e5166be3c6
--- /dev/null
+++ b/types/react-infinite-scroll-component/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for react-infinite-scroll-component 4.1
+// Project: https://github.com/ankeetmaini/react-infinite-scroll-component#readme
+// Definitions by: Stephanie Roy <https://github.com/sroy3>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="react" />
+
+declare module InfiniteScroll {
+    interface InfiniteScrollProps {
+        /**
+         * Set the length of the data.This will unlock the subsequent calls to next.
+         */
+        dataLength: number;
+
+        /**
+         * A function which must be called after reaching the bottom. It must trigger some sort of action which fetches the next data.
+         * The data is passed as children to the InfiniteScroll component and the data should contain previous items too.
+         * e.g. Initial data = [1, 2, 3] and then next load of data should be [1, 2, 3, 4, 5, 6].
+         */
+        next: () => void;
+
+        /**
+         * It tells the InfiniteScroll component on whether to call next function on reaching the bottom and shows an endMessage to the user
+         */
+        hasMore: boolean;
+
+        /**
+         * This message is shown to the user when he has seen all the records which means he's at the bottom and hasMore is false
+         */
+        endMessage: React.ReactNode
+
+        /**
+         * You can send a loader component to show while the component waits for the next load of data. e.g. <h3>Loading...</h3> or any fancy loader element
+         */
+        loader?: React.ReactNode;
+
+        /**
+         * This function will be called, it should return the fresh data that you want to show the user
+         */
+        refreshFunction?: () => void;
+
+        /**
+         * To enable Pull Down to Refresh feature
+         */
+        pullDownToRefresh?: boolean;
+
+        /**
+         * Any JSX that you want to show the user, default={<h3>Pull down to refresh</h3>}
+         */
+        pullDownToRefreshContent?: React.ReactNode;
+
+        /**
+         * Minimum distance the user needs to pull down to trigger the refresh, default=100px
+         */
+        pullDownToRefreshThreshold?: number;
+
+        /**
+         * Any JSX that you want to show the user, default={<h3>Release to refresh</h3>}
+         */
+        releaseToRefreshContent?: boolean;
+
+        /**
+         * A threshold value after that the InfiniteScroll will call next. By default it's 0.8. It means the next will be called when the user comes below 80% of the total height.
+         */
+        scrollThreshold?: number;
+
+        /**
+         * A function that will listen to the scroll event on the scrolling container. Note that the scroll event is throttled, so you may not receive as many events as you would expect.
+         */
+        onScroll?: () => void;
+
+        /**
+         * Reference to a (parent) DOM element that is already providing overflow scrollbars to the InfiniteScroll component.
+         * You should provide the id of the DOM node preferably.
+         */
+        scrollableTarget?: React.ReactNode | string;
+
+        /**
+         * Children is by default assumed to be of type array and it's length is used to determine if loader needs to be shown or not,
+         * if your children is not an array, specify this prop to tell if your items are 0 or more.
+         */
+        hasChildren?: boolean;
+
+        /**
+         * Set a scroll y position for the component to render with.
+         */
+        initialScrollY?: number;
+
+        /**
+         * Set a scroll y position for the component to render with.
+         */
+        style?: any;
+
+        /**
+         * Give only if you want to have a fixed height scrolling content
+         */
+        height?: number;
+    }
+}
+
+declare class InfiniteScroll extends React.Component<InfiniteScrollProps, any> {}
+
+declare module 'react-infinite-scroll-component' {
+    export = InfiniteScroll;
+    export as namespace InfiniteScroll;
+}
diff --git a/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx b/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
new file mode 100644
index 0000000000..ad515bb7bd
--- /dev/null
+++ b/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
@@ -0,0 +1,14 @@
+import * as InfiniteScroll from 'react-infinite-scroll-component';
+
+const options: JSX.Element[] = [
+    <div key='1'>1</div>,
+    <div key='2'>2</div>,
+];
+
+const props: InfiniteScroll.InfiniteScrollProps = {
+    dataLength: 4,
+    hasMore: true,
+    endMessage: 'The end.'
+};
+
+<InfiniteScroll {...props}>{options}</InfiniteScroll>
\ No newline at end of file
diff --git a/types/react-infinite-scroll-component/tsconfig.json b/types/react-infinite-scroll-component/tsconfig.json
new file mode 100644
index 0000000000..f2d3d0d9bb
--- /dev/null
+++ b/types/react-infinite-scroll-component/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",
+        "react-infinite-scroll-component-tests.tsx"
+    ]
+}
diff --git a/types/react-infinite-scroll-component/tslint.json b/types/react-infinite-scroll-component/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-infinite-scroll-component/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 851efd77ea67cac43242c53443ffbc223e76e4c9 Mon Sep 17 00:00:00 2001
From: Shini Ko <shini.ko@shopify.com>
Date: Tue, 5 Jun 2018 15:43:34 -0400
Subject: [PATCH 1041/1124] Add typing to StringBuffer

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

diff --git a/types/google-libphonenumber/index.d.ts b/types/google-libphonenumber/index.d.ts
index 52d2208c8f..5bdb6f5eab 100644
--- a/types/google-libphonenumber/index.d.ts
+++ b/types/google-libphonenumber/index.d.ts
@@ -110,9 +110,15 @@ declare namespace libphonenumber {
         }
     }
 
+    class StringBuffer {
+        constructor(opt_a1?: any, ...var_args: any[]);
+        append(a1: any, opt_a2?: any, ...var_args: any[]): StringBuffer;
+        toString(): string;
+    }
+
     export class PhoneNumberUtil {
         static getInstance(): PhoneNumberUtil
-        extractCountryCode(fullNumber: any, nationalNumber: any): number;
+        extractCountryCode(fullNumber: StringBuffer, nationalNumber: StringBuffer): number;
         format(phoneNumber: PhoneNumber, format: PhoneNumberFormat): string;
         formatOutOfCountryCallingNumber(phoneNumber: PhoneNumber, regionDialingFrom?: string): string;
         getNddPrefixForRegion(regionCode?: string, stripNonDigits?: boolean): string | undefined;

From 40439f96e7977e7ba418c5bc8decd68dca6c2752 Mon Sep 17 00:00:00 2001
From: Burns <cxk2@M-C02WC2LZHTDF.nordstrom.net>
Date: Tue, 5 Jun 2018 13:49:54 -0600
Subject: [PATCH 1042/1124] corrected type information for react-joyride

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

diff --git a/types/react-joyride/index.d.ts b/types/react-joyride/index.d.ts
index 4af8ab7d43..3e3f585cd1 100644
--- a/types/react-joyride/index.d.ts
+++ b/types/react-joyride/index.d.ts
@@ -156,7 +156,7 @@ export interface Props {
 export interface Step {
     title?: string;
     text?: React.ReactNode;
-    selector: string;
+    target: string;
     position?: "top" | "top-left" | "top-right" | "bottom" | "bottom-left" | "bottom-right" | "right" | "left";
     type?: "click" | "hover";
     isFixed?: boolean;
diff --git a/types/react-joyride/react-joyride-tests.tsx b/types/react-joyride/react-joyride-tests.tsx
index b5658bda95..52fc24f3c9 100644
--- a/types/react-joyride/react-joyride-tests.tsx
+++ b/types/react-joyride/react-joyride-tests.tsx
@@ -7,7 +7,7 @@ class NewComponent extends React.Component<undefined, undefined> {
     steps: Step[] = [{
             title: "Title",
             text: "Hurray",
-            selector: ".selectable",
+            target: ".selectable",
             position: "top-right",
             type: "click",
             style: {
@@ -37,7 +37,7 @@ class NewComponent extends React.Component<undefined, undefined> {
             parent: "MyParent"
         },
         {
-            selector: ".other-selectable",
+            target: ".other-selectable",
             text: (<div>Also works</div>)
         }];
 

From 01539bf84c867b0683744566869ace1f570872b0 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 5 Jun 2018 12:50:30 -0700
Subject: [PATCH 1043/1124] Adding developer caveat about internal mode types

---
 types/office-js/index.d.ts | 86 +++++++++++---------------------------
 1 file changed, 24 insertions(+), 62 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 28ecfb162c..718f1bd34f 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -6431,6 +6431,9 @@ declare namespace Office {
         getAsync(callback?: (result: AsyncResult) => void): void;
     }
 
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     interface Appointment extends Item {
         /**
          * Gets or sets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. Read and compose modes for appointment items. Read mode for meeting request items.
@@ -6470,16 +6473,15 @@ declare namespace Office {
          */
         seriesId: string;
     }
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     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.
@@ -6498,10 +6500,6 @@ declare namespace Office {
         /**
          * 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.
@@ -6518,10 +6516,6 @@ declare namespace Office {
         /**
          * 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.
@@ -6538,10 +6532,6 @@ declare namespace Office {
         /**
          * 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.
@@ -6560,10 +6550,6 @@ declare namespace Office {
          *
          * 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.
@@ -6580,6 +6566,9 @@ declare namespace Office {
          */
         start: Time;
     }
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     interface AppointmentRead extends Appointment, ItemRead {
         end: Date;
         /**
@@ -6589,10 +6578,6 @@ declare namespace Office {
          *
          * 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
@@ -6609,10 +6594,6 @@ declare namespace Office {
          *
          * 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
@@ -6641,10 +6622,6 @@ declare namespace Office {
          *
          * 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
@@ -6663,12 +6640,6 @@ declare namespace Office {
          *
          * 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
@@ -7000,16 +6971,15 @@ declare namespace Office {
         */
        removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     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.
@@ -7597,6 +7567,9 @@ declare namespace Office {
          */
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
     }
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     interface ItemRead extends Item {
         /**
          * Gets an array of attachments for the item. Read mode only.
@@ -7673,10 +7646,6 @@ declare namespace Office {
          *
          * 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
@@ -7925,6 +7894,9 @@ declare namespace Office {
          */
         getSelectedRegExMatches(): any;
     }
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     interface Message extends Item {
         /**
          * Gets an identifier for the email conversation that contains a particular message.
@@ -7943,6 +7915,9 @@ declare namespace Office {
          */
         conversationId: string;
     }
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     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.
@@ -7959,10 +7934,6 @@ declare namespace Office {
         /**
          * 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.
@@ -7995,10 +7966,6 @@ declare namespace Office {
         /**
          * 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.
@@ -8013,6 +7980,9 @@ declare namespace Office {
          */
         to: Recipients;
     }
+    /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     */
     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.
@@ -8021,10 +7991,6 @@ declare namespace Office {
          *
          * 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
@@ -8087,10 +8053,6 @@ declare namespace Office {
          *
          * 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

From 4da90836d0103c07e5c611f12cc270512d7e3bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=81aziuk?= <tlaziuk@gmail.com>
Date: Tue, 5 Jun 2018 21:56:51 +0200
Subject: [PATCH 1044/1124] remove blank line

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

diff --git a/types/koa-webpack/koa-webpack-tests.ts b/types/koa-webpack/koa-webpack-tests.ts
index f7f8aaf813..4821059a9b 100644
--- a/types/koa-webpack/koa-webpack-tests.ts
+++ b/types/koa-webpack/koa-webpack-tests.ts
@@ -54,7 +54,6 @@ koaWebpack({
         middleware.hotClient.options;
         middleware.hotClient.server;
 
-
         // close the middleware
         middleware.close(() => {
             console.log('closed');

From cf7e9c229c1f526dd2f7623ba69e0faa0cf6348a Mon Sep 17 00:00:00 2001
From: emjane <emily@embcreative.com>
Date: Tue, 5 Jun 2018 14:01:18 -0600
Subject: [PATCH 1045/1124] Update index.d.ts

updated version in header
---
 types/react-joyride/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-joyride/index.d.ts b/types/react-joyride/index.d.ts
index 3e3f585cd1..3224f2eaa0 100644
--- a/types/react-joyride/index.d.ts
+++ b/types/react-joyride/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-joyride 1.10
+// Type definitions for react-joyride 1.11.4
 // Project: https://github.com/gilbarbara/react-joyride
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>, Ben Dixon <https://github.com/bendxn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 4e43709c96e5a372ea2b59b223e21f879c3beece Mon Sep 17 00:00:00 2001
From: Stephanie Roy <sroy3@coveo.com>
Date: Tue, 5 Jun 2018 16:09:50 -0400
Subject: [PATCH 1046/1124] Fix lint errors

---
 types/react-infinite-scroll-component/index.d.ts   | 14 +++++---------
 .../react-infinite-scroll-component-tests.tsx      |  6 ++++--
 .../react-infinite-scroll-component/tsconfig.json  |  2 ++
 types/react-infinite-scroller/index.d.ts           |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/types/react-infinite-scroll-component/index.d.ts b/types/react-infinite-scroll-component/index.d.ts
index e5166be3c6..4e2ba078f5 100644
--- a/types/react-infinite-scroll-component/index.d.ts
+++ b/types/react-infinite-scroll-component/index.d.ts
@@ -4,9 +4,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-/// <reference types="react" />
+import * as React from 'react';
 
-declare module InfiniteScroll {
+declare namespace InfiniteScroll {
     interface InfiniteScrollProps {
         /**
          * Set the length of the data.This will unlock the subsequent calls to next.
@@ -28,7 +28,7 @@ declare module InfiniteScroll {
         /**
          * This message is shown to the user when he has seen all the records which means he's at the bottom and hasMore is false
          */
-        endMessage: React.ReactNode
+        endMessage: React.ReactNode;
 
         /**
          * You can send a loader component to show while the component waits for the next load of data. e.g. <h3>Loading...</h3> or any fancy loader element
@@ -99,9 +99,5 @@ declare module InfiniteScroll {
     }
 }
 
-declare class InfiniteScroll extends React.Component<InfiniteScrollProps, any> {}
-
-declare module 'react-infinite-scroll-component' {
-    export = InfiniteScroll;
-    export as namespace InfiniteScroll;
-}
+declare class InfiniteScroll extends React.Component<InfiniteScroll.InfiniteScrollProps, any> {}
+export = InfiniteScroll;
diff --git a/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx b/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
index ad515bb7bd..2b5a01d4cc 100644
--- a/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
+++ b/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import * as InfiniteScroll from 'react-infinite-scroll-component';
 
 const options: JSX.Element[] = [
@@ -8,7 +9,8 @@ const options: JSX.Element[] = [
 const props: InfiniteScroll.InfiniteScrollProps = {
     dataLength: 4,
     hasMore: true,
-    endMessage: 'The end.'
+    endMessage: 'The end.',
+    next: () => null,
 };
 
-<InfiniteScroll {...props}>{options}</InfiniteScroll>
\ No newline at end of file
+<InfiniteScroll {...props}>{options}</InfiniteScroll>;
diff --git a/types/react-infinite-scroll-component/tsconfig.json b/types/react-infinite-scroll-component/tsconfig.json
index f2d3d0d9bb..b1a54cd2ea 100644
--- a/types/react-infinite-scroll-component/tsconfig.json
+++ b/types/react-infinite-scroll-component/tsconfig.json
@@ -7,6 +7,8 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index 066714344c..d0c3141f17 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -66,4 +66,4 @@ declare namespace InfiniteScroll {
     namespace InfiniteScroll {}
 }
 
-export = InfiniteScroll.InfiniteScroll;
+export = InfiniteScroll;

From 81e5885bbfcd962522e4c40e60c2325ebbc61ad7 Mon Sep 17 00:00:00 2001
From: Stephanie Roy <sroy3@coveo.com>
Date: Tue, 5 Jun 2018 16:14:21 -0400
Subject: [PATCH 1047/1124] remove unwanted change

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

diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index d0c3141f17..066714344c 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -66,4 +66,4 @@ declare namespace InfiniteScroll {
     namespace InfiniteScroll {}
 }
 
-export = InfiniteScroll;
+export = InfiniteScroll.InfiniteScroll;

From 7b36e3dba743ecceb8d9d112e0596c8716931958 Mon Sep 17 00:00:00 2001
From: MosheF <moshef@wix.com>
Date: Tue, 5 Jun 2018 23:22:28 +0300
Subject: [PATCH 1048/1124] add Haptic

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 56e037bd75..9645ce4390 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2949,4 +2949,29 @@ export namespace MediaLibrary {
     totalCount: number;
   }
 }
+// #endregion
+
+// #region Haptic
+/**
+ * https://docs.expo.io/versions/latest/sdk/haptic
+ * Provides haptic feedback for iOS 10+ devices using the Taptic Engine.
+ */
+export namespace Haptic {
+  function selection(): void;
+  function notification(type: NotificationFeedbackType): void;
+  function impact(style: ImpactFeedbackStyle): void;
+
+  enum ImpactFeedbackStyle {
+    Light = 'light',
+    Medium = 'medium',
+    Heavy = 'heavy'
+  }
+
+  enum NotificationFeedbackType {
+    Success = 'success',
+    Warning = 'warning',
+    Error = 'error'
+  }
+}
+
 // #endregion
\ No newline at end of file

From da502e396ad9e900aea60b76bdf797b34cfbc94f Mon Sep 17 00:00:00 2001
From: Shayne Hartford <ShayneEHartford@Gmail.Com>
Date: Tue, 5 Jun 2018 16:27:27 -0400
Subject: [PATCH 1049/1124] Fixed query and set's param types

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

diff --git a/types/snekfetch/index.d.ts b/types/snekfetch/index.d.ts
index 643c376c5a..ecaf995d8f 100644
--- a/types/snekfetch/index.d.ts
+++ b/types/snekfetch/index.d.ts
@@ -110,13 +110,13 @@ declare class Snekfetch extends Readable {
     static unlock(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static unsubscribe(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
 
-    query(name: string | { [key: string]: string | string[] }, value?: string): Snekfetch;
+    query(name: string | object, value?: string): Snekfetch;
 
-    set(name: string | { [key: string]: string | string[] }, value?: string | string[]): Snekfetch;
+    set(name: string | object, value?: string): Snekfetch;
 
     attach(name: string, data: string | object | Buffer, filename?: string): Snekfetch;
 
-    send(data?: string|Buffer|object): Snekfetch;
+    send(data?: string | Buffer | object): Snekfetch;
 
     then(): Promise<Snekfetch.SnekfetchResponse>;
     then<T>(resolver: (res: Snekfetch.SnekfetchResponse) => T, rejector?: (err: Error) => any): Promise<T>;

From 7886cf621ac3142c4c2e6d0ed204e09c97c0cb1a Mon Sep 17 00:00:00 2001
From: Shayne Hartford <ShayneEHartford@Gmail.Com>
Date: Tue, 5 Jun 2018 16:33:09 -0400
Subject: [PATCH 1050/1124] Key should be a string - Yukine

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

diff --git a/types/snekfetch/index.d.ts b/types/snekfetch/index.d.ts
index ecaf995d8f..4885656a98 100644
--- a/types/snekfetch/index.d.ts
+++ b/types/snekfetch/index.d.ts
@@ -110,9 +110,9 @@ declare class Snekfetch extends Readable {
     static unlock(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static unsubscribe(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
 
-    query(name: string | object, value?: string): Snekfetch;
+    query(name: string | { [key: string]: any }, value?: string): Snekfetch;
 
-    set(name: string | object, value?: string): Snekfetch;
+    set(name: string | { [key: string]: any }, value?: string): Snekfetch;
 
     attach(name: string, data: string | object | Buffer, filename?: string): Snekfetch;
 

From 4bcbb7024088a52cfab69e507d44bb604b35424c Mon Sep 17 00:00:00 2001
From: David Koblas <david@tubularlabs.com>
Date: Tue, 5 Jun 2018 16:59:15 -0400
Subject: [PATCH 1051/1124] Add generic types to Queue and Job

---
 types/bull/bull-tests.tsx |  2 +-
 types/bull/index.d.ts     | 43 ++++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx
index 765be54733..c2e0d3161f 100644
--- a/types/bull/bull-tests.tsx
+++ b/types/bull/bull-tests.tsx
@@ -7,7 +7,7 @@ import Queue = require("bull");
 
 const videoQueue = new Queue('video transcoding', 'redis://127.0.0.1:6379');
 const audioQueue = new Queue('audio transcoding', {redis: {port: 6379, host: '127.0.0.1'}}); // Specify Redis connection using object
-const imageQueue = new Queue('image transcoding');
+const imageQueue: Queue.Queue<{ image: string }> = new Queue('image transcoding');
 
 videoQueue.process((job, done) => {
     // job.data contains the custom data passed when the job was created
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index dd97de15ac..83cc4a69bd 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -6,6 +6,7 @@
 //                 Weeco <https://github.com/weeco>
 //                 Gabriel Terwesten <https://github.com/blaugold>
 //                 Oleg Repin <https://github.com/iamolegga>
+//                 David Koblas <https://github.com/koblas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -87,13 +88,13 @@ declare namespace Bull {
 
   type JobId = number | string;
 
-  interface Job {
+  interface Job<T = any> {
     id: JobId;
 
     /**
      * The custom data passed when the job was created
      */
-    data: any;
+    data: T;
 
     /**
      * How many attempts where made to run this job
@@ -258,7 +259,7 @@ declare namespace Bull {
     next: number;
   }
 
-  interface Queue {
+  interface Queue<T = any> {
     /**
      * Returns a promise that resolves when Redis is connected and the queue is ready to accept jobs.
      * This replaces the `ready` event emitted on Queue in previous verisons.
@@ -276,7 +277,7 @@ declare namespace Bull {
      * Errors will be passed as a second argument to the "failed" event;
      * results, as a second argument to the "completed" event.
      */
-    process(callback: (job: Job, done: DoneCallback) => void): void;
+    process(callback: (job: Job<T>, done: DoneCallback) => void): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -294,7 +295,7 @@ declare namespace Bull {
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
      * If it is resolved, its value will be the "completed" event's second argument.
      */
-    process(callback: ((job: Job) => void) | string): Promise<any>;
+    process(callback: ((job: Job<T>) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -314,7 +315,7 @@ declare namespace Bull {
      *
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(concurrency: number, callback: ((job: Job) => void) | string): Promise<any>;
+    process(concurrency: number, callback: ((job: Job<T>) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -329,7 +330,7 @@ declare namespace Bull {
      *
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+    process(concurrency: number, callback: (job: Job<T>, done: DoneCallback) => void): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
@@ -350,7 +351,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: ((job: Job) => void) | string): Promise<any>;
+    process(name: string, callback: ((job: Job<T>) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -366,7 +367,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: (job: Job, done: DoneCallback) => void): void;
+    process(name: string, callback: (job: Job<T>, done: DoneCallback) => void): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
@@ -387,7 +388,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(name: string, concurrency: number, callback: ((job: Job) => void) | string): Promise<any>;
+    process(name: string, concurrency: number, callback: ((job: Job<T>) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -403,21 +404,21 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(name: string, concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+    process(name: string, concurrency: number, callback: (job: Job<T>, done: DoneCallback) => void): void;
 
     /**
      * Creates a new job and adds it to the queue.
      * If the queue is empty the job will be executed directly,
      * otherwise it will be placed in the queue and executed as soon as possible.
      */
-    add(data: any, opts?: JobOptions): Promise<Job>;
+    add(data: T, opts?: JobOptions): Promise<Job<T>>;
 
     /**
      * Creates a new named job and adds it to the queue.
      * If the queue is empty the job will be executed directly,
      * otherwise it will be placed in the queue and executed as soon as possible.
      */
-    add(name: string, data: any, opts?: JobOptions): Promise<Job>;
+    add(name: string, data: T, opts?: JobOptions): Promise<Job<T>>;
 
     /**
      * Returns a promise that resolves when the queue is paused.
@@ -466,32 +467,32 @@ declare namespace Bull {
      * Returns a promise that will return the job instance associated with the jobId parameter.
      * If the specified job cannot be located, the promise callback parameter will be set to null.
      */
-    getJob(jobId: JobId): Promise<Job>;
+    getJob(jobId: JobId): Promise<Job<T>>;
 
     /**
      * Returns a promise that will return an array with the waiting jobs between start and end.
      */
-    getWaiting(start?: number, end?: number): Promise<Job[]>;
+    getWaiting(start?: number, end?: number): Promise<Array<Job<T>>>;
 
     /**
      * Returns a promise that will return an array with the active jobs between start and end.
      */
-    getActive(start?: number, end?: number): Promise<Job[]>;
+    getActive(start?: number, end?: number): Promise<Array<Job<T>>>;
 
     /**
      * Returns a promise that will return an array with the delayed jobs between start and end.
      */
-    getDelayed(start?: number, end?: number): Promise<Job[]>;
+    getDelayed(start?: number, end?: number): Promise<Array<Job<T>>>;
 
     /**
      * Returns a promise that will return an array with the completed jobs between start and end.
      */
-    getCompleted(start?: number, end?: number): Promise<Job[]>;
+    getCompleted(start?: number, end?: number): Promise<Array<Job<T>>>;
 
     /**
      * Returns a promise that will return an array with the failed jobs between start and end.
      */
-    getFailed(start?: number, end?: number): Promise<Job[]>;
+    getFailed(start?: number, end?: number): Promise<Array<Job<T>>>;
 
     /**
      * Returns JobInformation of repeatable jobs (ordered descending). Provide a start and/or an end
@@ -502,7 +503,7 @@ declare namespace Bull {
     /**
      * ???
      */
-    nextRepeatableJob(name: string, data: any, opts: JobOptions): Promise<Job>;
+    nextRepeatableJob(name: string, data: any, opts: JobOptions): Promise<Job<T>>;
 
     /**
      * Removes a given repeatable job. The RepeatOptions and JobId needs to be the same as the ones
@@ -565,7 +566,7 @@ declare namespace Bull {
      * @param status Status of the job to clean. Values are completed, wait, active, delayed, and failed. Defaults to completed.
      * @param limit Maximum amount of jobs to clean per call. If not provided will clean all matching jobs.
      */
-    clean(grace: number, status?: JobStatus, limit?: number): Promise<Job[]>;
+    clean(grace: number, status?: JobStatus, limit?: number): Promise<Array<Job<T>>>;
 
     /**
      * Listens to queue events

From 5a70beef53ba1dca757130fbae9a4befcdda1989 Mon Sep 17 00:00:00 2001
From: Shayne Hartford <ShayneEHartford@Gmail.Com>
Date: Tue, 5 Jun 2018 17:11:36 -0400
Subject: [PATCH 1052/1124] Fixed author

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

diff --git a/types/snekfetch/index.d.ts b/types/snekfetch/index.d.ts
index 4885656a98..aa831be0cc 100644
--- a/types/snekfetch/index.d.ts
+++ b/types/snekfetch/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for snekfetch 4.0
 // Project: https://github.com/GusCaplan/snekfetch
-// Definitions by: Iker Pérez Brunelli <https://github.com/DarkerTV>
+// Definitions by: Iker Pérez Brunelli <https://github.com/ANekoIsFineToo>
 //                 Shayne Hartford <https://github.com/ShayBox>
 //                 Yukine <https://github.com/Dev-Yukine>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 03eb09d3c3ee357c370cd20d136a2c893f6cd99f Mon Sep 17 00:00:00 2001
From: kingdaro <kingdaro@gmail.com>
Date: Tue, 5 Jun 2018 17:24:45 -0400
Subject: [PATCH 1053/1124] @reach/router: fix Location props

---
 types/reach__router/index.d.ts              |  6 +++++-
 types/reach__router/reach__router-tests.tsx | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/types/reach__router/index.d.ts b/types/reach__router/index.d.ts
index 869329ef23..f52b3954e3 100644
--- a/types/reach__router/index.d.ts
+++ b/types/reach__router/index.d.ts
@@ -92,7 +92,11 @@ export interface NavigateOptions<TState> {
     replace?: boolean;
 }
 
-export class Location extends React.Component<LocationContext> {}
+export interface LocationProps {
+    children: LocationProviderRenderFn;
+}
+
+export class Location extends React.Component<LocationProps> {}
 
 export interface LocationProviderProps {
     history: History;
diff --git a/types/reach__router/reach__router-tests.tsx b/types/reach__router/reach__router-tests.tsx
index f20b11483f..56e2305a2e 100644
--- a/types/reach__router/reach__router-tests.tsx
+++ b/types/reach__router/reach__router-tests.tsx
@@ -1,4 +1,4 @@
-import { Link, RouteComponentProps, Router } from "@reach/router";
+import { Link, Location, RouteComponentProps, Router } from "@reach/router";
 import * as React from "react";
 import { render } from "react-dom";
 
@@ -21,6 +21,17 @@ render(
         <NotFound default />
 
         <Link to="/somepath" rel="noopener noreferrer" target="_blank" />
+
+        <Location>
+            {(context) => (
+                <>
+                    <div>hostname is {context.location.hostname}</div>
+                    <button onClick={() => context.navigate("/")}>
+                        Go Home
+                    </button>
+                </>
+            )}
+        </Location>
     </Router>,
     document.getElementById("app-root"),
 );

From 60009ab2a6a13daae68e6e6e7b1b3a1c709f30af Mon Sep 17 00:00:00 2001
From: David Koblas <david@tubularlabs.com>
Date: Tue, 5 Jun 2018 17:44:52 -0400
Subject: [PATCH 1054/1124] Updated the the event handlers with generic T

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

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 83cc4a69bd..cdef279acb 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -581,28 +581,28 @@ declare namespace Bull {
     /**
      * A job has started. You can use `jobPromise.cancel()` to abort it
      */
-    on(event: 'active', callback: ActiveEventCallback): this;
+    on(event: 'active', callback: ActiveEventCallback<T>): this;
 
     /**
      * A job has been marked as stalled.
      * This is useful for debugging job workers that crash or pause the event loop.
      */
-    on(event: 'stalled', callback: StalledEventCallback): this;
+    on(event: 'stalled', callback: StalledEventCallback<T>): this;
 
     /**
      * A job's progress was updated
      */
-    on(event: 'progress', callback: ProgressEventCallback): this;
+    on(event: 'progress', callback: ProgressEventCallback<T>): this;
 
     /**
      * A job successfully completed with a `result`
      */
-    on(event: 'completed', callback: CompletedEventCallback): this;
+    on(event: 'completed', callback: CompletedEventCallback<T>): this;
 
     /**
      * A job failed with `err` as the reason
      */
-    on(event: 'failed', callback: FailedEventCallback): this;
+    on(event: 'failed', callback: FailedEventCallback<T>): this;
 
     /**
      * The queue has been paused
@@ -620,7 +620,7 @@ declare namespace Bull {
      *
      * @see Queue#clean() for details
      */
-    on(event: 'cleaned', callback: CleanedEventCallback): this;
+    on(event: 'cleaned', callback: CleanedEventCallback<T>): this;
   }
 
   type EventCallback = () => void;
@@ -634,17 +634,17 @@ declare namespace Bull {
     cancel(): void;
   }
 
-  type ActiveEventCallback = (job: Job, jobPromise?: JobPromise) => void;
+  type ActiveEventCallback<T = any> = (job: Job<T>, jobPromise?: JobPromise) => void;
 
-  type StalledEventCallback = (job: Job) => void;
+  type StalledEventCallback<T = any> = (job: Job<T>) => void;
 
-  type ProgressEventCallback = (job: Job, progress: any) => void;
+  type ProgressEventCallback<T = any> = (job: Job<T>, progress: any) => void;
 
-  type CompletedEventCallback = (job: Job, result: any) => void;
+  type CompletedEventCallback<T = any> = (job: Job<T>, result: any) => void;
 
-  type FailedEventCallback = (job: Job, error: Error) => void;
+  type FailedEventCallback<T = any> = (job: Job<T>, error: Error) => void;
 
-  type CleanedEventCallback = (jobs: Job[], status: JobStatus) => void;
+  type CleanedEventCallback<T = any> = (jobs: Array<Job<T>>, status: JobStatus) => void;
 }
 
 export = Bull;

From 74e68b4f1234803ff77e021ce68ee5d2264ab3f4 Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Tue, 5 Jun 2018 15:56:19 -0700
Subject: [PATCH 1055/1124] Put openURL under CustomTabs namespace

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

diff --git a/types/react-native-custom-tabs/index.d.ts b/types/react-native-custom-tabs/index.d.ts
index ed74ff4303..5e0754c546 100644
--- a/types/react-native-custom-tabs/index.d.ts
+++ b/types/react-native-custom-tabs/index.d.ts
@@ -19,4 +19,6 @@ export interface CustomTabsOptions {
   headers?: any;
 }
 
-export function openURL(url: string, options?: CustomTabsOptions): Promise<boolean>;
+declare namespace CustomTabs {
+    function openURL(url: string, options?: CustomTabsOptions): Promise<boolean>;
+}

From d48e6d5e3b697ced4ebf52c5328baf0effbf197a Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Tue, 5 Jun 2018 16:03:51 -0700
Subject: [PATCH 1056/1124] Update tests

---
 .../react-native-custom-tabs/react-native-custom-tabs-tests.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts b/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
index 86dad3b3ee..f300f79d35 100644
--- a/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
+++ b/types/react-native-custom-tabs/react-native-custom-tabs-tests.ts
@@ -7,4 +7,4 @@ const rnt: ReactNativeCustomTabs.CustomTabsOptions = {
   enableDefaultShare: true,
 };
 
-const url: Promise<boolean> = ReactNativeCustomTabs.openURL('testurl.com', rnt);
+const url: Promise<boolean> = ReactNativeCustomTabs.CustomTabs.openURL('testurl.com', rnt);

From a84eda7449c8ab24553822c63f1d3d10a8626bb6 Mon Sep 17 00:00:00 2001
From: Justin Bay <justin.bay@outlook.com>
Date: Tue, 5 Jun 2018 19:34:36 -0400
Subject: [PATCH 1057/1124] remove myself from puppeteer types

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

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 510ae37107..9b81adcac7 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Christopher Deutsch <https://github.com/cdeutsch>
-//                 jwbay <https://github.com/jwbay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 45a5c626532acd09857b6610be09d05442c01233 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Tue, 5 Jun 2018 19:50:42 -0400
Subject: [PATCH 1058/1124] [react-navigation] Add index to NavigationLeafRoute

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index ef4904c11f..dd9efa0de4 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -96,6 +96,10 @@ export interface NavigationLeafRoute<Params = NavigationParams> {
    * they will be defined by the router.
    */
   key: string;
+  /**
+   * Index that represents the depth of the stack
+   */
+  index: number;
   /**
    * For example 'Home'.
    * This is used as a key in a route config when creating a navigator.
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index b59474bd11..9697e61de8 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -6,6 +6,7 @@ import {
 } from 'react-native';
 import {
     createDrawerNavigator,
+    createBottomTabNavigator,
     DrawerNavigatorConfig,
     NavigationAction,
     NavigationActions,
@@ -451,3 +452,20 @@ class Page2 extends React.Component {
         return <RootNavigator ref={(instance: NavigationContainerComponent | null): void => { this.navigatorRef = instance; }} />;
     }
 }
+
+const BottomStack = createBottomTabNavigator({
+    Posts: {
+        screen: Page2,
+        navigationOptions: ({ navigation }: NavigationScreenProps) => {
+            let tabBarVisible = true;
+
+            if (navigation.state.index > 0) {
+                tabBarVisible = false;
+            }
+
+            return {
+                tabBarVisible
+            };
+        }
+    }
+});

From 80e5beb6eb60c2e9a1edb75c4df1ee8545147ebe Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Tue, 5 Jun 2018 17:32:19 -0700
Subject: [PATCH 1059/1124] Prefer export to declare

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

diff --git a/types/react-native-custom-tabs/index.d.ts b/types/react-native-custom-tabs/index.d.ts
index 5e0754c546..42fd1cdf78 100644
--- a/types/react-native-custom-tabs/index.d.ts
+++ b/types/react-native-custom-tabs/index.d.ts
@@ -19,6 +19,6 @@ export interface CustomTabsOptions {
   headers?: any;
 }
 
-declare namespace CustomTabs {
+export namespace CustomTabs {
     function openURL(url: string, options?: CustomTabsOptions): Promise<boolean>;
 }

From 63d8cf1a1facd5d188f73f58f4968e94edd5cbbf Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 5 Jun 2018 18:13:12 -0700
Subject: [PATCH 1060/1124] Removing redundant mode guidance

---
 types/office-js/index.d.ts | 121 ++++++++++++++++++-------------------
 1 file changed, 60 insertions(+), 61 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 718f1bd34f..c6628f722a 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -6435,43 +6435,6 @@ declare namespace Office {
      * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
      */
     interface Appointment extends Item {
-        /**
-         * Gets or sets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. Read and compose modes for appointment items. Read mode for meeting request items.
-         * 
-         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance in a series. null is returned for single appointments and meeting requests of single appointments. undefined is returned for messages that are not meeting requests.
-         * 
-         * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
-         * 
-         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single appointment and NOT a part of a series.
-         * 
-         * [Api set: Mailbox Preview]
-         * 
-         * @remarks
-         * 
-         * Minimum permission level: ReadItem
-         * 
-         * Applicable Outlook mode: Compose or read
-         */
-        recurrence: Recurrence;
-
-        /**
-         * Gets the id of the series that an instance belongs to.
-         * 
-         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. However, in iOS and Android, the seriesId returns the REST ID of the parent item.
-         * 
-         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. The seriesId property is not identical to the Outlook IDs 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](https://docs.microsoft.com/outlook/add-ins/use-rest-api).
-         * 
-         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests and returns undefined for any other items that are not meeting requests.
-         * 
-         * [Api set: Mailbox Preview]
-         * 
-         * @remarks
-         * 
-         * Minimum permission level: ReadItem
-         * 
-         * Applicable Outlook mode: Compose or read
-         */
-        seriesId: string;
     }
     /**
      * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
@@ -6570,11 +6533,26 @@ declare namespace Office {
      * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
      */
     interface AppointmentRead extends Appointment, ItemRead {
+        /**
+         * Gets 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 returns a Date 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*
+         * Gets the location of an appointment.
          *
          * The location property returns a string that contains the location of the appointment.
          *
@@ -6590,8 +6568,6 @@ declare namespace Office {
         /**
          * 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.
          *
          * [Api set: Mailbox 1.0]
@@ -6618,8 +6594,6 @@ declare namespace Office {
         /**
          * 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.
          *
          * [Api set: Mailbox 1.0]
@@ -6632,12 +6606,10 @@ declare namespace Office {
          */
         requiredAttendees: EmailAddressDetails[];
         /**
-         * Gets or sets the date and time that the appointment is to begin.
+         * Gets 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.
          *
          * [Api set: Mailbox 1.0]
@@ -6650,6 +6622,7 @@ declare namespace Office {
          */
         start: Date;
     }
+
     interface AppointmentForm {
         /**
          * Gets an object that provides methods for manipulating the body of an item.
@@ -6871,6 +6844,44 @@ declare namespace Office {
          */
         notificationMessages: NotificationMessages;
 
+        /**
+         * Gets or sets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. Read and compose modes for appointment items. Read mode for meeting request items.
+         * 
+         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance in a series. null is returned for single appointments and meeting requests of single appointments. undefined is returned for messages that are not meeting requests.
+         * 
+         * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
+         * 
+         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single appointment and NOT a part of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        recurrence: Recurrence;
+
+        /**
+         * Gets the id of the series that an instance belongs to.
+         * 
+         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. However, in iOS and Android, the seriesId returns the REST ID of the parent item.
+         * 
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. The seriesId property is not identical to the Outlook IDs 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](https://docs.microsoft.com/outlook/add-ins/use-rest-api).
+         * 
+         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests and returns undefined for any other items that are not meeting requests.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        seriesId: string;
+
         /**
          * Adds an event handler for a supported event.
          * 
@@ -6980,8 +6991,6 @@ declare namespace Office {
          *
          * The subject property gets or sets the entire subject of the item, as sent by the email server.
          *
-         * *Compose mode*
-         *
          * The subject property returns a Subject object that provides methods to get and set the subject.
          *
          * [Api set: Mailbox 1.0]
@@ -7638,12 +7647,10 @@ declare namespace Office {
          */
         normalizedSubject: string;
         /**
-         * Gets or sets the description that appears in the subject field of an item.
+         * Gets 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:.
          *
          * [Api set: Mailbox 1.0]
@@ -7915,9 +7922,7 @@ declare namespace Office {
          */
         conversationId: string;
     }
-    /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
-     */
+
     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.
@@ -7966,8 +7971,6 @@ declare namespace Office {
         /**
          * 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.
          *
-         * *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]
@@ -7987,8 +7990,6 @@ declare namespace Office {
         /**
          * 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.
          *
          * [Api set: Mailbox 1.0]
@@ -8049,8 +8050,6 @@ declare namespace Office {
         /**
          * 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.
          *
          * [Api set: Mailbox 1.0]

From 2b125bc3057582e4d002b1631cf2f0a765064af6 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 5 Jun 2018 21:18:31 -0400
Subject: [PATCH 1061/1124] Fix sameSite parent interface

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

diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index 0728ff7624..fdceafeeea 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -32,6 +32,7 @@ declare global {
       httpOnly: boolean;
       domain?: string;
       expires: Date | boolean;
+      sameSite?: boolean | string;
     }
 
     interface SessionCookie extends SessionCookieData {
@@ -64,7 +65,6 @@ declare namespace session {
     proxy?: boolean;
     saveUninitialized?: boolean;
     unset?: string;
-    sameSite?: boolean | string;
   }
 
   interface BaseMemoryStore {

From 51eb68205a37fb1cc2de4e72bb411313114a5b9c Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 5 Jun 2018 21:18:59 -0400
Subject: [PATCH 1062/1124] Fix test for sameSite option

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

diff --git a/types/express-session/express-session-tests.ts b/types/express-session/express-session-tests.ts
index 37718f7f69..9189db1dfb 100644
--- a/types/express-session/express-session-tests.ts
+++ b/types/express-session/express-session-tests.ts
@@ -11,14 +11,13 @@ app.use(session({
   secret: 'keyboard cat',
   name: 'connect.sid',
   store: new session.MemoryStore(),
-  cookie: { path: '/', httpOnly: true, secure: false },
+  cookie: { path: '/', httpOnly: true, secure: false, sameSite: true },
   genid: (req: express.Request): string => '',
   rolling: false,
   resave: true,
   proxy: true,
   saveUninitialized: true,
-  unset: 'keep',
-  sameSite: true
+  unset: 'keep'
 }));
 
 interface MySession extends Express.Session {

From f6575e4fae6a482182ef0336fede53cad5a8db25 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <muntyan@fastmail.fm>
Date: Tue, 5 Jun 2018 18:35:07 -0700
Subject: [PATCH 1063/1124] Characteristic and friends cannot be simply
 imported from the module

---
 types/bleno/bleno-tests.ts | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/types/bleno/bleno-tests.ts b/types/bleno/bleno-tests.ts
index 7ea037587c..2251baed19 100644
--- a/types/bleno/bleno-tests.ts
+++ b/types/bleno/bleno-tests.ts
@@ -1,7 +1,4 @@
 import * as Bleno from 'bleno';
-// can also import these types as if they were exported from the module
-// tslint:disable-next-line:no-duplicate-imports
-import { Characteristic, Descriptor, PrimaryService } from 'bleno';
 
 export class EchoCharacteristic extends Bleno.Characteristic {
   _value: any;
@@ -62,13 +59,13 @@ const SERVICE_UUID = '87B1E448-1C07-4957-B7D3-017DF4EE3863';
 const CONTROL_CHAR_UUID = '87B1E448-1C07-4957-B7D3-017DF4EE3864';
 const STATUS_CHAR_UUID = '87B1E448-1C07-4957-B7D3-017DF4EE3866';
 
-class StatusCharacteristic extends Characteristic {
+class StatusCharacteristic extends Bleno.Characteristic {
     constructor() {
         super({
             uuid: 'STATUS_CHAR_UUID',
             properties: ['read'],
             descriptors: [
-                new Descriptor({
+                new Bleno.Descriptor({
                     uuid: '2901',
                     value: Buffer.from('Status'),
                 }),
@@ -82,14 +79,14 @@ class StatusCharacteristic extends Characteristic {
     ) {
         try {
             const data = Buffer.from('status ok');
-            callback(Characteristic.RESULT_SUCCESS, data.slice(offset));
+            callback(Bleno.Characteristic.RESULT_SUCCESS, data.slice(offset));
         } catch (error) {
-            callback(Characteristic.RESULT_UNLIKELY_ERROR);
+            callback(Bleno.Characteristic.RESULT_UNLIKELY_ERROR);
         }
     }
 }
 
-class ControlCharacteristic extends Characteristic {
+class ControlCharacteristic extends Bleno.Characteristic {
     private readonly callback: (data: Buffer) => void;
 
     constructor(onWriteRequestCb: (data: Buffer) => void) {
@@ -97,7 +94,7 @@ class ControlCharacteristic extends Characteristic {
             uuid: CONTROL_CHAR_UUID,
             properties: ['write'],
             descriptors: [
-                new Descriptor({
+                new Bleno.Descriptor({
                     uuid: '2901',
                     value: Buffer.from('test characteristic'),
                 }),
@@ -174,7 +171,7 @@ export class BluetoothController {
             if (!error) {
                 this.isAdvertising = true;
                 Bleno.setServices([
-                    new PrimaryService({
+                    new Bleno.PrimaryService({
                         uuid: SERVICE_UUID,
                         characteristics: [
                             new ControlCharacteristic((data) => {
@@ -206,8 +203,7 @@ export class BluetoothController {
 // code from bleno's README
 //
 
-// tslint:disable-next-line:no-duplicate-imports
-import * as bleno from 'bleno';
+const bleno = Bleno;
 
 function test1() {
   const name = 'name';
@@ -243,7 +239,7 @@ function test4() {
 }
 
 function test5() {
-  const service = new PrimaryService({uuid: '0000'});
+  const service = new bleno.PrimaryService({uuid: '0000'});
   const services = [
     service
   ];
@@ -282,7 +278,7 @@ function test9() {
       value: null, // optional static value, must be of type Buffer - for read only characteristics
       descriptors: [
           // see Descriptor for data type
-          new Descriptor({uuid: '0000'})
+          new bleno.Descriptor({uuid: '0000'})
       ],
       onReadRequest: null, // optional read request handler, function(offset, callback) { ... }
       onWriteRequest: null, // optional write request handler, function(data, offset, withoutResponse, callback) { ...}
@@ -294,10 +290,10 @@ function test9() {
 }
 
 function test10() {
-  Characteristic.RESULT_SUCCESS;
-  Characteristic.RESULT_INVALID_OFFSET;
-  Characteristic.RESULT_INVALID_ATTRIBUTE_LENGTH;
-  Characteristic.RESULT_UNLIKELY_ERROR;
+  bleno.Characteristic.RESULT_SUCCESS;
+  bleno.Characteristic.RESULT_INVALID_OFFSET;
+  bleno.Characteristic.RESULT_INVALID_ATTRIBUTE_LENGTH;
+  bleno.Characteristic.RESULT_UNLIKELY_ERROR;
 }
 
 function test11() {

From ca916022152dd46e86acad208759811e622a00be Mon Sep 17 00:00:00 2001
From: Alex Maclean <Alex.MacLean@novasystems.com>
Date: Wed, 6 Jun 2018 11:55:06 +1000
Subject: [PATCH 1064/1124] Updated to 0.16.3

---
 types/react-calendar-timeline/index.d.ts | 155 ++++++++++++++---------
 1 file changed, 95 insertions(+), 60 deletions(-)

diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 8c523e68c6..2ff17f6a82 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-calendar-timeline v0.15.12
+// Type definitions for react-calendar-timeline v0.16.3
 // Project: https://github.com/namespace-ee/react-calendar-timeline
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
 //				         Alex Maclean <https://github.com/acemac>
@@ -12,6 +12,7 @@ declare module "react-calendar-timeline" {
   export interface TimelineGroup {
     id: number;
     title: React.ReactNode;
+    rightTitle?: React.ReactNode;
   }
 
   export interface TimelineItem {
@@ -21,9 +22,10 @@ declare module "react-calendar-timeline" {
     start_time: any;
     end_time: any;
     canMove?: boolean;
-    canResize?: boolean;
+    canResize?: boolean | "left" | "right" | "both";
     canChangeGroup?: boolean;
     className?: string;
+    itemProps?: {};
   }
 
   export interface TimelineContext {
@@ -32,65 +34,98 @@ declare module "react-calendar-timeline" {
     timelineWidth: number
   }
 
-  export interface ReactCalendarTimelineProps {
-    groups: TimelineGroup[];
-    items: TimelineItem[];
-    keys?:{
-        groupIdKey: string;
-        groupTitleKey: string;
-        itemIdKey: string;
-        itemTitleKey: string;
-        itemGroupKey: string;
-        itemTimeStartKey: string;
-        itemTimeEndKey: string;
-    };
-    selected?: number[];
-    sidebarWidth?: number;
-    sidebarContent?: any;
-    rightSidebarWidth?: number;
-    rightSidebarContent?: any;
-    dragSnap?: number;
-    minResizeWidth?: number;
-    stickyOffset?: number;
-    stickyHeader?: boolean;
-    headerRef?: any;
-    lineHeight?: number;
-    headerLabelGroupHeight?: number;
-    headerLabelHeight?: number;
-    itemHeightRatio?: number;
-    minZoom?: number;
-    maxZoom?: number;
-    clickTolerance?: number;
-    canMove?: boolean;
-    canChangeGroup?: boolean;
-    canResize?: boolean;
-    useResizeHandle?: boolean;
-    showCursorLine?: boolean;
-    stackItems?: boolean;
-    traditionalZoom?: boolean;
-    itemTouchSendsClick?: boolean;
-    onItemMove?(itemId:number, dragTime:number, newGroupOrder:number): any;
-    onItemResize?(itemId:number, newResizeEnd: number, edge: "left" | "right"): any;
-    onItemSelect?(itemId:number, e: any, time: number): any;
-    onItemClick?(itemId:number, e: any, time: number): any;
-    onItemDoubleClick?(itemId:number, e: any, time: number): any;
-    onCanvasClick?(groupId:number, time:number, e:any): any;
-    onCanvasDoubleClick?(groupId:number, time:number, e:any): any;
-    moveResizeValidator?(action:"move" | "resize", itemId:number, time:number, resizeEdge: "left" | "right"): any;
-    defaultTimeStart?: any;
-    defaultTimeEnd?: any;
-    visibleTimeStart?: number;
-    visibleTimeEnd?: number;
-    onTimeChange?(visibleTimeStart: number, visibleTimeEnd: number, updateScrollCanvas: (start: number, end: number) => void): any;
-    onTimeInit?(visibleTimeStart: number, visibleTimeEnd: number): any;
-    onBoundsChange?(canvasTimeStart: number, canvasTimeEnd: number): any;
-    onZoom?(timelineContext: TimelineContext): any;
-    children?: any;
-    fullUpdate?: boolean;
-    itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactElement<{}>;
-    groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactElement<{}>;
-    minimumWidthForItemContentVisibility?: number;
+  export interface TimelineTimeSteps {
+    second: number,
+    minute: number,
+    hour: number,
+    day: number,
+    month: number,
+    year: number
   }
+
+  export interface TimelineHeaderLabelFormat {
+    yearShort: string,
+    yearLong: string,
+    monthShort: string,
+    monthMedium: string,
+    monthMediumLong: string,
+    monthLong: string,
+    dayShort: string,
+    dayLong: string,
+    hourShort: string,
+    hourMedium: string,
+    hourMediumLong: string,
+    hourLong: string,
+    time: string
+  }
+
+  export interface ReactCalendarTimelineProps {
+      groups: TimelineGroup[];
+      items: TimelineItem[];
+      keys?:{
+          groupIdKey: string;
+          groupTitleKey: string;
+          itemIdKey: string;
+          itemTitleKey: string;
+          itemGroupKey: string;
+          itemTimeStartKey: string;
+          itemTimeEndKey: string;
+      };
+      defaultTimeStart?: any;
+      defaultTimeEnd?: any;
+      visibleTimeStart?: any;
+      visibleTimeEnd?: any;
+      selected?: number[];
+      sidebarWidth?: number;
+      sidebarContent?: React.ReactNode;
+      rightSidebarWidth?: number;
+      rightSidebarContent?: React.ReactNode;
+      dragSnap?: number;
+      minResizeWidth?: number;
+      stickyOffset?: number;
+      stickyHeader?: boolean;
+      headerRef?: any;
+      lineHeight?: number;
+      headerLabelGroupHeight?: number;
+      headerLabelHeight?: number;
+      itemHeightRatio?: number;
+      minZoom?: number;
+      maxZoom?: number;
+      clickTolerance?: number;
+      canMove?: boolean;
+      canChangeGroup?: boolean;
+      canResize?: boolean | "left" | "right" | "both";
+      useResizeHandle?: boolean;
+      showCursorLine?: boolean;
+      stackItems?: boolean;
+      traditionalZoom?: boolean;
+      itemTouchSendsClick?: boolean;
+      timeSteps?: TimelineTimeSteps,
+      onItemMove?(itemId: number, dragTime: number, newGroupOrder: number): any;
+      onItemResize?(itemId: number, newResizeEnd: number, edge: "left" | "right"): any;
+      onItemSelect?(itemId: number, e: any, time: number): any;
+      onItemClick?(itemId: number, e: any, time: number): any;
+      onItemDoubleClick?(itemId: number, e: any, time: number): any;
+      onCanvasClick?(groupId:number, time:number, e:any): any;
+      onCanvasDoubleClick?(group: TimelineGroup, time: number, e: any): any;
+      onCanvasContextMenu?(group: TimelineGroup, time: number, e: any): any;
+      onZoom?(timelineContext: TimelineContext): any;
+      moveResizeValidator?(action:"move" | "resize", itemId: number, time: number, resizeEdge: "left" | "right"): any;
+      headerLabelFormats?: TimelineHeaderLabelFormat,
+      subHeaderLabelFormats?: TimelineHeaderLabelFormat,
+      onTimeChange?(visibleTimeStart: number, visibleTimeEnd: number, updateScrollCanvas: (start: number, end: number) => void): any;
+      onTimeInit?(canvasTimeStart: number, canvasTimeEnd: number): any;
+      onBoundsChange?(canvasTimeStart: number, canvasTimeEnd: number): any;
+      itemRenderer?: (props: {item: TimelineItem, context: TimelineContext}) => React.ReactElement<{}>;
+      groupRenderer?: (props: {group: TimelineGroup, isRightSidebar: boolean}) => React.ReactElement<{}>;
+      minimumWidthForItemContentVisibility?: number;
+      children?: any;
+  }
+
+  export const defaultHeaderLabelFormats: TimelineHeaderLabelFormat;
+  export const defaultSubHeaderLabelFormats: TimelineHeaderLabelFormat;
+
   let ReactCalendarTimeline : React.ClassicComponentClass<ReactCalendarTimelineProps>;
   export default ReactCalendarTimeline;
+  
 }

From 09831af230d8cda7def8214bdbf891ba90f0322f Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Tue, 5 Jun 2018 19:49:48 -0700
Subject: [PATCH 1065/1124] Added axe-webdriverjs typings with axe-core@3.0.3

---
 notNeededPackages.json                        |  2 +-
 .../axe-webdriverjs/axe-webdriverjs-tests.ts  | 31 +++++++++++++++++++
 types/axe-webdriverjs/index.d.ts              | 28 ++++++++++-------
 types/axe-webdriverjs/package.json            |  3 +-
 types/axe-webdriverjs/tsconfig.json           |  1 +
 types/jest-axe/package.json                   |  2 +-
 6 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4fb2ecedb3..a8c685e5e9 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -124,7 +124,7 @@
             "libraryName": "axe-core",
             "typingsPackageName": "axe-core",
             "sourceRepoURL": "https://github.com/dequelabs/axe-core",
-            "asOfVersion": "2.0.7"
+            "asOfVersion": "3.0.3"
         },
         {
             "libraryName": "axios",
diff --git a/types/axe-webdriverjs/axe-webdriverjs-tests.ts b/types/axe-webdriverjs/axe-webdriverjs-tests.ts
index e69de29bb2..47eeadc8c5 100644
--- a/types/axe-webdriverjs/axe-webdriverjs-tests.ts
+++ b/types/axe-webdriverjs/axe-webdriverjs-tests.ts
@@ -0,0 +1,31 @@
+import { Result, RunOptions, Spec } from "axe-core";
+import { AxeBuilder, AxeAnalysis } from "axe-webdriverjs";
+import { WebDriver } from "selenium-webdriver";
+
+const inTest = async (webDriver: WebDriver) => {
+    const builderCalled: AxeBuilder = AxeBuilder(webDriver);
+    const builderNewed: AxeBuilder = new AxeBuilder(webDriver);
+
+    const runOptions: RunOptions = {};
+    const spec: Spec = {};
+
+    const analysis: AxeAnalysis = await AxeBuilder(webDriver)
+        .include("include")
+        .exclude("exclude")
+        .options(runOptions)
+        .withRules("rule")
+        .withRules(["rule", "rule"])
+        .withTags("tag")
+        .withTags(["tag", "tag"])
+        .disableRules("rule")
+        .disableRules(["rule", "rule"])
+        .configure(spec)
+        .analyze((internalResults: AxeAnalysis) => {});
+
+    const inapplicable: Result[] = analysis.inapplicable;
+    const incomplete: Result[] = analysis.incomplete;
+    const passes: Result[] = analysis.passes;
+    const timestamp: string = analysis.timestamp;
+    const url: string = analysis.url;
+    const violations: Result[] = analysis.violations;
+};
diff --git a/types/axe-webdriverjs/index.d.ts b/types/axe-webdriverjs/index.d.ts
index d8e3979145..3c8ae27249 100644
--- a/types/axe-webdriverjs/index.d.ts
+++ b/types/axe-webdriverjs/index.d.ts
@@ -2,11 +2,12 @@
 // Project: https://github.com/dequelabs/axe-webdriverjs#readme
 // Definitions by: My Self <https://github.com/JoshuaKGoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Result, RunOptions, Spec } from "axe-core";
 import { WebDriver } from "selenium-webdriver";
 
-export interface IAxeAnalysis {
+export interface AxeAnalysis {
     inapplicable: Result[];
     incomplete: Result[];
     passes: Result[];
@@ -16,9 +17,6 @@ export interface IAxeAnalysis {
 }
 
 export interface AxeBuilder {
-    (driver: WebDriver): AxeBuilder;
-    new (driver: WebDriver): AxeBuilder;
-
     /**
      * Includes a selector in analysis.
      *
@@ -38,21 +36,22 @@ export interface AxeBuilder {
      *
      * @param options   aXe options object.
      * @remarks Will override any other configured options, including calls to `withRules` and `withTags`.
+     * @see https://github.com/dequelabs/axe-core/issues/937
      */
     options(options: RunOptions): this;
 
     /**
      * Limits analysis to only the specified rules.
-     * 
+     *
      * @param rules   Array of rule IDs, or a single rule ID as a string.
      * @remarks Cannot be used with `withTags`.
      */
     withRules(rules: string | string[]): this;
 
     /**
-     * Limist analysis to only the specified tags.  
+     * Limist analysis to only the specified tags.
      *
-     * @param rules   Array of tags, or a single tag as a string
+     * @param rules   Array of tags, or a single tag as a string.
      * @remarks Cannot be used with `withRules`.
      */
     withTags(tags: string | string[]): this;
@@ -60,7 +59,7 @@ export interface AxeBuilder {
     /**
      * Set the list of rules to skip when running an analysis
      *
-     * @param rules   Array of rule IDs, or a single rule ID as a string
+     * @param rules   Array of rule IDs, or a single rule ID as a string.
      */
     disableRules(rules: string | string[]): this;
 
@@ -72,8 +71,13 @@ export interface AxeBuilder {
     configure(config: Spec): this;
 
     /**
-    * Perform analysis and retrieve results.
-    * @param callback   Function to execute when analysis completes.
-    */
-    analyze(callback: (results: IAxeAnalysis) => void): Promise<IAxeAnalysis>;
+     * Perform analysis and retrieve results.
+     * @param callback   Function to execute when analysis completes.
+     */
+    analyze(callback: (results: AxeAnalysis) => void): Promise<AxeAnalysis>;
 }
+
+export const AxeBuilder: {
+    (driver: WebDriver): AxeBuilder;
+    new (driver: WebDriver): AxeBuilder;
+};
diff --git a/types/axe-webdriverjs/package.json b/types/axe-webdriverjs/package.json
index 5d94289f3b..e4e88ef33a 100644
--- a/types/axe-webdriverjs/package.json
+++ b/types/axe-webdriverjs/package.json
@@ -1,7 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "@types/selenium-webdriver": "^3.0.0",
-        "axe-core": "^2.6.1"
+        "axe-core": "^3.0.3"
     }
 }
diff --git a/types/axe-webdriverjs/tsconfig.json b/types/axe-webdriverjs/tsconfig.json
index efa6dfcf98..d8637d03e4 100644
--- a/types/axe-webdriverjs/tsconfig.json
+++ b/types/axe-webdriverjs/tsconfig.json
@@ -6,6 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/jest-axe/package.json b/types/jest-axe/package.json
index d9427293a7..e4e88ef33a 100644
--- a/types/jest-axe/package.json
+++ b/types/jest-axe/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "axe-core": "^2.6.1"
+        "axe-core": "^3.0.3"
     }
 }

From c64cf525c07844c4491aa49756705ace63eb6543 Mon Sep 17 00:00:00 2001
From: MosheF <moshef@wix.com>
Date: Wed, 6 Jun 2018 09:40:41 +0300
Subject: [PATCH 1066/1124] improve v27

---
 types/expo/index.d.ts | 70 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 9645ce4390..6c874b7ce6 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2855,22 +2855,67 @@ export namespace Updates {
 
 // #region MediaLibrary
 /**
+ * https://docs.expo.io/versions/latest/sdk/media-library
  * Provides access to user's media library
  * Requires Permissions.CAMERA_ROLL permissions.
  */
 
 
 export namespace MediaLibrary {
+
+  /**
+   * Creates an asset from existing file. The most common use case is to save a picture taken by Camera.
+   */
   function createAssetAsync(localUri: string): Promise<Asset>;
+
+  /**
+   * Fetches a page of assets matching the provided criteria.
+   */
   function getAssetsAsync(options: GetAssetsOptions): Promise<GetAssetsResult>;
+
+  /**
+   * Provides more informations about an asset, including GPS location, local URI and EXIF metadata.
+   */
   function getAssetInfoAsync(asset: string | Asset): Promise<Asset>;
+
+  /**
+   * Deletes assets from the library. On iOS it deletes assets from all albums they belong to, while on Android it keeps all copies of them
+   * (album is strictly connected to the asset). Also, there is additional dialog on iOS that requires user to confirm this action.
+   */
   function deleteAssetsAsync(asset: string | Asset[]): Promise<boolean>;
+
+  /**
+   * Queries for user-created albums in media gallery.
+   */
   function getAlbumsAsync(): Promise<Album[]>;
+
+  /**
+   * Queries for an album with a specific name.
+   */
   function getAlbumAsync(albumName: string): Promise<Album|null>;
+
+  /**
+   * Creates an album with given name and initial asset.
+   * The asset parameter is required on Android, since it's not possible to create empty album on this platform.
+   */
   function createAlbumAsync(albumName: string, asset: string | Asset): Promise<Album>;
+
+  /**
+   * Adds array of assets to the album.
+   * On Android, by default it copies assets from the current album to provided one, however it's also possible to move them by passing false as copyAssets argument.
+   * In case they're copied you should keep in mind that getAssetsAsync will return duplicated assets.
+   */
   function addAssetsToAlbumAsync(assets: Asset[], album: string | Album, copyAssets?: boolean /* default true */): Promise<boolean>;
+
+  /**
+   * Removes given assets from album.
+   * On Android, album will be automatically deleted if there are no more assets inside.
+   */
   function removeAssetsFromAlbumAsync(assets: Asset[], album: string | Album): Promise<boolean>;
-  // ios only
+
+  /**
+   * Available on iOS only. Fetches a list of moments, which is a group of assets taken around the same place and time.
+   */
   function getMomentsAsync(): Promise<Album[]>;
 
   enum MediaType {
@@ -2898,7 +2943,9 @@ export namespace MediaLibrary {
 
   interface AssetIos {
     mediaSubtypes: MediaType[];
+    // *
     orientation: number;
+    // *
     isFavorite: boolean;
   }
 
@@ -2912,21 +2959,36 @@ export namespace MediaLibrary {
     creationTime: number;
     modificationTime: number;
     duration: number;
+    // *
     localUri: string;
+    // *
     location: object;
+    // *
     exif: object;
   }
+
+  /**
+   * These fields can be obtained only by calling getAssetInfoAsync method
+   */
   //#endregion
 
   // #region Album
   interface AlbumIos {
     type: string;
+    // *
     startTime: number;
+    // *
     endTime: number;
+    // *
     approximateLocation: Location.LocationProps;
+    // *
     locationNames: string[];
   }
 
+  /**
+   * These fields apply only to albums whose type is moment
+   */
+
   interface Album extends AlbumIos {
     id: string;
     title: string;
@@ -2955,9 +3017,15 @@ export namespace MediaLibrary {
 /**
  * https://docs.expo.io/versions/latest/sdk/haptic
  * Provides haptic feedback for iOS 10+ devices using the Taptic Engine.
+ * If this is used in Android the device will use ReactNative.Vibrate instead, it's best to just avoid this.
  */
 export namespace Haptic {
+  /**
+   * Used to let a user know when a selection change has been registered
+   */
   function selection(): void;
+
+
   function notification(type: NotificationFeedbackType): void;
   function impact(style: ImpactFeedbackStyle): void;
 

From ee78198ebfc0d9b0c546274817833671f4376319 Mon Sep 17 00:00:00 2001
From: MosheF <moshef@wix.com>
Date: Wed, 6 Jun 2018 10:05:31 +0300
Subject: [PATCH 1067/1124] Add tests

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

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index beda910b8b..d5178e2885 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -38,7 +38,8 @@ import {
     MailComposer,
     Location,
     Updates,
-    MediaLibrary
+    MediaLibrary,
+    Haptic
 } from 'expo';
 
 const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
@@ -778,4 +779,37 @@ async () => {
     if (bundleFetchResult.isNew) {
         console.log(bundleFetchResult.manifest);
     }
-};
\ No newline at end of file
+};
+
+// #region MediaLibrary
+async () => {
+  const mlAsset: MediaLibrary.Asset = await MediaLibrary.createAssetAsync('localUri');
+  const mlAssetResult: MediaLibrary.GetAssetsResult = await MediaLibrary.getAssetsAsync({
+    first: 0,
+    after: '',
+    album: 'Album',
+    sortBy: MediaLibrary.SortBy.creationTime,
+    mediaType: MediaLibrary.MediaType.photo
+  });
+  const mlAsset1: MediaLibrary.Asset = await MediaLibrary.getAssetInfoAsync(mlAsset);
+  const areDeleted: boolean = await MediaLibrary.deleteAssetsAsync([mlAsset]);
+  const albums: MediaLibrary.Album[] = await MediaLibrary.getAlbumsAsync();
+  const album: MediaLibrary.Album = await MediaLibrary.getAlbumAsync('album');
+  const album1: MediaLibrary.Album = await MediaLibrary.createAlbumAsync('album', mlAsset);
+  const areAddedToAlbum: boolean = await MediaLibrary.addAssetsToAlbumAsync([mlAsset, mlAsset1], 'album');
+  const areDeletedFromAlbum: boolean = await MediaLibrary.removeAssetsFromAlbumAsync([mlAsset, mlAsset1], 'album');
+  const momuents: MediaLibrary.Album[] = await MediaLibrary.getMomentsAsync();
+}
+//#endregion
+
+// #region Haptic
+Haptic.impact(Haptic.ImpactFeedbackStyle.Heavy);
+Haptic.impact(Haptic.ImpactFeedbackStyle.Light);
+Haptic.impact(Haptic.ImpactFeedbackStyle.Medium);
+
+Haptic.notification(Haptic.NotificationFeedbackType.Error);
+Haptic.notification(Haptic.NotificationFeedbackType.Success);
+Haptic.notification(Haptic.NotificationFeedbackType.Error);
+
+Haptic.selection();
+// #endregion
\ No newline at end of file
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 6c874b7ce6..c681aa0244 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2882,7 +2882,7 @@ export namespace MediaLibrary {
    * Deletes assets from the library. On iOS it deletes assets from all albums they belong to, while on Android it keeps all copies of them
    * (album is strictly connected to the asset). Also, there is additional dialog on iOS that requires user to confirm this action.
    */
-  function deleteAssetsAsync(asset: string | Asset[]): Promise<boolean>;
+  function deleteAssetsAsync(asset: string[] | Asset[]): Promise<boolean>;
 
   /**
    * Queries for user-created albums in media gallery.
@@ -2892,7 +2892,7 @@ export namespace MediaLibrary {
   /**
    * Queries for an album with a specific name.
    */
-  function getAlbumAsync(albumName: string): Promise<Album|null>;
+  function getAlbumAsync(albumName: string): Promise<Album>;
 
   /**
    * Creates an album with given name and initial asset.

From 38626f770421d0259f03b665cf07e230d90e08a6 Mon Sep 17 00:00:00 2001
From: MosheF <moshef@wix.com>
Date: Wed, 6 Jun 2018 10:08:36 +0300
Subject: [PATCH 1068/1124] specify permissions for functions

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index c681aa0244..ded78b1308 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1520,6 +1520,9 @@ export namespace ImagePicker {
         mediaTypes?: keyof _MediaTypeOptions;
     }
 
+    /**
+     * require Permissions.CAMERA_ROLL
+     */
     function launchImageLibraryAsync(options?: ImageLibraryOptions): Promise<ImageResult>;
 
     interface CameraOptions {
@@ -1528,6 +1531,9 @@ export namespace ImagePicker {
         quality?: number;
     }
 
+    /**
+     * require Permissions.CAMERA_ROLL
+     */
     function launchCameraAsync(options?: CameraOptions): Promise<ImageResult>;
 }
 

From f60cec2782f06bdbeec6e886653443a39d7f75fa Mon Sep 17 00:00:00 2001
From: Karel-van-de-Plassche <karelvandeplassche@gmail.com>
Date: Wed, 6 Jun 2018 09:21:40 +0200
Subject: [PATCH 1069/1124] Removed wrongly-named typedef ion.rangeslider

---
 types/ion.rangeslider/index.d.ts              | 71 -----------------
 .../ion.rangeslider/ion.rangeslider-tests.ts  | 64 ---------------
 types/ion.rangeslider/tsconfig.json           | 24 ------
 types/ion.rangeslider/tslint.json             | 79 -------------------
 types/ion.rangeslider/v1/index.d.ts           | 52 ------------
 .../v1/ion.rangeslider-tests.ts               | 37 ---------
 types/ion.rangeslider/v1/tsconfig.json        | 29 -------
 types/ion.rangeslider/v1/tslint.json          | 79 -------------------
 8 files changed, 435 deletions(-)
 delete mode 100644 types/ion.rangeslider/index.d.ts
 delete mode 100644 types/ion.rangeslider/ion.rangeslider-tests.ts
 delete mode 100644 types/ion.rangeslider/tsconfig.json
 delete mode 100644 types/ion.rangeslider/tslint.json
 delete mode 100644 types/ion.rangeslider/v1/index.d.ts
 delete mode 100644 types/ion.rangeslider/v1/ion.rangeslider-tests.ts
 delete mode 100644 types/ion.rangeslider/v1/tsconfig.json
 delete mode 100644 types/ion.rangeslider/v1/tslint.json

diff --git a/types/ion.rangeslider/index.d.ts b/types/ion.rangeslider/index.d.ts
deleted file mode 100644
index 21d99c5c6d..0000000000
--- a/types/ion.rangeslider/index.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-// Type definitions for for Ion.RangeSlider 2.0.2
-// Project: https://github.com/IonDen/ion.rangeSlider/
-// Definitions by: Sixin Li <https://github.com/sixinli>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-// API documentation: http://ionden.com/a/plugins/ion.rangeSlider/en.html
-
-interface JQuery {
-    destroy(): void;
-    ionRangeSlider(): JQuery;
-    ionRangeSlider(options: IonRangeSliderOptions): JQuery;
-    reset(): void;
-    update(option: IonRangeSliderOptions): void;
-}
-
-interface IonRangeSliderOptions {
-    decorate_both?: boolean;
-    disable?: boolean;
-    drag_interval?: boolean;
-    force_edges?: boolean;
-    from?: number;
-    from_fixed?: boolean;
-    from_max?: number;
-    from_min?: number;
-    from_shadow?: boolean;
-    grid?: boolean;
-    grid_margin?: boolean;
-    grid_num?: number;
-    grid_snap?: boolean;
-    hide_from_to?: boolean;
-    hide_min_max?: boolean;
-    keyboard?: boolean;
-    keyboard_step?: number;
-    max?: number;
-    max_interval?: number;
-    max_postfix?: string;
-    min?: number;
-    min_interval?: number;
-    onChange?: (obj: IonRangeSliderEvent) => void;
-    onFinish?: (obj: IonRangeSliderEvent) => void;
-    onStart?: (obj: IonRangeSliderEvent) => void;
-    onUpdate?: (obj: IonRangeSliderEvent) => void;
-    postfix?: string;
-    prefix?: string;
-    prettify?: (num: number) => string;
-    prettify_enabled?: boolean;
-    prettify_separator?: string;
-    step?: number;
-    to?: number;
-    to_fixed?: boolean;
-    to_max?: number;
-    to_min?: number;
-    to_shadowed?: boolean;
-    type?: string;
-    values?: any[];
-    values_separator?: string;
-}
-
-interface IonRangeSliderEvent {
-    from: number;
-    from_precent: number;
-    from_value: any;
-    input: JQuery;
-    max: number;
-    min: number;
-    slider: JQuery;
-    to: number;
-    to_precent: number;
-    to_value: any;
-}
diff --git a/types/ion.rangeslider/ion.rangeslider-tests.ts b/types/ion.rangeslider/ion.rangeslider-tests.ts
deleted file mode 100644
index e60287feb3..0000000000
--- a/types/ion.rangeslider/ion.rangeslider-tests.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/// <reference types="jquery"/>
-
-var sliderInputElement = $('<input />');
-sliderInputElement.ionRangeSlider({
-    decorate_both: true,
-    disable: false,
-    drag_interval: false,
-    force_edges: false,
-    from: 30,
-    from_fixed: false,
-    from_max: 50,
-    from_min: 20,
-    from_shadow: false,
-    grid: true,
-    grid_margin: true,
-    grid_num: 4,
-    grid_snap: false,
-    hide_from_to: false,
-    hide_min_max: false,
-    keyboard: true,
-    keyboard_step: 1,
-    max: 100,
-    max_interval: 5,
-    max_postfix: "+",
-    min: 10,
-    min_interval: 5,
-    onChange: function (obj) {
-        console.log(obj);
-    },
-    onFinish: function (obj) {
-        console.log(obj);
-    },
-    onStart: function (obj) {
-        console.log(obj);
-    },
-    onUpdate: function (obj) {
-        console.log(obj);
-    },
-    postfix: ".00",
-    prefix: "$",
-    prettify: function(num) {
-        return String(num);
-    },
-    prettify_enabled: true,
-    prettify_separator: ",",
-    step: 10,
-    to: 80,
-    to_fixed: false,
-    to_max: 100,
-    to_min: 60,
-    to_shadowed: false,
-    type: "double", 
-    values: ["a", "b", "c"],
-    values_separator: ","
-});
-sliderInputElement.update({
-    min: 20,
-    max: 90,
-    from: 40,
-    to: 70,
-    step: 5
-});
-sliderInputElement.reset();
-sliderInputElement.destroy();
diff --git a/types/ion.rangeslider/tsconfig.json b/types/ion.rangeslider/tsconfig.json
deleted file mode 100644
index 1affa9f527..0000000000
--- a/types/ion.rangeslider/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ion.rangeslider-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ion.rangeslider/tslint.json b/types/ion.rangeslider/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/ion.rangeslider/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
diff --git a/types/ion.rangeslider/v1/index.d.ts b/types/ion.rangeslider/v1/index.d.ts
deleted file mode 100644
index d819f46964..0000000000
--- a/types/ion.rangeslider/v1/index.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for for Ion.RangeSlider 1.9.1
-// Project: https://github.com/IonDen/ion.rangeSlider/
-// Definitions by: Douglas Eichelberger <https://github.com/dduugg>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-// API documentation: http://ionden.com/a/plugins/ion.rangeSlider/en.html
-
-interface JQuery {
-    ionRangeSlider(): JQuery;
-    ionRangeSlider(options: IonRangeSliderOptions): JQuery;
-    ionRangeSlider(method: string): JQuery;
-    ionRangeSlider(method: string, options: IonRangeSliderOptions): JQuery;
-}
-
-interface IonRangeSliderOptions {
-    disable?: boolean;
-    from?: number;
-    hasGrid?: boolean;
-    hideFromTo?: boolean;
-    hideMinMax?: boolean;
-    max?: number;
-    maxPostfix?: string;
-    min?: number;
-    onChange?: (obj: IonRangeSliderEvent) => void;
-    onFinish?: (obj: IonRangeSliderEvent) => void;
-    onLoad?: (obj: IonRangeSliderEvent) => void;
-    postfix?: string;
-    prefix?: string;
-    prettify?: boolean;
-    step?: number;
-    to?: number;
-    type?: string;
-    values?: any[];
-}
-
-interface IonRangeSliderEvent {
-    fromNumber: number;
-    fromPers: number;
-    fromValue?: any;
-    fromX: number;
-    fromX_pure?: number;
-    input: JQuery;
-    max: number;
-    min: number;
-    slider: JQuery;
-    toNumber: number;
-    toPers: number;
-    toValue?: number;
-    toX: number;
-    toX_pure?: number;
-}
diff --git a/types/ion.rangeslider/v1/ion.rangeslider-tests.ts b/types/ion.rangeslider/v1/ion.rangeslider-tests.ts
deleted file mode 100644
index ba10fa776f..0000000000
--- a/types/ion.rangeslider/v1/ion.rangeslider-tests.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/// <reference types="jquery"/>
-
-var sliderInputElement = $('<input />');
-sliderInputElement.ionRangeSlider({
-    min: 10,
-    max: 100,
-    from: 30,
-    to: 80,
-    type: "single",
-    step: 10,
-    prefix: "$",
-    postfix: ".00",
-    maxPostfix: "+",
-    hasGrid: true,
-    hideMinMax: true,
-    hideFromTo: true,
-    prettify: true,
-    disable: false,
-    values: ["a", "b", "c"],
-    onLoad: function (obj) {
-        console.log(obj);
-    },
-    onChange: function (obj) {
-        console.log(obj);
-    },
-    onFinish: function (obj) {
-        console.log(obj);
-    }
-});
-sliderInputElement.ionRangeSlider("update", {
-    min: 20,
-    max: 90,
-    from: 40,
-    to: 70,
-    step: 5
-});
-sliderInputElement.ionRangeSlider("remove");
diff --git a/types/ion.rangeslider/v1/tsconfig.json b/types/ion.rangeslider/v1/tsconfig.json
deleted file mode 100644
index c63da8c0e1..0000000000
--- a/types/ion.rangeslider/v1/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "types": [],
-        "paths": {
-            "ion.rangeslider": [
-                "ion.rangeslider/v1"
-            ]
-        },
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ion.rangeslider-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ion.rangeslider/v1/tslint.json b/types/ion.rangeslider/v1/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/ion.rangeslider/v1/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}

From e884af2eec5986d465994af75d17834efbf35a55 Mon Sep 17 00:00:00 2001
From: Karel-van-de-Plassche <karelvandeplassche@gmail.com>
Date: Wed, 6 Jun 2018 09:26:40 +0200
Subject: [PATCH 1070/1124] New type definitions based on old ion.rangeslider
 types

---
 types/ion-rangeslider/index.d.ts              | 81 +++++++++++++++++++
 .../ion-rangeslider/ion-rangeslider-tests.ts  | 51 ++++++++++++
 types/ion-rangeslider/tsconfig.json           | 28 +++++++
 types/ion-rangeslider/tslint.json             |  6 ++
 types/ion-rangeslider/v1/index.d.ts           | 53 ++++++++++++
 .../v1/ion-rangeslider-tests.ts               | 37 +++++++++
 types/ion-rangeslider/v1/tsconfig.json        | 29 +++++++
 types/ion-rangeslider/v1/tslint.json          | 79 ++++++++++++++++++
 8 files changed, 364 insertions(+)
 create mode 100644 types/ion-rangeslider/index.d.ts
 create mode 100644 types/ion-rangeslider/ion-rangeslider-tests.ts
 create mode 100644 types/ion-rangeslider/tsconfig.json
 create mode 100644 types/ion-rangeslider/tslint.json
 create mode 100644 types/ion-rangeslider/v1/index.d.ts
 create mode 100644 types/ion-rangeslider/v1/ion-rangeslider-tests.ts
 create mode 100644 types/ion-rangeslider/v1/tsconfig.json
 create mode 100644 types/ion-rangeslider/v1/tslint.json

diff --git a/types/ion-rangeslider/index.d.ts b/types/ion-rangeslider/index.d.ts
new file mode 100644
index 0000000000..9788741b77
--- /dev/null
+++ b/types/ion-rangeslider/index.d.ts
@@ -0,0 +1,81 @@
+// Type definitions for ion-rangeslider 2.2
+// Project: https://github.com/IonDen/ion.rangeSlider/
+// Definitions by: Karel van de Plassche <https://github.com/Karel-van-de-Plassche>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+// API documentation: http://ionden.com/a/plugins/ion.rangeSlider/en.html
+// Parsed using https://github.com/Karel-van-de-Plassche/ion-rangeslider-parser.git
+// Based on global-modifying module template file
+
+declare global {
+    interface JQuery {
+        destroy(): void;
+        ionRangeSlider(options?: IonRangeSliderOptions): JQuery;
+        reset(): void;
+        update(option: IonRangeSliderOptions): void;
+    }
+}
+
+export interface IonRangeSliderOptions {
+    type?: string;    // Choose slider type, could be `single` - for one handle, or `double` for two handles [Default: single]
+    min?: number;    // Set slider minimum value [Default: 10]
+    max?: number;    // Set slider maximum value [Default: 100]
+    from?: number;    // Set start position for left handle (or for single handle) [Default: min]
+    to?: number;    // Set start position for right handle [Default: max]
+    step?: number;    // Set sliders step. Always > 0. Could be fractional [Default: 1]
+    min_interval?: number;    // Set minimum diapason between sliders. Only for **double** type [Default: -]
+    max_interval?: number;    // Set minimum maximum between sliders. Only for **double** type [Default: -]
+    drag_interval?: boolean;   // Allow user to drag whole range. Only for **double** type [Default: false]
+    values?: any[];     // Set up your own array of possible slider values. They could be numbers or strings. If the values array is set up, min, max and step param, can no longer be changed [Default: []]
+    from_fixed?: boolean;   // Fix position of left (or single) handle [Default: false]
+    from_min?: number;    // Set minimum limit for left (or single) handle [Default: min]
+    from_max?: number;    // Set maximum limit for left (or single) handle [Default: max]
+    from_shadow?: boolean;   // Highlight the limits for left handle [Default: false]
+    to_fixed?: boolean;   // Fix position of right handle [Default: false]
+    to_min?: number;    // Set minimum limit for right handle [Default: min]
+    to_max?: number;    // Set maximum limit for right handle [Default: max]
+    to_shadow?: boolean;   // Highlight the right handle [Default: false]
+    prettify_enabled?: boolean;   // Improve readability of long numbers: 10000000 &rarr; 10 000 000 [Default: true]
+    prettify_separator?: string;    // Set up your own separator for long numbers: 10000000 &rarr; 10,000,000 etc. [Default:  ]
+    prettify?: (num: number) => string; // Set up your own prettify function. Can be anything. For example, you can set up unix time as slider values and than transform them to cool looking dates [Default: null]
+    force_edges?: boolean;   // Sliders handles and tooltips will be always inside it's container [Default: false]
+    keyboard?: boolean;   // Activates keyboard controls. Move left: &larr;, &darr;, A, S. Move right: &rarr;, &uarr;, W, D. [Default: true]
+    grid?: boolean;   // Enables grid of values above the slider [Default: true]
+    grid_margin?: boolean;   // Set left and right grid gaps [Default: true]
+    grid_num?: number;    // Number of grid units [Default: 4]
+    grid_snap?: boolean;   // Snap grid to sliders step (step param). If activated, grid_num will not be used. Max steps = 50 [Default: false]
+    hide_min_max?: boolean;   // Hides **min** and **max** labels [Default: false]
+    hide_from_to?: boolean;   // Hides **from** and **to** labels [Default: false]
+    prefix?: string;    // Set prefix for values. Will be set up right before the number: **$**100 [Default: ]
+    postfix?: string;    // Set postfix for values. Will be set up right after the number: 100**k** [Default: ]
+    max_postfix?: string;    // Special postfix, used only for maximum value. Will be showed after handle will reach maximum right position. For example **0 — 100+** [Default: ]
+    decorate_both?: boolean;   // Used for **double** type and only if prefix or postfix was set up. Determine how to decorate close values. For example: **$10k — $100k** or **$10 — 100k** [Default: true]
+    values_separator?: string;    // Set your own separator for close values. Used for **double** type. Default: **10 — 100**. Or you may set: **10 to 100, 10 + 100, 10 &rarr; 100** etc. [Default:  - ]
+    input_values_separator?: string;    // Separator for **double** values in input value property. `<input value="25;42"> [Default:  ; ]
+    disable?: boolean;   // Locks slider and makes it inactive. Input is disabled too. Invisible to forms [Default: false]
+    block?: boolean;   // Locks slider and makes it inactive. Input is NOT disabled. Can be send with forms [Default: false]
+    extra_classes?: string;    // Traverse extra CSS-classes to sliders container [Default: —]
+    scope?: any;       // Scope for callbacks. Pass any object [Default: null]
+    onStart?: (obj: IonRangeSliderEvent) => void; // Callback. Is called on slider start. Gets all slider data as a 1st attribute [Default: null]
+    onChange?: (obj: IonRangeSliderEvent) => void; // Callback. IS called on each values change. Gets all slider data as a 1st attribute [Default: null]
+    onFinish?: (obj: IonRangeSliderEvent) => void; // Callback. Is called when user releases handle. Gets all slider data as a 1st attribute [Default: null]
+    onUpdate?: (obj: IonRangeSliderEvent) => void; // Callback. Is called when slider is modified by external methods `update` or `reset [Default: null]
+}
+
+export interface IonRangeSliderEvent {
+    input: JQuery; // jQuery-link to input
+    slider: JQuery; // jQuery-link to sliders container
+    min: number; // MIN value
+    max: number; // MAX values
+    from: number; // FROM value
+    from_percent: number; // FROM value in percents
+    from_value: number; // FROM index in values array (if used)
+    to: number; // TO value
+    to_percent: number; // TO value in percents
+    to_value: number; // TO index in values array (if used)
+    min_pretty: string; // MIN prettified (if used)
+    max_pretty: string; // MAX prettified (if used)
+    from_pretty: string; // FROM prettified (if used)
+    to_pretty: string; // TO prettified (if used)
+}
diff --git a/types/ion-rangeslider/ion-rangeslider-tests.ts b/types/ion-rangeslider/ion-rangeslider-tests.ts
new file mode 100644
index 0000000000..e3bffdd4b6
--- /dev/null
+++ b/types/ion-rangeslider/ion-rangeslider-tests.ts
@@ -0,0 +1,51 @@
+/// <reference types="jquery"/>
+let sliderInputElement = $('<input />');
+sliderInputElement.ionRangeSlider({
+    decorate_both: true,
+    disable: false,
+    drag_interval: false,
+    force_edges: false,
+    from: 30,
+    from_fixed: false,
+    from_max: 50,
+    from_min: 20,
+    from_shadow: false,
+    grid: true,
+    grid_margin: true,
+    grid_num: 4,
+    grid_snap: false,
+    hide_from_to: false,
+    hide_min_max: false,
+    keyboard: true,
+    max: 100,
+    max_interval: 5,
+    max_postfix: "+",
+    min: 10,
+    min_interval: 5,
+    onChange: obj => console.log(obj),
+    onFinish: obj => console.log(obj),
+    onStart: obj => console.log(obj),
+    onUpdate: obj => console.log(obj),
+    postfix: ".00",
+    prefix: "$",
+    prettify: (num: number) => (String(num)),
+    prettify_enabled: true,
+    prettify_separator: ",",
+    step: 10,
+    to: 80,
+    to_fixed: false,
+    to_max: 100,
+    to_min: 60,
+    type: "double",
+    values: ["a", "b", "c"],
+    values_separator: ","
+});
+sliderInputElement.update({
+    min: 20,
+    max: 90,
+    from: 40,
+    to: 70,
+    step: 5
+});
+sliderInputElement.reset();
+sliderInputElement.destroy();
diff --git a/types/ion-rangeslider/tsconfig.json b/types/ion-rangeslider/tsconfig.json
new file mode 100644
index 0000000000..2c77a196bd
--- /dev/null
+++ b/types/ion-rangeslider/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ion-rangeslider-tests.ts"
+    ],
+    "exclude": [
+        "util/**/*",
+        ".gitignore"
+    ]
+}
diff --git a/types/ion-rangeslider/tslint.json b/types/ion-rangeslider/tslint.json
new file mode 100644
index 0000000000..64aace11d6
--- /dev/null
+++ b/types/ion-rangeslider/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false
+    }
+}
diff --git a/types/ion-rangeslider/v1/index.d.ts b/types/ion-rangeslider/v1/index.d.ts
new file mode 100644
index 0000000000..2ce88db6d4
--- /dev/null
+++ b/types/ion-rangeslider/v1/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for ion-rangeslider 1.9
+// Project: https://github.com/IonDen/ion.rangeSlider/
+// Definitions by: Douglas Eichelberger <https://github.com/dduugg>
+//                 Karel van de Plassche <https://github.com/Karel-van-de-Plassche>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// API documentation: http://ionden.com/a/plugins/ion.rangeSlider/en.html
+
+interface JQuery {
+    ionRangeSlider(): JQuery;
+    ionRangeSlider(options: IonRangeSliderOptions): JQuery;
+    ionRangeSlider(method: string): JQuery;
+    ionRangeSlider(method: string, options: IonRangeSliderOptions): JQuery;
+}
+
+interface IonRangeSliderOptions {
+    disable?: boolean;
+    from?: number;
+    hasGrid?: boolean;
+    hideFromTo?: boolean;
+    hideMinMax?: boolean;
+    max?: number;
+    maxPostfix?: string;
+    min?: number;
+    onChange?: (obj: IonRangeSliderEvent) => void;
+    onFinish?: (obj: IonRangeSliderEvent) => void;
+    onLoad?: (obj: IonRangeSliderEvent) => void;
+    postfix?: string;
+    prefix?: string;
+    prettify?: boolean;
+    step?: number;
+    to?: number;
+    type?: string;
+    values?: any[];
+}
+
+interface IonRangeSliderEvent {
+    fromNumber: number;
+    fromPers: number;
+    fromValue?: any;
+    fromX: number;
+    fromX_pure?: number;
+    input: JQuery;
+    max: number;
+    min: number;
+    slider: JQuery;
+    toNumber: number;
+    toPers: number;
+    toValue?: number;
+    toX: number;
+    toX_pure?: number;
+}
diff --git a/types/ion-rangeslider/v1/ion-rangeslider-tests.ts b/types/ion-rangeslider/v1/ion-rangeslider-tests.ts
new file mode 100644
index 0000000000..ba10fa776f
--- /dev/null
+++ b/types/ion-rangeslider/v1/ion-rangeslider-tests.ts
@@ -0,0 +1,37 @@
+/// <reference types="jquery"/>
+
+var sliderInputElement = $('<input />');
+sliderInputElement.ionRangeSlider({
+    min: 10,
+    max: 100,
+    from: 30,
+    to: 80,
+    type: "single",
+    step: 10,
+    prefix: "$",
+    postfix: ".00",
+    maxPostfix: "+",
+    hasGrid: true,
+    hideMinMax: true,
+    hideFromTo: true,
+    prettify: true,
+    disable: false,
+    values: ["a", "b", "c"],
+    onLoad: function (obj) {
+        console.log(obj);
+    },
+    onChange: function (obj) {
+        console.log(obj);
+    },
+    onFinish: function (obj) {
+        console.log(obj);
+    }
+});
+sliderInputElement.ionRangeSlider("update", {
+    min: 20,
+    max: 90,
+    from: 40,
+    to: 70,
+    step: 5
+});
+sliderInputElement.ionRangeSlider("remove");
diff --git a/types/ion-rangeslider/v1/tsconfig.json b/types/ion-rangeslider/v1/tsconfig.json
new file mode 100644
index 0000000000..32d3577e6f
--- /dev/null
+++ b/types/ion-rangeslider/v1/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "ion-rangeslider": [
+                "ion-rangeslider/v1"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ion-rangeslider-tests.ts"
+    ]
+}
diff --git a/types/ion-rangeslider/v1/tslint.json b/types/ion-rangeslider/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ion-rangeslider/v1/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 c218dd1c27ee933d85b68d1c82d0365e511ab7e8 Mon Sep 17 00:00:00 2001
From: Bao Hua <red_s_bean@163.com>
Date: Wed, 6 Jun 2018 15:29:08 +0800
Subject: [PATCH 1071/1124] add cancel prop on IchooseImage

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

diff --git a/types/jweixin/index.d.ts b/types/jweixin/index.d.ts
index 6db4ac213f..b656e81ecc 100644
--- a/types/jweixin/index.d.ts
+++ b/types/jweixin/index.d.ts
@@ -210,6 +210,7 @@ declare namespace wx {
 			localIds: string[];
 			errMsg: string;
 		}): void;
+		cancel(): void;
 	}
 	/**
 	 * 从本地相册选择图片或使用相机拍照。

From 3595eba4d02afed07962e1d4df648c83ba0de3c1 Mon Sep 17 00:00:00 2001
From: whatasoda <a16dc107@dhw.ac.jp>
Date: Wed, 6 Jun 2018 16:52:08 +0900
Subject: [PATCH 1072/1124] Added definitions for 'glob-to-regexp'

---
 types/glob-to-regexp/glob-to-regexp-tests.ts | 26 ++++++++++++
 types/glob-to-regexp/index.d.ts              | 44 ++++++++++++++++++++
 types/glob-to-regexp/tsconfig.json           | 23 ++++++++++
 types/glob-to-regexp/tslint.json             |  1 +
 4 files changed, 94 insertions(+)
 create mode 100644 types/glob-to-regexp/glob-to-regexp-tests.ts
 create mode 100644 types/glob-to-regexp/index.d.ts
 create mode 100644 types/glob-to-regexp/tsconfig.json
 create mode 100644 types/glob-to-regexp/tslint.json

diff --git a/types/glob-to-regexp/glob-to-regexp-tests.ts b/types/glob-to-regexp/glob-to-regexp-tests.ts
new file mode 100644
index 0000000000..4234ea3f07
--- /dev/null
+++ b/types/glob-to-regexp/glob-to-regexp-tests.ts
@@ -0,0 +1,26 @@
+import * as globToRegExp from 'glob-to-regexp';
+let re = globToRegExp("p*uck");
+re.test("pot luck"); // true
+re.test("pluck"); // true
+re.test("puck"); // true
+
+re = globToRegExp("*.min.js");
+re.test("http://example.com/jquery.min.js"); // true
+re.test("http://example.com/jquery.min.js.map"); // false
+
+re = globToRegExp("*/www/*.js");
+re.test("http://example.com/www/app.js"); // true
+re.test("http://example.com/www/lib/factory-proxy-model-observer.js"); // true
+
+// Extended globs
+re = globToRegExp("*/www/{*.js,*.html}", { extended: true });
+re.test("http://example.com/www/app.js"); // true
+re.test("http://example.com/www/index.html"); // true
+
+// globstar
+re = globToRegExp("**/www/*", { globstar: true });
+re.test("http://example.com/www/index.html"); // true
+re.test("http://example.com/www/articles/index.html"); // false
+
+re = globToRegExp("*/www/*", { globstar: true });
+re.test("http://example.com/www/index.html"); // false
diff --git a/types/glob-to-regexp/index.d.ts b/types/glob-to-regexp/index.d.ts
new file mode 100644
index 0000000000..ac47a64f6a
--- /dev/null
+++ b/types/glob-to-regexp/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for glob-to-regexp 0.4
+// Project: https://github.com/fitzgen/glob-to-regexp#readme
+// Definitions by: whatasoda <https://github.com/whatasoda>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ Note that ES6 modules cannot directly export callable functions.
+ *~ This file should be imported using the CommonJS-style:
+ *~   import x = require('someLibrary');
+ *~
+ *~ Refer to the documentation to understand common
+ *~ workarounds for this limitation of ES6 modules.
+ */
+
+/*~ If this module is a UMD module that exposes a global variable 'myFuncLib' when
+ *~ loaded outside a module loader environment, declare that global here.
+ *~ Otherwise, delete this declaration.
+ */
+export as namespace GlobToRegExp;
+
+/*~ This declaration specifies that the function
+ *~ is the exported object from the file
+ */
+export = GlobToRegExp;
+
+declare function GlobToRegExp(glob: string, options?: GlobToRegExp.Options): RegExp;
+
+/*~ If you want to expose types from your module as well, you can
+ *~ place them in this block. Often you will want to describe the
+ *~ shape of the return type of the function; that type should
+ *~ be declared in here, as this example shows.
+ */
+declare namespace GlobToRegExp {
+    interface Options {
+        extended?: boolean;
+        globstar?: boolean;
+        flags   ?: string;
+    }
+
+    /*~ If the module also has properties, declare them here. For example,
+     *~ this declaration says that this code is legal:
+     *~   import f = require('myFuncLibrary');
+     *~   console.log(f.defaultName);
+     */
+}
diff --git a/types/glob-to-regexp/tsconfig.json b/types/glob-to-regexp/tsconfig.json
new file mode 100644
index 0000000000..e532e836d1
--- /dev/null
+++ b/types/glob-to-regexp/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "glob-to-regexp-tests.ts"
+    ]
+}
diff --git a/types/glob-to-regexp/tslint.json b/types/glob-to-regexp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/glob-to-regexp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c9faff23d973957542632073f3ce3c578cda96b2 Mon Sep 17 00:00:00 2001
From: asaarnak <asaarnak+git@gmail.com>
Date: Wed, 6 Jun 2018 11:14:25 +0300
Subject: [PATCH 1073/1124] Fix OnInputChangeHandler type.

https://github.com/JedWatson/react-select/tree/v1.2.1#updating-input-values-with-oninputchange
---
 types/react-select/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index e2a0520154..6d8bc6d8c7 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -40,7 +40,7 @@ export type FilterOptionsHandler<TValue = OptionValues> = (options: Options<TVal
 export type InputRendererHandler = (props: { [key: string]: any }) => HandlerRendererResult;
 export type MenuRendererHandler<TValue = OptionValues> = (props: MenuRendererProps<TValue>) => HandlerRendererResult;
 export type OnCloseHandler = () => void;
-export type OnInputChangeHandler = (inputValue: string) => void;
+export type OnInputChangeHandler = (inputValue: string) => string;
 export type OnInputKeyDownHandler = React.KeyboardEventHandler<HTMLDivElement | HTMLInputElement>;
 export type OnMenuScrollToBottomHandler = () => void;
 export type OnOpenHandler = () => void;

From e51382786f7d9f7f924ab6d3d22f5998cdbb379e Mon Sep 17 00:00:00 2001
From: Claas Ahlrichs <claasahl@gmail.com>
Date: Wed, 6 Jun 2018 11:16:30 +0200
Subject: [PATCH 1074/1124] added Claas Ahlrichs to "Definitions By"

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

diff --git a/types/xml2js/index.d.ts b/types/xml2js/index.d.ts
index 1875399e23..42fc669da4 100644
--- a/types/xml2js/index.d.ts
+++ b/types/xml2js/index.d.ts
@@ -5,6 +5,7 @@
 //                 Christopher Currens <https://github.com/ccurrens>
 //                 Edward Hinkle <https://github.com/edwardhinkle>
 //                 Behind The Math <https://github.com/BehindTheMath>
+//                 Claas Ahlrichs <https://github.com/claasahl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>

From 0090eeb52b2434cdc022b00a19f4307be3f2c1bf Mon Sep 17 00:00:00 2001
From: MosheF <moshef@wix.com>
Date: Wed, 6 Jun 2018 12:22:31 +0300
Subject: [PATCH 1075/1124] fix for tests

---
 types/expo/expo-tests.tsx    |  4 ++--
 types/expo/index.d.ts        | 10 +++-------
 types/expo/v26/tsconfig.json | 14 +++++++++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index d5178e2885..b0583b15f3 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -799,7 +799,7 @@ async () => {
   const areAddedToAlbum: boolean = await MediaLibrary.addAssetsToAlbumAsync([mlAsset, mlAsset1], 'album');
   const areDeletedFromAlbum: boolean = await MediaLibrary.removeAssetsFromAlbumAsync([mlAsset, mlAsset1], 'album');
   const momuents: MediaLibrary.Album[] = await MediaLibrary.getMomentsAsync();
-}
+};
 //#endregion
 
 // #region Haptic
@@ -812,4 +812,4 @@ Haptic.notification(Haptic.NotificationFeedbackType.Success);
 Haptic.notification(Haptic.NotificationFeedbackType.Error);
 
 Haptic.selection();
-// #endregion
\ No newline at end of file
+// #endregion
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index ded78b1308..3a7caf50c2 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for expo 26.0
+// Type definitions for expo 27.0
 // Project: https://github.com/expo/expo-sdk
 // Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
 //                 Martynas Kadiša <https://github.com/martynaskadisa>
@@ -6,6 +6,7 @@
 //                 Sergio Sánchez <https://github.com/ssanchezmarc>
 //                 Fernando Helwanger <https://github.com/fhelwanger>
 //                 Umidbek Karimov <https://github.com/umidbekkarimov>
+//                 Moshe Feuchtwanger <https://github.com/moshfeu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -2866,9 +2867,7 @@ export namespace Updates {
  * Requires Permissions.CAMERA_ROLL permissions.
  */
 
-
 export namespace MediaLibrary {
-
   /**
    * Creates an asset from existing file. The most common use case is to save a picture taken by Camera.
    */
@@ -3030,8 +3029,6 @@ export namespace Haptic {
    * Used to let a user know when a selection change has been registered
    */
   function selection(): void;
-
-
   function notification(type: NotificationFeedbackType): void;
   function impact(style: ImpactFeedbackStyle): void;
 
@@ -3047,5 +3044,4 @@ export namespace Haptic {
     Error = 'error'
   }
 }
-
-// #endregion
\ No newline at end of file
+// #endregion
diff --git a/types/expo/v26/tsconfig.json b/types/expo/v26/tsconfig.json
index 7711f49776..53a55b14f1 100644
--- a/types/expo/v26/tsconfig.json
+++ b/types/expo/v26/tsconfig.json
@@ -10,10 +10,18 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
+        "paths": {
+            "expo": [
+                "expo/v26"
+            ],
+            "expo/*": [
+                "expo/v26/*"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -22,4 +30,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
+}
\ No newline at end of file

From a132409be6236cf39560ccb4367f06118e14e0c1 Mon Sep 17 00:00:00 2001
From: Claas Ahlrichs <claasahl@gmail.com>
Date: Wed, 6 Jun 2018 11:43:49 +0200
Subject: [PATCH 1076/1124] updated version number and declared "name"
 parameter as optional

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

diff --git a/types/xml2js/index.d.ts b/types/xml2js/index.d.ts
index 42fc669da4..4a123a2f03 100644
--- a/types/xml2js/index.d.ts
+++ b/types/xml2js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-xml2js 0.4
+// Type definitions for node-xml2js 0.4.6
 // Project: https://github.com/Leonidas-from-XIV/node-xml2js
 // Definitions by: Michel Salib <https://github.com/michelsalib>
 //                 Jason McNeil <https://github.com/jasonrm>
@@ -35,7 +35,7 @@ export interface Options {
     async?: boolean;
     attrkey?: string;
     attrNameProcessors?: Array<(name: string) => any>;
-    attrValueProcessors?: Array<(value: string, name: string) => any>;
+    attrValueProcessors?: Array<(value: string, name?: string) => any>;
     charkey?: string;
     charsAsChildren?: boolean;
     childkey?: string;
@@ -53,7 +53,7 @@ export interface Options {
     tagNameProcessors?: Array<(name: string) => any>;
     trim?: boolean;
     validator?: Function;
-    valueProcessors?: Array<(value: string, name: string) => any>;
+    valueProcessors?: Array<(value: string, name?: string) => any>;
     xmlns?: boolean;
 }
 

From d8b2358f2a0b7882509cfb7303a3f1effb301f7b Mon Sep 17 00:00:00 2001
From: Claas Ahlrichs <claasahl@gmail.com>
Date: Wed, 6 Jun 2018 11:52:30 +0200
Subject: [PATCH 1077/1124] Expected: foo MAJOR.MINOR (patch version not
 allowed)

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

diff --git a/types/xml2js/index.d.ts b/types/xml2js/index.d.ts
index 4a123a2f03..bc8250af19 100644
--- a/types/xml2js/index.d.ts
+++ b/types/xml2js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-xml2js 0.4.6
+// Type definitions for node-xml2js 0.4
 // Project: https://github.com/Leonidas-from-XIV/node-xml2js
 // Definitions by: Michel Salib <https://github.com/michelsalib>
 //                 Jason McNeil <https://github.com/jasonrm>

From 6f72c2699daedc2abaed3b71d1b6ff9feecaf6de Mon Sep 17 00:00:00 2001
From: Claas Ahlrichs <claasahl@gmail.com>
Date: Wed, 6 Jun 2018 12:22:35 +0200
Subject: [PATCH 1078/1124] REVERTED: declared "name" parameter as optional

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

diff --git a/types/xml2js/index.d.ts b/types/xml2js/index.d.ts
index bc8250af19..42fc669da4 100644
--- a/types/xml2js/index.d.ts
+++ b/types/xml2js/index.d.ts
@@ -35,7 +35,7 @@ export interface Options {
     async?: boolean;
     attrkey?: string;
     attrNameProcessors?: Array<(name: string) => any>;
-    attrValueProcessors?: Array<(value: string, name?: string) => any>;
+    attrValueProcessors?: Array<(value: string, name: string) => any>;
     charkey?: string;
     charsAsChildren?: boolean;
     childkey?: string;
@@ -53,7 +53,7 @@ export interface Options {
     tagNameProcessors?: Array<(name: string) => any>;
     trim?: boolean;
     validator?: Function;
-    valueProcessors?: Array<(value: string, name?: string) => any>;
+    valueProcessors?: Array<(value: string, name: string) => any>;
     xmlns?: boolean;
 }
 

From b09582f9730995cf1c7148f0df0d174443bef90d Mon Sep 17 00:00:00 2001
From: L&H <abc@hub.moe>
Date: Wed, 6 Jun 2018 18:58:35 +0800
Subject: [PATCH 1079/1124] Add gulp-strip-comments type

---
 .../gulp-strip-comments-tests.ts              | 12 +++++++++
 types/gulp-strip-comments/index.d.ts          | 26 +++++++++++++++++++
 types/gulp-strip-comments/tsconfig.json       | 23 ++++++++++++++++
 types/gulp-strip-comments/tslint.json         |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 types/gulp-strip-comments/gulp-strip-comments-tests.ts
 create mode 100644 types/gulp-strip-comments/index.d.ts
 create mode 100644 types/gulp-strip-comments/tsconfig.json
 create mode 100644 types/gulp-strip-comments/tslint.json

diff --git a/types/gulp-strip-comments/gulp-strip-comments-tests.ts b/types/gulp-strip-comments/gulp-strip-comments-tests.ts
new file mode 100644
index 0000000000..7f1c88af77
--- /dev/null
+++ b/types/gulp-strip-comments/gulp-strip-comments-tests.ts
@@ -0,0 +1,12 @@
+import * as gulp from 'gulp';
+import * as stripComments from 'gulp-strip-comments';
+
+gulp.task('default', () => {
+	return gulp.src('src/app.js')
+		.pipe(stripComments({
+            safe: true,
+        }))
+        .pipe(stripComments.html())
+        .pipe(stripComments.text())
+		.pipe(gulp.dest('dist'));
+});
diff --git a/types/gulp-strip-comments/index.d.ts b/types/gulp-strip-comments/index.d.ts
new file mode 100644
index 0000000000..a516bd7c87
--- /dev/null
+++ b/types/gulp-strip-comments/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for gulp-strip-comments 2.5
+// Project: https://github.com/RnbWd/gulp-strip-comments
+// Definitions by: Aqours <https://github.com/Aqours>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace stripComments {
+    interface StripOptions {
+        safe?: boolean;
+        ignore?: RegExp | RegExp[];
+        space?: boolean;
+        trim?: boolean;
+    }
+
+    interface Strip {
+        (options?: StripOptions): NodeJS.ReadWriteStream;
+        text(options?: StripOptions): NodeJS.ReadWriteStream;
+        html(options?: StripOptions): NodeJS.ReadWriteStream;
+        getEOL(): string;
+    }
+}
+
+declare const strip: stripComments.Strip;
+
+export = strip;
diff --git a/types/gulp-strip-comments/tsconfig.json b/types/gulp-strip-comments/tsconfig.json
new file mode 100644
index 0000000000..08db2f47d9
--- /dev/null
+++ b/types/gulp-strip-comments/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-strip-comments-tests.ts"
+    ]
+}
diff --git a/types/gulp-strip-comments/tslint.json b/types/gulp-strip-comments/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-strip-comments/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3d4bf4345d5292e7dcbf6f36dcab3b05645713cd Mon Sep 17 00:00:00 2001
From: Stephen Allred <me@stephenallred.com>
Date: Wed, 6 Jun 2018 12:34:12 +0100
Subject: [PATCH 1080/1124] Added missing maxBarThickness

Added missing maxBarThickness to the CommonAxe interface
---
 types/chart.js/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 923af5583e..cb3db72855 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -514,6 +514,7 @@ declare namespace Chart {
         ticks?: TickOptions;
         gridLines?: GridLineOptions;
         barThickness?: number;
+        maxBarThickness?: number;
         scaleLabel?: ScaleTitleOptions;
         offset?: boolean;
         beforeUpdate?(scale?: any): void;

From cc2065ff1f30e1144ccaaf1fda4fc894de5c9c22 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 6 Jun 2018 08:27:37 -0700
Subject: [PATCH 1081/1124] Documenting the ReplyFormData and
 ReplyFormAttachment types

---
 types/office-js/index.d.ts | 50 ++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index c6628f722a..dc122635c1 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -7682,14 +7682,7 @@ declare namespace Office {
          *
          * @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.
+         * A ReplyFormData object that contains body or attachment data and a callback function
          */
         displayReplyAllForm(formData: string | ReplyFormData): void;
         /**
@@ -7713,14 +7706,7 @@ declare namespace Office {
          *
          * @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.
+         * A ReplyFormData object that contains body or attachment data and a callback function.
          */
         displayReplyForm(formData: string | ReplyFormData): void;
         /**
@@ -9401,15 +9387,47 @@ declare namespace Office {
         firstDayOfWeek: MailboxEnums.Days;
     }
 
+    /**
+     * A file or item attachment. Used when displaying a reply form
+     */
     export interface ReplyFormAttachment {
+        /**
+         * Indicates the type of attachment. Must be file for a file attachment or item for an item attachment.
+         */
         type: string;
+        /**
+         * A string that contains the name of the attachment, up to 255 characters in length.
+         */
         name: string;
+        /**
+         * Only used if type is set to file. The URI of the location for the file.
+         */
         url?: string;
+        /**
+         * 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.
+         */
+        inLine?: boolean;
+        /**
+         * Only used if type is set to item. The EWS item id of the attachment. This is a string up to 100 characters.
+         */
         itemId?: string;
     }
+
+    /**
+     * A ReplyFormData object that contains body or attachment data and a callback function. Used when displaying a reply form.
+     */
     interface ReplyFormData {
+        /**
+         * A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
+         */
         htmlBody?: string;
+        /**
+         * An array of ReplyFormAttachments that are either file or item attachments.
+         */
         attachments?: ReplyFormAttachment[];
+        /**
+         * 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.
+         */
         callback?: (result: AsyncResult) => void;
     }
     /**

From 10af13f86145337bfc346b277fd00eb88c8919c9 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 6 Jun 2018 11:23:05 -0700
Subject: [PATCH 1082/1124] Correcting callback description

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index dc122635c1..93cf3ee07a 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -9388,7 +9388,7 @@ declare namespace Office {
     }
 
     /**
-     * A file or item attachment. Used when displaying a reply form
+     * A file or item attachment. Used when displaying a reply form.
      */
     export interface ReplyFormAttachment {
         /**
@@ -9426,7 +9426,7 @@ declare namespace Office {
          */
         attachments?: ReplyFormAttachment[];
         /**
-         * 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.
+         * When the reply display call completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         callback?: (result: AsyncResult) => void;
     }

From 84137149e466c9964c8dd56d72b7e395ea104ac2 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 6 Jun 2018 11:41:49 -0700
Subject: [PATCH 1083/1124] Correcting callback description

---
 types/office-js/index.d.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 93cf3ee07a..5af6916816 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -6432,12 +6432,12 @@ declare namespace Office {
     }
 
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface Appointment extends Item {
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface AppointmentCompose extends Appointment, ItemCompose {
         /**
@@ -6530,7 +6530,7 @@ declare namespace Office {
         start: Time;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface AppointmentRead extends Appointment, ItemRead {
         /**
@@ -6983,7 +6983,7 @@ declare namespace Office {
        removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface ItemCompose extends Item {
         /**
@@ -7577,7 +7577,7 @@ declare namespace Office {
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface ItemRead extends Item {
         /**
@@ -7888,7 +7888,7 @@ declare namespace Office {
         getSelectedRegExMatches(): any;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface Message extends Item {
         /**
@@ -7909,6 +7909,9 @@ declare namespace Office {
         conversationId: string;
     }
 
+     /**
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
+     */
     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.
@@ -7970,7 +7973,7 @@ declare namespace Office {
         to: Recipients;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface MessageRead extends Message, ItemRead {
         /**

From 4601b9b03a31badf97a512521a609c1c827c55e5 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 6 Jun 2018 11:55:48 -0700
Subject: [PATCH 1084/1124] Changing link syntax to AEDoc standard

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 718f1bd34f..78c30b5548 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -661,7 +661,7 @@ declare namespace Office {
      */
     interface Auth {
         /**
-        * Calls the Azure Active Directory V 2.0 endpoint to get an access token to your add-in's web application. Allows add-ins to identify users. Server side code can use this token to access Microsoft Graph for the add-in's web application by using the ["on behalf of" OAuth flow](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of).
+        * Calls the Azure Active Directory V 2.0 endpoint to get an access token to your add-in's web application. Allows add-ins to identify users. Server side code can use this token to access Microsoft Graph for the add-in's web application by using the {@link https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of | "on behalf of" OAuth flow}.
         *
         * @remarks
         * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
@@ -2600,7 +2600,7 @@ declare namespace Office {
          *
          * 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.
+         * See {@link https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table | Format tables in add-ins for Excel} 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.
@@ -2692,7 +2692,7 @@ declare namespace Office {
         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).
+     * Specifies enumerated values for the cells: property in the cellFormat parameter of {@link https://dev.office.com/reference/docs/excel/format-tables-in-add-ins-for-excel.htm | table formatting methods}.
      *
      * @remarks
      * Hosts: Excel
@@ -2787,7 +2787,7 @@ declare namespace Office {
      * @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.
+     * For more information about working with fields in Project, see {@link https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460 | Available fields} reference. In Project Help, search for Available fields.
      */
     enum ProjectResourceFields {
         /**
@@ -3597,7 +3597,7 @@ declare namespace Office {
      * @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.
+     * For more information about working with fields in Project, see the {@link https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460 | Available fields} reference. In Project Help, search for Available fields.
      *
      * Hosts: Project
      */
@@ -6432,7 +6432,7 @@ declare namespace Office {
     }
 
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface Appointment extends Item {
         /**
@@ -6459,7 +6459,7 @@ declare namespace Office {
          * 
          * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. However, in iOS and Android, the seriesId returns the REST ID of the parent item.
          * 
-         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. The seriesId property is not identical to the Outlook IDs 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](https://docs.microsoft.com/outlook/add-ins/use-rest-api).
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. The seriesId property is not identical to the Outlook IDs 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 {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api | Use the Outlook REST APIs from an Outlook add-in}.
          * 
          * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests and returns undefined for any other items that are not meeting requests.
          * 
@@ -6474,7 +6474,7 @@ declare namespace Office {
         seriesId: string;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface AppointmentCompose extends Appointment, ItemCompose {
         /**
@@ -6567,7 +6567,7 @@ declare namespace Office {
         start: Time;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface AppointmentRead extends Appointment, ItemRead {
         end: Date;
@@ -6972,7 +6972,7 @@ declare namespace Office {
        removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface ItemCompose extends Item {
         /**
@@ -7236,7 +7236,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 {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
          *
          * Minimum permission level: ReadItem
          *
@@ -7568,7 +7568,7 @@ declare namespace Office {
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface ItemRead extends Item {
         /**
@@ -7578,7 +7578,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 {@link https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519 | Blocked attachments in Outlook}.
          *
          * Minimum permission level: ReadItem
          *
@@ -7717,7 +7717,7 @@ declare namespace Office {
          */
         displayReplyForm(formData: string | ReplyFormData): 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 {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | 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.
          *
@@ -7735,7 +7735,7 @@ declare namespace Office {
          */
         getInitializationContextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): 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 {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | 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.
          *
@@ -7895,7 +7895,7 @@ declare namespace Office {
         getSelectedRegExMatches(): any;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface Message extends Item {
         /**
@@ -7916,7 +7916,7 @@ declare namespace Office {
         conversationId: string;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface MessageCompose extends Message, ItemCompose {
         /**
@@ -7981,7 +7981,7 @@ declare namespace Office {
         to: Recipients;
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the [Object Model pages for more information](https://review.docs.microsoft.com/en-us/javascript/office/objectmodel/preview-requirement-set/office-item?branch=AlexJ-OMPreservation).
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface MessageRead extends Message, ItemRead {
         /**
@@ -8260,7 +8260,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 {@link https://msdn.microsoft.com/library/office/dn148008.aspx | get attachments from the selected item}.
          *
          * Minimum permission level: ReadItem
          *
@@ -8284,7 +8284,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 {@link https://docs.microsoft.com/outlook/rest/ | REST API} calls to the user's mailbox.
          *
          * Minimum permission level: ReadItem
          *
@@ -8356,7 +8356,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 {@link https://msdn.microsoft.com/office/office365/APi/mail-rest-operations | Outlook Mail API} or the {@link http://graph.microsoft.io/ | Microsoft Graph}. The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
          *
          * Minimum permission level: Restricted
          *
@@ -8571,7 +8571,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 {@link https://msdn.microsoft.com/library/office/fp179828.aspx | authenticate the add-in and user with a third-party system}.
          *
          * Minimum permission level: ReadItem
          *
@@ -9520,7 +9520,7 @@ declare namespace Office {
         getDuration(): number;
 
         /**
-         * Gets the end date of a recurrence pattern in the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD"
+         * Gets the end date of a recurrence pattern in the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD"
          * 
          * [Api set: Mailbox Preview]
          *
@@ -9532,7 +9532,7 @@ declare namespace Office {
         getEndDate(): string;
 
         /**
-         * Gets the end time of a usual appointment or meeting request instance of a recurrence pattern in whichever time zone that the user or add-in set the recurrence pattern using the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format: "THH:mm:ss:mmm"
+         * Gets the end time of a usual appointment or meeting request instance of a recurrence pattern in whichever time zone that the user or add-in set the recurrence pattern using the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} format: "THH:mm:ss:mmm"
          * 
          * [Api set: Mailbox Preview]
          *
@@ -9544,7 +9544,7 @@ declare namespace Office {
         getEndTime(): string;
 
         /**
-         * Gets the start date of a recurrence pattern in the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD"
+         * Gets the start date of a recurrence pattern in the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD"
          * 
          * [Api set: Mailbox Preview]
          *
@@ -9556,7 +9556,7 @@ declare namespace Office {
         getStartDate(): string;
 
         /**
-         * Gets the start time of a usual appointment instance of a recurrence pattern in whichever time zone that the user/add-in set the recurrence pattern using the following [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format: "THH:mm:ss:mmm"
+         * Gets the start time of a usual appointment instance of a recurrence pattern in whichever time zone that the user/add-in set the recurrence pattern using the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} format: "THH:mm:ss:mmm"
          * 
          * [Api set: Mailbox Preview]
          *
@@ -9611,7 +9611,7 @@ declare namespace Office {
          * 
          * Errors: Invalid date format - The date is not in an acceptable format.
          * 
-         * @param date End date of the recurring appointment series represented in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD".
+         * @param date End date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
          */
         setEndDate(date: string): void;
 
@@ -9645,7 +9645,7 @@ declare namespace Office {
          * 
          * Errors: Invalid date format - The date is not in an acceptable format.
          * 
-         * @param date Start date of the recurring appointment series represented in the [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) date format: "YYYY-MM-DD".
+         * @param date Start date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
          */
         setStartDate(date:string): void;
 

From 61806350bf1dfebcf30474e9a9fec294476b0945 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 6 Jun 2018 13:28:02 -0700
Subject: [PATCH 1085/1124] Relinking types and correcting Excel link

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 78c30b5548..55e45b1bad 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -376,14 +376,14 @@ declare namespace Office {
         */
         asyncContext: any;
         /**
-        * Gets the [AsyncResultStatus](office.asyncresultstatus.md) of the asynchronous operation.
+        * Gets the {@link Office.AsyncResultStatus} 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.
+        * Gets an {@link Office.Error} object that provides a description of the error, if any error occurred.
         *
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
@@ -1459,7 +1459,7 @@ declare namespace Office {
          *
          *        array of arrays: Excel and Word only
          *
-         *        [TableData](office.tabledata.md): Access, Excel, and Word only
+         *        {@link Office.TableData}: Access, Excel, and Word only
          *
          *        HTML: Word and Word Online only
          *
@@ -2692,7 +2692,7 @@ declare namespace Office {
         rows: any[][];
     }
     /**
-     * Specifies enumerated values for the cells: property in the cellFormat parameter of {@link https://dev.office.com/reference/docs/excel/format-tables-in-add-ins-for-excel.htm | table formatting methods}.
+     * Specifies enumerated values for the cells: property in the cellFormat parameter of {@link https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table | table formatting methods}.
      *
      * @remarks
      * Hosts: Excel

From 02e40a2806e478196a42737605d0505fbb2d1ea8 Mon Sep 17 00:00:00 2001
From: L&H <abc@hub.moe>
Date: Thu, 7 Jun 2018 08:16:42 +0800
Subject: [PATCH 1086/1124] Update gulp-strip-comments-tests.ts

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

diff --git a/types/gulp-strip-comments/gulp-strip-comments-tests.ts b/types/gulp-strip-comments/gulp-strip-comments-tests.ts
index 7f1c88af77..737f2c16a2 100644
--- a/types/gulp-strip-comments/gulp-strip-comments-tests.ts
+++ b/types/gulp-strip-comments/gulp-strip-comments-tests.ts
@@ -1,5 +1,5 @@
 import * as gulp from 'gulp';
-import * as stripComments from 'gulp-strip-comments';
+import stripComments = require('gulp-strip-comments');
 
 gulp.task('default', () => {
 	return gulp.src('src/app.js')

From 9a3c4002e314af91b3bb1cf9ffb8fa74d71bbb28 Mon Sep 17 00:00:00 2001
From: whatasoda <a16dc107@dhw.ac.jp>
Date: Thu, 7 Jun 2018 13:31:01 +0900
Subject: [PATCH 1087/1124] Removed template comments from definittions file

---
 types/glob-to-regexp/index.d.ts | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/types/glob-to-regexp/index.d.ts b/types/glob-to-regexp/index.d.ts
index ac47a64f6a..ae5c1de6da 100644
--- a/types/glob-to-regexp/index.d.ts
+++ b/types/glob-to-regexp/index.d.ts
@@ -3,42 +3,16 @@
 // Definitions by: whatasoda <https://github.com/whatasoda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/*~ Note that ES6 modules cannot directly export callable functions.
- *~ This file should be imported using the CommonJS-style:
- *~   import x = require('someLibrary');
- *~
- *~ Refer to the documentation to understand common
- *~ workarounds for this limitation of ES6 modules.
- */
-
-/*~ If this module is a UMD module that exposes a global variable 'myFuncLib' when
- *~ loaded outside a module loader environment, declare that global here.
- *~ Otherwise, delete this declaration.
- */
 export as namespace GlobToRegExp;
 
-/*~ This declaration specifies that the function
- *~ is the exported object from the file
- */
 export = GlobToRegExp;
 
 declare function GlobToRegExp(glob: string, options?: GlobToRegExp.Options): RegExp;
 
-/*~ If you want to expose types from your module as well, you can
- *~ place them in this block. Often you will want to describe the
- *~ shape of the return type of the function; that type should
- *~ be declared in here, as this example shows.
- */
 declare namespace GlobToRegExp {
     interface Options {
         extended?: boolean;
         globstar?: boolean;
         flags   ?: string;
     }
-
-    /*~ If the module also has properties, declare them here. For example,
-     *~ this declaration says that this code is legal:
-     *~   import f = require('myFuncLibrary');
-     *~   console.log(f.defaultName);
-     */
 }

From c7ff550c12e5569722b2c10efdb5b5b38e644a60 Mon Sep 17 00:00:00 2001
From: whatasoda <a16dc107@dhw.ac.jp>
Date: Thu, 7 Jun 2018 13:32:13 +0900
Subject: [PATCH 1088/1124] Fixed import notation

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

diff --git a/types/glob-to-regexp/glob-to-regexp-tests.ts b/types/glob-to-regexp/glob-to-regexp-tests.ts
index 4234ea3f07..d6918d5f0a 100644
--- a/types/glob-to-regexp/glob-to-regexp-tests.ts
+++ b/types/glob-to-regexp/glob-to-regexp-tests.ts
@@ -1,4 +1,4 @@
-import * as globToRegExp from 'glob-to-regexp';
+import globToRegExp = require('glob-to-regexp');
 let re = globToRegExp("p*uck");
 re.test("pot luck"); // true
 re.test("pluck"); // true

From e3d0539fcaa81cd7bc8fedb85e7de4003d50a1a1 Mon Sep 17 00:00:00 2001
From: Thomas Thiebaud <thiebaud.tom@gmail.com>
Date: Tue, 5 Jun 2018 18:36:38 +0200
Subject: [PATCH 1089/1124] Add type definition for serialize-error

---
 types/serialize-error/index.d.ts              | 17 ++++++++++++++
 .../serialize-error/serialize-error-tests.ts  |  5 ++++
 types/serialize-error/tsconfig.json           | 23 +++++++++++++++++++
 types/serialize-error/tslint.json             |  1 +
 4 files changed, 46 insertions(+)
 create mode 100644 types/serialize-error/index.d.ts
 create mode 100644 types/serialize-error/serialize-error-tests.ts
 create mode 100644 types/serialize-error/tsconfig.json
 create mode 100644 types/serialize-error/tslint.json

diff --git a/types/serialize-error/index.d.ts b/types/serialize-error/index.d.ts
new file mode 100644
index 0000000000..56ae34df60
--- /dev/null
+++ b/types/serialize-error/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for serialize-error 2.1
+// Project: https://github.com/sindresorhus/serialize-error
+// Definitions by: Thomas Thiebaud <https://github.com/thomasthiebaud>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function SerializeError(error: any): SerializeError.ErrorObject;
+
+declare namespace SerializeError {
+    interface ErrorObject {
+        name: string;
+        stack: string;
+        message: string;
+        [keyof: string]: string;
+    }
+}
+
+export = SerializeError;
diff --git a/types/serialize-error/serialize-error-tests.ts b/types/serialize-error/serialize-error-tests.ts
new file mode 100644
index 0000000000..721fae45f4
--- /dev/null
+++ b/types/serialize-error/serialize-error-tests.ts
@@ -0,0 +1,5 @@
+import serializeError = require('serialize-error');
+
+const error = new Error('unicorn');
+
+const serializedError = serializeError(error);
diff --git a/types/serialize-error/tsconfig.json b/types/serialize-error/tsconfig.json
new file mode 100644
index 0000000000..83731d0922
--- /dev/null
+++ b/types/serialize-error/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "serialize-error-tests.ts"
+    ]
+}
diff --git a/types/serialize-error/tslint.json b/types/serialize-error/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/serialize-error/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 226ec2c9c9de617650ba05c8deca2a7d61f85727 Mon Sep 17 00:00:00 2001
From: Kei Son <kson@ea.com>
Date: Thu, 7 Jun 2018 16:27:53 +0800
Subject: [PATCH 1090/1124] Add missing errors

---
 types/restify-errors/index.d.ts              | 5 +++++
 types/restify-errors/restify-errors-tests.ts | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/types/restify-errors/index.d.ts b/types/restify-errors/index.d.ts
index ecec86f8f7..fb9c136ab1 100644
--- a/types/restify-errors/index.d.ts
+++ b/types/restify-errors/index.d.ts
@@ -130,6 +130,11 @@ export class InsufficientStorageError extends DefinedHttpError { }
 export class BandwidthLimitExceededError extends DefinedHttpError { }
 export class NotExtendedError extends DefinedHttpError { }
 export class NetworkAuthenticationRequiredError extends DefinedHttpError { }
+export class PayloadTooLargeError extends DefinedHttpError { }
+export class UriTooLongError extends DefinedHttpError { }
+export class MisdirectedRequestError extends DefinedHttpError { }
+export class UnavailableForLegalReasonsError extends DefinedHttpError { }
+export class LoopDetectedError extends DefinedHttpError { }
 
 export class BadDigestError extends DefinedRestError { }
 export class BadMethodError extends DefinedRestError { }
diff --git a/types/restify-errors/restify-errors-tests.ts b/types/restify-errors/restify-errors-tests.ts
index 600a0545fb..2bda424f6a 100644
--- a/types/restify-errors/restify-errors-tests.ts
+++ b/types/restify-errors/restify-errors-tests.ts
@@ -62,6 +62,12 @@ httpError = new restifyErrors.InsufficientStorageError();
 httpError = new restifyErrors.BandwidthLimitExceededError();
 httpError = new restifyErrors.NotExtendedError();
 httpError = new restifyErrors.NetworkAuthenticationRequiredError();
+httpError = new restifyErrors.PayloadTooLargeError();
+httpError = new restifyErrors.UriTooLongError();
+httpError = new restifyErrors.MisdirectedRequestError();
+httpError = new restifyErrors.UnavailableForLegalReasonsError();
+httpError = new restifyErrors.LoopDetectedError();
+httpError = new restifyErrors.NetworkAuthenticationRequiredError();
 
 // RestErrors
 let restError = new restifyErrors.BadDigestError();

From 48058a1a69e8d838e8e29f4e10ed57cd4213e3fa Mon Sep 17 00:00:00 2001
From: MosheF <moshef@wix.com>
Date: Thu, 7 Jun 2018 11:57:06 +0300
Subject: [PATCH 1091/1124] Fix optinal etc.

---
 types/expo/expo-tests.tsx | 12 ++++++------
 types/expo/index.d.ts     | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index b0583b15f3..d9b7edcb5d 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -803,13 +803,13 @@ async () => {
 //#endregion
 
 // #region Haptic
-Haptic.impact(Haptic.ImpactFeedbackStyle.Heavy);
-Haptic.impact(Haptic.ImpactFeedbackStyle.Light);
-Haptic.impact(Haptic.ImpactFeedbackStyle.Medium);
+Haptic.impact(Haptic.ImpactStyles.Heavy);
+Haptic.impact(Haptic.ImpactStyles.Light);
+Haptic.impact(Haptic.ImpactStyles.Medium);
 
-Haptic.notification(Haptic.NotificationFeedbackType.Error);
-Haptic.notification(Haptic.NotificationFeedbackType.Success);
-Haptic.notification(Haptic.NotificationFeedbackType.Error);
+Haptic.notification(Haptic.NotificationType.Error);
+Haptic.notification(Haptic.NotificationType.Success);
+Haptic.notification(Haptic.NotificationType.Error);
 
 Haptic.selection();
 // #endregion
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 3a7caf50c2..e556e5255a 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2943,11 +2943,11 @@ export namespace MediaLibrary {
 
   // region Asset
   interface AssetAndroid {
-    albumId: string;
+    albumId?: string;
   }
 
   interface AssetIos {
-    mediaSubtypes: MediaType[];
+    mediaSubtypes?: MediaType[];
     // *
     orientation: number;
     // *
@@ -2965,11 +2965,11 @@ export namespace MediaLibrary {
     modificationTime: number;
     duration: number;
     // *
-    localUri: string;
+    localUri?: string;
     // *
-    location: object;
+    location?: Location.LocationProps;
     // *
-    exif: object;
+    exif?: object;
   }
 
   /**
@@ -2979,15 +2979,15 @@ export namespace MediaLibrary {
 
   // #region Album
   interface AlbumIos {
-    type: string;
+    type?: string;
     // *
     startTime: number;
     // *
     endTime: number;
     // *
-    approximateLocation: Location.LocationProps;
+    approximateLocation?: Location.LocationProps;
     // *
-    locationNames: string[];
+    locationNames?: string[];
   }
 
   /**
@@ -3029,16 +3029,16 @@ export namespace Haptic {
    * Used to let a user know when a selection change has been registered
    */
   function selection(): void;
-  function notification(type: NotificationFeedbackType): void;
-  function impact(style: ImpactFeedbackStyle): void;
+  function notification(notificationType?: NotificationType): void;
+  function impact(impactStyles?: ImpactStyles): void;
 
-  enum ImpactFeedbackStyle {
+  enum ImpactStyles {
     Light = 'light',
     Medium = 'medium',
     Heavy = 'heavy'
   }
 
-  enum NotificationFeedbackType {
+  enum NotificationType {
     Success = 'success',
     Warning = 'warning',
     Error = 'error'

From 4acc2d229c2dee699d27a714afff5d1401a86115 Mon Sep 17 00:00:00 2001
From: Scott Jones <scottdj92@gmail.com>
Date: Thu, 7 Jun 2018 08:13:30 -0400
Subject: [PATCH 1092/1124] Adding ImperativeRouter type

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

diff --git a/types/next/router.d.ts b/types/next/router.d.ts
index 5a17bd2a53..544c29bc7e 100644
--- a/types/next/router.d.ts
+++ b/types/next/router.d.ts
@@ -61,4 +61,5 @@ export function withRouter<T extends {}>(
 ): React.ComponentType<T>;
 
 export const Singleton: SingletonRouter;
+export type ImperativeRouter = RouterProps;
 export default Singleton;

From 997a0150e9a8a72cefb28565e36bb6ed1ea5c0b4 Mon Sep 17 00:00:00 2001
From: Zachary Wade <zacharywade@gmail.com>
Date: Thu, 7 Jun 2018 10:53:00 -0400
Subject: [PATCH 1093/1124] added the Object.TYPE enum as well as fixed typos
 on Object.type2String and Object.string2Type

---
 types/nodegit/diff-binary-file.d.ts |  4 +++-
 types/nodegit/object.d.ts           | 29 ++++++++++++++++++++++-------
 types/nodegit/odb-expand-id.d.ts    |  3 ++-
 types/nodegit/odb.d.ts              |  3 ++-
 types/nodegit/reference.d.ts        |  2 +-
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/types/nodegit/diff-binary-file.d.ts b/types/nodegit/diff-binary-file.d.ts
index 46b67f406e..362e1a63fc 100644
--- a/types/nodegit/diff-binary-file.d.ts
+++ b/types/nodegit/diff-binary-file.d.ts
@@ -1,5 +1,7 @@
+import { Object } from './object';
+
 export class DiffBinaryFile {
-    type: number;
+    type: Object.TYPE;
     data: string;
     datalen: number;
     inflatedlen: number;
diff --git a/types/nodegit/object.d.ts b/types/nodegit/object.d.ts
index 4ec5a19b6c..be7e879b95 100644
--- a/types/nodegit/object.d.ts
+++ b/types/nodegit/object.d.ts
@@ -3,20 +3,35 @@ import { Repository } from './repository';
 import { Buf } from './buf';
 
 export class Object {
-    static size(type: number): number;
-    static lookup(repo: Repository, id: Oid, type: number): Promise<Object>;
-    static lookupPrefix(repo: Repository, id: Oid, len: number, type: number): Promise<Object>;
-    static string2type(str: string): number;
-    static type2string(type: number): string;
-    static typeisloose(type: number): number;
+    static size(type: Object.TYPE): number;
+    static lookup(repo: Repository, id: Oid, type: Object.TYPE): Promise<Object>;
+    static lookupPrefix(repo: Repository, id: Oid, len: number, type: Object.TYPE): Promise<Object>;
+    static string2Type(str: string): Object.TYPE;
+    static type2String(type: Object.TYPE): string;
+    static typeisloose(type: Object.TYPE): number;
 
     dup(): Promise<Object>;
 
     free(): void;
     id(): Oid;
-    lookupByPath(path: string, type: number): Promise<Object>;
+    lookupByPath(path: string, type: Object.TYPE): Promise<Object>;
     owner(): Repository;
     peel(targetType: number): Promise<Object>;
     shortId(): Promise<Buf>;
     type(): number;
 }
+
+export namespace Object {
+    const enum TYPE {
+        ANY = -2,
+        BAD = -1,
+        EXT1 = 0,
+        COMMIT = 1,
+        TREE = 2,
+        BLOB = 3,
+        TAG = 4,
+        EXT2 = 5,
+        OFS_DELTA = 6,
+        REF_DELTA = 7
+    }
+}
diff --git a/types/nodegit/odb-expand-id.d.ts b/types/nodegit/odb-expand-id.d.ts
index d4fe264c3a..5576fbad58 100644
--- a/types/nodegit/odb-expand-id.d.ts
+++ b/types/nodegit/odb-expand-id.d.ts
@@ -1,7 +1,8 @@
 import { Oid } from './oid';
+import { Object } from './object';
 
 export class OdbExpandId {
     id: Oid;
     length: number;
-    type: number;
+    type: Object.TYPE;
 }
diff --git a/types/nodegit/odb.d.ts b/types/nodegit/odb.d.ts
index db0aacda61..e5348d088f 100644
--- a/types/nodegit/odb.d.ts
+++ b/types/nodegit/odb.d.ts
@@ -1,6 +1,7 @@
 import { Oid } from './oid';
 import { OdbObject } from './odb-object';
 import { OdbExpandId } from './odb-expand-id';
+import { Object } from './object';
 
 export namespace Odb {
     const enum STREAM {
@@ -17,6 +18,6 @@ export class Odb {
 
     free(): void;
     read(id: Oid): Promise<OdbObject>;
-    write(data: Buffer, len: number, type: number): Promise<Oid>;
+    write(data: Buffer, len: number, type: Object.TYPE): Promise<Oid>;
     expandIds(ids: OdbExpandId, count: number): number;
 }
diff --git a/types/nodegit/reference.d.ts b/types/nodegit/reference.d.ts
index 80e16c9350..cc6cb90e28 100644
--- a/types/nodegit/reference.d.ts
+++ b/types/nodegit/reference.d.ts
@@ -41,7 +41,7 @@ export class Reference {
     isTag(): number;
     name(): string;
     owner(): Repository;
-    peel(type: number): Promise<Object>;
+    peel(type: Object.TYPE): Promise<Object>;
     rename(newName: string, force: number, logMessage: string): Promise<Reference>;
     resolve(): Promise<Reference>;
     setTarget(id: Oid, logMessage: string): Promise<Reference>;

From 8dfa12287ebf386b30a51000eb17107d127a3577 Mon Sep 17 00:00:00 2001
From: Lucas Sloan <lucassloan@google.com>
Date: Thu, 31 May 2018 09:56:11 -0700
Subject: [PATCH 1094/1124] Make the IControllerService typings more specific.

Tighten the IControllerService typings by replacing the generic Function type with the more specific (...args: any[]) => T, which specifies a function which returns a generic type matching the controller required.
---
 types/angular-desktop-notification/index.d.ts | 2 +-
 types/angular-mocks/index.d.ts                | 2 +-
 types/angular/index.d.ts                      | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/types/angular-desktop-notification/index.d.ts b/types/angular-desktop-notification/index.d.ts
index a20d67cd21..6281396b66 100644
--- a/types/angular-desktop-notification/index.d.ts
+++ b/types/angular-desktop-notification/index.d.ts
@@ -101,7 +101,7 @@ declare module 'angular' {
              * Note: This property is not currently supported in any browser.
              * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/vibrate
              */
-            vibrate?: boolean;
+            vibrate?: any;
 
             /**
              * The onclick property of the Notification interface specifies an event listener to receive click events.
diff --git a/types/angular-mocks/index.d.ts b/types/angular-mocks/index.d.ts
index ac9e6cece3..051539e2ac 100644
--- a/types/angular-mocks/index.d.ts
+++ b/types/angular-mocks/index.d.ts
@@ -97,7 +97,7 @@ declare module 'angular' {
   interface IControllerService {
     // Although the documentation doesn't state this, locals are optional
     <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, bindings?: any): T;
-    <T>(controllerConstructor: Function, locals?: any, bindings?: any): T;
+    <T>(controllerConstructor: (...args: any[]) => T, locals?: any, bindings?: any): T;
     <T>(controllerName: string, locals?: any, bindings?: any): T;
   }
 
diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 6dccefc926..89e897a7ad 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -1390,10 +1390,9 @@ declare namespace angular {
 
     interface IControllerService {
         // Although the documentation doesn't state this, locals are optional
-        <T>(controllerConstructor: new (...args: any[]) => T, locals?: any, later?: boolean, ident?: string): T;
-        <T>(controllerConstructor: Function, locals?: IControllerLocals, later?: boolean, ident?: string): T;
-        <T>(controllerConstructor: Function, locals?: any, later?: boolean, ident?: string): T;
-        <T>(controllerName: string, locals?: any, later?: boolean, ident?: string): T;
+        <T>(controllerConstructor: new (...args: any[]) => T, locals?: any): T;
+        <T>(controllerConstructor: (...args: any[]) => T, locals?: any): T;
+        <T>(controllerName: string, locals?: any): T;
     }
 
     interface IControllerProvider extends IServiceProvider {

From 270369930e5141e65d4e8a1f7443a35c5441065b Mon Sep 17 00:00:00 2001
From: bradleat <bradleat@inkibra.com>
Date: Thu, 7 Jun 2018 14:55:44 -0700
Subject: [PATCH 1095/1124] inverted support

see: https://github.com/archriss/react-native-snap-carousel/issues/197
they forgot to document it, but it works
---
 types/react-native-snap-carousel/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index 5b5406f6fa..56b083638b 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -45,6 +45,10 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProps> {
      * Width in pixels of your slides, must be the same for all of them
      * Note: Required with horizontal carousel
      */
+    /**
+     * Reverses the direction of scroll. Uses scale transforms of -1.
+     */
+    inverted?: boolean;
     itemWidth?: number;
     /**
      * Height in pixels of carousel's items, must be the same for all of them

From caaaebc65f28a3d7808857b73ec56166638819fc Mon Sep 17 00:00:00 2001
From: Craig Bruce <“craigrbruce@gmail.com”>
Date: Fri, 8 Jun 2018 10:45:02 +1000
Subject: [PATCH 1096/1124] Remove tslint rules and fix JSDoc formatting.
 Rewrite email address on previous commits.

---
 .../cast.framework.breaks.d.ts                |   6 -
 .../cast.framework.d.ts                       |  47 ++-
 .../cast.framework.messages.d.ts              | 374 ++++++++++++------
 .../cast.framework.system.d.ts                |  23 +-
 .../cast.framework.ui.d.ts                    |  18 +-
 types/chromecast-caf-receiver/tslint.json     |   3 -
 6 files changed, 312 insertions(+), 159 deletions(-)

diff --git a/types/chromecast-caf-receiver/cast.framework.breaks.d.ts b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
index 309d87fd74..21adf13fb0 100644
--- a/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.breaks.d.ts
@@ -36,13 +36,11 @@ declare namespace cast.framework.breaks {
     interface BreakManager {
         /**
          * Get current media break by id.
-         * @param {*} id
          */
         getBreakById(id: string): Break;
 
         /**
          * Get current media break clip by id
-         * @param {*} id
          */
         getBreakClipById(id: string): BreakClip;
 
@@ -61,7 +59,6 @@ declare namespace cast.framework.breaks {
          * By default VAST fetching and parsing logic in default interceptor.
          * So if customized interceptor is set by developer;
          * the VAST logic will be overridden and developers should implement their own VAST fetching and parsing logic in the provided interceptor.
-         * @param {*} interceptor
          */
         setBreakClipLoadInterceptor(
             interceptor: (
@@ -72,7 +69,6 @@ declare namespace cast.framework.breaks {
 
         /**
          * Provide an interceptor for developer to specify what breaks they want to play after seek.
-         * @param {*} seekInterceptor
          */
         setBreakSeekInterceptor(
             seekInterceptor: (breakSeekData: BreakSeekData) => void
@@ -80,7 +76,6 @@ declare namespace cast.framework.breaks {
 
         /**
          * Set a flag to control if the watched client stitching break should be played.
-         * @param {*} playWatchedBreak
          */
         setPlayWatchedBreak(playWatchedBreak: boolean): void;
 
@@ -89,7 +84,6 @@ declare namespace cast.framework.breaks {
          * The input of the interceptor is a string of the tracking URL.
          * The interceptor can either return a modified string of URL or a Promise of modified string of URL.
          * The interceptor can also return null if you want to send the tracking URL by your own code instead of by CAF.
-         * @param {*} interceptor
          */
         setVastTrackingInterceptor(
             interceptor?: (trackingUrl: string) => void
diff --git a/types/chromecast-caf-receiver/cast.framework.d.ts b/types/chromecast-caf-receiver/cast.framework.d.ts
index 2ee078021a..28b0c69e2d 100644
--- a/types/chromecast-caf-receiver/cast.framework.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.d.ts
@@ -149,7 +149,9 @@ declare namespace cast.framework {
      */
     class QueueBase {
         /**
-         * Fetches a window of items using the specified item id as reference; called by the receiver MediaManager when it needs more queue items; often as a request from senders. If only one of nextCount and prevCount is non-zero; fetchItems should only return items after or before the reference item; if both nextCount and prevCount are non-zero; a window of items including the reference item should be returned.
+         * Fetches a window of items using the specified item id as reference; called by the receiver MediaManager when it needs more queue items;
+         *  often as a request from senders. If only one of nextCount and prevCount is non-zero; fetchItems should only return items after or before
+         *  the reference item; if both nextCount and prevCount are non-zero; a window of items including the reference item should be returned.
          */
         fetchItems(
             itemId: number,
@@ -158,7 +160,9 @@ declare namespace cast.framework {
         ): QueueItem[] | Promise<QueueItem[]>;
 
         /**
-         * Initializes the queue with the requestData. This is called when a new LOAD request comes in to the receiver. If this returns or resolves to null; our default queueing implementation will create a queue based on queueData.items or the single media in the load request data.
+         * Initializes the queue with the requestData. This is called when a new LOAD request comes in to the receiver.
+         * If this returns or resolves to null; our default queueing implementation will create a queue based on queueData.items or the single media
+         *  in the load request data.
          */
         initialize(
             requestData: LoadRequestData
@@ -175,12 +179,14 @@ declare namespace cast.framework {
         onCurrentItemIdChanged(itemId: number): void;
 
         /**
-         * A callback for informing the following items have been inserted into the receiver queue in this session. A cloud based implementation can optionally choose to update its queue based on the new information.
+         * A callback for informing the following items have been inserted into the receiver queue in this session.
+         *  A cloud based implementation can optionally choose to update its queue based on the new information.
          */
         onItemsInserted(items: QueueItem[], insertBefore?: number): void;
 
         /**
-         * A callback for informing the following items have been removed from the receiver queue in this session. A cloud based implementation can optionally choose to update its queue based on the new information.
+         * A callback for informing the following items have been removed from the receiver queue in this session.
+         * A cloud based implementation can optionally choose to update its queue based on the new information.
          */
         onItemsRemoved(itemIds: number[]): void;
 
@@ -219,9 +225,6 @@ declare namespace cast.framework {
             includeQueueItems?: boolean
         ): void;
 
-        /**
-         *
-         */
         getAudioTracksManager(): AudioTracksManager;
 
         /**
@@ -280,7 +283,8 @@ declare namespace cast.framework {
         getPlayerState(): PlayerState;
 
         /**
-         * Get the preferred playback rate. (Can be used on shutdown event to save latest preferred playback rate to a persistent storage; so it can be used in next session in the cast options).
+         * Get the preferred playback rate. (Can be used on shutdown event to save latest preferred playback rate to a persistent storage;
+         *  so it can be used in next session in the cast options).
          */
         getPreferredPlaybackRate(): number;
 
@@ -294,9 +298,6 @@ declare namespace cast.framework {
          */
         getQueueManager(): QueueManager;
 
-        /**
-         *
-         */
         getTextTracksManager(): TextTracksManager;
 
         /**
@@ -365,7 +366,10 @@ declare namespace cast.framework {
         ): void;
 
         /**
-         * Sets the IDLE reason. This allows applications that want to force the IDLE state to indicate the reason that made the player going to IDLE state (a custom error; for example). The idle reason will be sent in the next status message. NOTE: Most applications do not need to set this value; it is only needed if they want to make the player go to IDLE in special circumstances and the default idleReason does not reflect their intended behavior.
+         * Sets the IDLE reason. This allows applications that want to force the IDLE state to indicate the reason that made the player going to IDLE state
+         * (a custom error; for example). The idle reason will be sent in the next status message. NOTE: Most applications do not need to set this value;
+         * it is only needed if they want to make the player go to IDLE in special circumstances and the default idleReason does not reflect their intended
+         * behavior.
          */
         setIdleReason(idleReason: IdleReason): void;
 
@@ -383,7 +387,9 @@ declare namespace cast.framework {
         ): void;
 
         /**
-         * Sets a handler to return or modify PlaybackConfig; for a specific load request. The handler paramaters are the load request data and default playback config for the receiver (provided in the context options). The handler should returns a modified playback config; or null to prevent the media from playing. The return value can be a promise to allow waiting for data from the server.
+         * Sets a handler to return or modify PlaybackConfig; for a specific load request. The handler paramaters are the load request data
+         * and default playback config for the receiver (provided in the context options). The handler should returns a modified playback config;
+         *  or null to prevent the media from playing. The return value can be a promise to allow waiting for data from the server.
          */
         setMediaPlaybackInfoHandler(
             handler: (
@@ -393,14 +399,19 @@ declare namespace cast.framework {
         ): void;
 
         /**
-         * Sets a handler to return the media url for a load request. This handler can be used to avoid having the media content url published as part of the media status. By default the media contentId is used as the content url.
+         * Sets a handler to return the media url for a load request. This handler can be used to avoid having the media content url published as part
+         * of the media status. By default the media contentId is used as the content url.
          */
         setMediaUrlResolver(
             resolver: (loadRequestData: LoadRequestData) => void
         ): void;
 
         /**
-         * Provide an interceptor of incoming and outgoing messages. The interceptor can update the request data; and return updated data; a promise of updated data if need to get more data from the server; or null if the request should not be handled. Note that if load message interceptor is provided; and no interceptor is provided for preload - the load interceptor will be called for preload messages.
+         * Provide an interceptor of incoming and outgoing messages.
+         * The interceptor can update the request data; and return updated data; a promise of
+         * updated data if need to get more data from the server; or null if the request should not be handled.
+         * Note that if load message interceptor is provided; and no interceptor is provided for preload -
+         * the load interceptor will be called for preload messages.
          */
         setMessageInterceptor(
             type: MessageType,
@@ -413,12 +424,14 @@ declare namespace cast.framework {
         setPlaybackConfig(playbackConfig: PlaybackConfig): void;
 
         /**
-         * Set the preferred playback rate for follow up load or media items. The preferred playback rate will be updated automatically to the latest playback rate that was provided by a load request or explicit set of playback rate.
+         * Set the preferred playback rate for follow up load or media items. The preferred playback rate will be updated automatically to the latest
+         * playback rate that was provided by a load request or explicit set of playback rate.
          */
         setPreferredPlaybackRate(preferredPlaybackRate: number): void;
 
         /**
-         * Set the preferred text track language. The preferred text track language will be updated automatically to the latest enabled language by a load request or explicit change to text tracks. (Should be called only in idle state; and Will only apply to next loaded media).
+         * Set the preferred text track language. The preferred text track language will be updated automatically to the latest enabled language
+         * by a load request or explicit change to text tracks. (Should be called only in idle state; and Will only apply to next loaded media).
          */
         setPreferredTextLanguage(preferredTextLanguage: string): void;
 
diff --git a/types/chromecast-caf-receiver/cast.framework.messages.d.ts b/types/chromecast-caf-receiver/cast.framework.messages.d.ts
index 311232e5e0..d6dda6d145 100644
--- a/types/chromecast-caf-receiver/cast.framework.messages.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.messages.d.ts
@@ -224,19 +224,10 @@ declare namespace cast.framework.messages {
     class VideoInformation {
         constructor(width: number, height: number, hdrType: HdrType);
 
-        /**
-         *
-         */
         width: number;
 
-        /**
-         *
-         */
         height: number;
 
-        /**
-         *
-         */
         hdrType: HdrType;
     }
 
@@ -245,7 +236,10 @@ declare namespace cast.framework.messages {
      */
     interface VastAdsRequest {
         /**
-         * Specifies a VAST document to be used as the ads response instead of making a request via an ad tag url. This can be useful for debugging and other situations where a VAST response is already available.
+         * Specifies a VAST document to be used as the ads response instead of making a
+         * request via an ad tag url.
+         * This can be useful for debugging and other situations where a VAST response is
+         * already available.
          */
         adsResponse?: string;
 
@@ -260,7 +254,8 @@ declare namespace cast.framework.messages {
      */
     interface UserActionRequestData {
         /**
-         * Optional request source. It contain the assistent query that initiate the request.
+         * Optional request source.
+         * It contain the assistent query that initiate the request.
          */
         source?: string;
 
@@ -295,7 +290,8 @@ declare namespace cast.framework.messages {
         episodeTitle?: string;
 
         /**
-         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         * Content images. Examples would include cover art or a thumbnail of
+         * the currently playing media.
          */
         images?: Image[];
 
@@ -356,12 +352,19 @@ declare namespace cast.framework.messages {
         subtype?: string;
 
         /**
-         * It can be the url of the track or any other identifier that allows the receiver to find the content (when the track is not inband or included in the manifest). For example it can be the url of a vtt file.
+         * It can be the url of the track or any other identifier that allows the receiver
+         * to find the content (when the track is not inband or included in the manifest).
+         * For example it can be the url of a vtt file.
          */
         trackContentId?: string;
 
         /**
-         * It represents the MIME type of the track content. For example if the track is a vtt file it will be ‘text/vtt’. This field is needed for out of band tracks; so it is usually provided if a trackContentId has also been provided. It is not mandatory if the receiver has a way to identify the content from the trackContentId; but recommended. The track content type; if provided; must be consistent with the track type.
+         * It represents the MIME type of the track content. For example if the track
+         * is a vtt file it will be ‘text/vtt’. This field is needed for out of band tracks;
+         *  so it is usually provided if a trackContentId has also been provided.
+         * It is not mandatory if the receiver has a way to identify the content from
+         * the trackContentId; but recommended.
+         * The track content type; if provided; must be consistent with the track type.
          */
         trackContentType?: string;
 
@@ -394,9 +397,6 @@ declare namespace cast.framework.messages {
          */
         edgeColor?: string;
 
-        /**
-         *
-         */
         edgeType?: TextTrackEdgeType;
 
         /**
@@ -430,7 +430,8 @@ declare namespace cast.framework.messages {
         windowColor?: string;
 
         /**
-         * Rounded corner radius absolute value in pixels (px). This value will be ignored if windowType is not ROUNDED_CORNERS.
+         * Rounded corner radius absolute value in pixels (px). This value will be ignored
+         * if windowType is not ROUNDED_CORNERS.
          */
         windowRoundedCornerRadius?: number;
 
@@ -450,7 +451,10 @@ declare namespace cast.framework.messages {
         playbackRate?: number;
 
         /**
-         * New playback rate relative to current playback rate. New rate will be the result of multiplying the current rate with the value. For example a value of 1.1 will increase rate by 10%. (Only used if the playbackRate value is not provided).
+         * New playback rate relative to current playback rate.
+         * New rate will be the result of multiplying the current rate with the value.
+         * For example a value of 1.1 will increase rate by 10%.
+         * (Only used if the playbackRate value is not provided).
          */
         relativePlaybackRate?: number;
     }
@@ -465,7 +469,8 @@ declare namespace cast.framework.messages {
         credentials?: string;
 
         /**
-         * If it is a response for refresh credentials; it will indicate the request id of the refresh credentials request.
+         * If it is a response for refresh credentials; it will indicate the request id
+         * of the refresh credentials request.
          */
         forRequestId?: number;
 
@@ -485,7 +490,8 @@ declare namespace cast.framework.messages {
         currentTime?: number;
 
         /**
-         * Seconds relative to the current playback position. If this field is defined; the currentTime field will be ignored.
+         * Seconds relative to the current playback position. If this field is defined;
+         * the currentTime field will be ignored.
          */
         relativeTime?: number;
 
@@ -519,7 +525,9 @@ declare namespace cast.framework.messages {
         constructor(type: MessageType);
 
         /**
-         * Application-specific data for this request. It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         * Application-specific data for this request.
+         * It enables the sender and receiver to easily extend the media protocol
+         * without having to use a new namespace with custom messages.
          */
         customData?: any;
 
@@ -539,22 +547,35 @@ declare namespace cast.framework.messages {
      */
     interface QueueUpdateRequestData {
         /**
-         * ID of the current media Item after the deletion (if not provided; the currentItem value will be the same as before the deletion; if it does not exist because it has been deleted; the currentItem will point to the next logical item in the list).
+         * ID of the current media Item after the deletion
+         * (if not provided; the currentItem value will be the same as before the deletion;
+         *  if it does not exist because it has been deleted; the currentItem will point to
+         * the next logical item in the list).
          */
         currentItemId?: number;
 
         /**
-         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         * Seconds since the beginning of content to start playback of the current item.
+         *  If provided; this value will take precedence over the startTime value provided
+         * at the QueueItem level but only the first time the item is played.
+         *  This is to cover the common case where the user jumps to the middle of an
+         * item so the currentTime does not apply to the item permanently like the
+         * QueueItem startTime does. It avoids having to reset the startTime dynamically
+         *  (that may not be possible if the phone has gone to sleep).
          */
         currentTime?: number;
 
         /**
-         * List of queue items to be updated. No reordering will happen; the items will retain the existing order.
+         * List of queue items to be updated. No reordering will happen; the items will
+         * retain the existing order.
          */
         items?: QueueItem[];
 
         /**
-         * Skip/Go back number of items with respect to the position of currentItem (it can be negative). If it is out of boundaries; the currentItem will be the next logical item in the queue wrapping around the boundaries. The new currentItem position will follow the rules of the queue repeat behavior.
+         * Skip/Go back number of items with respect to the position of currentItem
+         * (it can be negative). If it is out of boundaries; the currentItem will be the
+         * next logical item in the queue wrapping around the boundaries.
+         * The new currentItem position will follow the rules of the queue repeat behavior.
          */
         jump?: number;
 
@@ -564,7 +585,9 @@ declare namespace cast.framework.messages {
         repeatMode?: RepeatMode;
 
         /**
-         * Shuffle the queue items when the update is processed. After the queue items are shuffled; the item at the currentItem position will be loaded.
+         * Shuffle the queue items when the update is processed.
+         * After the queue items are shuffled; the item at the currentItem position will
+         *  be loaded.
          */
         shuffle?: boolean;
     }
@@ -576,29 +599,43 @@ declare namespace cast.framework.messages {
         constructor(itemIds: number[]);
 
         /**
-         * ID of the current media Item after the deletion (if not provided; the currentItem value will be the same as before the deletion; if it does not exist because it has been deleted; the currentItem will point to the next logical item in the list).
+         * ID of the current media Item after the deletion (if not provided;
+         * the currentItem value will be the same as before the deletion;
+         * if it does not exist because it has been deleted;
+         * the currentItem will point to the next logical item in the list).
          */
         currentItemId?: number;
 
         /**
-         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         * Seconds since the beginning of content to start playback of the current item.
+         * If provided; this value will take precedence over the startTime value provided
+         * at the QueueItem level but only the first time the item is played.
+         * This is to cover the common case where the user jumps to the middle of an
+         * item so the currentTime does not apply to the item permanently like
+         * the QueueItem startTime does. It avoids having to reset the startTime dynamically
+         * (that may not be possible if the phone has gone to sleep).
          */
         currentTime?: number;
 
         /**
-         * ID of the item that will be located immediately after the reordered list. If the ID is not found or it is not provided; the reordered list will be appended at the end of the existing list.
+         * ID of the item that will be located immediately after the reordered list.
+         * If the ID is not found or it is not provided;
+         * the reordered list will be appended at the end of the existing list.
          */
         insertBefore?: number;
 
         /**
-           * IDs of the items to be reordered; in the new order. Items not provided will keep their existing order. The provided list will be inserted at the position determined by insertBefore. For example:
-
-              If insertBefore is not specified Existing queue: “A”;”D”;”G”;”H”;”B”;”E” itemIds: “D”;”H”;”B” New Order: “A”;”G”;”E”;“D”;”H”;”B”
-
-              If insertBefore is “A” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “D”;”H”;”B”;“A”;”G”;”E”
-
-              If insertBefore is “G” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds: “D”;”H”;”B” New Order: “A”;“D”;”H”;”B”;”G”;”E”
-           */
+         * IDs of the items to be reordered; in the new order.
+         * Items not provided will keep their existing order.
+         * The provided list will be inserted at the position determined by insertBefore.
+         * For example:
+         *  If insertBefore is not specified Existing queue: “A”;”D”;”G”;”H”;”B”;”E” itemIds:
+         * “D”;”H”;”B” New Order: “A”;”G”;”E”;“D”;”H”;”B”
+         *   If insertBefore is “A” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds:
+         *   “D”;”H”;”B” New Order: “D”;”H”;”B”;“A”;”G”;”E”
+         *   If insertBefore is “G” Existing queue: “A”;”D”;”G”;”H”;”B” itemIds:
+         *   “D”;”H”;”B” New Order: “A”;“D”;”H”;”B”;”G”;”E”
+         */
         itemIds: number[];
     }
 
@@ -609,12 +646,21 @@ declare namespace cast.framework.messages {
         constructor(itemIds: number[]);
 
         /**
-         * ID of the current media Item after the deletion (if not provided; the currentItem value will be the same as before the deletion; if it does not exist because it has been deleted; the currentItem will point to the next logical item in the list).
+         * ID of the current media Item after the deletion
+         * (if not provided; the currentItem value will be the same as before the deletion;
+         * if it does not exist because it has been deleted;
+         * the currentItem will point to the next logical item in the list).
          */
         currentItemId?: number;
 
         /**
-         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         * Seconds since the beginning of content to start playback of the current item.
+         *  If provided; this value will take precedence over the startTime value provided
+         * at the QueueItem level but only the first time the item is played.
+         * This is to cover the common case where the user jumps to the middle of an
+         * item so the currentTime does not apply to the item permanently like the
+         *  QueueItem startTime does. It avoids having to reset the startTime dynamically
+         * (that may not be possible if the phone has gone to sleep).
          */
         currentTime?: number;
 
@@ -630,7 +676,14 @@ declare namespace cast.framework.messages {
         constructor(items: QueueItem[]);
 
         /**
-         * Seconds (since the beginning of content) to start playback of the first item to be played. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user casts the item that was playing locally so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         * Seconds (since the beginning of content) to start playback of the first item to
+         *  be played. If provided; this value will take precedence over the
+         * startTime value provided at the QueueItem level but only the first
+         * time the item is played. This is to cover the common case where the user
+         * casts the item that was playing locally so the currentTime does not apply
+         * to the item permanently like the QueueItem startTime does.
+         * It avoids having to reset the startTime dynamically
+         * (that may not be possible if the phone has gone to sleep).
          */
         currentTime?: number;
 
@@ -645,24 +698,37 @@ declare namespace cast.framework.messages {
         repeatMode?: RepeatMode;
 
         /**
-         * The index of the item in the items array that must be the first currentItem (the item that will be played first). Note this is the index of the array (starts at 0) and not the itemId (as it is not known until the queue is created). If repeatMode is REPEAT_OFF playback will end when the last item in the array is played (elements before the startIndex will not be played). This may be useful for continuation scenarios where the user was already using the sender app and in the middle decides to cast. In this way the sender app does not need to map between the local and remote queue positions or saves one extra QUEUE_UPDATE request.
+         * The index of the item in the items array that must be the first currentItem
+         * (the item that will be played first). Note this is the index of the array
+         *  (starts at 0) and not the itemId (as it is not known until the queue is created).
+         * If repeatMode is REPEAT_OFF playback will end when the last item in the array is
+         * played (elements before the startIndex will not be played).
+         * This may be useful for continuation scenarios where the user was already
+         * using the sender app and in the middle decides to cast.
+         * In this way the sender app does not need to map between the local and remote queue
+         * positions or saves one extra QUEUE_UPDATE request.
          */
         startIndex?: number;
     }
 
     /**
-     * Queue item information. Application developers may need to create a QueueItem to insert a queue element using InsertQueueItems. In this case they should not provide an itemId (as the actual itemId will be assigned when the item is inserted in the queue). This prevents ID collisions with items added from a sender app.
+     * Queue item information. Application developers may need to create a QueueItem to
+     * insert a queue element using InsertQueueItems. In this case they should not
+     * provide an itemId (as the actual itemId will be assigned when the item is inserted
+     * in the queue). This prevents ID collisions with items added from a sender app.
      */
     class QueueItem {
         constructor(opt_itemId?: number);
 
         /**
-         * Array of Track trackIds that are active. If the array is not provided; the default tracks will be active.
+         * Array of Track trackIds that are active. If the array is not provided;
+         * the default tracks will be active.
          */
         activeTrackIds?: number[];
 
         /**
-         * If the autoplay parameter is not specified or is true; the media player will begin playing the element in the queue when the item becomes the currentItem.
+         * If the autoplay parameter is not specified or is true; the media player
+         *  will begin playing the element in the queue when the item becomes the currentItem.
          */
         autoplay?: boolean;
 
@@ -672,7 +738,9 @@ declare namespace cast.framework.messages {
         customData?: any;
 
         /**
-         * Unique identifier of the item in the queue. The attribute is optional because for LOAD or INSERT should not be provided (as it will be assigned by the receiver when an item is first created/inserted).
+         * Unique identifier of the item in the queue.
+         * The attribute is optional because for LOAD or INSERT should not be provided
+         * (as it will be assigned by the receiver when an item is first created/inserted).
          */
         itemId?: number;
 
@@ -682,17 +750,36 @@ declare namespace cast.framework.messages {
         media?: MediaInformation;
 
         /**
-         * Playback duration of the item; if it is larger than the actual duration - startTime it will be ignored (default behavior). It can be negative; in such case the duration will be the actual asset duration minus the duration provided. It can be used for photo slideshows to control the duration the item should be presented or for live events to control the duration that the program should be played. It may be useful for autoplay scenarios to avoid displaying all the credits after an episode has ended.
+         * Playback duration of the item; if it is larger than the actual duration -
+         * startTime it will be ignored (default behavior).
+         * It can be negative; in such case the duration will be the actual asset
+         * duration minus the duration provided.
+         * It can be used for photo slideshows to control the duration the item should
+         * be presented or for live events to control the duration that the program
+         * should be played. It may be useful for autoplay scenarios to avoid displaying all
+         *  the credits after an episode has ended.
          */
         playbackDuration?: number;
 
         /**
-         * This parameter is a hint for the receiver to preload this media item before it is played. It allows for a smooth transition between items played from the queue. The time is expressed in seconds; relative to the beginning of this item playback (usually the end of the previous item playback). Only positive values are valid. For example; if the value is 10 seconds; this item will be preloaded 10 seconds before the previous item has finished. The receiver will try to honor this value but will not guarantee it; for example if the value is larger than the previous item duration the receiver may just preload this item shortly after the previous item has started playing (there will never be two items being preloaded in parallel). Also; if an item is inserted in the queue just after the currentItem and the time to preload is higher than the time left on the currentItem; the preload will just happen as soon as possible.
+         * This parameter is a hint for the receiver to preload this media
+         * item before it is played. It allows for a smooth transition between items
+         * played from the queue. The time is expressed in seconds; relative to
+         * the beginning of this item playback (usually the end of the previous item playback).
+         *  Only positive values are valid. For example; if the value is 10 seconds; this item
+         * will be preloaded 10 seconds before the previous item has finished.
+         * The receiver will try to honor this value but will not guarantee it;
+         * for example if the value is larger than the previous item duration the
+         * receiver may just preload this item shortly after the previous item has started playing
+         * (there will never be two items being preloaded in parallel).
+         * Also; if an item is inserted in the queue just after the currentItem and the time to preload is higher than the
+         * time left on the currentItem; the preload will just happen as soon as possible.
          */
         preloadTime?: number;
 
         /**
-         * Seconds since beginning of content. If the content is live content; and startTime is not specified; the stream will start at the live position.
+         * Seconds since beginning of content. If the content is live content;
+         * and startTime is not specified; the stream will start at the live position.
          */
         startTime?: number;
     }
@@ -704,27 +791,42 @@ declare namespace cast.framework.messages {
         constructor(items: QueueItem[]);
 
         /**
-         * ID of the current media Item after the insertion (if not provided; the currentItem value will be the same as before the insertion).
+         * ID of the current media Item after the insertion (if not provided;
+         * the currentItem value will be the same as before the insertion).
          */
         currentItemId?: number;
 
         /**
-         * Index (relative to the items array; starting with 0) of the new current media Item. For inserted items we use the index (similar to startIndex in QUEUE_LOAD) and not currentItemId; because the itemId is unknown until the items are inserted. If not provided; the currentItem value will be the same as before the insertion (unless currentItemId is provided). This param allows to make atomic the common use case of insert and play an item.
+         * Index (relative to the items array; starting with 0) of the new current media Item.
+         *  For inserted items we use the index (similar to startIndex in QUEUE_LOAD) and not
+         * currentItemId; because the itemId is unknown until the items are inserted.
+         * If not provided; the currentItem value will be the same as before the insertion
+         * (unless currentItemId is provided). This param allows to make atomic the common use
+         * case of insert and play an item.
          */
         currentItemIndex?: number;
 
         /**
-         * Seconds since the beginning of content to start playback of the current item. If provided; this value will take precedence over the startTime value provided at the QueueItem level but only the first time the item is played. This is to cover the common case where the user jumps to the middle of an item so the currentTime does not apply to the item permanently like the QueueItem startTime does. It avoids having to reset the startTime dynamically (that may not be possible if the phone has gone to sleep).
+         * Seconds since the beginning of content to start playback of the current item.
+         * If provided; this value will take precedence over the startTime value provided
+         * at the QueueItem level but only the first time the item is played.
+         * This is to cover the common case where the user jumps to the middle of an
+         * item so the currentTime does not apply to the item permanently like the
+         * QueueItem startTime does. It avoids having to reset the startTime dynamically
+         * (that may not be possible if the phone has gone to sleep).
          */
         currentTime?: number;
 
         /**
-         * ID of the item that will be located immediately after the inserted list. If the ID is not found or it is not provided; the list will be appended at the end of the existing list.
+         * ID of the item that will be located immediately after the inserted list.
+         *  If the ID is not found or it is not provided; the list will be appended at
+         *  the end of the existing list.
          */
         insertBefore?: number;
 
         /**
-         * List of queue items. The itemId field of the items should be empty. It is sorted (first element will be played first).
+         * List of queue items. The itemId field of the items should be empty.
+         *  It is sorted (first element will be played first).
          */
         items: QueueItem[];
     }
@@ -743,9 +845,6 @@ declare namespace cast.framework.messages {
          */
         requestId?: number;
 
-        /**
-         *
-         */
         type: MessageType;
     }
 
@@ -834,13 +933,11 @@ declare namespace cast.framework.messages {
         requestId?: number;
 
         /**
-         * The queue change sequence ID. Used to coordinate state sync between various senders and the receiver.
+         * The queue change sequence ID. Used to coordinate state sync between various
+         * senders and the receiver.
          */
         sequenceNumber?: number;
 
-        /**
-         *
-         */
         type: MessageType;
     }
 
@@ -849,11 +946,14 @@ declare namespace cast.framework.messages {
      */
     class PreloadRequestData implements LoadRequestData {
         /**
-         * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
+         * Array of trackIds that are active. If the array is not provided;
+         *  the default tracks will be active.
          */
         activeTrackIds: number[];
         /**
-         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified;the media player implementation may choose to begin playback immediately.
+         * If the autoplay parameter is specified; the media player will begin playing
+         * the content when it is loaded. Even if autoplay is not specified;the media player
+         *  implementation may choose to begin playback immediately.
          */
         autoplay?: boolean;
         /**
@@ -861,15 +961,19 @@ declare namespace cast.framework.messages {
          */
         credentials?: string;
         /**
-         * Optional credentials type. The type 'cloud' is a reserved type used by load requests that were originated by voice assistant commands.
+         * Optional credentials type. The type 'cloud' is a reserved type used by load
+         * requests that were originated by voice assistant commands.
          */
         credentialsType?: string;
         /**
-         * Seconds since beginning of content. If the content is live content; and currentTime is not specified; the stream will start at the live position.
+         * Seconds since beginning of content. If the content is live content;
+         * and currentTime is not specified; the stream will start at the live position.
          */
         currentTime?: number;
         /**
-         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified; the media player implementation may choose to begin playback immediately.
+         * If the autoplay parameter is specified; the media player will begin playing
+         * the content when it is loaded. Even if autoplay is not specified; the media
+         *  player implementation may choose to begin playback immediately.
          */
         media: MediaInformation;
         /**
@@ -881,7 +985,9 @@ declare namespace cast.framework.messages {
          */
         queueData: QueueData;
         /**
-         * Application-specific data for this request. It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         * Application-specific data for this request.
+         * It enables the sender and receiver to easily extend the media protocol
+         * without having to use a new namespace with custom messages.
          */
         customData?: any;
         /**
@@ -901,15 +1007,19 @@ declare namespace cast.framework.messages {
     }
 
     /**
-     * Media event PRECACHE request data. (Some fields of the load request; like autoplay and queueData; are ignored).
+     * Media event PRECACHE request data. (Some fields of the load request;
+     * like autoplay and queueData; are ignored).
      */
     class PrecacheRequestData implements LoadRequestData {
         /**
-         * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
+         * Array of trackIds that are active. If the array is not provided;
+         * the default tracks will be active.
          */
         activeTrackIds: number[];
         /**
-         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified;the media player implementation may choose to begin playback immediately.
+         * If the autoplay parameter is specified; the media player will begin playing
+         * the content when it is loaded. Even if autoplay is not specified;the media player
+         * implementation may choose to begin playback immediately.
          */
         autoplay?: boolean;
         /**
@@ -917,15 +1027,19 @@ declare namespace cast.framework.messages {
          */
         credentials?: string;
         /**
-         * Optional credentials type. The type 'cloud' is a reserved type used by load requests that were originated by voice assistant commands.
+         * Optional credentials type. The type 'cloud' is a reserved type used by load
+         * requests that were originated by voice assistant commands.
          */
         credentialsType?: string;
         /**
-         * Seconds since beginning of content. If the content is live content; and currentTime is not specified; the stream will start at the live position.
+         * Seconds since beginning of content. If the content is live content; and
+         * currentTime is not specified; the stream will start at the live position.
          */
         currentTime?: number;
         /**
-         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified; the media player implementation may choose to begin playback immediately.
+         * If the autoplay parameter is specified; the media player will begin playing
+         * the content when it is loaded. Even if autoplay is not specified;
+         * the media player implementation may choose to begin playback immediately.
          */
         media: MediaInformation;
         /**
@@ -937,7 +1051,9 @@ declare namespace cast.framework.messages {
          */
         queueData: QueueData;
         /**
-         * Application-specific data for this request. It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         * Application-specific data for this request.
+         * It enables the sender and receiver to easily extend the media protocol
+         * without having to use a new namespace with custom messages.
          */
         customData?: any;
         /**
@@ -1058,7 +1174,8 @@ declare namespace cast.framework.messages {
         discNumber?: number;
 
         /**
-         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         * Content images. Examples would include cover art or a thumbnail of the
+         * currently playing media.
          */
         images: Image[];
 
@@ -1093,7 +1210,8 @@ declare namespace cast.framework.messages {
      */
     interface MovieMediaMetadata {
         /**
-         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         * Content images. Examples would include cover art or a thumbnail of the
+         * currently playing media.
          */
         images: Image[];
 
@@ -1132,7 +1250,8 @@ declare namespace cast.framework.messages {
         activeTrackIds: number[];
 
         /**
-         * Status of break; if receiver is playing break. This field will be defined only when receiver is playing break.
+         * Status of break; if receiver is playing break.
+         * This field will be defined only when receiver is playing break.
          */
         breakStatus: BreakStatus;
 
@@ -1167,12 +1286,14 @@ declare namespace cast.framework.messages {
         items: QueueItem[];
 
         /**
-         * Seekable range of a live or event stream. It uses relative media time in seconds. It will be undefined for VOD streams.
+         * Seekable range of a live or event stream. It uses relative media time in seconds.
+         * It will be undefined for VOD streams.
          */
         liveSeekableRange: LiveSeekableRange;
 
         /**
-         * ID of the media Item currently loading. If there is no item being loaded; it will be undefined.
+         * ID of the media Item currently loading. If there is no item being loaded;
+         * it will be undefined.
          */
         loadingItemId?: number;
 
@@ -1197,7 +1318,10 @@ declare namespace cast.framework.messages {
         playerState: PlayerState;
 
         /**
-         * ID of the next Item; only available if it has been preloaded. Media items can be preloaded and cached temporarily in memory; so when they are loaded later on; the process is faster (as the media does not have to be fetched from the network).
+         * ID of the next Item; only available if it has been preloaded.
+         * Media items can be preloaded and cached temporarily in memory;
+         * so when they are loaded later on; the process is faster
+         * (as the media does not have to be fetched from the network).
          */
         preloadedItemId?: number;
 
@@ -1216,9 +1340,6 @@ declare namespace cast.framework.messages {
          */
         supportedMediaCommands: number;
 
-        /**
-         *
-         */
         type: MessageType;
 
         /**
@@ -1248,7 +1369,9 @@ declare namespace cast.framework.messages {
      */
     interface MediaInformation {
         /**
-         * Partial list of break clips that includes current break clip that receiver is playing or ones that receiver will play shortly after; instead of sending whole list of clips. This is to avoid overflow of MediaStatus message.
+         * Partial list of break clips that includes current break clip that receiver
+         * is playing or ones that receiver will play shortly after; instead of sending
+         * whole list of clips. This is to avoid overflow of MediaStatus message.
          */
         breakClips: BreakClip[];
 
@@ -1268,7 +1391,9 @@ declare namespace cast.framework.messages {
         contentType: string;
 
         /**
-         * Optional media url; to allow using contentId for real id. If contentUrl is provided; it will be used as media url; otherwise the contentId will be used as the media url.
+         * Optional media url; to allow using contentId for real id. If contentUrl
+         * is provided; it will be used as media url; otherwise the contentId will
+         * be used as the media url.
          */
         contentUrl?: string;
 
@@ -1318,12 +1443,16 @@ declare namespace cast.framework.messages {
      */
     interface LoadRequestData extends RequestData {
         /**
-         * Array of trackIds that are active. If the array is not provided; the default tracks will be active.
+         * Array of trackIds that are active. If the array is not provided; the
+         * default tracks will be active.
          */
         activeTrackIds: number[];
 
         /**
-         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified;the media player implementation may choose to begin playback immediately.
+         * If the autoplay parameter is specified; the media player will begin
+         * playing the content when it is loaded. Even if autoplay is not
+         * specified;the media player implementation may choose to begin playback
+         * immediately.
          */
         autoplay?: boolean;
 
@@ -1333,17 +1462,21 @@ declare namespace cast.framework.messages {
         credentials?: string;
 
         /**
-         * Optional credentials type. The type 'cloud' is a reserved type used by load requests that were originated by voice assistant commands.
+         * Optional credentials type. The type 'cloud' is a reserved type used by
+         * load requests that were originated by voice assistant commands.
          */
         credentialsType?: string;
 
         /**
-         * Seconds since beginning of content. If the content is live content; and currentTime is not specified; the stream will start at the live position.
+         * Seconds since beginning of content. If the content is live content;
+         * and currentTime is not specified; the stream will start at the live position.
          */
         currentTime?: number;
 
         /**
-         * If the autoplay parameter is specified; the media player will begin playing the content when it is loaded. Even if autoplay is not specified; the media player implementation may choose to begin playback immediately.
+         * If the autoplay parameter is specified; the media player will begin playing
+         * the content when it is loaded. Even if autoplay is not specified; the media
+         * player implementation may choose to begin playback immediately.
          */
         media: MediaInformation;
 
@@ -1379,7 +1512,8 @@ declare namespace cast.framework.messages {
     }
 
     /**
-     * Provides live seekable range with start and end time in seconds and two more attributes.
+     * Provides live seekable range with start and end time in seconds and two more
+     * attributes.
      */
     class LiveSeekableRange {
         constructor(
@@ -1390,12 +1524,15 @@ declare namespace cast.framework.messages {
         );
 
         /**
-         * A boolean value indicates whether a live stream is ended. If it is done; the end of live seekable range should stop updating.
+         * A boolean value indicates whether a live stream is ended. If it is done;
+         * the end of live seekable range should stop updating.
          */
         isLiveDone?: boolean;
 
         /**
-         * A boolean value indicates whether the live seekable range is a moving window. If false; it will be either a expanding range or a fixed range meaning live has ended.
+         * A boolean value indicates whether the live seekable range is a moving window.
+         * If false; it will be either a expanding range or a fixed range meaning live
+         * has ended.
          */
         isMovingWindow?: boolean;
     }
@@ -1414,9 +1551,6 @@ declare namespace cast.framework.messages {
          */
         requestId?: number;
 
-        /**
-         *
-         */
         type: MessageType;
     }
 
@@ -1466,7 +1600,8 @@ declare namespace cast.framework.messages {
      */
     interface GenericMediaMetadata extends MediaMetadata {
         /**
-         * Content images. Examples would include cover art or a thumbnail of the currently playing media.
+         * Content images. Examples would include cover art or a thumbnail of the
+         * currently playing media.
          */
         images: Image[];
 
@@ -1476,7 +1611,7 @@ declare namespace cast.framework.messages {
         releaseDate?: string;
 
         /**
-         *@deprecated - use @see{@link releaseDate} instead
+         * @deprecated - use @see{@link releaseDate} instead
          */
         releaseYear?: number;
 
@@ -1530,20 +1665,15 @@ declare namespace cast.framework.messages {
             opt_media?: MediaInformation
         );
 
-        /**
-         *
-         */
         media: MediaInformation;
 
-        /**
-         *
-         */
         playerState: ExtendedPlayerState;
     }
 
     /** Event data for @see{@link EventType.ERROR} event. */
     class ErrorEvent extends Event {
         constructor(detailedErrorCode?: DetailedErrorCode, error?: any);
+
         /**
          * An error code representing the cause of the error.
          */
@@ -1552,7 +1682,8 @@ declare namespace cast.framework.messages {
         /**
          * The error object.
          * This could be an Error object (e.g.; if an Error was thrown in an event handler)
-         * or an object with error information (e.g.; if the receiver received an invalid command).
+         * or an object with error information (e.g.; if the receiver received an invalid
+         * command).
          */
         error?: any;
     }
@@ -1562,13 +1693,14 @@ declare namespace cast.framework.messages {
 
         /**
          * Application-specific data for this request.
-         * It enables the sender and receiver to easily extend the media protocol without having to use a new namespace with custom messages.
+         * It enables the sender and receiver to easily extend the media protocol
+         * without having to use a new namespace with custom messages.
          */
         customData?: any;
 
         /**
-            Id of the request; used to correlate request/response.
-           */
+         * Id of the request; used to correlate request/response.
+         */
         requestId?: number;
     }
 
@@ -1590,35 +1722,33 @@ declare namespace cast.framework.messages {
         enableTextTracks?: boolean;
 
         /**
-         * Indicates that the provided language was not explicit user request; but rather inferred from used language in voice query.
+         * Indicates that the provided language was not explicit user request; but rather
+         * inferred from used language in voice query.
          * It allows receiver apps to use user saved preference instead of spoken language.
          */
         isSuggestedLanguage?: boolean;
 
         /**
-         * Language for the tracks that should be active. The language field will take precedence over activeTrackIds if both are specified.
+         * Language for the tracks that should be active. The language field will take
+         * precedence over activeTrackIds if both are specified.
          */
         language?: string;
 
-        /**
-         *
-         */
         textTrackStyle?: TextTrackStyle;
     }
 
     /**
-     * Media event EDIT_AUDIO_TRACKS request data. If language is not provided; the default audio track for the media will be enabled.
+     * Media event EDIT_AUDIO_TRACKS request data. If language is not provided;
+     * the default audio track for the media will be enabled.
      */
     interface EditAudioTracksRequestData extends RequestData {
         /**
-         * Indicates that the provided language was not explicit user request; but rather inferred from used language in voice query.
+         * Indicates that the provided language was not explicit user request;
+         * but rather inferred from used language in voice query.
          * It allows receiver apps to use user saved preference instead of spoken language.
          */
         isSuggestedLanguage?: boolean;
 
-        /**
-         *
-         */
         language?: string;
     }
 
@@ -1694,7 +1824,8 @@ declare namespace cast.framework.messages {
         contentType?: string;
         /**
          * Optional break media url; to allow using contentId for real id.
-         * If contentUrl is provided; it will be used as media url; otherwise the contentId will be used as the media url.
+         * If contentUrl is provided; it will be used as media url;
+         * otherwise the contentId will be used as the media url.
          */
         contentUrl?: string;
         /**
@@ -1751,13 +1882,16 @@ declare namespace cast.framework.messages {
         /**
          * If true; indicates this is embedded break in main stream.
          */
+
         isEmbedded?: boolean;
         /**
          * Whether break is watched.
-         * Sender can change color of progress bar marker corresponding to this break once this field changes from false to true;
+         * Sender can change color of progress bar marker corresponding to this break once
+         *  this field changes from false to true;
          *  denoting that the end-user already watched this break.
          */
         isWatched: boolean;
+
         /**
          * Where the break is located inside main video. -1 represents the end of main video.
          */
diff --git a/types/chromecast-caf-receiver/cast.framework.system.d.ts b/types/chromecast-caf-receiver/cast.framework.system.d.ts
index 92e7732f7f..d055e252fb 100644
--- a/types/chromecast-caf-receiver/cast.framework.system.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.system.d.ts
@@ -5,7 +5,7 @@ declare namespace cast.framework.system {
     type EventType =
         // Fired when the system is ready.
         | "READY"
-        // Fired when the application is terminated.
+        // Fired when the application is terminated
         | "SHUTDOWN"
         // Fired when a new sender has connected.
         | "SENDER_CONNECTED"
@@ -15,9 +15,19 @@ declare namespace cast.framework.system {
         | "ERROR"
         // Fired when the system volume has changed.
         | "SYSTEM_VOLUME_CHANGED"
-        // Fired when the visibility of the application has changed (for example after a HDMI Input change or when the TV is turned off/on and the cast device is externally powered). Note that this API has the same effect as the webkitvisibilitychange event raised by your document, we provided it as CastReceiverManager API for convenience and to avoid a dependency on a webkit-prefixed event.
+        // Fired when the visibility of the application has changed
+        // (for example after a HDMI Input change or when the TV is turned
+        // off/on and the cast device is externally powered).
+        // Note that this API has the same effect as the webkitvisibilitychange event raised
+        // by your document, we provided it as CastReceiverManager API for convenience and
+        // to avoid a dependency on a webkit-prefixed event.
         | "VISIBILITY_CHANGED"
-        // Fired when the standby state of the TV has changed. This event is related to the visibility chnaged event, as if the TV is in standby the visibility will be false, the visibility is more granular (as it also detects that the TV has selected a different channel) but it is not reliably detected in all TVs, standby can be used in those cases as most TVs implement it.
+        // Fired when the standby state of the TV has changed.
+        // This event is related to the visibility chnaged event, as if the TV is in standby
+        // the visibility will be false, the visibility is more granular
+        // (as it also detects that the TV has selected a different channel)
+        // but it is not reliably detected in all TVs,
+        // standby can be used in those cases as most TVs implement it.
         | "STANDBY_CHANGED"
         | "MAX_VIDEO_RESOLUTION_CHANGED"
         | "FEEDBACK_STARTED";
@@ -51,7 +61,7 @@ declare namespace cast.framework.system {
      */
     interface SystemVolumeData {
         /**
-         * The level (from 0.0 to 1.0) of the system volume.
+         * The level (from 0.0 to 1.0) of the system volume
          */
         level: number;
 
@@ -77,9 +87,6 @@ declare namespace cast.framework.system {
     class StandbyChangedEvent {
         constructor(isStandby: boolean);
 
-        /**
-         *
-         */
         isStandby: boolean;
     }
     /**
@@ -136,7 +143,7 @@ declare namespace cast.framework.system {
         id: string;
 
         /**
-         * Indicate the sender supports large messages (>64KB).
+         * Indicate the sender supports large messages (>64KB)
          */
         largeMessageSupported?: boolean;
 
diff --git a/types/chromecast-caf-receiver/cast.framework.ui.d.ts b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
index b13f036be2..77d93c8082 100644
--- a/types/chromecast-caf-receiver/cast.framework.ui.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.ui.d.ts
@@ -50,9 +50,6 @@ declare namespace cast.framework.ui {
          */
         field: string;
 
-        /**
-         *
-         */
         type: PlayerDataEventType;
 
         /**
@@ -61,7 +58,8 @@ declare namespace cast.framework.ui {
         value: any;
     }
     /**
-     * Player data binder. Bind a player data object to the player state. The player data will be updated to reflect correctly the current player state without firing any change event.
+     * Player data binder. Bind a player data object to the player state.
+     * The player data will be updated to reflect correctly the current player state without firing any change event.
      */
     class PlayerDataBinder {
         constructor(playerData: PlayerData);
@@ -107,7 +105,17 @@ declare namespace cast.framework.ui {
         currentTime: number;
 
         /**
-         * Whether the player metadata (ie: title; currentTime) should be displayed. This will be true if at least one field in the metadata should be displayed. In some cases; displayStatus will be true; but parts of the metadata should be hidden (ie: the media title while media is seeking). In these cases; additional css can be applied to hide those elements. For cases where the media is audio-only; this will almost always be true. In cases where the media is video; this will be true when: (1) the video is loading; buffering; or seeking (2) a play request was made in the last five seconds while media is already playing; (3) there is a request made to show the status in the last five seconds; or (4) the media was paused in the last five seconds.
+         * Whether the player metadata (ie: title; currentTime) should be displayed.
+         *  This will be true if at least one field in the metadata should be displayed.
+         *  In some cases; displayStatus will be true; but parts of the metadata should be hidden
+         * (ie: the media title while media is seeking).
+         * In these cases; additional css can be applied to hide those elements.
+         * For cases where the media is audio-only; this will almost always be true.
+         * In cases where the media is video; this will be true when:
+         *   (1) the video is loading; buffering; or seeking
+         *   (2) a play request was made in the last five seconds while media is already playing;
+         *   (3) there is a request made to show the status in the last five seconds; or
+         *   (4) the media was paused in the last five seconds.
          */
         displayStatus: boolean;
 
diff --git a/types/chromecast-caf-receiver/tslint.json b/types/chromecast-caf-receiver/tslint.json
index f85a173bd5..495d29983d 100644
--- a/types/chromecast-caf-receiver/tslint.json
+++ b/types/chromecast-caf-receiver/tslint.json
@@ -1,8 +1,5 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-redundant-jsdoc-2": false,
-        "jsdoc-format": false,
-        "max-line-length": false
     }
 }

From f9ec668d5982ab153ef6c174ee731a39c880e47e Mon Sep 17 00:00:00 2001
From: Craig Bruce <“craigrbruce@gmail.com”>
Date: Fri, 8 Jun 2018 14:25:02 +1000
Subject: [PATCH 1097/1124] Fix current media time type in BreaksEvent

---
 types/chromecast-caf-receiver/cast.framework.events.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/chromecast-caf-receiver/cast.framework.events.d.ts b/types/chromecast-caf-receiver/cast.framework.events.d.ts
index 0ad1bfee8c..0c69727a05 100644
--- a/types/chromecast-caf-receiver/cast.framework.events.d.ts
+++ b/types/chromecast-caf-receiver/cast.framework.events.d.ts
@@ -378,7 +378,7 @@ declare namespace cast.framework.events {
         /**
          * The time in the currently playing media when the break event occurred.
          */
-        currentMediaTime?: string;
+        currentMediaTime?: number;
 
         /**
          * The reason the break clip ended.

From bc93f0695f1aeef6c0dc0a801e0a21af2fb8b411 Mon Sep 17 00:00:00 2001
From: ComFreek <comfreek@outlook.com>
Date: Sat, 2 Jun 2018 18:17:19 +0200
Subject: [PATCH 1098/1124] libxmljs: add typings for latest version

Important changes of the v0.18 version:

- The previous libxmljs-tests.ts file used a require, thus made any
  variable from the imported 'libxmljs' typed 'any'. Hence, the test file
  actually tested no type declarations at all.
  This has been fixed via an ordinary 'import' statement.
- Enabled strict null checks in tsconfig.json
- Removed some exported classes (such as XMLDocument, HTMLDocument)
which are neither used nor exported anymore in more recent libxmljs versions.
- Added null return values to functions which sometimes return null,
  e.g. prevSibling(): Node|null.
---
 types/libxmljs/index.d.ts         | 207 +++++++++++++++++++-----------
 types/libxmljs/libxmljs-tests.ts  |  39 +++---
 types/libxmljs/tsconfig.json      |   2 +-
 types/libxmljs/tslint.json        |  80 +-----------
 types/libxslt/index.d.ts          |  56 +++-----
 types/libxslt/internal-types.d.ts |  11 ++
 types/libxslt/libxslt-tests.ts    |   4 +-
 types/libxslt/tsconfig.json       |   1 +
 types/libxslt/tslint.json         |  80 +-----------
 9 files changed, 187 insertions(+), 293 deletions(-)
 create mode 100644 types/libxslt/internal-types.d.ts

diff --git a/types/libxmljs/index.d.ts b/types/libxmljs/index.d.ts
index ceeb1a3783..7fc9e9e2bf 100644
--- a/types/libxmljs/index.d.ts
+++ b/types/libxmljs/index.d.ts
@@ -1,114 +1,173 @@
-// Type definitions for Libxmljs v0.14.2
-// Project: https://github.com/polotek/libxmljs
+// Type definitions for Libxmljs 0.18
+// Project: https://github.com/libxmljs/libxmljs
 // Definitions by: François de Campredon <https://github.com/fdecampredon>
+//                 ComFreek <https://github.com/ComFreek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
+import { EventEmitter } from 'events';
 
+export const version: string;
+export const libxml_version: string;
+export const libxml_parser_version: string;
 
+// tslint:disable-next-line:strict-export-declare-modifiers
+interface ParseOptions {
+    [optionName: string]: string;
+}
 
-import events = require('events');
+export function parseXml(source: string, options?: ParseOptions): Document;
+export function parseXmlString(source: string, options?: ParseOptions): Document;
 
-export declare function parseXml(source: string): XMLDocument;
-export declare function parseHtml(source: string): HTMLDocument;
-export declare function parseXmlString(source: string, options?: { [key: string]: string }): XMLDocument;
-export declare function parseHtmlString(source: string): HTMLDocument;
+export function parseHtml(source: string, options?: ParseOptions): Document;
+export function parseHtmlString(source: string, options?: ParseOptions): Document;
+export function parseHtmlFragment(source: string, options?: ParseOptions): Document;
 
+export function memoryUsage(): number;
+export function nodeCount(): number;
 
-export declare class XMLDocument {
-    constructor(version: number, encoding: string);
-    child(idx: number): Element | undefined;
+export class Document {
+    /**
+     * Create a new XML Document
+     * @param version XML document version, defaults to 1.0
+     * @param encoding Encoding, defaults to utf8
+     */
+    constructor(version?: number, encoding?: string);
+
+    errors: SyntaxError[];
+
+    child(idx: number): Element|null;
     childNodes(): Element[];
-    errors(): SyntaxError[];
     encoding(): string;
-    encoding(enc: string): void;
+    encoding(enc: string): this;
     find(xpath: string): Element[];
-    get(xpath: string): Element | undefined;
-    node(name: string, content: string): Element;
-    root(): Element;
-    toString(): string;
-    validate(xsdDoc: XMLDocument): boolean;
-    validationErrors: XmlError[];
-    version(): Number;
+    get(xpath: string): Element|null;
+    node(name: string, content?: string): Element;
+    root(): Element|null;
+    root(newRoot: Node): Node;
+    toString(formatted?: boolean): string;
+    type(): 'document';
+    version(): string;
+    setDtd(name: string, ext: string, sys: string): void;
+    getDtd(): {
+        name: string;
+        externalId: string;
+        systemId: string;
+    };
 }
 
-export declare class HTMLDocument extends XMLDocument {
+export class Node {
+    doc(): Document;
+    parent(): Element|Document;
+    /**
+     * The namespace or null in case of comment nodes
+     */
+    namespace(): Namespace|null;
 
+    /**
+     * An array of namespaces that the object belongs to.
+     *
+     * @param local If it is true, only the namespace declarations local to this
+     *              node are returned, rather than all of the namespaces in scope
+     *              at this node (including the ones from the parent elements).
+     */
+    namespaces(local?: boolean): Namespace[];
+
+    prevSibling(): Node|null;
+    nextSibling(): Node|null;
+
+    type(): 'comment'|'element'|'text'|'attribute';
+    remove(): this;
+    clone(): this;
+    /**
+     * Serializes the node to a string. The string will contain all contents of the node formatted as XML and can be used to print the node.
+     */
+    toString(format?: boolean|{
+        declaration: boolean;
+        selfCloseEmpty: boolean;
+        whitespace: boolean;
+        type: 'xml'|'html'|'xhtml'
+    }): string;
 }
 
-
-export declare class Element {
-    constructor(doc: XMLDocument, name: string, content?: string);
+export class Element extends Node {
+    constructor(doc: Document, name: string, content?: string);
+    node(name: string, content?: string): Element;
     name(): string;
-    name(newName: string): void;
+    name(newName: string): this;
     text(): string;
-    attr(name: string): Attribute;
-    attr(attr: Attribute): void;
-    attr(attrObject: { [key: string]: string; }): void;
+    text(newText: string): this;
+    attr(name: string): Attribute|null;
+    attr(attrObject: { [key: string]: string; }): this;
     attrs(): Attribute[];
-    parent(): Element;
-    doc(): XMLDocument;
-    child(idx: number): Element | undefined;
-    childNodes(): Element[];
-    addChild(child: Element): Element;
-    nextSibling(): Element;
-    nextElement(): Element;
-    addNextSibling(siblingNode: Element): Element;
-    prevSibling(): Element;
-    prevElement(): Element;
-    addPrevSibling(siblingNode: Element): Element;
-    find(xpath: string): Element[];
-    find(xpath: string, ns_uri: string): Element[];
-    find(xpath: string, namespaces: { [key: string]: string; }): Element[];
-    get(xpath: string): Element | undefined;
-    get(xpath: string, ns_uri: string): Element | undefined;
-    get(xpath: string, ns_uri: { [key: string]: string; }): Element | undefined;
-    defineNamespace(href: string): Namespace;
-    defineNamespace(prefix: string, href: string): Namespace;
-    namespace(): Namespace;
-    namespace(ns: Namespace): void;
-    namespace(href: string): void;
-    namespace(prefix: string, href: string): void;
-    remove(): void;
+
+    doc(): Document;
+    child(idx: number): Node | null;
+    childNodes(): Node[];
+
+    /**
+     * @return The original element, not the child.
+     */
+    addChild(child: Element): this;
+
+    prevElement(): Element|null;
+    nextElement(): Element|null;
+    addNextSibling(siblingNode: Node): Node;
+
+    find(xpath: string, ns_uri?: string): Node[];
+    find(xpath: string, namespaces: { [key: string]: string; }): Node[];
+    get(xpath: string, ns_uri?: string): Element|null;
+
+    defineNamespace(prefixOrHref: string, hrefInCaseOfPrefix?: string): Namespace;
+
+    namespace(): Namespace|null;
+    namespace(newNamespace: Namespace): this;
+    namespace(prefixOrHref: string, hrefInCaseOfPrefix?: string): Namespace;
+
+    replace(replacement: string): string;
+    replace(replacement: Element): Element;
+
     path(): string;
-    type(): string;
 }
 
-
-export declare class Attribute {
-    constructor(node: Element, name: string, value: string);
-    constructor(node: Element, name: string, value: string, ns: Namespace);
+export class Attribute {
     name(): string;
-    namespace(): Namespace;
-    namespace(ns: Namespace): Namespace;
-    nextSibling(): Attribute;
-    node(): Element;
-    prevSibling(): Attribute;
-    remove(): void;
     value(): string;
+    value(newValue: string): Attribute;
+    namespace(): Namespace;
+
+    remove(): void;
 }
 
-export declare class Namespace {
-    constructor(node: Element, prefix: string, href: string);
+export class Namespace {
     href(): string;
     prefix(): string;
 }
 
-export declare class SaxParser extends events.EventEmitter {
+export class SaxParser extends EventEmitter {
+    constructor();
     parseString(source: string): boolean;
 }
 
-
-export declare class SaxPushParser extends events.EventEmitter {
+export class SaxPushParser extends EventEmitter {
+    constructor();
     push(source: string): boolean;
 }
 
-export interface XmlError {
-    domain: number;
-    code: number;
-    message: string;
-    level: number;
-    file?: string;
+export interface SyntaxError {
+    domain: number|null;
+    code: number|null;
+    message: string|null;
+    level: number|null;
+    file: string|null;
+    line: number|null;
+    /**
+     * 1-based column number, 0 if not applicable/available.
+     */
     column: number;
-    line: number;
+
+    str1: number|null;
+    str2: number|null;
+    str3: number|null;
+    int1: number|null;
 }
diff --git a/types/libxmljs/libxmljs-tests.ts b/types/libxmljs/libxmljs-tests.ts
index 87d634aab4..367d74c69d 100644
--- a/types/libxmljs/libxmljs-tests.ts
+++ b/types/libxmljs/libxmljs-tests.ts
@@ -1,7 +1,6 @@
+import * as libxmljs from 'libxmljs';
 
-
-var libxmljs = require("libxmljs");
-var xml =  '<?xml version="1.0" encoding="UTF-8"?>' +
+const xml =  '<?xml version="1.0" encoding="UTF-8"?>' +
            '<root>' +
                '<child foo="bar">' +
                    '<grandchild baz="fizbuzz">grandchild content</grandchild>' +
@@ -9,40 +8,42 @@ var xml =  '<?xml version="1.0" encoding="UTF-8"?>' +
                '<sibling>with content!</sibling>' +
            '</root>';
 
-var xmlDoc = libxmljs.parseXml(xml);
+const xmlDoc = libxmljs.parseXml(xml);
 
 // xpath queries
-var gchild = xmlDoc.get('//grandchild');
+const gchild = xmlDoc.get('//grandchild')!;
 
 console.log(gchild.text());  // prints "grandchild content"
 
-var children = xmlDoc.root().childNodes();
-var child = children[0];
+const children = xmlDoc.root()!.childNodes();
+const child = children[0] as libxmljs.Element;
 
-console.log(child.attr('foo').value()); // prints "bar"
+console.log(child.attr('foo')!.value()); // prints "bar"
 
-var parser = new libxmljs.SaxParser();
+const parser = new libxmljs.SaxParser();
 
-parser.on('startDocument', null);
-parser.on('startElement', null);
+parser.on('startDocument', () => 0);
+parser.on('startElement', () => 0);
 
-var parser2 = new libxmljs.SaxPushParser();
+const parser2 = new libxmljs.SaxPushParser();
 
 // connect any callbacks here
 parser2
-  .on('startDocument', null)
-  .on('startElement', null)
+  .on('startDocument', () => 0)
+  .on('startElement', () => 0);
 
-var xmlChunk: any;
+const xmlChunk = '';
 
-while(xmlChunk) {
+while (xmlChunk) {
   parser2.push(xmlChunk);
 }
 
-var doc = new libxmljs.Document();
-  doc.node('root')
+const doc = new libxmljs.Document();
+  ((doc.node('root')
     .node('child').attr({foo: 'bar'})
       .node('grandchild', 'grandchild content').attr({baz: 'fizbuzz'})
     .parent()
-  .parent()
+  )  as libxmljs.Element).parent()
     .node('sibling', 'with content!');
+
+const {name, externalId, systemId} = doc.getDtd();
diff --git a/types/libxmljs/tsconfig.json b/types/libxmljs/tsconfig.json
index 7201fffe81..45835560c6 100644
--- a/types/libxmljs/tsconfig.json
+++ b/types/libxmljs/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/libxmljs/tslint.json b/types/libxmljs/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/libxmljs/tslint.json
+++ b/types/libxmljs/tslint.json
@@ -1,79 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/libxslt/index.d.ts b/types/libxslt/index.d.ts
index 329525d7df..3b400d08e7 100644
--- a/types/libxslt/index.d.ts
+++ b/types/libxslt/index.d.ts
@@ -1,59 +1,37 @@
-// Type definitions for node-libxslt
+// Type definitions for node-libxslt 0.7
 // Project: https://github.com/albanm/node-libxslt
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="libxmljs" />
+// TypeScript Version: 2.2
 
 import * as xmljs from 'libxmljs';
 
+import {
+	ApplyCallback,
+	ApplyResult,
+	ApplyStringCallback,
+	OutputFormat,
+	ParseCallback
+} from './internal-types';
 export const libxmljs: typeof xmljs;
 
-type OutputFormat = 'document' | 'string';
-
 export interface ApplyOptions {
 	outputFormat?: OutputFormat;
 	noWrapParams?: boolean;
 }
 
-type ApplyResult = string | xmljs.XMLDocument;
-
-type ApplyCallback = (err: Error, result: ApplyResult) => void;
-
-type ApplyStringCallback = (err: Error, result: string) => void;
-
-type ApplyDocumentCallback = (err: Error, result: xmljs.XMLDocument) => void;
-
 export interface Stylesheet {
-	apply(source: string, params?: Object): string;
-
-	apply(source: string, params: Object, options: ApplyOptions): ApplyResult;
-
-	apply(source: string, params: Object, options: ApplyOptions, callback: ApplyCallback): void;
-
-	apply(source: string, callback: ApplyStringCallback): void;
-
-	apply(source: xmljs.XMLDocument, params?: Object): xmljs.XMLDocument;
-
-	apply(source: xmljs.XMLDocument, params: Object, options: ApplyOptions): ApplyResult;
-
-	apply(source: xmljs.XMLDocument, params: Object, options: ApplyOptions, callback: ApplyCallback): void;
-
-	apply(source: xmljs.XMLDocument, callback: ApplyDocumentCallback): void;
-
-	applyToFile(sourcePath: string, params: Object, options: ApplyOptions, callback: ApplyStringCallback): void;
+	apply(source: string, params?: object): string;
+	apply(source: string|xmljs.Document, params: object, options: ApplyOptions): ApplyResult;
+	apply(source: string|xmljs.Document, params: object, options: ApplyOptions, callback: ApplyCallback): void;
+	apply(source: string|xmljs.Document, callback: ApplyStringCallback): void;
+	apply(source: xmljs.Document, params?: object): xmljs.Document;
 
+	applyToFile(sourcePath: string, params: object, options: ApplyOptions, callback: ApplyStringCallback): void;
 	applyToFile(sourcePath: string, callback: ApplyStringCallback): void;
 }
 
-type ParseCallback = (err: Error, stylesheet: Stylesheet) => void;
-
-export function parse(source: string): Stylesheet;
-
-export function parse(source: string, callback: ParseCallback): void;
-
-export function parse(source: xmljs.XMLDocument): Stylesheet;
-
-export function parse(source: xmljs.XMLDocument, callback: ParseCallback): void;
+export function parse(source: string|xmljs.Document): Stylesheet;
+export function parse(source: string|xmljs.Document, callback: ParseCallback): void;
 
 export function parseFile(sourcePath: string, callback: ParseCallback): void;
diff --git a/types/libxslt/internal-types.d.ts b/types/libxslt/internal-types.d.ts
new file mode 100644
index 0000000000..a0d4041e52
--- /dev/null
+++ b/types/libxslt/internal-types.d.ts
@@ -0,0 +1,11 @@
+import * as xmljs from 'libxmljs';
+import { Stylesheet } from './index';
+
+export type OutputFormat = 'document' | 'string';
+
+export type ApplyResult = string | xmljs.Document;
+export type ApplyCallback = (err: Error, result: ApplyResult) => void;
+export type ApplyStringCallback = (err: Error, result: string) => void;
+export type ApplyDocumentCallback = (err: Error, result: xmljs.Document) => void;
+
+export type ParseCallback = (err: Error, stylesheet: Stylesheet) => void;
diff --git a/types/libxslt/libxslt-tests.ts b/types/libxslt/libxslt-tests.ts
index bed54e5f52..1530ad0eb1 100644
--- a/types/libxslt/libxslt-tests.ts
+++ b/types/libxslt/libxslt-tests.ts
@@ -1,7 +1,7 @@
 import * as libxslt from 'libxslt';
 import * as libxmljs from 'libxmljs';
 
-const document: libxmljs.XMLDocument = libxslt.libxmljs.parseXmlString('<xml></xml>');
+const document: libxmljs.Document = libxslt.libxmljs.parseXmlString('<xml></xml>');
 
 let stylesheet: libxslt.Stylesheet;
 
@@ -36,7 +36,7 @@ applyOptions = {
 
 let transformedString: string;
 
-let transformedDocument: libxmljs.XMLDocument;
+let transformedDocument: libxmljs.Document;
 
 transformedString = stylesheet.apply('<xml></xml>');
 
diff --git a/types/libxslt/tsconfig.json b/types/libxslt/tsconfig.json
index a7f7f94ffc..00f8d27037 100644
--- a/types/libxslt/tsconfig.json
+++ b/types/libxslt/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "internal-types.d.ts",
         "libxslt-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/libxslt/tslint.json b/types/libxslt/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/libxslt/tslint.json
+++ b/types/libxslt/tslint.json
@@ -1,79 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
+{ "extends": "dtslint/dt.json" }

From 16acbedbaa8530da2a054379dbb5e2e03e92f7a3 Mon Sep 17 00:00:00 2001
From: danielcollette <daniel.collette@pb.com>
Date: Fri, 8 Jun 2018 14:29:27 -0400
Subject: [PATCH 1099/1124] change to PathOptions or MarkerOptions

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

diff --git a/types/leaflet.locatecontrol/index.d.ts b/types/leaflet.locatecontrol/index.d.ts
index 458f7232ca..0afcd0d613 100644
--- a/types/leaflet.locatecontrol/index.d.ts
+++ b/types/leaflet.locatecontrol/index.d.ts
@@ -27,7 +27,7 @@ declare module 'leaflet' {
             drawMarker?: boolean;
             markerClass?: any;
             circleStyle?: PathOptions;
-            markerStyle?: any;
+            markerStyle?: PathOptions | MarkerOptions;
             followCircleStyle?: PathOptions;
             followMarkerStyle?: PathOptions;
             icon?: string;

From 0f53b0059db2cf39c09d7992c34e4b2db926d6b5 Mon Sep 17 00:00:00 2001
From: Sunny Juneja <jr.sunny@gmail.com>
Date: Fri, 8 Jun 2018 15:46:23 -0700
Subject: [PATCH 1100/1124] Chartist: Relax constraints on meta.

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

diff --git a/types/chartist/chartist-tests.ts b/types/chartist/chartist-tests.ts
index 53ba63497c..270e6e0970 100644
--- a/types/chartist/chartist-tests.ts
+++ b/types/chartist/chartist-tests.ts
@@ -247,7 +247,7 @@ new Chartist.Pie('.ct-chart', {
         value: 70,
         name: 'Series 3',
         className: 'my-custom-class-three',
-        meta: 'Meta Three'
+        meta: {  description: 'Meta Three' }
     }]
 });
 
diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index a4fb2c832d..80cc589ee2 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -1,6 +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>, Sunny Juneja <https://github.com/sunnyrjuneja>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Chartist {
@@ -101,7 +101,7 @@ declare namespace Chartist {
         value?: number;
         data?: Array<number>;
         className?: string;
-        meta?: string; // I assume this could probably be a number as well?
+        meta?: any;
     }
 
     interface IChartistBase<T extends IChartOptions> {

From 42e514d82c6971218608e8d07519d6d537a7cc2d Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 8 Jun 2018 16:50:54 -0700
Subject: [PATCH 1101/1124] ember: Fix no-unnecessary-class error (#26392)

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 91c45b94e7..56a0879ae5 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -2368,7 +2368,7 @@ declare module 'ember' {
             function Exception(message: string): void;
             class SafeString {
                 constructor(str: string);
-                static toString(): string;
+                toString(): string;
             }
             function parse(string: string): any;
             function print(ast: any): void;
diff --git a/types/ember/tslint.json b/types/ember/tslint.json
index 7069614893..f77f8d2ed8 100755
--- a/types/ember/tslint.json
+++ b/types/ember/tslint.json
@@ -24,8 +24,6 @@
         "only-arrow-functions": false,
         "no-submodule-imports": false,
 
-        "no-unnecessary-class": false,
-
         // false positives
         "unified-signatures": false
     }

From 6bddfd9921357e6dea040dee8724717a6d3a1e86 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Fri, 1 Jun 2018 20:42:29 -0700
Subject: [PATCH 1102/1124] More robust Mocha definitions

---
 types/ember-mocha/ember-mocha-tests.ts |    2 +-
 types/ember-mocha/index.d.ts           |    3 +-
 types/mocha/UNUSED_FILES.txt           |    2 -
 types/mocha/index.d.ts                 | 3166 ++++++++++++++++++++----
 types/mocha/lib/interfaces/common.d.ts |  109 +
 types/mocha/lib/ms.d.ts                |   17 +
 types/mocha/mocha-node-tests.ts        |   37 -
 types/mocha/mocha-node.d.ts            |   16 -
 types/mocha/mocha-tests.ts             | 1440 ++++++++---
 types/mocha/tsconfig.json              |    2 +
 10 files changed, 3915 insertions(+), 879 deletions(-)
 delete mode 100644 types/mocha/UNUSED_FILES.txt
 create mode 100644 types/mocha/lib/interfaces/common.d.ts
 create mode 100644 types/mocha/lib/ms.d.ts
 delete mode 100644 types/mocha/mocha-node-tests.ts
 delete mode 100644 types/mocha/mocha-node.d.ts

diff --git a/types/ember-mocha/ember-mocha-tests.ts b/types/ember-mocha/ember-mocha-tests.ts
index 3516932eec..75d1154a87 100644
--- a/types/ember-mocha/ember-mocha-tests.ts
+++ b/types/ember-mocha/ember-mocha-tests.ts
@@ -3,7 +3,7 @@ import {
     setResolver, setupAcceptanceTest, setupComponentTest,
     setupModelTest, setupTest
 } from 'ember-mocha';
-import { context, describe, it, beforeEach, afterEach, before, after } from 'mocha';
+import { describe, it, beforeEach, afterEach, before, after } from 'mocha';
 import chai = require('chai');
 import Ember from "ember";
 import hbs from 'htmlbars-inline-precompile';
diff --git a/types/ember-mocha/index.d.ts b/types/ember-mocha/index.d.ts
index 1d24564e31..84510eee38 100644
--- a/types/ember-mocha/index.d.ts
+++ b/types/ember-mocha/index.d.ts
@@ -60,6 +60,5 @@ declare module 'ember-mocha' {
 
 declare module 'mocha' {
     // augment test callback context
-    interface ITestCallbackContext extends TestContext {}
-    interface IHookCallbackContext extends TestContext {}
+    interface Context extends TestContext {}
 }
diff --git a/types/mocha/UNUSED_FILES.txt b/types/mocha/UNUSED_FILES.txt
deleted file mode 100644
index 2c70329a00..0000000000
--- a/types/mocha/UNUSED_FILES.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-mocha-node.d.ts
-mocha-node-tests.ts
\ No newline at end of file
diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 2dd6bb2c21..1ada77c0a4 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -9,261 +9,2146 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
+export = Mocha;
+export as namespace Mocha;
+
 /**
- * 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.
+ * Mocha API
  *
- * @see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/25117#issuecomment-383404187
+ * @see https://mochajs.org/api/mocha
  */
-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;
-  }
+declare class Mocha {
+    private _growl;
+    private _reporter;
+    private _ui;
 
-  interface MochaSetupOptions {
-    // milliseconds to wait before considering a test slow
-    slow?: number;
+    constructor(options?: Mocha.MochaOptions);
 
-    // timeout in milliseconds
-    timeout?: number;
-
-    // ui name "bdd", "tdd", "exports" etc
-    ui?: Mocha.Interface;
-
-    // array of accepted globals
-    globals?: any[];
-
-    // reporter instance (function or string), defaults to `mocha.reporters.Spec`
-    reporter?: string | ReporterConstructor;
-
-    // bail on the first test failure
-    bail?: boolean;
-
-    // ignore global leaks
-    ignoreLeaks?: boolean;
-
-    // grep string or regexp to filter tests with
-    grep?: any;
-
-    // require modules before running tests
-    require?: string[];
-
-    asyncOnly?: boolean;
-    delay?: boolean;
-    files?: string[];
-    forbidOnly?: boolean;
-    forbidPending?: boolean;
-    fullStackTrace?: boolean;
-    hasOnly?: boolean;
-  }
-
-  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;
-
-  // Used with the --delay flag; see https://mochajs.org/#hooks
-  declare function run(): void;
-
-  type MochaDone = (error?: any) => void;
-
-  declare function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-  declare function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-  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 {
-    currentTest: Mocha.ITestDefinition;
-    suite: Mocha.ISuite;
+    suite: Mocha.Suite;
     files: string[];
-    options: MochaSetupOptions;
+    options: Mocha.MochaInstanceOptions;
 
-    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;
-    bail(value?: boolean): Mocha;
-    addFile(file: string): Mocha;
-    /** Sets reporter by name, defaults to "spec". */
-    reporter(name: string, reporterOptions?: any): Mocha;
-    /** Sets reporter constructor, defaults to mocha.reporters.Spec. */
-    reporter(reporter: ReporterConstructor, reporterOptions?: any): Mocha;
-    ui(value: string): Mocha;
-    grep(value: string): Mocha;
-    grep(value: RegExp): Mocha;
-    invert(): Mocha;
-    ignoreLeaks(value: boolean): Mocha;
-    checkLeaks(): Mocha;
     /**
-     * Function to allow assertion libraries to throw errors directly into mocha.
-     * This is useful when running tests in a browser because window.onerror will
-     * only receive the 'message' attribute of the Error.
+     * Enable or disable bailing on the first failure.
+     *
+     * @see https://mochajs.org/api/mocha#bail
      */
-    throwError(error: Error): void;
-    /** Enables growl support. */
-    growl(): Mocha;
-    globals(value: string): Mocha;
-    globals(values: string[]): Mocha;
-    useColors(value: boolean): Mocha;
-    useInlineDiffs(value: boolean): Mocha;
-    timeout(value: number): Mocha;
-    slow(value: number): Mocha;
-    enableTimeouts(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;
+    bail(bail?: boolean): this;
 
-    // internals exposed via exports.*
-    Runnable: Mocha.Runnable;
-    Context: Mocha.Context;
-    Runner: Mocha.Runner;
-    Suite: Mocha.Suite;
-    Hook: Mocha.Hook;
-    Test: Mocha.Test;
-  }
+    /**
+     * Add test `file`.
+     *
+     * @see https://mochajs.org/api/mocha#addFile
+     */
+    addFile(file: string): this;
 
-  // merge the Mocha class declaration with a module
-  declare namespace Mocha {
-    /** Third-party declarations that want to add new interfaces can contribute names here */
-    interface InterfaceContributions {
-        bdd: any;
-        tdd: any;
-        qunit: any;
-        exports: any;
+    /**
+     * Set reporter to one of the built-in reporters.
+     *
+     * @see https://mochajs.org/api/mocha#reporter
+     */
+    reporter(reporter: Mocha.Reporter, reporterOptions?: any): this;
+
+    /**
+     * Set reporter to the provided constructor, one of the built-in reporters, or loads a reporter
+     * from a module path. Defaults to `"spec"`.
+     *
+     * @see https://mochajs.org/api/mocha#reporter
+     */
+    reporter(reporter?: string | Mocha.ReporterConstructor, reporterOptions?: any): this;
+
+    /**
+     * Set test UI to one of the built-in test interfaces.
+     *
+     * @see https://mochajs.org/api/mocha#ui
+     */
+    ui(name: Mocha.Interface): this;
+
+    /**
+     * Set test UI to one of the built-in test interfaces or loads a test interface from a module
+     * path. Defaults to `"bdd"`.
+     *
+     * @see https://mochajs.org/api/mocha#ui
+     */
+    ui(name?: string): this;
+
+    /**
+     * Escape string and add it to grep as a RegExp.
+     *
+     * @see https://mochajs.org/api/mocha#fgrep
+     */
+    fgrep(str: string): this;
+
+    /**
+     * Add regexp to grep, if `re` is a string it is escaped.
+     *
+     * @see https://mochajs.org/api/mocha#grep
+     */
+    grep(re: string | RegExp): this;
+
+    /**
+     * Invert `.grep()` matches.
+     *
+     * @see https://mochajs.org/api/mocha#invert
+     */
+    invert(): this;
+
+    /**
+     * Ignore global leaks.
+     *
+     * @see https://mochajs.org/api/mocha#ignoreLeaks
+     */
+    ignoreLeaks(ignore: boolean): this;
+
+    /**
+     * Enable global leak checking.
+     *
+     * @see https://mochajs.org/api/mocha#checkLeaks
+     */
+    checkLeaks(): this;
+
+    /**
+     * Display long stack-trace on failing
+     *
+     * @see https://mochajs.org/api/mocha#fullTrace
+     */
+    fullTrace(): this;
+
+    /**
+     * Enable growl support.
+     *
+     * @see https://mochajs.org/api/mocha#growl
+     */
+    growl(): this;
+
+    /**
+     * Ignore `globals` array or string.
+     *
+     * @see https://mochajs.org/api/mocha#globals
+     */
+    globals(globals: string | ReadonlyArray<string>): this;
+
+    /**
+     * Emit color output.
+     *
+     * @see https://mochajs.org/api/mocha#useColors
+     */
+    useColors(colors: boolean): this;
+
+    /**
+     * Use inline diffs rather than +/-.
+     *
+     * @see https://mochajs.org/api/mocha#useInlineDiffs
+     */
+    useInlineDiffs(inlineDiffs: boolean): this;
+
+    /**
+     * Do not show diffs at all.
+     *
+     * @see https://mochajs.org/api/mocha#hideDiff
+     */
+    hideDiff(hideDiff: boolean): this;
+
+    /**
+     * Set the timeout in milliseconds.
+     *
+     * @see https://mochajs.org/api/mocha#timeout
+     */
+    timeout(timeout: string | number): this;
+
+    /**
+     * Set the number of times to retry failed tests.
+     *
+     * @see https://mochajs.org/api/mocha#retries
+     */
+    retries(n: number): this;
+
+    /**
+     * Set slowness threshold in milliseconds.
+     *
+     * @see https://mochajs.org/api/mocha#slow
+     */
+    slow(slow: string | number): this;
+
+    /**
+     * Enable timeouts.
+     *
+     * @see https://mochajs.org/api/mocha#enableTimeouts
+     */
+    enableTimeouts(enabled?: boolean): this;
+
+    /**
+     * Makes all tests async (accepting a callback)
+     *
+     * @see https://mochajs.org/api/mocha#asyncOnly.
+     */
+    asyncOnly(): this;
+
+    /**
+     * Disable syntax highlighting (in browser).
+     *
+     * @see https://mochajs.org/api/mocha#noHighlighting
+     */
+    noHighlighting(): this;
+
+    /**
+     * Enable uncaught errors to propagate (in browser).
+     *
+     * @see https://mochajs.org/api/mocha#allowUncaught
+     */
+    allowUncaught(): boolean;
+
+    /**
+     * Delay root suite execution.
+     *
+     * @see https://mochajs.org/api/mocha#delay
+     */
+    delay(): boolean;
+
+    /**
+     * Tests marked only fail the suite
+     *
+     * @see https://mochajs.org/api/mocha#forbidOnly
+     */
+    forbidOnly(): boolean;
+
+    /**
+     * Pending tests and tests marked skip fail the suite
+     *
+     * @see https://mochajs.org/api/mocha#forbidPending
+     */
+    forbidPending(): boolean;
+
+    /**
+     * Run tests and invoke `fn()` when complete.
+     *
+     * Note that `run` relies on Node's `require` to execute
+     * the test interface functions and will be subject to the
+     * cache - if the files are already in the `require` cache,
+     * they will effectively be skipped. Therefore, to run tests
+     * multiple times or to run tests in files that are already
+     * in the `require` cache, make sure to clear them from the
+     * cache first in whichever manner best suits your needs.
+     *
+     * @see https://mochajs.org/api/mocha#run
+     */
+    run(fn?: (failures: number) => void): Mocha.Runner;
+
+    /**
+     * Load registered files.
+     *
+     * @see https://mochajs.org/api/mocha#loadFiles
+     */
+    protected loadFiles(fn?: () => void): void;
+}
+
+declare namespace Mocha {
+    namespace utils {
+        /**
+         * Compute a slug from the given `str`.
+         *
+         * @see https://mochajs.org/api/module-utils.html#.slug
+         */
+        function slug(str: string): string;
+
+        /**
+         * Strip the function definition from `str`, and re-indent for pre whitespace.
+         *
+         * @see https://mochajs.org/api/module-utils.html#.clean
+         */
+        function clean(str: string): string;
+
+        /**
+         * Highlight the given string of `js`.
+         */
+        function highlight(js: string): string;
+
+        /**
+         * Takes some variable and asks `Object.prototype.toString()` what it thinks it is.
+         */
+        function type(value: any): string;
+
+        /**
+         * Stringify `value`. Different behavior depending on type of value:
+         *
+         * - If `value` is undefined or null, return `'[undefined]'` or `'[null]'`, respectively.
+         * - If `value` is not an object, function or array, return result of `value.toString()` wrapped in double-quotes.
+         * - If `value` is an *empty* object, function, or array, returns `'{}'`, `'[Function]'`, or `'[]'` respectively.
+         * - If `value` has properties, call canonicalize} on it, then return result of `JSON.stringify()`
+         *
+         * @see https://mochajs.org/api/module-utils.html#.stringify
+         */
+        function stringify(value: any): string;
+
+        /**
+         * Return a new Thing that has the keys in sorted order. Recursive.
+         *
+         * If the Thing...
+         * - has already been seen, return string `'[Circular]'`
+         * - is `undefined`, return string `'[undefined]'`
+         * - is `null`, return value `null`
+         * - is some other primitive, return the value
+         * - is not a primitive or an `Array`, `Object`, or `Function`, return the value of the Thing's `toString()` method
+         * - is a non-empty `Array`, `Object`, or `Function`, return the result of calling this function again.
+         * - is an empty `Array`, `Object`, or `Function`, returns `'[]'`, `'{}'`, or `'[Function]'` respectively.
+         *
+         * @see https://mochajs.org/api/module-utils.html#.canonicalize
+         */
+        function canonicalize(value: any, stack: any[], typeHint: string): any;
+
+        /**
+         * Lookup file names at the given `path`.
+         *
+         * @see https://mochajs.org/api/Mocha.utils.html#.exports.lookupFiles
+         */
+        function lookupFiles(filepath: string, extensions?: string[], recursive?: boolean): string[];
+
+        /**
+         * Generate an undefined error with a message warning the user.
+         *
+         * @see https://mochajs.org/api/module-utils.html#.undefinedError
+         */
+        function undefinedError(): Error;
+
+        /**
+         * Generate an undefined error if `err` is not defined.
+         *
+         * @see https://mochajs.org/api/module-utils.html#.getError
+         */
+        function getError(err: Error | undefined): Error;
+
+        /**
+         * When invoking this function you get a filter function that get the Error.stack as an
+         * input, and return a prettify output. (i.e: strip Mocha and internal node functions from
+         * stack trace).
+         *
+         * @see https://mochajs.org/api/module-utils.html#.stackTraceFilter
+         */
+        function stackTraceFilter(): (stack: string) => string;
     }
 
-    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;
+    namespace interfaces {
+        function bdd(suite: Suite): void;
+        function tdd(suite: Suite): void;
+        function qunit(suite: Suite): void;
+        function exports(suite: Suite): void;
     }
 
-    interface ISuiteCallbackContext {
-        timeout(ms: number | string): this;
-        retries(n: number): this;
-        slow(ms: number): this;
+    // #region Test interface augmentations
+
+    interface HookFunction {
+        /**
+         * [bdd, qunit, tdd] Describe a "hook" to execute the given callback `fn`. The name of the
+         * function is used as the name of the hook.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: Func): void;
+
+        /**
+         * [bdd, qunit, tdd] Describe a "hook" to execute the given callback `fn`. The name of the
+         * function is used as the name of the hook.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: AsyncFunc): void;
+
+        /**
+         * [bdd, qunit, tdd] Describe a "hook" to execute the given `title` and callback `fn`.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (name: string, fn?: Func): void;
+
+        /**
+         * [bdd, qunit, tdd] Describe a "hook" to execute the given `title` and callback `fn`.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (name: string, fn?: AsyncFunc): void;
     }
 
-    interface IHookCallbackContext {
-        skip(): this;
-        timeout(ms: number | string): this;
-        [index: string]: any;
+    interface SuiteFunction {
+        /**
+         * [bdd, tdd] Describe a "suite" with the given `title` and callback `fn` containing
+         * nested suites.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn: (this: Suite) => void): Suite;
+
+        /**
+         * [qunit] Describe a "suite" with the given `title`.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string): Suite;
+
+        /**
+         * [bdd, tdd, qunit] Indicates this suite should be executed exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        only: ExclusiveSuiteFunction;
+
+        /**
+         * [bdd, tdd] Indicates this suite should not be executed.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        skip: PendingSuiteFunction;
     }
 
-    interface ITestCallbackContext {
-        skip(): this;
-        timeout(ms: number | string): this;
-        retries(n: number): this;
-        slow(ms: number): this;
-        [index: string]: any;
+    interface ExclusiveSuiteFunction {
+        /**
+         * [bdd, tdd] Describe a "suite" with the given `title` and callback `fn` containing
+         * nested suites. Indicates this suite should be executed exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn: (this: Suite) => void): Suite;
+
+        /**
+         * [qunit] Describe a "suite" with the given `title`. Indicates this suite should be executed
+         * exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string): Suite;
     }
 
-    /** Partial interface for Mocha's `Runnable` class. */
-    interface IRunnable extends GenericEventEmitter {
+    /**
+     * [bdd, tdd] Describe a "suite" with the given `title` and callback `fn` containing
+     * nested suites. Indicates this suite should not be executed.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @returns [bdd] `Suite`
+     * @returns [tdd] `void`
+     */
+    type PendingSuiteFunction = (title: string, fn: (this: Suite) => void) => Suite | void;
+
+    interface TestFunction {
+        /**
+         * Describe a specification or test-case with the given callback `fn` acting as a thunk.
+         * The name of the function is used as the name of the test.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: Func): Test;
+
+        /**
+         * Describe a specification or test-case with the given callback `fn` acting as a thunk.
+         * The name of the function is used as the name of the test.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: AsyncFunc): Test;
+
+        /**
+         * Describe a specification or test-case with the given `title` and callback `fn` acting
+         * as a thunk.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn?: Func): Test;
+
+        /**
+         * Describe a specification or test-case with the given `title` and callback `fn` acting
+         * as a thunk.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn?: AsyncFunc): Test;
+
+        /**
+         * Indicates this test should be executed exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        only: ExclusiveTestFunction;
+
+        /**
+         * Indicates this test should not be executed.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        skip: PendingTestFunction;
+
+        /**
+         * Number of attempts to retry.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        retries(n: number): void;
+    }
+
+    interface ExclusiveTestFunction {
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given callback `fn`
+         * acting as a thunk. The name of the function is used as the name of the test. Indicates
+         * this test should be executed exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: Func): Test;
+
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given callback `fn`
+         * acting as a thunk. The name of the function is used as the name of the test. Indicates
+         * this test should be executed exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: AsyncFunc): Test;
+
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given `title` and
+         * callback `fn` acting as a thunk. Indicates this test should be executed exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn?: Func): Test;
+
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given `title` and
+         * callback `fn` acting as a thunk. Indicates this test should be executed exclusively.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn?: AsyncFunc): Test;
+    }
+
+    interface PendingTestFunction {
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given callback `fn`
+         * acting as a thunk. The name of the function is used as the name of the test. Indicates
+         * this test should not be executed.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: Func): Test;
+
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given callback `fn`
+         * acting as a thunk. The name of the function is used as the name of the test. Indicates
+         * this test should not be executed.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (fn: AsyncFunc): Test;
+
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given `title` and
+         * callback `fn` acting as a thunk. Indicates this test should not be executed.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn?: Func): Test;
+
+        /**
+         * [bdd, tdd, qunit] Describe a specification or test-case with the given `title` and
+         * callback `fn` acting as a thunk. Indicates this test should not be executed.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        (title: string, fn?: AsyncFunc): Test;
+    }
+
+    /**
+     * Execute after each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#afterEach
+     */
+    let afterEach: HookFunction;
+
+    /**
+     * Execute after running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#after
+     */
+    let after: HookFunction;
+
+    /**
+     * Execute before each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#beforeEach
+     */
+    let beforeEach: HookFunction;
+
+    /**
+     * Execute before running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#before
+     */
+    let before: HookFunction;
+
+    /**
+     * Describe a "suite" containing nested suites and tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    let describe: SuiteFunction;
+
+    /**
+     * Describes a test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    let it: TestFunction;
+
+    /**
+     * Describes a pending test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    let xit: PendingTestFunction;
+
+    /**
+     * Execute before each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#beforeEach
+     */
+    let setup: HookFunction;
+
+    /**
+     * Execute before running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#before
+     */
+    let suiteSetup: HookFunction;
+
+    /**
+     * Execute after running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#after
+     */
+    let suiteTeardown: HookFunction;
+
+    /**
+     * Describe a "suite" containing nested suites and tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    let suite: SuiteFunction;
+
+    /**
+     * Execute after each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#afterEach
+     */
+    let teardown: HookFunction;
+
+    /**
+     * Describes a test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    let test: TestFunction;
+
+    /**
+     * Triggers root suite execution.
+     *
+     * - _Only available if flag --delay is passed into Mocha._
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#runWithSuite
+     */
+    function run(): void;
+
+    // #endregion Test interface augmentations
+
+    namespace reporters {
+        /**
+         * Initialize a new `Base` reporter.
+         *
+         * All other reporters generally inherit from this reporter, providing stats such as test duration,
+         * number of tests passed / failed, etc.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Base.html
+         */
+        class Base {
+            constructor(runner: Runner, options?: MochaOptions);
+            /** @deprecated Use the overload that accepts `Mocha.Runner` instead. */
+            constructor(runner: IRunner, options?: MochaOptions);
+
+            /**
+             * Test run statistics
+             */
+            stats: Stats;
+
+            /**
+             * Test failures
+             */
+            failures: Test[];
+
+            /**
+             * The configured runner
+             */
+            runner: Runner;
+
+            /**
+             * Output common epilogue used by many of the bundled reporters.
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.Base.html#.Base#epilogue
+             */
+            epilogue(): void;
+
+            done?(failures: number, fn?: (failures: number) => void): void;
+        }
+
+        namespace Base {
+            /**
+             * Enables coloring by default
+             *
+             * @see https://mochajs.org/api/module-base#.useColors
+             */
+            let useColors: boolean;
+
+            /**
+             * Inline diffs instead of +/-
+             *
+             * @see https://mochajs.org/api/module-base#.inlineDiffs
+             */
+            let inlineDiffs: boolean;
+
+            /**
+             * Default color map
+             *
+             * @see https://mochajs.org/api/module-base#.colors
+             */
+            const colors: ColorMap;
+
+            /**
+             * Default color map
+             *
+             * @see https://mochajs.org/api/module-base#.colors
+             */
+            interface ColorMap {
+                // added by Base
+                pass: number;
+                fail: number;
+                "bright pass": number;
+                "bright fail": number;
+                "bright yellow": number;
+                pending: number;
+                suite: number;
+                "error title": number;
+                "error message": number;
+                "error stack": number;
+                checkmark: number;
+                fast: number;
+                medium: number;
+                slow: number;
+                green: number;
+                light: number;
+                "diff gutter": number;
+                "diff added": number;
+                "diff removed": number;
+
+                // added by Progress
+                progress: number;
+
+                // added by Landing
+                plane: number;
+                "plane crash": number;
+                runway: number;
+
+                [key: string]: number;
+            }
+
+            /**
+             * Default symbol map
+             *
+             * @see https://mochajs.org/api/module-base#.symbols
+             */
+            const symbols: SymbolMap;
+
+            /**
+             * Default symbol map
+             *
+             * @see https://mochajs.org/api/module-base#.symbols
+             */
+            interface SymbolMap {
+                ok: string;
+                err: string;
+                dot: string;
+                comma: string;
+                bang: string;
+                [key: string]: string;
+            }
+
+            /**
+             * Color `str` with the given `type` (from `colors`)
+             *
+             * @see https://mochajs.org/api/module-base#.color
+             */
+            function color(type: string, str: string): string;
+
+            /**
+             * Expose terminal window size
+             *
+             * @see https://mochajs.org/api/module-base#.window
+             */
+            const window: {
+                width: number;
+            };
+
+            /**
+             * ANSI TTY control sequences common among reporters.
+             *
+             * @see https://mochajs.org/api/module-base#.cursor
+             */
+            namespace cursor {
+                /**
+                 * Hides the cursor
+                 */
+                function hide(): void;
+
+                /**
+                 * Shows the cursor
+                 */
+                function show(): void;
+
+                /**
+                 * Deletes the current line
+                 */
+                function deleteLine(): void;
+
+                /**
+                 * Moves to the beginning of the line
+                 */
+                function beginningOfLine(): void;
+
+                /**
+                 * Clears the line and moves to the beginning of the line.
+                 */
+                function CR(): void;
+            }
+
+            /**
+             * Returns a diff between two strings with colored ANSI output.
+             *
+             * @see https://mochajs.org/api/module-base#.generateDiff
+             */
+            function generateDiff(actual: string, expected: string): string;
+
+            /**
+             * Output the given `failures` as a list.
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.Base.html#.exports.list1
+             */
+            function list(failures: Test[]): void;
+        }
+
+        /**
+         * Initialize a new `Dot` matrix test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Dot.html
+         */
+        class Dot extends Base {
+        }
+
+        /**
+         * Initialize a new `Doc` reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Doc.html
+         */
+        class Doc extends Base {
+        }
+
+        /**
+         * Initialize a new `TAP` test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.TAP.html
+         */
+        class TAP extends Base {
+        }
+
+        /**
+         * Initialize a new `JSON` reporter
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.JSON.html
+         */
+        class JSON extends Base {
+        }
+
+        /**
+         * Initialize a new `HTML` reporter.
+         *
+         * - _This reporter cannot be used on the console._
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.HTML.html
+         */
+        class HTML extends Base {
+            /**
+             * Provide suite URL.
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.HTML.html#suiteURL
+             */
+            suiteURL(suite: Suite): string;
+
+            /**
+             * Provide test URL.
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.HTML.html#testURL
+             */
+            testURL(test: Test): string;
+
+            /**
+             * Adds code toggle functionality for the provided test's list element.
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.HTML.html#addCodeToggle
+             */
+            addCodeToggle(el: HTMLLIElement, contents: string): void;
+        }
+
+        /**
+         * Initialize a new `List` test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.List.html
+         */
+        class List extends Base {
+        }
+
+        /**
+         * Initialize a new `Min` minimal test reporter (best used with --watch).
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Min.html
+         */
+        class Min extends Base {
+        }
+
+        /**
+         * Initialize a new `Spec` test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Spec.html
+         */
+        class Spec extends Base {
+        }
+
+        /**
+         * Initialize a new `NyanCat` test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Nyan.html
+         */
+        class Nyan extends Base {
+            private colorIndex;
+            private numberOfLines;
+            private rainbowColors;
+            private scoreboardWidth;
+            private tick;
+            private trajectories;
+            private trajectoryWidthMax;
+            private draw;
+            private drawScoreboard;
+            private appendRainbow;
+            private drawRainbow;
+            private drawNyanCat;
+            private face;
+            private cursorUp;
+            private cursorDown;
+            private generateColors;
+            private rainbowify;
+        }
+
+        /**
+         * Initialize a new `XUnit` test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.XUnit.html
+         */
+        class XUnit extends Base {
+            constructor(runner: Runner, options?: XUnit.MochaOptions);
+            /** @deprecated Use the overload that accepts `Mocha.Runner` instead. */
+            constructor(runner: IRunner, options?: XUnit.MochaOptions);
+
+            /**
+             * Override done to close the stream (if it's a file).
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.XUnit.html#done
+             */
+            done(failures: number, fn: (failures: number) => void): void;
+
+            /**
+             * Write out the given line.
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.XUnit.html#write
+             */
+            write(line: string): void;
+
+            /**
+             * Output tag for the given `test.`
+             *
+             * @see https://mochajs.org/api/Mocha.reporters.XUnit.html#test
+             */
+            test(test: Test): void;
+        }
+
+        namespace XUnit {
+            interface MochaOptions extends Mocha.MochaOptions {
+                reporterOptions?: ReporterOptions;
+            }
+
+            interface ReporterOptions {
+                output?: string;
+                suiteName?: string;
+            }
+        }
+
+        /**
+         * Initialize a new `Markdown` test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Markdown.html
+         */
+        class Markdown extends Base {
+        }
+
+        /**
+         * Initialize a new `Progress` bar test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Progress.html
+         */
+        class Progress extends Base {
+            constructor(runner: Runner, options?: Progress.MochaOptions);
+            /** @deprecated Use the overload that accepts `Mocha.Runner` instead. */
+            constructor(runner: IRunner, options?: Progress.MochaOptions);
+        }
+
+        namespace Progress {
+            interface MochaOptions extends Mocha.MochaOptions {
+                reporterOptions?: ReporterOptions;
+            }
+
+            interface ReporterOptions {
+                open?: string;
+                complete?: string;
+                incomplete?: string;
+                close?: string;
+                verbose?: boolean;
+            }
+        }
+
+        /**
+         * Initialize a new `Landing` reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.Landing.html
+         */
+        class Landing extends Base {
+        }
+
+        /**
+         * Initialize a new `JSONStream` test reporter.
+         *
+         * @see https://mochajs.org/api/Mocha.reporters.JSONStream.html
+         */
+        class JSONStream extends Base {
+        }
+
+        // value-only aliases
+        const base: typeof Base;
+        const dot: typeof Dot;
+        const doc: typeof Doc;
+        const tap: typeof TAP;
+        const json: typeof JSON;
+        const html: typeof HTML;
+        const list: typeof List;
+        const spec: typeof Spec;
+        const nyan: typeof Nyan;
+        const xunit: typeof XUnit;
+        const markdown: typeof Markdown;
+        const progress: typeof Progress;
+        const landing: typeof Landing;
+        // NOTE: not possible to type this correctly:
+        // const "json-stream": typeof JSONStream;
+    }
+
+    /**
+     * Initialize a new `Runnable` with the given `title` and callback `fn`.
+     *
+     * @see https://mochajs.org/api/Runnable.html
+     */
+    class Runnable {
+        private _slow;
+        private _enableTimeouts;
+        private _retries;
+        private _currentRetry;
+        private _timeout;
+        private _timeoutError;
+
+        constructor(title: string, fn?: Func | AsyncFunc);
+
         title: string;
-        fn: Function;
+        fn: Func | AsyncFunc | undefined;
+        body: string;
         async: boolean;
         sync: boolean;
         timedOut: boolean;
-        timeout(n: number | string): this;
-        duration?: number;
-    }
-
-    /** 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';
+        duration?: number;
+        parent?: Suite;
+        state?: "failed" | "passed";
+        timer?: any;
+        ctx?: Context;
+        callback?: Done;
+        allowUncaught?: boolean;
+        file?: string;
 
+        /**
+         * Get test timeout.
+         *
+         * @see https://mochajs.org/api/Runnable.html#timeout
+         */
+        timeout(): number;
+
+        /**
+         * Set test timeout.
+         *
+         * @see https://mochajs.org/api/Runnable.html#timeout
+         */
+        timeout(ms: string | number): this;
+
+        /**
+         * Get test slowness threshold.
+         *
+         * @see https://mochajs.org/api/Runnable.html#slow
+         */
+        slow(): number;
+
+        /**
+         * Set test slowness threshold.
+         *
+         * @see https://mochajs.org/api/Runnable.html#slow
+         */
+        slow(ms: string | number): this;
+
+        /**
+         * Get whether timeouts are enabled.
+         *
+         * @see https://mochajs.org/api/Runnable.html#enableTimeouts
+         */
+        enableTimeouts(): boolean;
+
+        /**
+         * Set whether timeouts are enabled.
+         *
+         * @see https://mochajs.org/api/Runnable.html#enableTimeouts
+         */
+        enableTimeouts(enabled: boolean): this;
+
+        /**
+         * Halt and mark as pending.
+         */
+        skip(): never;
+
+        /**
+         * Check if this runnable or its parent suite is marked as pending.
+         *
+         * @see https://mochajs.org/api/Runnable.html#isPending
+         */
+        isPending(): boolean;
+
+        /**
+         * Return `true` if this Runnable has failed.
+         */
+        isFailed(): boolean;
+
+        /**
+         * Return `true` if this Runnable has passed.
+         */
+        isPassed(): boolean;
+
+        /**
+         * Set or get number of retries.
+         *
+         * @see https://mochajs.org/api/Runnable.html#retries
+         */
+        retries(): number;
+
+        /**
+         * Set or get number of retries.
+         *
+         * @see https://mochajs.org/api/Runnable.html#retries
+         */
+        retries(n: number): void;
+
+        /**
+         * Set or get current retry
+         *
+         * @see https://mochajs.org/api/Runnable.html#currentRetry
+         */
+        protected currentRetry(): number;
+
+        /**
+         * Set or get current retry
+         *
+         * @see https://mochajs.org/api/Runnable.html#currentRetry
+         */
+        protected currentRetry(n: number): void;
+
+        /**
+         * Return the full title generated by recursively concatenating the parent's full title.
+         */
         fullTitle(): string;
+
+        /**
+         * Return the title path generated by concatenating the parent's title path with the title.
+         */
+        titlePath(): string[];
+
+        /**
+         * Clear the timeout.
+         *
+         * @see https://mochajs.org/api/Runnable.html#clearTimeout
+         */
+        clearTimeout(): void;
+
+        /**
+         * Inspect the runnable void of private properties.
+         *
+         * @see https://mochajs.org/api/Runnable.html#inspect
+         */
+        inspect(): string;
+
+        /**
+         * Reset the timeout.
+         *
+         * @see https://mochajs.org/api/Runnable.html#resetTimeout
+         */
+        resetTimeout(): void;
+
+        /**
+         * Get a list of whitelisted globals for this test run.
+         *
+         * @see https://mochajs.org/api/Runnable.html#globals
+         */
+        globals(): string[];
+
+        /**
+         * Set a list of whitelisted globals for this test run.
+         *
+         * @see https://mochajs.org/api/Runnable.html#globals
+         */
+        globals(globals: ReadonlyArray<string>): void;
+
+        /**
+         * Run the test and invoke `fn(err)`.
+         *
+         * @see https://mochajs.org/api/Runnable.html#run
+         */
+        run(fn: Done): void;
     }
 
-    interface IHook extends IRunnable {
-        ctx?: IContext;
-        parent?: ISuite;
-        type: 'hook';
+    // #region Runnable "error" event
+    interface Runnable extends NodeJS.EventEmitter {
+        on(event: "error", listener: (error: any) => void): this;
+        once(event: "error", listener: (error: any) => void): this;
+        addListener(event: "error", listener: (error: any) => void): this;
+        removeListener(event: "error", listener: (error: any) => void): this;
+        prependListener(event: "error", listener: (error: any) => void): this;
+        prependOnceListener(event: "error", listener: (error: any) => void): this;
+        emit(name: "error", error: any): boolean;
+    }
+    // #endregion Runnable "error" event
+    // #region Runnable untyped events
+    interface Runnable extends NodeJS.EventEmitter {
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        emit(name: string, ...args: any[]): boolean;
+    }
+    // #endregion Runnable untyped events
 
-        error(err: Error): void;
+    /**
+     * Test context
+     *
+     * @see https://mochajs.org/api/module-Context.html#~Context
+     */
+    class Context {
+        private _runnable;
+
+        test?: Runnable;
+        currentTest?: Test;
+
+        /**
+         * Get the context `Runnable`.
+         */
+        runnable(): Runnable;
+
+        /**
+         * Set the context `Runnable`.
+         */
+        runnable(runnable: Runnable): this;
+        /** @deprecated Use the overload that accepts `Mocha.Runnable` instead. */
+        runnable(runnable: IRunnable): this;
+
+        /**
+         * Get test timeout.
+         */
+        timeout(): number;
+
+        /**
+         * Set test timeout.
+         */
+        timeout(ms: string | number): this;
+
+        /**
+         * Get whether timeouts are enabled.
+         */
+        enableTimeouts(): boolean;
+
+        /**
+         * Set whether timeouts are enabled.
+         */
+        enableTimeouts(enabled: boolean): this;
+
+        /**
+         * Get test slowness threshold.
+         */
+        slow(): number;
+
+        /**
+         * Set test slowness threshold.
+         */
+        slow(ms: string | number): this;
+
+        /**
+         * Mark a test as skipped.
+         */
+        skip(): never;
+
+        /**
+         * Get the number of allowed retries on failed tests.
+         */
+        retries(): number;
+
+        /**
+         * Set the number of allowed retries on failed tests.
+         */
+        retries(n: number): this;
+
+        [key: string]: any;
     }
 
-    interface IBeforeAndAfterContext extends IHookCallbackContext {
-        currentTest: ITest;
+    /**
+     * Initialize a `Runner` for the given `suite`.
+     *
+     * @see https://mochajs.org/api/Mocha.Runner.html
+     */
+    class Runner {
+        private _globals;
+        private _abort;
+        private _delay;
+        private _defaultGrep;
+        private next;
+        private hookErr;
+        private prevGlobalsLength;
+        private nextSuite;
+
+        constructor(suite: Suite, delay: boolean);
+
+        /** @deprecated Use the overload that accepts `Mocha.Suite` instead. */
+        constructor(suite: ISuite, delay: boolean);
+
+        suite: Suite;
+        started: boolean;
+        total: number;
+        failures: number;
+        asyncOnly?: boolean;
+        allowUncaught?: boolean;
+        fullStackTrace?: boolean;
+        forbidOnly?: boolean;
+        forbidPending?: boolean;
+        ignoreLeaks?: boolean;
+        test?: Test;
+        currentRunnable?: Runnable;
+        stats?: Stats; // added by reporters
+
+        /**
+         * Run tests with full titles matching `re`. Updates runner.total
+         * with number of tests matched.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#.Runner#grep
+         */
+        grep(re: RegExp, invert: boolean): this;
+
+        /**
+         * Returns the number of tests matching the grep search for the
+         * given suite.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#.Runner#grepTotal
+         */
+        grepTotal(suite: Suite): number;
+
+        /** @deprecated Use the overload that accepts `Mocha.Suite` instead. */
+        grepTotal(suite: ISuite): number;
+
+        /**
+         * Gets the allowed globals.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#.Runner#globals
+         */
+        globals(): string[];
+
+        /**
+         * Allow the given `arr` of globals.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#.Runner#globals
+         */
+        globals(arr: ReadonlyArray<string>): this;
+
+        /**
+         * Run the root suite and invoke `fn(failures)` on completion.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#.Runner#run
+         */
+        run(fn?: (failures: number) => void): this;
+
+        /**
+         * Cleanly abort execution.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#.Runner#abort
+         */
+        abort(): this;
+
+        /**
+         * Handle uncaught exceptions.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#uncaught
+         */
+        uncaught(err: any): void;
+
+        /**
+         * Wrapper for setImmediate, process.nextTick, or browser polyfill.
+         */
+        protected static immediately(callback: Function): void;
+
+        /**
+         * Return a list of global properties.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#globalProps
+         */
+        protected globalProps(): string[];
+
+        /**
+         * Check for global variable leaks.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#checkGlobals
+         */
+        protected checkGlobals(test: Test): void;
+
+        /**
+         * Fail the given `test`.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#fail
+         */
+        protected fail(test: Test, err: any): void;
+
+        /**
+         * Fail the given `hook` with `err`.
+         *
+         * Hook failures work in the following pattern:
+         * - If bail, then exit
+         * - Failed `before` hook skips all tests in a suite and subsuites,
+         *   but jumps to corresponding `after` hook
+         * - Failed `before each` hook skips remaining tests in a
+         *   suite and jumps to corresponding `after each` hook,
+         *   which is run only once
+         * - Failed `after` hook does not alter
+         *   execution order
+         * - Failed `after each` hook skips remaining tests in a
+         *   suite and subsuites, but executes other `after each`
+         *   hooks
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#failHook
+         */
+        protected failHook(hook: Hook, err: any): void;
+
+        /**
+         * Run hook `name` callbacks and then invoke `fn()`.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#hook
+         */
+        protected hook(name: string, fn: () => void): void;
+
+        /**
+         * Run hook `name` for the given array of `suites`
+         * in order, and callback `fn(err, errSuite)`.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#hooks
+         */
+        protected hooks(name: string, suites: Suite[], fn: (err?: any, errSuite?: Suite) => void): void;
+
+        /**
+         * Run hooks from the top level down.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#hookUp
+         */
+        protected hookUp(name: string, fn: (err?: any, errSuite?: Suite) => void): void;
+
+        /**
+         * Run hooks from the bottom up.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#hookDown
+         */
+        protected hookDown(name: string, fn: (err?: any, errSuite?: Suite) => void): void;
+
+        /**
+         * Return an array of parent Suites from closest to furthest.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#parents
+         */
+        protected parents(): Suite[];
+
+        /**
+         * Run the current test and callback `fn(err)`.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#runTest
+         */
+        protected runTest(fn: Done): any;
+
+        /**
+         * Run tests in the given `suite` and invoke the callback `fn()` when complete.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#runTests
+         */
+        protected runTests(suite: Suite, fn: (errSuite?: Suite) => void): void;
+
+        /**
+         * Run the given `suite` and invoke the callback `fn()` when complete.
+         *
+         * @see https://mochajs.org/api/Mocha.Runner.html#runSuite
+         */
+        protected runSuite(suite: Suite, fn: (errSuite?: Suite) => void): void;
     }
 
-    interface IStats {
+    // #region Runner "waiting" event
+    interface Runner {
+        on(event: "waiting", listener: (rootSuite: Suite) => void): this;
+        once(event: "waiting", listener: (rootSuite: Suite) => void): this;
+        addListener(event: "waiting", listener: (rootSuite: Suite) => void): this;
+        removeListener(event: "waiting", listener: (rootSuite: Suite) => void): this;
+        prependListener(event: "waiting", listener: (rootSuite: Suite) => void): this;
+        prependOnceListener(event: "waiting", listener: (rootSuite: Suite) => void): this;
+        emit(name: "waiting", rootSuite: Suite): boolean;
+    }
+    // #endregion Runner "waiting" event
+    // #region Runner "start" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "start", listener: () => void): this;
+        once(event: "start", listener: () => void): this;
+        addListener(event: "start", listener: () => void): this;
+        removeListener(event: "start", listener: () => void): this;
+        prependListener(event: "start", listener: () => void): this;
+        prependOnceListener(event: "start", listener: () => void): this;
+        emit(name: "start"): boolean;
+    }
+    // #endregion Runner "start" event
+    // #region Runner "end" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "end", listener: () => void): this;
+        once(event: "end", listener: () => void): this;
+        addListener(event: "end", listener: () => void): this;
+        removeListener(event: "end", listener: () => void): this;
+        prependListener(event: "end", listener: () => void): this;
+        prependOnceListener(event: "end", listener: () => void): this;
+        emit(name: "end"): boolean;
+    }
+    // #endregion Runner "end" event
+    // #region Runner "suite" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "suite", listener: (suite: Suite) => void): this;
+        once(event: "suite", listener: (suite: Suite) => void): this;
+        addListener(event: "suite", listener: (suite: Suite) => void): this;
+        removeListener(event: "suite", listener: (suite: Suite) => void): this;
+        prependListener(event: "suite", listener: (suite: Suite) => void): this;
+        prependOnceListener(event: "suite", listener: (suite: Suite) => void): this;
+        emit(name: "suite", suite: Suite): boolean;
+    }
+    // #endregion Runner "suite" event
+    // #region Runner "suite end" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "suite end", listener: (suite: Suite) => void): this;
+        once(event: "suite end", listener: (suite: Suite) => void): this;
+        addListener(event: "suite end", listener: (suite: Suite) => void): this;
+        removeListener(event: "suite end", listener: (suite: Suite) => void): this;
+        prependListener(event: "suite end", listener: (suite: Suite) => void): this;
+        prependOnceListener(event: "suite end", listener: (suite: Suite) => void): this;
+        emit(name: "suite end", suite: Suite): boolean;
+    }
+    // #endregion Runner "suite end" event
+    // #region Runner "test" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "test", listener: (test: Test) => void): this;
+        once(event: "test", listener: (test: Test) => void): this;
+        addListener(event: "test", listener: (test: Test) => void): this;
+        removeListener(event: "test", listener: (test: Test) => void): this;
+        prependListener(event: "test", listener: (test: Test) => void): this;
+        prependOnceListener(event: "test", listener: (test: Test) => void): this;
+        emit(name: "test", test: Test): boolean;
+    }
+    // #endregion Runner "test" event
+    // #region Runner "test end" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "test end", listener: (test: Test) => void): this;
+        once(event: "test end", listener: (test: Test) => void): this;
+        addListener(event: "test end", listener: (test: Test) => void): this;
+        removeListener(event: "test end", listener: (test: Test) => void): this;
+        prependListener(event: "test end", listener: (test: Test) => void): this;
+        prependOnceListener(event: "test end", listener: (test: Test) => void): this;
+        emit(name: "test end", test: Test): boolean;
+    }
+    // #endregion Runner "test end" event
+    // #region Runner "hook" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "hook", listener: (hook: Hook) => void): this;
+        once(event: "hook", listener: (hook: Hook) => void): this;
+        addListener(event: "hook", listener: (hook: Hook) => void): this;
+        removeListener(event: "hook", listener: (hook: Hook) => void): this;
+        prependListener(event: "hook", listener: (hook: Hook) => void): this;
+        prependOnceListener(event: "hook", listener: (hook: Hook) => void): this;
+        emit(name: "hook", hook: Hook): boolean;
+    }
+    // #endregion Runner "hook" event
+    // #region Runner "hook end" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "hook end", listener: (hook: Hook) => void): this;
+        once(event: "hook end", listener: (hook: Hook) => void): this;
+        addListener(event: "hook end", listener: (hook: Hook) => void): this;
+        removeListener(event: "hook end", listener: (hook: Hook) => void): this;
+        prependListener(event: "hook end", listener: (hook: Hook) => void): this;
+        prependOnceListener(event: "hook end", listener: (hook: Hook) => void): this;
+        emit(name: "hook end", hook: Hook): boolean;
+    }
+    // #endregion Runner "hook end" event
+    // #region Runner "pass" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "pass", listener: (test: Test) => void): this;
+        once(event: "pass", listener: (test: Test) => void): this;
+        addListener(event: "pass", listener: (test: Test) => void): this;
+        removeListener(event: "pass", listener: (test: Test) => void): this;
+        prependListener(event: "pass", listener: (test: Test) => void): this;
+        prependOnceListener(event: "pass", listener: (test: Test) => void): this;
+        emit(name: "pass", test: Test): boolean;
+    }
+    // #endregion Runner "pass" event
+    // #region Runner "fail" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "fail", listener: (test: Test, err: any) => void): this;
+        once(event: "fail", listener: (test: Test, err: any) => void): this;
+        addListener(event: "fail", listener: (test: Test, err: any) => void): this;
+        removeListener(event: "fail", listener: (test: Test, err: any) => void): this;
+        prependListener(event: "fail", listener: (test: Test, err: any) => void): this;
+        prependOnceListener(event: "fail", listener: (test: Test, err: any) => void): this;
+        emit(name: "fail", test: Test, err: any): boolean;
+    }
+    // #endregion Runner "fail" event
+    // #region Runner "pending" event
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: "pending", listener: (test: Test) => void): this;
+        once(event: "pending", listener: (test: Test) => void): this;
+        addListener(event: "pending", listener: (test: Test) => void): this;
+        removeListener(event: "pending", listener: (test: Test) => void): this;
+        prependListener(event: "pending", listener: (test: Test) => void): this;
+        prependOnceListener(event: "pending", listener: (test: Test) => void): this;
+        emit(name: "pending", test: Test): boolean;
+    }
+    // #endregion Runner "pending" event
+    // #region Runner untyped events
+    interface Runner extends NodeJS.EventEmitter {
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        emit(name: string, ...args: any[]): boolean;
+    }
+    // #endregion Runner untyped events
+
+    /**
+     * Initialize a new `Suite` with the given `title` and `ctx`.
+     *
+     * @see https://mochajs.org/api/Mocha.Suite.html
+     */
+    class Suite {
+        private _beforeEach;
+        private _beforeAll;
+        private _afterEach;
+        private _afterAll;
+        private _timeout;
+        private _enableTimeouts;
+        private _slow;
+        private _bail;
+        private _retries;
+        private _onlyTests;
+        private _onlySuites;
+
+        constructor(title: string, parentContext?: Context);
+        /** @deprecated Use the overload that accepts `Mocha.Context` instead. */
+        constructor(title: string, parentContext?: IContext);
+
+        ctx: Context;
+        suites: Suite[];
+        tests: Test[];
+        pending: boolean;
+        file?: string;
+        root: boolean;
+        delayed: boolean;
+        parent: Suite | undefined;
+        title: string;
+
+        /**
+         * Create a new `Suite` with the given `title` and parent `Suite`. When a suite
+         * with the same title is already present, that suite is returned to provide
+         * nicer reporter and more flexible meta-testing.
+         *
+         * @see https://mochajs.org/api/mocha#.exports.create
+         */
+        static create(parent: Suite, title: string): Suite;
+        /** @deprecated Use the overload that accepts `Mocha.Suite` instead. */
+        static create(parent: ISuite, title: string): Suite;
+
+        /**
+         * Return a clone of this `Suite`.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#clone
+         */
+        clone(): Suite;
+
+        /**
+         * Get timeout `ms`.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#timeout
+         */
+        timeout(): number;
+
+        /**
+         * Set timeout `ms` or short-hand such as "2s".
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#timeout
+         */
+        timeout(ms: string | number): this;
+
+        /**
+         * Get number of times to retry a failed test.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#retries
+         */
+        retries(): number;
+
+        /**
+         * Set number of times to retry a failed test.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#retries
+         */
+        retries(n: string | number): this;
+
+        /**
+         * Get whether timeouts are enabled.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#enableTimeouts
+         */
+        enableTimeouts(): boolean;
+
+        /**
+         * Set whether timeouts are `enabled`.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#enableTimeouts
+         */
+        enableTimeouts(enabled: boolean): this;
+
+        /**
+         * Get slow `ms`.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#slow
+         */
+        slow(): number;
+
+        /**
+         * Set slow `ms` or short-hand such as "2s".
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#slow
+         */
+        slow(ms: string | number): this;
+
+        /**
+         * Get whether to bail after first error.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#bail
+         */
+        bail(): boolean;
+
+        /**
+         * Set whether to bail after first error.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#bail
+         */
+        bail(bail: boolean): this;
+
+        /**
+         * Check if this suite or its parent suite is marked as pending.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#isPending
+         */
+        isPending(): boolean;
+
+        /**
+         * Run `fn(test[, done])` before running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeAll
+         */
+        beforeAll(fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` before running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeAll
+         */
+        beforeAll(fn?: AsyncFunc): this;
+
+        /**
+         * Run `fn(test[, done])` before running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeAll
+         */
+        beforeAll(title: string, fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` before running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeAll
+         */
+        beforeAll(title: string, fn?: AsyncFunc): this;
+
+        /**
+         * Run `fn(test[, done])` after running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterAll
+         */
+        afterAll(fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` after running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterAll
+         */
+        afterAll(fn?: AsyncFunc): this;
+
+        /**
+         * Run `fn(test[, done])` after running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterAll
+         */
+        afterAll(title: string, fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` after running tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterAll
+         */
+        afterAll(title: string, fn?: AsyncFunc): this;
+
+        /**
+         * Run `fn(test[, done])` before each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeEach
+         */
+        beforeEach(fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` before each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeEach
+         */
+        beforeEach(fn?: AsyncFunc): this;
+
+        /**
+         * Run `fn(test[, done])` before each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeEach
+         */
+        beforeEach(title: string, fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` before each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#beforeEach
+         */
+        beforeEach(title: string, fn?: AsyncFunc): this;
+
+        /**
+         * Run `fn(test[, done])` after each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterEach
+         */
+        afterEach(fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` after each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterEach
+         */
+        afterEach(fn?: AsyncFunc): this;
+
+        /**
+         * Run `fn(test[, done])` after each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterEach
+         */
+        afterEach(title: string, fn?: Func): this;
+
+        /**
+         * Run `fn(test[, done])` after each test case.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#afterEach
+         */
+        afterEach(title: string, fn?: AsyncFunc): this;
+
+        /**
+         * Add a test `suite`.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#addSuite
+         */
+        addSuite(suite: Suite): this;
+        /** @deprecated Use the overload that accepts `Mocha.ISuite` instead. */
+        addSuite(suite: ISuite): this;
+
+        /**
+         * Add a `test` to this suite.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#addTest
+         */
+        addTest(test: Test): this;
+        /** @deprecated Use the overload that accepts `Mocha.ITest` instead. */
+        addTest(test: ITest): this;
+
+        /**
+         * Return the full title generated by recursively concatenating the parent's
+         * full title.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#.Suite#fullTitle
+         */
+        fullTitle(): string;
+
+        /**
+         * Return the title path generated by recursively concatenating the parent's
+         * title path.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#.Suite#titlePath
+         */
+        titlePath(): string[];
+
+        /**
+         * Return the total number of tests.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#.Suite#total
+         */
+        total(): number;
+
+        /**
+         * Iterates through each suite recursively to find all tests. Applies a
+         * function in the format `fn(test)`.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#eachTest
+         */
+        eachTest(fn: (test: Test) => void): this;
+
+        /**
+         * This will run the root suite if we happen to be running in delayed mode.
+         *
+         * @see https://mochajs.org/api/Mocha.Suite.html#run
+         */
+        run(): void;
+
+        /**
+         * Generic hook-creator.
+         */
+        protected _createHook(title: string, fn?: Func | AsyncFunc): Hook;
+    }
+
+    // #region Suite "beforeAll" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "beforeAll", listener: (hook: Hook) => void): this;
+        once(event: "beforeAll", listener: (hook: Hook) => void): this;
+        addListener(event: "beforeAll", listener: (hook: Hook) => void): this;
+        removeListener(event: "beforeAll", listener: (hook: Hook) => void): this;
+        prependListener(event: "beforeAll", listener: (hook: Hook) => void): this;
+        prependOnceListener(event: "beforeAll", listener: (hook: Hook) => void): this;
+        emit(name: "beforeAll", hook: Hook): boolean;
+    }
+    // #endregion Suite "beforeAll" event
+    // #region Suite "afterAll" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "afterAll", listener: (hook: Hook) => void): this;
+        once(event: "afterAll", listener: (hook: Hook) => void): this;
+        addListener(event: "afterAll", listener: (hook: Hook) => void): this;
+        removeListener(event: "afterAll", listener: (hook: Hook) => void): this;
+        prependListener(event: "afterAll", listener: (hook: Hook) => void): this;
+        prependOnceListener(event: "afterAll", listener: (hook: Hook) => void): this;
+        emit(name: "afterAll", hook: Hook): boolean;
+    }
+    // #endregion Suite "afterAll" event
+    // #region Suite "beforeEach" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "beforeEach", listener: (hook: Hook) => void): this;
+        once(event: "beforeEach", listener: (hook: Hook) => void): this;
+        addListener(event: "beforeEach", listener: (hook: Hook) => void): this;
+        removeListener(event: "beforeEach", listener: (hook: Hook) => void): this;
+        prependListener(event: "beforeEach", listener: (hook: Hook) => void): this;
+        prependOnceListener(event: "beforeEach", listener: (hook: Hook) => void): this;
+        emit(name: "beforeEach", hook: Hook): boolean;
+    }
+    // #endregion Suite "beforeEach" event
+    // #region Suite "afterEach" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "afterEach", listener: (hook: Hook) => void): this;
+        once(event: "afterEach", listener: (hook: Hook) => void): this;
+        addListener(event: "afterEach", listener: (hook: Hook) => void): this;
+        removeListener(event: "afterEach", listener: (hook: Hook) => void): this;
+        prependListener(event: "afterEach", listener: (hook: Hook) => void): this;
+        prependOnceListener(event: "afterEach", listener: (hook: Hook) => void): this;
+        emit(name: "afterEach", hook: Hook): boolean;
+    }
+    // #endregion Suite "afterEach" event
+    // #region Suite "suite" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "suite", listener: (suite: Suite) => void): this;
+        once(event: "suite", listener: (suite: Suite) => void): this;
+        addListener(event: "suite", listener: (suite: Suite) => void): this;
+        removeListener(event: "suite", listener: (suite: Suite) => void): this;
+        prependListener(event: "suite", listener: (suite: Suite) => void): this;
+        prependOnceListener(event: "suite", listener: (suite: Suite) => void): this;
+        emit(name: "suite", suite: Suite): boolean;
+    }
+    // #endregion Suite "suite" event
+    // #region Suite "test" event
+    interface Suite {
+        on(event: "test", listener: (test: Test) => void): this;
+        once(event: "test", listener: (test: Test) => void): this;
+        addListener(event: "test", listener: (test: Test) => void): this;
+        removeListener(event: "test", listener: (test: Test) => void): this;
+        prependListener(event: "test", listener: (test: Test) => void): this;
+        prependOnceListener(event: "test", listener: (test: Test) => void): this;
+        emit(name: "test", test: Test): boolean;
+    }
+    // #endregion Suite "test" event
+    // #region Suite "run" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "run", listener: () => void): this;
+        once(event: "run", listener: () => void): this;
+        addListener(event: "run", listener: () => void): this;
+        removeListener(event: "run", listener: () => void): this;
+        prependListener(event: "run", listener: () => void): this;
+        prependOnceListener(event: "run", listener: () => void): this;
+        emit(name: "run"): boolean;
+    }
+    // #endregion Suite "run" event
+    // #region Suite "pre-require" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "pre-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        once(event: "pre-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        addListener(event: "pre-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        removeListener(event: "pre-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        prependListener(event: "pre-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        prependOnceListener(event: "pre-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        emit(name: "pre-require", context: MochaGlobals, file: string, mocha: Mocha): boolean;
+    }
+    // #endregion Suite "pre-require" event
+    // #region Suite "require" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "require", listener: (module: any, file: string, mocha: Mocha) => void): this;
+        once(event: "require", listener: (module: any, file: string, mocha: Mocha) => void): this;
+        addListener(event: "require", listener: (module: any, file: string, mocha: Mocha) => void): this;
+        removeListener(event: "require", listener: (module: any, file: string, mocha: Mocha) => void): this;
+        prependListener(event: "require", listener: (module: any, file: string, mocha: Mocha) => void): this;
+        prependOnceListener(event: "require", listener: (module: any, file: string, mocha: Mocha) => void): this;
+        emit(name: "require", module: any, file: string, mocha: Mocha): boolean;
+    }
+    // #endregion Suite "require" event
+    // #region Suite "post-require" event
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: "post-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        once(event: "post-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        addListener(event: "post-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        removeListener(event: "post-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        prependListener(event: "post-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        prependOnceListener(event: "post-require", listener: (context: MochaGlobals, file: string, mocha: Mocha) => void): this;
+        emit(name: "post-require", context: MochaGlobals, file: string, mocha: Mocha): boolean;
+    }
+    // #endregion Suite "post-require" event
+    // #region Suite untyped events
+    interface Suite extends NodeJS.EventEmitter {
+        on(event: string, listener: (...args: any[]) => void): this;
+        once(event: string, listener: (...args: any[]) => void): this;
+        addListener(event: string, listener: (...args: any[]) => void): this;
+        removeListener(event: string, listener: (...args: any[]) => void): this;
+        prependListener(event: string, listener: (...args: any[]) => void): this;
+        prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+        emit(name: string, ...args: any[]): boolean;
+    }
+    // #endregion Runner untyped events
+
+    /**
+     * Initialize a new `Hook` with the given `title` and callback `fn`
+     *
+     * @see https://mochajs.org/api/Hook.html
+     */
+    class Hook extends Runnable {
+        private _error;
+
+        type: "hook";
+        originalTitle?: string; // added by Runner
+
+        /**
+         * Get the test `err`.
+         *
+         * @see https://mochajs.org/api/Hook.html#error
+         */
+        error(): any;
+
+        /**
+         * Set the test `err`.
+         *
+         * @see https://mochajs.org/api/Hook.html#error
+         */
+        error(err: any): void;
+    }
+
+    /**
+     * Initialize a new `Test` with the given `title` and callback `fn`.
+     *
+     * @see https://mochajs.org/api/Test.html
+     */
+    class Test extends Runnable {
+        type: "test";
+        speed?: "slow" | "medium" | "fast"; // added by reporters
+        err?: Error; // added by reporters
+        clone(): Test;
+    }
+
+    /**
+     * Test statistics
+     */
+    interface Stats {
         suites: number;
         tests: number;
         passes: number;
@@ -271,252 +2156,701 @@ declare class GenericEventEmitter {
         failures: number;
         start?: Date;
         end?: Date;
-        duration?: Date;
+        duration?: number;
     }
 
-    /** Partial interface for Mocha's `Runner` class. */
-    interface IRunner extends GenericEventEmitter {
-        asyncOnly?: boolean;
-        stats?: IStats;
-        started: boolean;
-        suite: ISuite;
-        total: number;
-        failures: number;
-        forbidOnly?: boolean;
-        forbidPending?: boolean;
-        fullStackTrace?: boolean;
-        hasOnly?: boolean;
+    type TestInterface = (suite: Suite) => void;
+
+    interface ReporterConstructor {
+        new (runner: Runner, options: { reporterOptions?: any; }): reporters.Base;
+    }
+
+    type Done = (err?: any) => void;
+
+    /**
+     * Callback function used for tests and hooks.
+     */
+    type Func = (this: Context, done: Done) => void;
+
+    /**
+     * Async callback function used for tests and hooks.
+     */
+    type AsyncFunc = (this: Context) => PromiseLike<any>;
+
+    /**
+     * Options to pass to Mocha.
+     */
+    interface MochaOptions {
+        /** Test interfaces ("bdd", "tdd", "exports", etc.). */
+        ui?: Interface;
+
+        /**
+         * Reporter constructor, built-in reporter name, or reporter module path. Defaults to
+         * `"spec"`.
+         */
+        reporter?: string | ReporterConstructor;
+
+        /** Options to pass to the reporter. */
+        reporterOptions?: any;
+
+        /** Array of accepted globals. */
+        globals?: string[];
+
+        /** timeout in milliseconds. */
+        timeout?: number;
+
+        enableTimeouts?: boolean;
+
+        /** number of times to retry failed tests. */
+        retries?: number;
+
+        /** bail on the first test failure. */
+        bail?: boolean;
+
+        /** milliseconds to wait before considering a test slow. */
+        slow?: number;
+
+        /** ignore global leaks. */
         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;
+        /** display the full stack trace on failure. */
+        fullStackTrace?: boolean;
+
+        /** string or regexp to filter tests with. */
+        grep?: string | RegExp;
+
+        /** Enable growl support. */
+        growl?: boolean;
+
+        /** Emit color output. */
+        useColors?: boolean;
+
+        /** Use inline diffs rather than +/-. */
+        inlineDiffs?: boolean;
+
+        /** Do not show diffs at all. */
+        hideDiff?: boolean;
+
+        asyncOnly?: boolean;
+        delay?: boolean;
+        forbidOnly?: boolean;
+        forbidPending?: boolean;
+        noHighlighting?: boolean;
+        allowUncaught?: boolean;
     }
 
-    interface IContextDefinition {
-        (description: string, callback: (this: ISuiteCallbackContext) => void): ISuite;
-        only(description: string, callback: (this: ISuiteCallbackContext) => void): ISuite;
-        skip(description: string, callback: (this: ISuiteCallbackContext) => void): void;
-        timeout(ms: number | string): void;
+    interface MochaInstanceOptions extends MochaOptions {
+        files?: string[];
     }
 
-    interface ITestDefinition {
-        (expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): ITest;
-        only(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): ITest;
-        skip(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-        timeout(ms: number | string): void;
-        state: "failed" | "passed";
-    }
-
-    namespace reporters {
-        class Base {
-            runner: IRunner;
-            stats: IStats;
-
-            constructor(runner: IRunner);
-        }
-
-        class Doc extends Base { }
-        class Dot extends Base { }
-        class HTML extends Base { }
-        class HTMLCov extends Base { }
-        class JSON extends Base { }
-        class JSONCov extends Base { }
-        class JSONStream extends Base { }
-        class Landing extends Base { }
-        class List extends Base { }
-        class Markdown extends Base { }
-        class Min extends Base { }
-        class Nyan extends Base { }
-        class Progress extends Base {
-            /**
-             * @param options.open String used to indicate the start of the progress bar.
-             * @param options.complete String used to indicate a complete test on the progress bar.
-             * @param options.incomplete String used to indicate an incomplete test on the progress bar.
-             * @param options.close String used to indicate the end of the progress bar.
-             */
-            constructor(runner: IRunner, options?: {
-                open?: string;
-                complete?: string;
-                incomplete?: string;
-                close?: string;
-            });
-        }
-        class Spec extends Base { }
-        class TAP extends Base { }
-        class XUnit extends Base {
-            constructor(runner: IRunner, options?: any);
-        }
-    }
-
-    /*
-     * All ambient functions are also available via require('mocha') when invoked via the mocha CLI
-     * See for details: https://mochajs.org/#require
-     */
-
-    /** Only available when invoked via the mocha CLI */
-    const describe: IContextDefinition;
-    /** Only available when invoked via the mocha CLI */
-    const xdescribe: IContextDefinition;
     /**
-     * alias for `describe`
-     * Only available when invoked via the mocha CLI
+     * Variables added to the global scope by Mocha when run in the CLI.
      */
-    const context: IContextDefinition;
-    /**
-     * alias for `describe`
-     * Only available when invoked via the mocha CLI
-     */
-    const suite: IContextDefinition;
-    /** Only available when invoked via the mocha CLI */
-    const it: ITestDefinition;
-    /** Only available when invoked via the mocha CLI */
-    const xit: ITestDefinition;
-    /**
-     * alias for `it`
-     * Only available when invoked via the mocha CLI
-     */
-    const test: ITestDefinition;
-    /**
-     * Alias for `it`
-     * Only available when invoked via the mocha CLI
-     */
-    const specify: ITestDefinition;
-    /** Only available when invoked via the mocha CLI */
-    function setup(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function teardown(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function suiteSetup(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function suiteTeardown(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function before(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function before(description: string, callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function after(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function after(description: string, callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function beforeEach(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    function beforeEach(description: string, callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-    /** Only available when invoked via the mocha CLI */
-    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;
+    interface MochaGlobals {
+        /**
+         * Execute before running tests.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#before
+         */
+        before: HookFunction;
 
-    class Runnable extends GenericEventEmitter {
-        new(title: string, fn: () => any): IRunnable;
+        /**
+         * Execute after running tests.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#after
+         */
+        after: HookFunction;
+
+        /**
+         * Execute before each test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#beforeEach
+         */
+        beforeEach: HookFunction;
+
+        /**
+         * Execute after each test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#afterEach
+         */
+        afterEach: HookFunction;
+
+        /**
+         * Describe a "suite" containing nested suites and tests.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        describe: SuiteFunction;
+
+        /**
+         * Describe a "suite" containing nested suites and tests.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        context: SuiteFunction;
+
+        /**
+         * Pending suite.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        xdescribe: PendingSuiteFunction;
+
+        /**
+         * Pending suite.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        xcontext: PendingSuiteFunction;
+
+        /**
+         * Describes a test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        it: TestFunction;
+
+        /**
+         * Describes a test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        specify: TestFunction;
+
+        /**
+         * Describes a pending test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        xit: PendingTestFunction;
+
+        /**
+         * Describes a pending test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        xspecify: PendingTestFunction;
+
+        /**
+         * Execute before running tests.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#before
+         */
+        suiteSetup: HookFunction;
+
+        /**
+         * Execute after running tests.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#after
+         */
+        suiteTeardown: HookFunction;
+
+        /**
+         * Execute before each test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#beforeEach
+         */
+        setup: HookFunction;
+
+        /**
+         * Execute after each test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         *
+         * @see https://mochajs.org/api/global.html#afterEach
+         */
+        teardown: HookFunction;
+
+        /**
+         * Describe a "suite" containing nested suites and tests.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        suite: SuiteFunction;
+
+        /**
+         * Describes a test case.
+         *
+         * - _Only available when invoked via the mocha CLI._
+         */
+        test: TestFunction;
+
+        run: typeof run;
     }
 
-    class Context implements IContext {
-        constructor();
+    /**
+     * Third-party declarations that want to add new entries to the `Reporter` union can
+     * contribute names here.
+     */
+    interface ReporterContributions {
+        Base: never;
+        base: never;
+        Dot: never;
+        dot: never;
+        TAP: never;
+        tap: never;
+        JSON: never;
+        json: never;
+        HTML: never;
+        html: never;
+        List: never;
+        list: never;
+        Min: never;
+        min: never;
+        Spec: never;
+        spec: never;
+        Nyan: never;
+        nyan: never;
+        XUnit: never;
+        xunit: never;
+        Markdown: never;
+        markdown: never;
+        Progress: never;
+        progress: never;
+        Landing: never;
+        landing: never;
+        JSONStream: never;
+        "json-stream": never;
+    }
 
-        _runnable?: IRunnable;
+    type Reporter = keyof ReporterContributions;
+
+    /**
+     * Third-party declarations that want to add new entries to the `Interface` union can
+     * contribute names here.
+     */
+    interface InterfaceContributions {
+        bdd: never;
+        tdd: never;
+        qunit: never;
+        exports: never;
+    }
+
+    type Interface = keyof InterfaceContributions;
+
+    // #region Deprecations
+
+    /** @deprecated use `Mocha.Context` instead. */
+    interface IContext {
         test?: IRunnable;
-
         runnable(): IRunnable | undefined;
+        /** @deprecated `.runnable()` returns `this` in `Mocha.Context`. */
         runnable(runnable: IRunnable): IContext;
         timeout(): number;
+        /** @deprecated `.timeout()` returns `this` in `Mocha.Context`. */
         timeout(timeout: number): IContext;
+        /** @deprecated `.enableTimeouts()` has additional overloads in `Mocha.Context`. */
+        /** @deprecated `.enableTimeouts()` returns `this` in `Mocha.Context`. */
         enableTimeouts(enableTimeouts: boolean): IContext;
+        /** @deprecated `.slow()` has additional overloads in `Mocha.Context`. */
+        /** @deprecated `.slow()` returns `this` in `Mocha.Context`. */
         slow(slow: number): IContext;
+        /** @deprecated `.skip()` returns `never` in `Mocha.Context`. */
         skip(): IContext;
         retries(): number;
+        /** @deprecated `.retries()` returns `this` in `Mocha.Context`. */
         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;
+    /** @deprecated use `Mocha.Suite` instead. */
+    interface ISuiteCallbackContext {
+        /** @deprecated `.timeout()` has additional overloads in `Mocha.Suite`. */
+        timeout(ms: number | string): this;
+        /** @deprecated `.retries()` has additional overloads in `Mocha.Suite`. */
+        retries(n: number): this;
+        /** @deprecated `.slow()` has additional overloads in `Mocha.Suite`. */
+        slow(ms: number): this;
     }
 
-    class Suite extends GenericEventEmitter implements ISuite {
-        constructor(title: string, parentContext: IContext);
+    /** @deprecated use `Mocha.Context` instead. */
+    interface IHookCallbackContext {
+        /** @deprecated `.skip()` returns `never` in `Mocha.Context`. */
+        skip(): this;
+        /** @deprecated `.timeout()` has additional overloads in `Mocha.Context`. */
+        timeout(ms: number | string): this;
+        [index: string]: any;
+    }
 
+    /** @deprecated use `Mocha.Context` instead. */
+    interface ITestCallbackContext {
+        /** @deprecated `.skip()` returns `never` in `Mocha.Context`. */
+        skip(): this;
+        /** @deprecated `.timeout()` has additional overloads in `Mocha.Context`. */
+        timeout(ms: number | string): this;
+        /** @deprecated `.retries()` has additional overloads in `Mocha.Context`. */
+        retries(n: number): this;
+        /** @deprecated `.slow()` has additional overloads in `Mocha.Context`. */
+        slow(ms: number): this;
+        [index: string]: any;
+    }
+
+    /** Partial interface for Mocha's `Runnable` class. */
+    /** @deprecated use `Mocha.Runnable` instead. */
+    interface IRunnable extends NodeJS.EventEmitter {
+        title: string;
+        /** @deprecated `.fn` has type `Func | AsyncFunc` in `Mocha.Runnable`. */
+        fn: Function | undefined;
+        async: boolean;
+        sync: boolean;
+        timedOut: boolean;
+        /** @deprecated `.timeout()` has additional overloads in `Mocha.Runnable`. */
+        timeout(n: number | string): this;
+        duration?: number;
+    }
+
+    /** Partial interface for Mocha's `Suite` class. */
+    /** @deprecated use `Mocha.Suite` instead. */
+    interface ISuite {
+        /** @deprecated `.ctx` has type `Mocha.Context` in `Mocha.Suite`. */
         ctx: IContext;
-        parent: ISuite;
+        /** @deprecated `.parent` has type `Mocha.Suite | undefined` in `Mocha.Suite`. */
+        parent: ISuite | undefined;
         root: boolean;
         title: string;
+        /** @deprecated `.suites` has type `Mocha.Suite[]` in `Mocha.Suite`. */
         suites: ISuite[];
+        /** @deprecated `.tests` has type `Mocha.Test[]` in `Mocha.Suite`. */
         tests: ITest[];
 
-        _beforeEach: IHook[];
-        _beforeAll: IHook[];
-        _afterEach: IHook[];
-        _afterAll: IHook[];
-
         bail(): boolean;
+        /** @deprecated `.bail()` returns `this` in `Mocha.Suite`. */
         bail(bail: boolean): ISuite;
         fullTitle(): string;
         retries(): number;
+        /** @deprecated `.retries()` returns `this` in `Mocha.Suite`. */
         retries(retries: number): ISuite;
         slow(): number;
+        /** @deprecated `.slow()` returns `this` in `Mocha.Suite`. */
         slow(slow: number): ISuite;
         timeout(): number;
+        /** @deprecated `.timeout()` returns `this` in `Mocha.Suite`. */
         timeout(timeout: number): ISuite;
     }
 
-    class Hook extends Runnable implements IHook {
-        constructor(title: string, fn: () => any);
-
-        async: boolean;
-        ctx?: IContext;
-        duration?: number;
-        fn: Function;
+    /** Partial interface for Mocha's `Test` class. */
+    /** @deprecated use `Mocha.Test` instead. */
+    interface ITest extends IRunnable {
+        body?: string;
+        file?: string;
+        /** @deprecated `.parent` has type `Mocha.Suite | undefined` in `Mocha.Test`. */
         parent?: ISuite;
-        sync: boolean;
-        timedOut: boolean;
-        timeout(n: number | string): this;
-        title: string;
-        type: 'hook';
+        pending: boolean;
+        state?: 'failed' | 'passed';
+        type: 'test';
+        fullTitle(): string;
+    }
 
+    /** @deprecated use `Mocha.Hook` instead. */
+    interface IHook extends IRunnable {
+        /** @deprecated `.ctx` has type `Mocha.Context` in `Mocha.Runnable`. */
+        ctx?: IContext;
+        /** @deprecated `.parent` has type `Mocha.Suite` in `Mocha.Runnable`. */
+        parent?: ISuite;
+        type: 'hook';
+        /** @deprecated `.error()` has additional overloads in `Mocha.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;
+    /** @deprecated use `Mocha.Context` instead. */
+    interface IBeforeAndAfterContext extends IHookCallbackContext {
+        /** @deprecated `.currentTest` has type `Mocha.Test` in `Mocha.Context`. */
+        currentTest?: ITest;
     }
-  }
 
-  declare module "mocha" {
-    export = Mocha;
-  }
+    /** @deprecated use `Mocha.Stats` instead. */
+    type IStats = Stats;
+
+    /** Partial interface for Mocha's `Runner` class. */
+    /** @deprecated use `Mocha.Runner` instead. */
+    interface IRunner extends NodeJS.EventEmitter {
+        asyncOnly?: boolean;
+        stats?: IStats;
+        started: boolean;
+        /** @deprecated `.suite` has type `Mocha.Suite` in `Mocha.Runner`. */
+        suite: ISuite;
+        total: number;
+        failures: number;
+        forbidOnly?: boolean;
+        forbidPending?: boolean;
+        fullStackTrace?: boolean;
+        ignoreLeaks?: boolean;
+        grep(re: RegExp, invert: boolean): this;
+        /** @deprecated Parameter `suite` has type `Mocha.Suite` in `Mocha.Runner`. */
+        grepTotal(suite: ISuite): number;
+        /** @deprecated `.globals()` has different overloads in `Mocha.Runner`. */
+        globals(arr: ReadonlyArray<string>): this | string[];
+        abort(): this;
+        run(fn?: (failures: number) => void): this;
+    }
+
+    /** @deprecated use `Mocha.SuiteFunction` instead. */
+    interface IContextDefinition {
+        /** @deprecated use `Mocha.SuiteFunction` instead. */
+        (description: string, callback: (this: ISuiteCallbackContext) => void): ISuite;
+        /** @deprecated use `Mocha.SuiteFunction` instead. */
+        only(description: string, callback: (this: ISuiteCallbackContext) => void): ISuite;
+        /** @deprecated use `Mocha.SuiteFunction` instead. */
+        skip(description: string, callback: (this: ISuiteCallbackContext) => void): void;
+    }
+
+    /** @deprecated use `Mocha.TestFunction` instead. */
+    interface ITestDefinition {
+        /** @deprecated use `Mocha.TestFunction` instead. */
+        /** @deprecated `Mocha.TestFunction` does not allow mixing `done` with a return type of `PromiseLike<any>`. */
+        (expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): ITest;
+        /** @deprecated use `Mocha.TestFunction` instead. */
+        /** @deprecated `Mocha.TestFunction#only` does not allow mixing `done` with a return type of `PromiseLike<any>`. */
+        only(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): ITest;
+        /** @deprecated use `Mocha.TestFunction` instead. */
+        /** @deprecated `Mocha.TestFunction#skip` does not allow mixing `done` with a return type of `PromiseLike<any>`. */
+        skip(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    }
+
+    // #endregion
+}
+
+declare global {
+    // #region Test interface augmentations
+
+    /**
+     * Triggers root suite execution.
+     *
+     * - _Only available if flag --delay is passed into Mocha._
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#runWithSuite
+     */
+    function run(): void;
+
+    /**
+     * Execute before running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#before
+     */
+    var before: Mocha.HookFunction;
+
+    /**
+     * Execute before running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#before
+     */
+    var suiteSetup: Mocha.HookFunction;
+
+    /**
+     * Execute after running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#after
+     */
+    var after: Mocha.HookFunction;
+
+    /**
+     * Execute after running tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#after
+     */
+    var suiteTeardown: Mocha.HookFunction;
+
+    /**
+     * Execute before each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#beforeEach
+     */
+    var beforeEach: Mocha.HookFunction;
+
+    /**
+     * Execute before each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#beforeEach
+     */
+    var setup: Mocha.HookFunction;
+
+    /**
+     * Execute after each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#afterEach
+     */
+    var afterEach: Mocha.HookFunction;
+
+    /**
+     * Execute after each test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     *
+     * @see https://mochajs.org/api/global.html#afterEach
+     */
+    var teardown: Mocha.HookFunction;
+
+    /**
+     * Describe a "suite" containing nested suites and tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var describe: Mocha.SuiteFunction;
+
+    /**
+     * Describe a "suite" containing nested suites and tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var context: Mocha.SuiteFunction;
+
+    /**
+     * Describe a "suite" containing nested suites and tests.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var suite: Mocha.SuiteFunction;
+
+    /**
+     * Pending suite.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var xdescribe: Mocha.PendingSuiteFunction;
+
+    /**
+     * Pending suite.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var xcontext: Mocha.PendingSuiteFunction;
+
+    /**
+     * Describes a test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var it: Mocha.TestFunction;
+
+    /**
+     * Describes a test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var specify: Mocha.TestFunction;
+
+    /**
+     * Describes a test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var test: Mocha.TestFunction;
+
+    /**
+     * Describes a pending test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var xit: Mocha.PendingTestFunction;
+
+    /**
+     * Describes a pending test case.
+     *
+     * - _Only available when invoked via the mocha CLI._
+     */
+    var xspecify: Mocha.PendingTestFunction;
+
+    // #endregion Test interface augmentations
+
+    // #region Reporter augmentations
+
+    // Forward declaration for `HTMLLIElement` from lib.dom.d.ts.
+    // Required by Mocha.reporters.HTML.
+    // NOTE: Mocha *must not* have a direct dependency on DOM types.
+    // tslint:disable-next-line no-empty-interface
+    interface HTMLLIElement { }
+
+    // Augments the DOM `Window` object when lib.dom.d.ts is loaded.
+    // tslint:disable-next-line no-empty-interface
+    interface Window extends Mocha.MochaGlobals { }
+
+    namespace NodeJS {
+        // Forward declaration for `NodeJS.EventEmitter` from node.d.ts.
+        // Required by Mocha.Runnable, Mocha.Runner, and Mocha.Suite.
+        // NOTE: Mocha *must not* have a direct dependency on @types/node.
+        // tslint:disable-next-line no-empty-interface
+        interface EventEmitter { }
+
+        // Augments NodeJS's `global` object when node.d.ts is loaded
+        // tslint:disable-next-line no-empty-interface
+        interface Global extends Mocha.MochaGlobals { }
+    }
+
+    // #endregion Reporter augmentations
+
+    // #region Browser augmentations
+
+    /**
+     * Mocha global.
+     *
+     * - _Only supported in the browser._
+     */
+    const mocha: BrowserMocha;
+
+    interface BrowserMocha extends Mocha {
+        /**
+         * Function to allow assertion libraries to throw errors directly into mocha.
+         * This is useful when running tests in a browser because window.onerror will
+         * only receive the 'message' attribute of the Error.
+         *
+         * - _Only supported in the browser._
+         */
+        throwError(err: any): never;
+
+        /**
+         * Setup mocha with the given settings options.
+         *
+         * - _Only supported in the browser._
+         */
+        setup(opts?: Mocha.Interface | MochaSetupOptions): this;
+    }
+
+    /**
+     * Options to pass to `mocha.setup` in the browser.
+     */
+    interface MochaSetupOptions extends Mocha.MochaOptions {
+        // TODO: This does not seem to be supported according to the source. Should it be removed?
+        require?: string[];
+        fullTrace?: boolean;
+    }
+
+    // #endregion Browser augmentations
+
+    // #region Deprecations
+
+    /** @deprecated use `Mocha.DoneCallback` instead. */
+    type MochaDone = Mocha.Done;
+
+    /** @deprecated use `Mocha.ReporterConstructor` instead. */
+    type ReporterConstructor = Mocha.ReporterConstructor;
+
+    // #endregion Deprecations
+}
diff --git a/types/mocha/lib/interfaces/common.d.ts b/types/mocha/lib/interfaces/common.d.ts
new file mode 100644
index 0000000000..9756482354
--- /dev/null
+++ b/types/mocha/lib/interfaces/common.d.ts
@@ -0,0 +1,109 @@
+import Mocha = require("../../");
+
+export = common;
+
+declare function common(suites: Mocha.Suite[], context: Mocha.MochaGlobals, mocha: Mocha): common.CommonFunctions;
+
+declare namespace common {
+    interface CommonFunctions {
+        /**
+         * This is only present if flag --delay is passed into Mocha. It triggers
+         * root suite execution.
+         */
+        runWithSuite(suite: Mocha.Suite): () => void;
+
+        /**
+         * Execute before running tests.
+         */
+        before(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        /**
+         * Execute before running tests.
+         */
+        before(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        /**
+         * Execute after running tests.
+         */
+        after(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        /**
+         * Execute after running tests.
+         */
+        after(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        /**
+         * Execute before each test case.
+         */
+        beforeEach(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        /**
+         * Execute before each test case.
+         */
+        beforeEach(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        /**
+         * Execute after each test case.
+         */
+        afterEach(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        /**
+         * Execute after each test case.
+         */
+        afterEach(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+        suite: SuiteFunctions;
+        test: TestFunctions;
+    }
+
+    interface CreateOptions {
+        /** Title of suite */
+        title: string;
+
+        /** Suite function */
+        fn?: (this: Mocha.Suite) => void;
+
+        /** Is suite pending? */
+        pending?: boolean;
+
+        /** Filepath where this Suite resides */
+        file?: string;
+
+        /** Is suite exclusive? */
+        isOnly?: boolean;
+    }
+
+    interface SuiteFunctions {
+        /**
+         * Create an exclusive Suite; convenience function
+         */
+        only(opts: CreateOptions): Mocha.Suite;
+
+        /**
+         * Create a Suite, but skip it; convenience function
+         */
+        skip(opts: CreateOptions): Mocha.Suite;
+
+        /**
+         * Creates a suite.
+         */
+        create(opts: CreateOptions): Mocha.Suite;
+    }
+
+    interface TestFunctions {
+        /**
+         * Exclusive test-case.
+         */
+        only(mocha: Mocha, test: Mocha.Test): Mocha.Test;
+
+        /**
+         * Pending test case.
+         */
+        skip(title: string): void;
+
+        /**
+         * Number of retry attempts
+         */
+        retries(n: number): void;
+    }
+}
diff --git a/types/mocha/lib/ms.d.ts b/types/mocha/lib/ms.d.ts
new file mode 100644
index 0000000000..3b89a55fc5
--- /dev/null
+++ b/types/mocha/lib/ms.d.ts
@@ -0,0 +1,17 @@
+export = milliseconds;
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @see {@link https://mochajs.org/api/module-milliseconds.html}
+ * @see {@link https://mochajs.org/api/module-milliseconds.html#~parse}
+ */
+declare function milliseconds(val: string): number;
+
+/**
+ * Format for `ms`.
+ *
+ * @see {@link https://mochajs.org/api/module-milliseconds.html}
+ * @see {@link https://mochajs.org/api/module-milliseconds.html#~format}
+ */
+declare function milliseconds(val: number): string;
diff --git a/types/mocha/mocha-node-tests.ts b/types/mocha/mocha-node-tests.ts
deleted file mode 100644
index e5cd80c8cf..0000000000
--- a/types/mocha/mocha-node-tests.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-import MochaDef = require('mocha');
-
-class CustomSpecReporter extends MochaDef.reporters.Spec {
-    constructor(runner: Mocha.IRunner) {
-        super(runner);
-
-        runner.on('test', (test: Mocha.ITest) => {
-            console.log(test.parent.title + '/' + test.title);
-        });
-    }
-}
-
-class MyReporter extends MochaDef.reporters.Base {
-    passes: number = 0;
-    failures: number = 0;
-
-    constructor(runner: Mocha.IRunner) {
-        super(runner);
-
-        runner.on('pass', (test: Mocha.ITest) => {
-            this.passes++;
-            console.log('pass: %s', test.fullTitle());
-        });
-
-        runner.on('fail', (test: Mocha.ITest, err: Error) => {
-            this.failures++;
-            console.log('fail: %s -- error: %s', test.fullTitle(), err.message);
-        });
-
-        runner.on('end', () => {
-            console.log('end: %d/%d', this.passes, this.passes + this.failures);
-            process.exit(this.failures);
-        });
-    }
-}
diff --git a/types/mocha/mocha-node.d.ts b/types/mocha/mocha-node.d.ts
deleted file mode 100644
index dcee001b54..0000000000
--- a/types/mocha/mocha-node.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for mocha 2.2.5
-// Project: http://mochajs.org/
-// Definitions by: Vadim Macagon <https://github.com/enlight>, vvakame <https://github.com/vvakame>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-/// <reference types="node" />
-
-declare namespace Mocha {
-    interface IRunnable extends NodeJS.EventEmitter {
-    }
-    interface ISuite extends NodeJS.EventEmitter {
-    }
-    interface IRunner extends NodeJS.EventEmitter {
-    }
-}
diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts
index ec9b238d80..b80d7b415d 100644
--- a/types/mocha/mocha-tests.ts
+++ b/types/mocha/mocha-tests.ts
@@ -3,36 +3,36 @@ import {
     before as importedBefore,
     afterEach as importedAfterEach,
     beforeEach as importedBeforeEach,
-    context as importedContext,
     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';
+import LocalMocha = require('mocha');
 
 // Warning!!
 // Don't refer node.d.ts!!
 // See #22510.
 (): number => setTimeout(() => 0, 0);
 
-let boolean: boolean;
-let string: string;
-let number: number;
-let stringOrUndefined: string | undefined;
-let dateOrUndefined: Date | undefined;
-const resolved = Promise.resolve();
-const rejected = Promise.reject('some error');
+declare let number: number;
+declare let boolean: boolean;
+declare let string: string;
+declare let stringOrUndefined: string | undefined;
+declare let any: any;
 
-// Use module augmentation to add a third-party interface
+// Use module augmentation to add a third-party interface or reporter
 declare module 'mocha' {
     interface InterfaceContributions {
-        'third-party-interface': any;
+        'third-party-interface': never;
+    }
+    interface ReporterContributions {
+        'third-party-reporter': never;
     }
 }
-const i: Mocha.Interface = 'third-party-interface';
+
+const thirdPartyInterface: Mocha.Interface = 'third-party-interface';
+const thirdPartyReporter: Mocha.Reporter = 'third-party-reporter';
 
 // Lazy tests of compatibility between imported and global functions; should be identical
 const _after: typeof after = importedAfter;
@@ -43,469 +43,786 @@ const _afterEach: typeof afterEach = importedAfterEach;
 const _afterEach2: typeof importedAfterEach = afterEach;
 const _beforeEach: typeof beforeEach = importedBeforeEach;
 const _beforeEach2: typeof importedBeforeEach = beforeEach;
-const _context: typeof context = importedContext;
-const _context2: typeof importedContext = context;
 const _describe: typeof describe = importedDescribe;
 const _describe2: typeof importedDescribe = describe;
 const _it: typeof it = importedIt;
 const _it2: typeof importedIt = it;
-const _xdescribe: typeof xdescribe = importedXdescribe;
-const _xdescribe2: typeof importedXdescribe = xdescribe;
 const _xit: typeof xit = importedXit;
 const _xit2: typeof importedXit = xit;
 
-function test_describe() {
-    describe('something', () => { });
-
-    describe.only('something', () => { });
-
-    describe.skip('something', () => { });
-
+function test_bdd_describe() {
+    // $ExpectType Suite
     describe('something', function() {
-        this.retries(3).slow(1000).timeout(2000).retries(3);
+        // $ExpectType Suite
+        this;
+    });
+
+    // $ExpectType Suite
+    describe.only('something', function() {
+        // $ExpectType Suite
+        this;
+    });
+
+    // $ExpectType void | Suite
+    describe.skip('something', function() {
+        // $ExpectType Suite
+        this;
     });
 }
 
-function test_context() {
-    context('some context', () => { });
+function test_bdd_context() {
+    // $ExpectType Suite
+    context('something', function() {
+        // $ExpectType Suite
+        this;
+    });
 
-    context.only('some context', () => { });
+    // $ExpectType Suite
+    context.only('something', function() {
+        // $ExpectType Suite
+        this;
+    });
 
-    context.skip('some context', () => { });
-
-    context('some context', function() {
-        this.retries(3).slow(1000).timeout(2000).retries(3);
+    // $ExpectType void | Suite
+    context.skip('something', function() {
+        // $ExpectType Suite
+        this;
     });
 }
 
-function test_suite() {
-    suite('some context', () => { });
-
-    suite.only('some context', () => { });
-
-    suite.skip('some context', () => { });
-
-    suite('some context', function() {
-        this.retries(3).slow(1000).timeout(2000).retries(3);
+function test_bdd_xdescribe() {
+    // $ExpectType void | Suite
+    xdescribe('something', function() {
+        // $ExpectType Suite
+        this;
     });
 }
 
-function test_it() {
-    it('does something', () => { }).timeout('2s');
-
-    it('does something', function() { this['sharedState'] = true; });
-
-    it('does something', (done) => { done(); });
-
-    it('does something', () => resolved);
-    it('does something', () => rejected);
-
-    it.only('does something', () => { });
-
-    it.skip('does something', () => { });
-
-    it('does something', function() {
-        this.skip().retries(3).slow(1000).timeout(2000).skip();
+function test_bdd_xcontext() {
+    // $ExpectType void | Suite
+    xcontext('something', function() {
+        // $ExpectType Suite
+        this;
     });
 }
 
-function test_test() {
-    test('does something', () => { });
+function test_tdd_suite() {
+    // $ExpectType Suite
+    suite('something', function() {
+        // $ExpectType Suite
+        this;
+    });
 
-    test('does something', function() { this['sharedState'] = true; });
+    // $ExpectType Suite
+    suite.only('something', function() {
+        // $ExpectType Suite
+        this;
+    });
 
-    test('does something', (done) => { done(); });
-
-    test('does something', () => resolved);
-    test('does something', () => rejected);
-
-    test.only('does something', () => { });
-
-    test.skip('does something', () => { });
-
-    test('does something', function() {
-        this.skip().retries(3).slow(1000).timeout(2000).skip();
+    // $ExpectType void | Suite
+    suite.skip('something', function() {
+        // $ExpectType Suite
+        this;
     });
 }
 
-function test_specify() {
-    specify('does something', () => { });
+function test_qunit_suite() {
+    // $ExpectType Suite
+    suite('some context');
 
-    specify('does something', function() { this['sharedState'] = true; });
+    // $ExpectType Suite
+    suite.only('some context');
+}
 
-    specify('does something', (done) => { done(); });
+function test_bdd_it() {
+    // $ExpectType Test
+    it(function doesSomething(done) {
+        // $ExpectType Done
+        done;
 
-    specify('does something', () => resolved);
-    specify('does something', () => rejected);
+        // $ExpectType Context
+        this;
+    });
 
-    specify.only('does something', () => { });
+    // $ExpectType Test
+    it(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
 
-    specify.skip('does something', () => { });
+    // $ExpectType Test
+    it('does something', function(done) {
+        // $ExpectType Done
+        done;
 
-    specify('does something', function() {
-        this.skip().retries(3).slow(1000).timeout(2000).skip();
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.only(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.only(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.only('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.only('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.skip(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.skip(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.skip('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    it.skip('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType void
+    it.retries(number);
+}
+
+function test_bdd_xit() {
+    // $ExpectType Test
+    xit(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    xit(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    xit('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    xit('does something', async function() {
+        // $ExpectType Context
+        this;
     });
 }
 
-function test_before() {
-    before(() => { });
+function test_bdd_specify() {
+    // $ExpectType Test
+    specify(function doesSomething(done) {
+        // $ExpectType Done
+        done;
 
-    before(function() { this['sharedState'] = true; });
+        // $ExpectType Context
+        this;
+    });
 
-    before((done) => { done(); });
+    // $ExpectType Test
+    specify(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
 
-    before(() => resolved);
-    before(() => rejected);
+    // $ExpectType Test
+    specify('does something', function(done) {
+        // $ExpectType Done
+        done;
 
-    before("my description", () => { });
+        // $ExpectType Context
+        this;
+    });
 
-    before("my description", done => { });
+    // $ExpectType Test
+    specify('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
 
-    before("my description", () => resolved);
+    // $ExpectType Test
+    specify.only(function doesSomething(done) {
+        // $ExpectType Done
+        done;
 
-    before("my description", function() {
-        this.skip().timeout(2000).skip();
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    specify.only(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    specify.only('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    specify.only('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    specify.skip(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    specify.skip(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    specify.skip('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    specify.skip('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType void
+    specify.retries(number);
+}
+
+function test_bdd_xspecify() {
+    // $ExpectType Test
+    xspecify(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    xspecify(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    xspecify('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    xspecify('does something', async function() {
+        // $ExpectType Context
+        this;
     });
 }
 
-function test_setup() {
-    setup(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+function test_tdd_qunit_test() {
+    // $ExpectType Test
+    test(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
     });
 
-    setup(function() {
-        this['sharedState'] = true;
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+    // $ExpectType Test
+    test(async function doesSomething() {
+        // $ExpectType Context
+        this;
     });
 
+    // $ExpectType Test
+    test('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.only(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.only(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.only('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.only('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.skip(function doesSomething(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.skip(async function doesSomething() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.skip('does something', function(done) {
+        // $ExpectType Done
+        done;
+
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType Test
+    test.skip('does something', async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    // $ExpectType void
+    test.retries(number);
+}
+
+function test_bdd_qunit_before() {
+    before(function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
+
+    before(async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    before('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
+
+    before('description', async function() {
+        // $ExpectType Context
+        this;
+    });
+}
+
+function test_tdd_setup() {
     setup(function(done) {
-        done();
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
     });
 
-    setup(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-        return resolved;
+    setup(async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    setup('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
+
+    setup('description', async function() {
+        // $ExpectType Context
+        this;
     });
 }
 
-function test_after() {
-    after(() => { });
+function test_bdd_qunit_after() {
+    after(function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
 
-    after(function() { this['sharedState'] = true; });
+    after(async function() {
+        // $ExpectType Context
+        this;
+    });
 
-    after((done) => { done(); });
+    after('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
 
-    after(() => resolved);
-
-    after("my description", () => { });
-
-    after("my description", done => { });
-
-    after("my description", () => resolved);
+    after('description', async function() {
+        // $ExpectType Context
+        this;
+    });
 }
 
-function test_teardown() {
-    teardown(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
-    teardown(function() {
-        this['sharedState'] = true;
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
+function test_tdd_teardown() {
     teardown(function(done) {
-        done();
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
     });
 
-    teardown(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-        return resolved;
+    teardown(async function() {
+        // $ExpectType Context
+        this;
+    });
+
+    teardown('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
+
+    teardown('description', async function() {
+        // $ExpectType Context
+        this;
     });
 }
 
-function test_beforeEach() {
-    beforeEach(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
-    beforeEach(function() {
-        this['sharedState'] = true;
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
+function test_bdd_qunit_beforeEach() {
     beforeEach(function(done) {
-        done();
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
     });
 
-    beforeEach(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-        return resolved;
+    beforeEach(async function() {
+        // $ExpectType Context
+        this;
     });
 
-    beforeEach("my description", function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+    beforeEach('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
     });
 
-    beforeEach("my description", function(done) {
-        done();
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
-    beforeEach("my description", function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-        return resolved;
+    beforeEach('description', async function() {
+        // $ExpectType Context
+        this;
     });
 }
 
-function test_suiteSetup() {
-    suiteSetup(() => { });
+function test_tdd_suiteSetup() {
+    suiteSetup(function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
 
-    suiteSetup(function() { this['sharedState'] = true; });
+    suiteSetup(async function() {
+        // $ExpectType Context
+        this;
+    });
 
-    suiteSetup((done) => { done(); });
+    suiteSetup('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
 
-    suiteSetup(() => resolved);
+    suiteSetup('description', async function() {
+        // $ExpectType Context
+        this;
+    });
 }
 
-function test_afterEach() {
-    afterEach(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
-    afterEach(function() {
-        this['sharedState'] = true;
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
+function test_bdd_qunit_afterEach() {
     afterEach(function(done) {
-        done();
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
     });
 
-    afterEach(function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-        return resolved;
+    afterEach(async function() {
+        // $ExpectType Context
+        this;
     });
 
-    afterEach("my description", function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
+    afterEach('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
     });
 
-    afterEach("my description", function(done) {
-        done();
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-    });
-
-    afterEach("my description", function() {
-        boolean = this.currentTest.async;
-        boolean = this.currentTest.pending;
-        boolean = this.currentTest.sync;
-        boolean = this.currentTest.timedOut;
-        string = this.currentTest.title;
-        string = this.currentTest.fullTitle();
-        stringOrUndefined = this.currentTest.state;
-        return resolved;
+    afterEach('description', async function() {
+        // $ExpectType Context
+        this;
     });
 }
 
-function test_suiteTeardown() {
-    suiteTeardown(() => { });
+function test_tdd_suiteTeardown() {
+    suiteTeardown(function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
 
-    suiteTeardown(function() { this['sharedState'] = true; });
+    suiteTeardown(async function() {
+        // $ExpectType Context
+        this;
+    });
 
-    suiteTeardown((done) => { done(); });
+    suiteTeardown('description', function(done) {
+        // $ExpectType Done
+        done;
+        // $ExpectType Context
+        this;
+    });
 
-    suiteTeardown(() => resolved);
+    suiteTeardown('description', async function() {
+        // $ExpectType Context
+        this;
+    });
 }
 
-function test_reporter_string() {
+function test_Context(ctx: LocalMocha.Context, runnable: LocalMocha.Runnable) {
+    // $ExpectType never
+    ctx.skip(); // throws
+
+    // $ExpectType boolean
+    ctx.enableTimeouts();
+
+    // $ExpectType Context
+    ctx.enableTimeouts(boolean);
+
+    // $ExpectType number
+    ctx.retries();
+
+    // $ExpectType Context
+    ctx.retries(number);
+
+    // $ExpectType Runnable
+    ctx.runnable();
+
+    // $ExpectType Context
+    ctx.runnable(runnable);
+
+    // $ExpectType number
+    ctx.slow();
+
+    // $ExpectType Context
+    ctx.slow(number);
+
+    // $ExpectType number
+    ctx.timeout();
+
+    // $ExpectType Context
+    ctx.timeout(number);
+
+    // $ExpectType Test | undefined
+    ctx.currentTest;
+
+    // $ExpectType Runnable | undefined
+    ctx.test;
+
+    ctx["extended"] = any;
+
+    // $ExpectType any
+    ctx["extended"];
+
+    ctx.enableTimeouts(boolean)
+        .retries(number)
+        .runnable(runnable)
+        .slow(number)
+        .timeout(number)
+        .skip();
+}
+
+function test_reporter_string(localMocha: LocalMocha) {
+    // $ExpectType BrowserMocha
     mocha.reporter('html');
+
+    // $ExpectType Mocha
+    localMocha.reporter('html');
 }
 
-function test_reporter_function() {
-    mocha.reporter(class { });
+function test_reporter_function(localMocha: LocalMocha) {
+    // $ExpectType BrowserMocha
+    mocha.reporter(class extends LocalMocha.reporters.Base { });
+
+    // $ExpectType Mocha
+    localMocha.reporter(class extends LocalMocha.reporters.Base { });
 }
 
-function test_setup_slow_option() {
-    new Mocha({ slow: 25 });
+function test_browser_mocha_setup_slow_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ slow: 25 });
 }
 
-function test_setup_timeout_option() {
-    new Mocha({ timeout: 25 });
+function test_browser_mocha_setup_timeout_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ timeout: 25 });
 }
 
-function test_setup_globals_option() {
-    new Mocha({ globals: ['mocha'] });
+function test_browser_mocha_setup_globals_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ globals: ['mocha'] });
 }
 
-function test_setup_ui_option() {
-    new Mocha({ ui: 'bdd' });
+function test_browser_mocha_setup_ui_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ ui: 'bdd' });
 }
 
-function test_setup_reporter_string_option() {
-    new Mocha({ reporter: 'html' });
+function test_browser_mocha_setup_reporter_string_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ reporter: 'html' });
 }
 
-function test_setup_require_stringArray_option() {
-    new Mocha({ require: ['ts-node/register'] });
+function test_browser_mocha_setup_require_stringArray_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ require: ['ts-node/register'] });
 }
 
-function test_setup_reporter_function_option() {
-    new Mocha({ reporter: class { } });
+function test_browser_mocha_setup_reporter_function_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ reporter: class extends LocalMocha.reporters.Base { } });
 }
 
-function test_setup_bail_option() {
-    new Mocha({ bail: false });
+function test_browser_mocha_setup_bail_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ bail: false });
 }
 
-function test_setup_ignore_leaks_option() {
-    new Mocha({ ignoreLeaks: false });
+function test_browser_mocha_setup_ignore_leaks_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ ignoreLeaks: false });
 }
 
-function test_setup_grep_string_option() {
-    new Mocha({ grep: "describe" });
+function test_browser_mocha_setup_grep_string_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ grep: "describe" });
 }
 
-function test_setup_grep_regex_option() {
-    new Mocha({ grep: new RegExp('describe') });
+function test_browser_mocha_setup_grep_regex_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ grep: new RegExp('describe') });
 }
 
-function test_setup_grep_regex_literal_option() {
-    new Mocha({ grep: /(expect|should)/i });
+function test_browser_mocha_setup_grep_regex_literal_option() {
+    // $ExpectType BrowserMocha
+    mocha.setup({ grep: /(expect|should)/i });
 }
 
-function test_setup_all_options() {
-    new Mocha({
+function test_browser_mocha_setup_all_options() {
+    // $ExpectType BrowserMocha
+    mocha.setup({
         slow: 25,
         timeout: 25,
         ui: 'bdd',
@@ -514,12 +831,97 @@ function test_setup_all_options() {
         bail: true,
         ignoreLeaks: true,
         grep: 'test',
-        require: ['ts-node/register']
+        require: ['ts-node/register'] // TODO: It doesn't appear this is actually supported. Should it be removed?
     });
 }
 
-function test_run() {
-    mocha.run(() => {});
+function test_constructor_slow_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ slow: 25 });
+}
+
+function test_constructor_timeout_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ timeout: 25 });
+}
+
+function test_constructor_globals_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ globals: ['mocha'] });
+}
+
+function test_constructor_ui_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ ui: 'bdd' });
+}
+
+function test_constructor_reporter_string_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ reporter: 'html' });
+}
+
+function test_constructor_reporter_function_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ reporter: class extends LocalMocha.reporters.Base { } });
+}
+
+function test_constructor_bail_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ bail: false });
+}
+
+function test_constructor_ignore_leaks_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ ignoreLeaks: false });
+}
+
+function test_constructor_grep_string_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ grep: "describe" });
+}
+
+function test_constructor_grep_regex_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ grep: new RegExp('describe') });
+}
+
+function test_constructor_grep_regex_literal_option() {
+    // $ExpectType Mocha
+    new LocalMocha({ grep: /(expect|should)/i });
+}
+
+function test_constructor_all_options() {
+    // $ExpectType Mocha
+    new LocalMocha({
+        slow: 25,
+        timeout: 25,
+        ui: 'bdd',
+        globals: ['mocha'],
+        reporter: 'html',
+        bail: true,
+        ignoreLeaks: true,
+        grep: 'test'
+    });
+}
+
+function test_run(localMocha: LocalMocha) {
+    // $ExpectType Runner
+    mocha.run();
+
+    // $ExpectType Runner
+    mocha.run((failures) => {
+        // $ExpectType number
+        failures;
+    });
+
+    // $ExpectType Runner
+    localMocha.run();
+
+    // $ExpectType Runner
+    localMocha.run((failures) => {
+        // $ExpectType number
+        failures;
+    });
 }
 
 function test_growl() {
@@ -527,24 +929,22 @@ function test_growl() {
 }
 
 function test_chaining() {
-    new Mocha({ slow: 25 })
+    new LocalMocha({ slow: 25 })
         .growl()
         .reporter('html')
-        .reporter(class { });
+        .reporter(class extends LocalMocha.reporters.Base { });
 }
 
-import MochaDef = require('mocha');
-
 function test_require_constructor_empty() {
-    const instance = new MochaDef();
+    const instance = new LocalMocha();
 }
 
 function test_require_constructor_noOptions() {
-    const instance = new MochaDef({});
+    const instance = new LocalMocha({});
 }
 
 function test_require_constructor_allOptions() {
-    const instance = new MochaDef({
+    const instance = new LocalMocha({
         grep: /[a-z]*/,
         ui: 'tdd',
         reporter: 'dot',
@@ -554,13 +954,13 @@ function test_require_constructor_allOptions() {
 }
 
 function test_require_fluentParams() {
-    const instance = new MochaDef();
+    const instance = new LocalMocha();
 
     instance.bail(true)
         .bail()
         .addFile('foo.js')
-        .reporter('bdd')
-        .ui('dot')
+        .reporter('dot')
+        .ui('bdd')
         .grep('[a-z]*')
         .grep(/[a-z]*/)
         .invert()
@@ -574,60 +974,290 @@ function test_require_fluentParams() {
         .timeout(500)
         .slow(100)
         .enableTimeouts(true)
-        .asyncOnly(false)
-        .noHighlighting(true)
+        .asyncOnly()
+        .noHighlighting()
         .run();
 }
 
-function test_run_withOnComplete() {
-    const instance = new MochaDef();
-
-    instance.run((failures: number): void => {
-        console.log(failures);
-    });
-}
-
 function test_throwError() {
     mocha.throwError(new Error("I'm an error!"));
 }
 
-function test_mochaRunner_properties(runner: MochaDef.IRunner, suite: MochaDef.ISuite) {
-    runner = runner.abort();
+function test_mochaRunner_properties(runner: LocalMocha.Runner, suite: LocalMocha.Suite) {
+    // $Expecttype Runner
+    runner.abort();
 
-    if (runner.stats !== undefined) {
-        number = runner.stats.failures;
-        number = runner.stats.passes;
-        number = runner.stats.pending;
-        number = runner.stats.suites;
-        number = runner.stats.tests;
+    // $ExpectType Suite
+    runner.suite;
 
-        dateOrUndefined = runner.stats.start;
-        dateOrUndefined = runner.stats.end;
-        dateOrUndefined = runner.stats.duration;
-    }
+    // $ExpectType boolean
+    runner.started;
 
-    const s: MochaDef.ISuite = runner.suite;
-    boolean = runner.started;
-    number = runner.total;
-    number = runner.failures;
+    // $ExpectType number
+    runner.total;
 
-    runner = runner.grep("regex", false);
-    number = runner.grepTotal(suite);
+    // $ExpectType number
+    runner.failures;
 
-    const globals: string[] | MochaDef.IRunner = runner.globals(["hello", "world"]);
+    // $ExpectType Runner
+    runner.grep(/regex/, false);
 
-    runner = runner.run();
-    runner = runner.run((f: number) => {});
+    // $ExpectType number
+    runner.grepTotal(suite);
+
+    // $ExpectType string[]
+    runner.globals();
+
+    // $ExpectType Runner
+    runner.globals(["hello", "world"]);
+
+    // $ExpectType Runner
+    runner.run();
+
+    // $ExpectType Runner
+    runner.run((failures) => {
+        // $ExpectType number
+        failures;
+    });
 }
 
-function test_base_reporter_properties(reporter: MochaDef.reporters.Base) {
-    number = reporter.stats.failures;
-    number = reporter.stats.passes;
-    number = reporter.stats.pending;
-    number = reporter.stats.suites;
-    number = reporter.stats.tests;
+function test_base_reporter_properties(reporter: LocalMocha.reporters.Base) {
+    // $ExpectType number
+    reporter.stats.failures;
 
-    dateOrUndefined = reporter.stats.start;
-    dateOrUndefined = reporter.stats.end;
-    dateOrUndefined = reporter.stats.duration;
+    // $ExpectType number
+    reporter.stats.passes;
+
+    // $ExpectType number
+    reporter.stats.pending;
+
+    // $ExpectType number
+    reporter.stats.suites;
+
+    // $ExpectType number
+    reporter.stats.tests;
+
+    // $ExpectType Date | undefined
+    reporter.stats.start;
+
+    // $ExpectType Date | undefined
+    reporter.stats.end;
+
+    // $ExpectType number | undefined
+    reporter.stats.duration;
+}
+
+function test_runner_events(runner: LocalMocha.Runner) {
+    // $ExpectType Runner
+    runner.on("start", () => {});
+
+    // $ExpectType Runner
+    runner.on("end", () => {});
+
+    // $ExpectType Runner
+    runner.on("suite", (suite) => {
+        // $ExpectType Suite
+        suite;
+    });
+
+    // $ExpectType Runner
+    runner.on("suite end", (suite) => {
+        // $ExpectType Suite
+        suite;
+    });
+
+    // $ExpectType Runner
+    runner.on("test", (test) => {
+        // $ExpectType Test
+        test;
+    });
+
+    // $ExpectType Runner
+    runner.on("test end", (test) => {
+        // $ExpectType Test
+        test;
+    });
+
+    // $ExpectType Runner
+    runner.on("hook", (hook) => {
+        // $ExpectType Hook
+        hook;
+    });
+
+    // $ExpectType Runner
+    runner.on("hook end", (hook) => {
+        // $ExpectType Hook
+        hook;
+    });
+
+    // $ExpectType Runner
+    runner.on("pass", (test) => {
+        // $ExpectType Test
+        test;
+    });
+
+    // $ExpectType Runner
+    runner.on("fail", (test, err) => {
+        // $ExpectType Test
+        test;
+
+        // $ExpectType any
+        err;
+    });
+
+    // $ExpectType Runner
+    runner.on("pending", (test) => {
+        // $ExpectType Test
+        test;
+    });
+}
+
+function test_runnable_events(runnable: LocalMocha.Runnable) {
+    // $ExpectType Runnable
+    runnable.on("error", (error) => {
+        // $ExpectType any
+        error;
+    });
+}
+
+function test_suite_events(suite: LocalMocha.Suite) {
+    // $ExpectType Suite
+    suite.on("beforeAll", (hook) => {
+        // $ExpectType Hook
+        hook;
+    });
+
+    // $ExpectType Suite
+    suite.on("afterAll", (hook) => {
+        // $ExpectType Hook
+        hook;
+    });
+
+    // $ExpectType Suite
+    suite.on("beforeEach", (hook) => {
+        // $ExpectType Hook
+        hook;
+    });
+
+    // $ExpectType Suite
+    suite.on("afterEach", (hook) => {
+        // $ExpectType Hook
+        hook;
+    });
+
+    // $ExpectType Suite
+    suite.on("run", () => { });
+
+    // $ExpectType Suite
+    suite.on("pre-require", (context, file, mocha) => {
+        // $ExpectType MochaGlobals
+        context;
+        // $ExpectType string
+        file;
+        // $ExpectType Mocha
+        mocha;
+    });
+
+    // $ExpectType Suite
+    suite.on("require", (module, file, mocha) => {
+        // $ExpectType any
+        module;
+        // $ExpectType string
+        file;
+        // $ExpectType Mocha
+        mocha;
+    });
+
+    // $ExpectType Suite
+    suite.on("post-require", (context, file, mocha) => {
+        // $ExpectType MochaGlobals
+        context;
+        // $ExpectType string
+        file;
+        // $ExpectType Mocha
+        mocha;
+    });
+}
+
+function test_backcompat_Suite(suite: Mocha.Suite, iSuite: Mocha.ISuite, iSuiteContext: Mocha.ISuiteCallbackContext, iTest: Mocha.ITest, iContext: Mocha.IContext) {
+    iSuite = suite;
+    iSuiteContext = suite;
+    suite.addTest(iTest);
+    suite.addSuite(iSuite);
+    LocalMocha.Suite.create(iSuite, string);
+    new LocalMocha.Suite(string, iContext);
+}
+
+function test_backcompat_Runner(runner: Mocha.Runner, iRunner: Mocha.IRunner, iSuite: Mocha.ISuite) {
+    iRunner = runner;
+    runner.grepTotal(iSuite);
+}
+
+function test_backcompat_Runnable(runnable: Mocha.Runnable, iRunnable: Mocha.IRunnable) {
+    iRunnable = runnable;
+}
+
+function test_backcompat_Test(test: Mocha.Test, iTest: Mocha.ITest) {
+    iTest = test;
+}
+
+function test_backcompat_Hook(hook: Mocha.Hook, iHook: Mocha.IHook) {
+    iHook = hook;
+}
+
+function test_backcompat_Context(context: Mocha.Context, iContext: Mocha.IContext,
+    iHookContext: Mocha.IHookCallbackContext, iBeforeAfterContext: Mocha.IBeforeAndAfterContext,
+    iTestContext: Mocha.ITestCallbackContext, iRunnable: Mocha.IRunnable) {
+    iContext = context;
+    iHookContext = context;
+    iBeforeAfterContext = context;
+    iTestContext = context;
+    context.runnable(iRunnable);
+}
+
+function test_backcompat_Base(iRunner: Mocha.IRunner) {
+    new LocalMocha.reporters.Base(iRunner);
+}
+
+function test_backcompat_XUnit(iRunner: Mocha.IRunner) {
+    new LocalMocha.reporters.XUnit(iRunner);
+}
+
+function test_backcompat_Progress(iRunner: Mocha.IRunner) {
+    new LocalMocha.reporters.Progress(iRunner);
+}
+
+import common = require("mocha/lib/interfaces/common");
+
+function test_interfaces_common(suites: Mocha.Suite[], context: Mocha.MochaGlobals, localMocha: Mocha,
+    fn: Mocha.Func | Mocha.AsyncFunc, test: Mocha.Test) {
+    const funcs = common(suites, context, localMocha);
+    // $ExpectType CommonFunctions
+    funcs;
+
+    funcs.before(fn);
+    funcs.before(string, fn);
+    funcs.beforeEach(fn);
+    funcs.beforeEach(string, fn);
+    funcs.after(fn);
+    funcs.after(string, fn);
+    funcs.afterEach(fn);
+    funcs.afterEach(string, fn);
+
+    // $ExpectType Suite
+    funcs.suite.create({ title: string });
+    funcs.suite.create({ title: string, file: string, fn: () => {}, pending: boolean, isOnly: boolean });
+
+    // $ExpectType Suite
+    funcs.suite.only({ title: string });
+    funcs.suite.only({ title: string, file: string, fn: () => {}, pending: boolean, isOnly: boolean });
+
+    // $ExpectType Suite
+    funcs.suite.skip({ title: string });
+    funcs.suite.skip({ title: string, file: string, fn: () => {}, pending: boolean, isOnly: boolean });
+
+    // $ExpectType Test
+    funcs.test.only(mocha, test);
+    funcs.test.skip(string);
+    funcs.test.retries(number);
 }
diff --git a/types/mocha/tsconfig.json b/types/mocha/tsconfig.json
index 6e88356fe4..f26091927f 100644
--- a/types/mocha/tsconfig.json
+++ b/types/mocha/tsconfig.json
@@ -19,6 +19,8 @@
     },
     "files": [
         "index.d.ts",
+        "lib/ms.d.ts",
+        "lib/interfaces/common.d.ts",
         "mocha-tests.ts"
     ]
 }
\ No newline at end of file

From ce4abcf585e1da3ce14c2f2f999a5b7a04644095 Mon Sep 17 00:00:00 2001
From: Andrew Makarov <me@r3nya.ru>
Date: Sat, 9 Jun 2018 11:52:11 +0300
Subject: [PATCH 1103/1124] [jest] add toHaveBeenNthCalledWith matcher

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index af86996795..fd602b18d9 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -13,6 +13,7 @@
 //                 Ahn <https://github.com/AhnpGit>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Bradley Ayers <https://github.com/bradleyayers>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -473,6 +474,11 @@ declare namespace jest {
          * to test what arguments it was last called with.
          */
         toHaveBeenLastCalledWith(...params: any[]): R;
+        /**
+         * If you have a mock function, you can use `.toHaveBeenNthCalledWith`
+         * to test what arguments it was nth called with.
+         */
+        toHaveBeenNthCalledWith(nthCall: number, ...params: any[]): R;
         /**
          * Used to check that an object has a `.length` property
          * and it is set to a certain numeric value.

From e1a31cd5494b0c3adc58aa096d547ba4cd3eb7f6 Mon Sep 17 00:00:00 2001
From: LinChen <lc1990linux@gmail.com>
Date: Sat, 9 Jun 2018 21:24:20 +0800
Subject: [PATCH 1104/1124] [chen] make webAuth support social login

Auth0.js support social login by using
webAuth.authorize({
  connection: 'twitter'
});
https://auth0.com/docs/libraries/auth0js/v9
but @types/react-native-auth0 stop us to pass it in, so add "connnection" as a legal parameter
---
 types/react-native-auth0/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-native-auth0/index.d.ts b/types/react-native-auth0/index.d.ts
index 1291baeafd..b6a4e769e8 100644
--- a/types/react-native-auth0/index.d.ts
+++ b/types/react-native-auth0/index.d.ts
@@ -137,6 +137,7 @@ export interface AuthorizeParams {
     nonce?: string;
     audience?: string;
     scope?: string;
+    connection?: string;
 }
 
 export interface ClearSessionParams {

From 028d2422e95393529d5b14ba3acb328870c07f4a Mon Sep 17 00:00:00 2001
From: Shane Fitzpatrick <fitzpasd@gmail.com>
Date: Sat, 9 Jun 2018 08:21:28 -0700
Subject: [PATCH 1105/1124] Adding a test

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

diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index b3487057ed..1f506eb124 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -49,8 +49,10 @@ import {
     NativeModules,
     MaskedViewIOS,
     TextInput,
+    TextInputFocusEventData,
     InputAccessoryView,
-    StatusBar
+    StatusBar,
+    NativeSyntheticEvent
 } from "react-native";
 
 declare module "react-native" {
@@ -447,6 +449,25 @@ class TextInputRefTest extends React.Component<{}, {username: string}> {
     }
 }
 
+class TextInputFocusBlurEventTest extends React.Component {
+    handleOnBlur(e: NativeSyntheticEvent<TextInputFocusEventData>) {
+    }
+
+    handleOnFocus(e: NativeSyntheticEvent<TextInputFocusEventData>) {
+    }
+
+    render() {
+        return (
+            <View>
+                <TextInput
+                    onBlur={(e: NativeSyntheticEvent<TextInputFocusEventData>) => this.handleOnBlur(e)}
+                    onFocus={(e: NativeSyntheticEvent<TextInputFocusEventData>) => this.handleOnFocus(e)}
+                />
+            </View>
+        )
+    }
+}
+
 class StatusBarTest extends React.Component {
     render() {
         StatusBar.setBarStyle("dark-content", true);

From b5fc7477d0a847a61706586ad579419b01d2070b Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Sun, 10 Jun 2018 15:16:50 -0700
Subject: [PATCH 1106/1124] [jest] Added Jest 23 matchers, with tests

Superset of the following PRs, with author attributions:
* https://github.com/DefinitelyTyped/DefinitelyTyped/pull/26230
* https://github.com/DefinitelyTyped/DefinitelyTyped/pull/26236
* https://github.com/DefinitelyTyped/DefinitelyTyped/pull/26399

I tried to keep things in alphabetical order. Filed https://github.com/DefinitelyTyped/DefinitelyTyped/issues/26424 to clean up the tests file after this.

Does not add `jest-each`per https://github.com/DefinitelyTyped/DefinitelyTyped/issues/26368. Will do separately.
---
 types/jest/index.d.ts    | 82 +++++++++++++++++++++++++++++++++++++++-
 types/jest/jest-tests.ts | 23 +++++++++++
 2 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index af86996795..2afe0eb750 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -10,9 +10,11 @@
 //                 Waseem Dahman <https://github.com/wsmd>
 //                 Jamie Mason <https://github.com/JamieMason>
 //                 Douglas Duteil <https://github.com/douglasduteil>
-//                 Ahn <https://github.com/AhnpGit>
+//                 Ahn <https://github.com/ahnpnl>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Bradley Ayers <https://github.com/bradleyayers>
+//                 Jeff Lau <https://github.com/UselessPickles>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -357,10 +359,22 @@ declare namespace jest {
     }
 
     interface Matchers<R> {
+        /**
+         * Ensures the last call to a mock function was provided specific args.
+         */
+        lastCalledWith(...args: any[]): R;
+        /**
+         * Ensure that the last call to a mock function has returned a specified value.
+         */
+        lastReturnedWith(value: any): R;
         /**
          * If you know how to test something, `.not` lets you test its opposite.
          */
         not: Matchers<R>;
+        /**
+         * Ensure that the nth call to a mock function has returned a specified value.
+         */
+        nthReturnedWith(n: number, value: any): R;
         /**
          * Use resolves to unwrap the value of a fulfilled promise so any other
          * matcher can be chained. If the promise is rejected the assertion fails.
@@ -371,7 +385,6 @@ declare namespace jest {
          * If the promise is fulfilled the assertion fails.
          */
         rejects: Matchers<Promise<R>>;
-        lastCalledWith(...args: any[]): R;
         /**
          * Checks that a value is what you expect. It uses `===` to check strict equality.
          * Don't use `toBe` with floating-point numbers.
@@ -468,17 +481,46 @@ declare namespace jest {
          * Ensure that a mock function is called with specific arguments.
          */
         toHaveBeenCalledWith(...params: any[]): R;
+        /**
+         * Ensure that a mock function is called with specific arguments on an Nth call.
+         */
+        toHaveBeenNthCalledWith(nthCall: number, ...params: any[]): R;
         /**
          * If you have a mock function, you can use `.toHaveBeenLastCalledWith`
          * to test what arguments it was last called with.
          */
         toHaveBeenLastCalledWith(...params: any[]): R;
+        /**
+         * Use to test the specific value that a mock function last returned.
+         * If the last call to the mock function threw an error, then this matcher will fail
+         * no matter what value you provided as the expected return value.
+         */
+        toHaveLastReturnedWith(expected: any): R;
         /**
          * Used to check that an object has a `.length` property
          * and it is set to a certain numeric value.
          */
         toHaveLength(expected: number): R;
+        /**
+         * Use to test the specific value that a mock function returned for the nth call.
+         * If the nth call to the mock function threw an error, then this matcher will fail
+         * no matter what value you provided as the expected return value.
+         */
+        toHaveNthReturnedWith(nthCall: number, expected: any): R;
         toHaveProperty(propertyPath: string | any[], value?: any): R;
+        /**
+         * Use to test that the mock function successfully returned (i.e., did not throw an error) at least one time
+         */
+        toHaveReturned(): R;
+        /**
+         * Use to ensure that a mock function returned successfully (i.e., did not throw an error) an exact number of times.
+         * Any calls to the mock function that throw an error are not counted toward the number of times the function returned.
+         */
+        toHaveReturnedTimes(expected: number): R;
+        /**
+         * Use to ensure that a mock function returned a specific value.
+         */
+        toHaveReturnedWith(expected: any): R;
         /**
          * Check that a string matches a regular expression.
          */
@@ -492,6 +534,22 @@ declare namespace jest {
          * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
          */
         toMatchSnapshot(snapshotName?: string): R;
+        /**
+         * Ensure that a mock function has returned (as opposed to thrown) at least once.
+         */
+        toReturn(): R;
+        /**
+         * Ensure that a mock function has returned (as opposed to thrown) a specified number of times.
+         */
+        toReturnTimes(count: number): R;
+        /**
+         * Ensure that a mock function has returned a specified value at least once.
+         */
+        toReturnWith(value: any): R;
+        /**
+         * Use to test that objects have the same types as well as structure.
+         */
+        toStrictEqual(expected: {}): R;
         /**
          * Used to test that a function throws when it is called.
          */
@@ -550,9 +608,29 @@ declare namespace jest {
         mockRejectedValueOnce(value: any): Mock<T>;
     }
 
+    /**
+     * Represents the result of a single call to a mock function.
+     */
+    interface MockResult {
+        /**
+         * True if the function threw.
+         * False if the function returned.
+         */
+        isThrow: boolean;
+        /**
+         * The value that was either thrown or returned by the function.
+         */
+        value: any;
+    }
+
     interface MockContext<T> {
         calls: any[][];
         instances: T[];
+        invocationCallOrder: number[];
+        /**
+         * List of results of calls to the mock function.
+         */
+        results: MockResult[];
     }
 }
 
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index a90a7a9e5a..d22d1d272d 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -213,6 +213,9 @@ describe('Assymetric matchers', () => {
             greeting: expect.stringContaining('hello'),
         });
 
+        expect("foo").toStrictEqual("foo");
+        expect({ a: "foo" }).toStrictEqual({ a: "foo" });
+
         const callback = jest.fn();
         expect(callback).toEqual(expect.any(Function));
         callback(5, "test");
@@ -254,6 +257,26 @@ describe('setTimeout', () => {
     });
 });
 
+describe("spy call matchers", () => {
+    const spy = jest.fn();
+
+    expect(spy).lastReturnedWith("foo");
+    expect(spy).nthReturnedWith(3, "foo");
+    expect(spy).toHaveBeenCalled();
+    expect(spy).toHaveBeenCalledTimes(7);
+    expect(spy).toHaveBeenCalledWith("foo");
+    expect(spy).toHaveBeenLastCalledWith("foo");
+    expect(spy).toHaveBeenNthCalledWith(3, "foo");
+    expect(spy).toHaveReturned();
+    expect(spy).toHaveReturnedTimes(7);
+    expect(spy).toHaveReturnedWith("foo");
+    expect(spy).toHaveLastReturnedWith("foo");
+    expect(spy).toHaveNthReturnedWith(3, "foo");
+    expect(spy).toReturn();
+    expect(spy).toReturnTimes(3);
+    expect(spy).toReturnWith("foo");
+});
+
 describe('Extending extend', () => {
     it('works', () => {
         expect.extend({

From d77dc9c062cba00b0d711776508284f7e6d808ad Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 02:17:08 -0400
Subject: [PATCH 1107/1124] babel-traverse: Allow use of visitors with custom
 state types in calls to traverse

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index df420c17bd..211770d76d 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -8,9 +8,10 @@
 import * as t from 'babel-types';
 export type Node = t.Node;
 
-export default function traverse(parent: Node | Node[], opts?: TraverseOptions, scope?: Scope, state?: any, parentPath?: NodePath): void;
+export default function traverse<S>(parent: Node | Node[], opts: TraverseOptions<S>, scope: Scope, state: S, parentPath?: NodePath): void;
+export default function traverse(parent: Node | Node[], opts: TraverseOptions, scope?: Scope, state?: any, parentPath?: NodePath): void;
 
-export interface TraverseOptions extends Visitor {
+export interface TraverseOptions<S = Node> extends Visitor<S> {
     scope?: Scope;
     noScope?: boolean;
 }
@@ -353,7 +354,8 @@ export class NodePath<T = Node> {
 
     buildCodeFrameError<TError extends Error>(msg: string, Error?: new (msg: string) => TError): TError;
 
-    traverse(visitor: Visitor, state?: any): void;
+    traverse<T>(visitor: Visitor<T>, state: T): void;
+    traverse(visitor: Visitor): void;
 
     set(key: string, node: Node): void;
 

From 920bf98cd87fbf36be60ac1ff302cdcfa8a5d63e Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 02:18:04 -0400
Subject: [PATCH 1108/1124] babel-traverse: Denote that path keys may be
 indexes

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 211770d76d..738f60f3df 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -340,7 +340,7 @@ export class NodePath<T = Node> {
     listKey: string;
     inList: boolean;
     parentKey: string;
-    key: string;
+    key: string | number;
     node: T;
     scope: Scope;
     type: string;

From 38cf733222102bd30f73f0f2862ff1233952ab0a Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 02:20:14 -0400
Subject: [PATCH 1109/1124] babel-traverse: Denote proper return types for
 getFunctionParent/getStatementParent and add missing
 getAllPrevSiblings/getAllNextSiblings

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 738f60f3df..c3d7b1d819 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -374,10 +374,10 @@ export class NodePath<T = Node> {
     find(callback: (path: NodePath) => boolean): NodePath;
 
     /** Get the parent function of the current path. */
-    getFunctionParent(): NodePath;
+    getFunctionParent(): NodePath<t.Function>;
 
     /** Walk up the tree until we hit a parent node path in a list. */
-    getStatementParent(): NodePath;
+    getStatementParent(): NodePath<t.Statement>;
 
     /**
      * Get the deepest common ancestor and then from it, get the earliest relationship path
@@ -584,7 +584,9 @@ export class NodePath<T = Node> {
 
     getCompletionRecords(): NodePath[];
 
-    getSibling(key: string): NodePath;
+    getSibling(key: string | number): NodePath;
+    getAllPrevSiblings(): NodePath[];
+    getAllNextSiblings(): NodePath[];
 
     get(key: string, context?: boolean | TraversalContext): NodePath;
 

From 361f4949ac881c66ce93def5e537bd33dac8ff39 Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 04:12:50 -0400
Subject: [PATCH 1110/1124] babel-types: Infer return types on NodePath.get
 using the keys/values of the type of node the path represents

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index c3d7b1d819..e1cfbfa49b 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.9
 
 import * as t from 'babel-types';
 export type Node = t.Node;
@@ -588,7 +588,8 @@ export class NodePath<T = Node> {
     getAllPrevSiblings(): NodePath[];
     getAllNextSiblings(): NodePath[];
 
-    get(key: string, context?: boolean | TraversalContext): NodePath;
+    get<K extends keyof T>(key: K, context?: boolean | TraversalContext): T[K] extends (Node | null | undefined)[] ? NodePath<T[K][number]>[] : T[K] extends Node | null | undefined ? NodePath<T[K]> : never;
+    get(key: string, context?: boolean | TraversalContext): NodePath | NodePath[];
 
     getBindingIdentifiers(duplicates?: boolean): Node[];
 

From 3b237ad2dddc7c66cfb8907bd1d2a2032254ece6 Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 04:13:44 -0400
Subject: [PATCH 1111/1124] babel-traverse: Add missing typed overload of
 traverse on Scope

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index e1cfbfa49b..e979844adb 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -26,6 +26,7 @@ export class Scope {
     bindings: { [name: string]: Binding; };
 
     /** Traverse node with current scope and path. */
+    traverse<S>(node: Node | Node[], opts: TraverseOptions<S>, state: S): void;
     traverse(node: Node | Node[], opts?: TraverseOptions, state?: any): void;
 
     /** Generate a unique identifier and add it to the current scope. */

From 5c76c6db99c046815fc6d1ff5797f44c328a6879 Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 04:14:50 -0400
Subject: [PATCH 1112/1124] babel-traverse: Make the type of NodePath.type
 include null if the NodePath can contain a null node

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index e979844adb..9fb6bd99c2 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -344,7 +344,7 @@ export class NodePath<T = Node> {
     key: string | number;
     node: T;
     scope: Scope;
-    type: string;
+    type: T extends undefined | null ? string | null : string;
     typeAnnotation: object;
 
     getScope(scope: Scope): Scope;

From 28a15301ba8398437dd0a0303c7b27e6daf2e894 Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 04:15:10 -0400
Subject: [PATCH 1113/1124] babel-traverse: Add missing willIMaybeExecuteBefore
 on NodePath

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 9fb6bd99c2..12c5bd0f55 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -540,6 +540,9 @@ export class NodePath<T = Node> {
     /** Get the source code associated with this node. */
     getSource(): string;
 
+    /** Check if the current path will maybe execute before another path */
+    willIMaybeExecuteBefore(path: NodePath): boolean;
+
     // ------------------------- context -------------------------
     call(key: string): boolean;
 

From 8a68eebb8cfe87f911473511f160486f2eba0f3e Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 04:15:51 -0400
Subject: [PATCH 1114/1124] babel-traverse: Add Ryan Petrich to authors list

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 12c5bd0f55..be85de0475 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/babel/babel/tree/master/packages/babel-traverse
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
+//                 Ryan Petrich <https://github.com/rpetrich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 

From 4aafc97af0cb7b52353648aafbddb1af80d3715b Mon Sep 17 00:00:00 2001
From: Andrew Makarov <me@r3nya.ru>
Date: Mon, 11 Jun 2018 10:43:01 +0300
Subject: [PATCH 1115/1124] =?UTF-8?q?[jest]=20Added=20tests=20for=20?=
 =?UTF-8?q?=E2=80=9CtoHaveBeenNthCalledWith=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index a90a7a9e5a..09e9ecef99 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -731,3 +731,9 @@ test('moduleName 2', () => {
     const moduleName = require('../moduleName');
     expect(moduleName()).toEqual(2);
 });
+
+describe('toHaveBeenNthCalledWith', () => {
+    const fn = jest.fn();
+
+    expect(fn).toHaveBeenNthCalledWith(3, "foo");
+});

From 49d2f9d924250667ec0dcc2a24b48adabad48082 Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 05:57:10 -0400
Subject: [PATCH 1116/1124] babel-traverse: Fix lint warnings

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

diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index be85de0475..9be09f7655 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -593,7 +593,10 @@ export class NodePath<T = Node> {
     getAllPrevSiblings(): NodePath[];
     getAllNextSiblings(): NodePath[];
 
-    get<K extends keyof T>(key: K, context?: boolean | TraversalContext): T[K] extends (Node | null | undefined)[] ? NodePath<T[K][number]>[] : T[K] extends Node | null | undefined ? NodePath<T[K]> : never;
+    get<K extends keyof T>(key: K, context?: boolean | TraversalContext):
+        T[K] extends Array<Node | null | undefined> ? Array<NodePath<T[K][number]>> :
+        T[K] extends Node | null | undefined ? NodePath<T[K]> :
+        never;
     get(key: string, context?: boolean | TraversalContext): NodePath | NodePath[];
 
     getBindingIdentifiers(duplicates?: boolean): Node[];

From c972d79ad2f1d8b9f3aca76e9ff67c55fab537de Mon Sep 17 00:00:00 2001
From: Ryan Petrich <rpetrich@gmail.com>
Date: Mon, 11 Jun 2018 05:57:50 -0400
Subject: [PATCH 1117/1124] babel-traverse: Update all babel-related packages
 to require TypeScript 2.8 (so that tests pass)

---
 types/babel-core/index.d.ts              | 2 +-
 types/babel-generator/index.d.ts         | 2 +-
 types/babel-template/index.d.ts          | 2 +-
 types/babel-traverse/index.d.ts          | 2 +-
 types/babel-types/index.d.ts             | 2 +-
 types/babel-webpack-plugin/index.d.ts    | 2 +-
 types/babelify/index.d.ts                | 2 +-
 types/babylon-walk/index.d.ts            | 2 +-
 types/babylon/index.d.ts                 | 2 +-
 types/istanbul-lib-instrument/index.d.ts | 2 +-
 types/prettier/index.d.ts                | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/types/babel-core/index.d.ts b/types/babel-core/index.d.ts
index de09b2a91f..3a6da1b49d 100644
--- a/types/babel-core/index.d.ts
+++ b/types/babel-core/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as t from 'babel-types';
 export { t as types };
diff --git a/types/babel-generator/index.d.ts b/types/babel-generator/index.d.ts
index 2e34d158fc..8afeca4cd1 100644
--- a/types/babel-generator/index.d.ts
+++ b/types/babel-generator/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Johnny Estilles <https://github.com/johnnyestilles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as t from 'babel-types';
 
diff --git a/types/babel-template/index.d.ts b/types/babel-template/index.d.ts
index 467b0193e7..50b759c3f5 100644
--- a/types/babel-template/index.d.ts
+++ b/types/babel-template/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import { BabylonOptions } from 'babylon';
 import * as t from 'babel-types';
diff --git a/types/babel-traverse/index.d.ts b/types/babel-traverse/index.d.ts
index 9be09f7655..5c18c3ff29 100644
--- a/types/babel-traverse/index.d.ts
+++ b/types/babel-traverse/index.d.ts
@@ -4,7 +4,7 @@
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Ryan Petrich <https://github.com/rpetrich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.9
+// TypeScript Version: 2.8
 
 import * as t from 'babel-types';
 export type Node = t.Node;
diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index 8c892a3ca0..47068c3481 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -5,7 +5,7 @@
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Boris Cherny <https://github.com/bcherny>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 export interface Comment {
     value: string;
diff --git a/types/babel-webpack-plugin/index.d.ts b/types/babel-webpack-plugin/index.d.ts
index 3f16d154ac..6f85bae2cc 100644
--- a/types/babel-webpack-plugin/index.d.ts
+++ b/types/babel-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/simlrh/babel-webpack-plugin
 // Definitions by: Jed Fox <https://github.com/j-f1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import { Plugin } from 'webpack';
 import { TransformOptions } from 'babel-core';
diff --git a/types/babelify/index.d.ts b/types/babelify/index.d.ts
index f394d2ba44..ca90ae9d4c 100644
--- a/types/babelify/index.d.ts
+++ b/types/babelify/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/babylon-walk/index.d.ts b/types/babylon-walk/index.d.ts
index 02c3f39d10..43c9c1bf3a 100644
--- a/types/babylon-walk/index.d.ts
+++ b/types/babylon-walk/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pugjs/babylon-walk
 // Definitions by: Marek Buchar <https://github.com/czbuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as babelTypes from 'babel-types';
 
diff --git a/types/babylon/index.d.ts b/types/babylon/index.d.ts
index eb22f30c13..07eb74bb32 100644
--- a/types/babylon/index.d.ts
+++ b/types/babylon/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Troy Gerwien <https://github.com/yortus>
 //                 Marvin Hagemeister <https://github.com/marvinhagemeister>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import { File, Expression } from 'babel-types';
 
diff --git a/types/istanbul-lib-instrument/index.d.ts b/types/istanbul-lib-instrument/index.d.ts
index e1d4e813f9..1b749a893c 100644
--- a/types/istanbul-lib-instrument/index.d.ts
+++ b/types/istanbul-lib-instrument/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/istanbuljs/istanbuljs
 // Definitions by: Jason Cheatham <https://github.com/jason0x43>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 import { FileCoverage, FileCoverageData, Range } from 'istanbul-lib-coverage';
 import { RawSourceMap } from 'source-map';
diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 7d6621d69b..881ca6b182 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/prettier/prettier
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 export type AST = any;
 export type Doc = doc.builders.Doc;

From 87177af1e74a07c85741baf0f61fc505a230d530 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 11 Jun 2018 09:20:45 -0700
Subject: [PATCH 1118/1124] Outlook permission level links

---
 types/office-js/index.d.ts | 534 +++++++++++++++++++------------------
 1 file changed, 270 insertions(+), 264 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index e4cb2bb0cc..20ded0bc20 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -459,7 +459,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -484,7 +484,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -535,7 +535,7 @@ declare namespace Office {
          * 
          * Add-in type: Content, task pane, Outlook
          * 
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or Read
          */
@@ -552,7 +552,7 @@ declare namespace Office {
              *
              * @remarks
              * 
-             * Minimum permission level: Restricted
+             * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
              *
              * Applicable Outlook mode: Compose or read
              * 
@@ -2213,14 +2213,13 @@ declare namespace Office {
         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 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.
+         * 
          * |Property |Use to...|
          * |---------|---------|
          * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
@@ -2228,24 +2227,29 @@ 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.|
          *
+         * Hosts: PowerPoint, Word
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. 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.
+         *
          * Available in Requirement set: File
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Returns the specified slice.
+         * 
          * @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
-         * @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|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         * 
+         * 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. 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.
          *
          * Available in Requirement set: File
          */
@@ -2309,6 +2313,15 @@ 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.
+         * 
+         * 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|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          *
          * Hosts: Excel
          *
@@ -2317,16 +2330,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 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.
-         * 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|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. 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.
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
@@ -2346,22 +2350,24 @@ 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
-         *
-         * 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.
          * 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|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         * 
+         * 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. 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.
+
          */
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -2402,22 +2408,20 @@ 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.
-         *
-         * 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.
-         * @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.
+         * 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.
+         * 
          * 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|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         *
+         * 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. 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.
          */
         saveAsync(options?: SaveSettingsOptions, callback?: (result: AsyncResult) => void): void;
         /**
@@ -5747,7 +5751,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Read
      */
@@ -5783,7 +5787,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -5798,7 +5802,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -5818,7 +5822,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -5833,7 +5837,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -5852,7 +5856,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
          *
@@ -5873,7 +5877,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
          *
@@ -5893,7 +5897,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
          *
@@ -5911,7 +5915,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
          *
@@ -5928,7 +5932,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -5953,7 +5957,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -5977,7 +5981,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -5999,7 +6003,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -6021,7 +6025,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -6046,7 +6050,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -6070,7 +6074,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -6092,7 +6096,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -6112,7 +6116,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: Restricted
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
      *
      * Applicable Outlook mode: Read
      */
@@ -6150,7 +6154,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -6163,7 +6167,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6178,7 +6182,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -6195,7 +6199,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6213,7 +6217,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6225,7 +6229,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -6238,7 +6242,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6251,7 +6255,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6274,7 +6278,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6286,7 +6290,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -6314,7 +6318,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Read
      */
@@ -6346,7 +6350,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Read
      */
@@ -6387,7 +6391,7 @@ declare namespace Office {
      * [Api set: Mailbox Preview]
      * 
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      * 
      * Applicable Outlook mode: Compose
      */
@@ -6402,7 +6406,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          * 
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose
          * 
@@ -6422,7 +6426,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose
          * 
@@ -6455,7 +6459,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6471,7 +6475,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6487,7 +6491,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6503,7 +6507,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6523,7 +6527,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6546,7 +6550,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6560,7 +6564,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6574,7 +6578,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6586,7 +6590,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -6600,7 +6604,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6616,7 +6620,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6631,7 +6635,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6655,7 +6659,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6675,7 +6679,7 @@ declare namespace Office {
         *
         * @remarks
         *
-        * Minimum permission level: ReadItem
+        * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
         * Applicable Outlook mode: Compose or read
         */
         location: string;
@@ -6694,7 +6698,7 @@ declare namespace Office {
         *
         * @remarks
         *
-        * Minimum permission level: ReadItem
+        * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
         *
         * Applicable Outlook mode: Compose or read
         */
@@ -6715,7 +6719,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6739,7 +6743,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6761,7 +6765,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6774,7 +6778,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: Restricted
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -6786,7 +6790,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6798,7 +6802,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -6812,7 +6816,7 @@ declare namespace Office {
          *
          * Note: This member is not supported in Outlook for iOS or Outlook for Android.
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -6826,7 +6830,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6838,7 +6842,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -6857,7 +6861,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          */
@@ -6876,7 +6880,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          */
@@ -6891,7 +6895,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          * 
@@ -6912,7 +6916,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          * 
@@ -6933,7 +6937,7 @@ declare namespace Office {
         *
         * @remarks
         *
-        * Minimum permission level: ReadItem
+        * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
         *
         * Applicable Outlook mode: Compose or read
         *
@@ -6951,7 +6955,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          * 
@@ -6972,7 +6976,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          * 
@@ -6997,7 +7001,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -7012,7 +7016,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7042,7 +7046,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7068,7 +7072,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7097,7 +7101,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7127,7 +7131,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7154,7 +7158,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7178,7 +7182,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7204,7 +7208,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7231,7 +7235,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose
          */
@@ -7247,7 +7251,7 @@ declare namespace Office {
          *
          * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -7270,7 +7274,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7292,7 +7296,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7311,7 +7315,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7332,7 +7336,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7350,7 +7354,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7370,7 +7374,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7400,7 +7404,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7430,7 +7434,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7457,7 +7461,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7486,7 +7490,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7504,7 +7508,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7526,7 +7530,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7544,7 +7548,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7565,7 +7569,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -7589,7 +7593,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 {@link https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519 | Blocked attachments in Outlook}.
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -7600,18 +7604,18 @@ declare namespace Office {
          *
          * 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
+         * |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|
+         * 
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -7627,7 +7631,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -7641,7 +7645,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -7657,7 +7661,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -7676,7 +7680,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -7700,7 +7704,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -7718,7 +7722,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          * 
@@ -7736,7 +7740,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          * 
@@ -7752,7 +7756,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -7767,7 +7771,10 @@ declare namespace Office {
          * @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.
          *
+         * @remarks
+         * 
          * 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|
@@ -7777,9 +7784,8 @@ declare namespace Office {
          * |PhoneNumber|PhoneNumber|Restricted|
          * |TaskSuggestion|TaskSuggestion|ReadItem|
          * |URL|String|Restricted|
-         *
-         * @remarks
-         * Minimum permission level: Restricted
+         * 
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Read
          *
@@ -7797,7 +7803,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -7821,7 +7827,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -7842,7 +7848,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -7858,7 +7864,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -7881,7 +7887,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -7902,7 +7908,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -7920,7 +7926,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          */
@@ -7936,7 +7942,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -7952,7 +7958,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -7966,7 +7972,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -7985,7 +7991,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8003,7 +8009,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -8015,7 +8021,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -8031,7 +8037,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          */
@@ -8045,7 +8051,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8059,7 +8065,7 @@ declare namespace Office {
      *
      * @remarks
      *
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Read
      */
@@ -8103,7 +8109,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose
      */
@@ -8120,7 +8126,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          */
@@ -8135,7 +8141,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          */
@@ -8153,7 +8159,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -8170,7 +8176,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -8189,7 +8195,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -8207,7 +8213,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -8230,7 +8236,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: Restricted
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -8250,7 +8256,7 @@ declare namespace Office {
          *
          * 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 {@link https://msdn.microsoft.com/library/office/dn148008.aspx | get attachments from the selected item}.
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8274,7 +8280,7 @@ declare namespace Office {
          *
          * The restUrl value can be used to make {@link https://docs.microsoft.com/outlook/rest/ | REST API} calls to the user's mailbox.
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8288,7 +8294,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8309,7 +8315,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8328,7 +8334,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8346,7 +8352,7 @@ declare namespace Office {
          *
          * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the {@link https://msdn.microsoft.com/office/office365/APi/mail-rest-operations | Outlook Mail API} or the {@link http://graph.microsoft.io/ | Microsoft Graph}. The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
          *
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8363,7 +8369,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8388,7 +8394,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8412,7 +8418,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8436,7 +8442,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -8454,7 +8460,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Read
          *
@@ -8495,7 +8501,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose and read
          *
@@ -8520,7 +8526,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose and read
          *
@@ -8542,7 +8548,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose and read
          *
@@ -8561,7 +8567,7 @@ declare namespace Office {
          *
          * The getUserIdentityTokenAsync method returns a token that you can use to identify and {@link https://msdn.microsoft.com/library/office/fp179828.aspx | authenticate the add-in and user with a third-party system}.
          *
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose and read
          *
@@ -8600,7 +8606,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Minimum permission level: ReadWriteMailbox
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteMailbox
          *
          * Applicable Outlook mode: Compose and read
          *
@@ -8621,7 +8627,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Read
      */
@@ -8657,7 +8663,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.3]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -8689,7 +8695,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.3]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -8708,7 +8714,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8724,7 +8730,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8742,7 +8748,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8759,7 +8765,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -8770,7 +8776,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8785,7 +8791,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8798,7 +8804,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8814,7 +8820,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8827,7 +8833,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8842,7 +8848,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8858,7 +8864,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8877,7 +8883,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8893,7 +8899,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8911,7 +8917,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -8929,7 +8935,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Read
      */
@@ -8951,7 +8957,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose
      */
@@ -8970,7 +8976,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -8996,7 +9002,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9019,7 +9025,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9044,7 +9050,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9063,7 +9069,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9078,7 +9084,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9103,7 +9109,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9131,7 +9137,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9156,7 +9162,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9183,7 +9189,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9213,7 +9219,7 @@ declare namespace Office {
      * |Meeting Request - Read Series|No (setAsync not available)|Yes (item.recurrence)|
      * |Meeting Request - Read Instance|No (setAsync not available)|Yes (item.recurrence)|
      * 
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      * 
      * Applicable Outlook mode: Compose or read
      */
@@ -9225,7 +9231,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          */
@@ -9237,7 +9243,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          */
@@ -9250,7 +9256,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          */
@@ -9263,7 +9269,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          */
@@ -9278,7 +9284,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          * 
@@ -9297,7 +9303,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
          * 
@@ -9314,7 +9320,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          * 
          * Applicable Outlook mode: Compose
          * 
@@ -9336,7 +9342,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          * 
          * Applicable Outlook mode: Compose
          * 
@@ -9355,7 +9361,7 @@ declare namespace Office {
      * 
      * @remarks
      * 
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      * 
      * Applicable Outlook mode: Compose or read
      */
@@ -9447,7 +9453,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: Restricted
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -9458,7 +9464,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -9472,7 +9478,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -9487,7 +9493,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -9506,7 +9512,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: Restricted
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
          *
          * Applicable Outlook mode: Compose or read
          *
@@ -9522,7 +9528,7 @@ declare namespace Office {
      * [Api set: Mailbox Preview]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -9533,7 +9539,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -9545,7 +9551,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -9557,7 +9563,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -9569,7 +9575,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -9581,7 +9587,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -9593,7 +9599,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          * 
@@ -9607,7 +9613,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          * 
@@ -9625,7 +9631,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          * 
@@ -9641,7 +9647,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          * 
@@ -9659,7 +9665,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          * 
@@ -9675,7 +9681,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          * 
@@ -9692,7 +9698,7 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          * 
@@ -9709,7 +9715,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose
      */
@@ -9721,7 +9727,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9736,7 +9742,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9753,7 +9759,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9773,7 +9779,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9790,7 +9796,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9809,7 +9815,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9829,7 +9835,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Read
      */
@@ -9849,7 +9855,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose
      */
@@ -9862,7 +9868,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9877,7 +9883,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9896,7 +9902,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9918,7 +9924,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9937,7 +9943,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9958,7 +9964,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Minimum permission level: ReadWriteItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
          *
          * Applicable Outlook mode: Compose
          *
@@ -9974,7 +9980,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * Minimum permission level: ReadItem
+     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -9995,7 +10001,7 @@ declare namespace Office {
          * |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
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -10006,7 +10012,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -10017,7 +10023,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */
@@ -10028,7 +10034,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Minimum permission level: ReadItem
+         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
          *
          * Applicable Outlook mode: Compose or read
          */

From c45e389921480a8eb9e5702c3c6863478c8ceba2 Mon Sep 17 00:00:00 2001
From: Tim Cigrand <tcigrand@gmail.com>
Date: Mon, 11 Jun 2018 10:48:09 -0600
Subject: [PATCH 1119/1124] Make width and height strings, so they can accept
 100%

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

diff --git a/types/youtube/index.d.ts b/types/youtube/index.d.ts
index b9e45aab2d..e8e62c22f1 100644
--- a/types/youtube/index.d.ts
+++ b/types/youtube/index.d.ts
@@ -373,12 +373,12 @@ declare namespace YT
 		/**
 		 * Player width.
 		 */
-		width?: number;
+		width?: string | number;
 
 		/**
 		 * Player height
 		 */
-		height?: number;
+		height?: string | number;
 
 		/**
 		 * ID of the video to load.

From 9d821320c50c726dfa35d7b321faf4faa6faba4d Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Mon, 11 Jun 2018 12:11:53 -0700
Subject: [PATCH 1120/1124] Update index.d.ts

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

diff --git a/types/react-joyride/index.d.ts b/types/react-joyride/index.d.ts
index 3224f2eaa0..5f15d84d66 100644
--- a/types/react-joyride/index.d.ts
+++ b/types/react-joyride/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-joyride 1.11.4
+// Type definitions for react-joyride 1.11
 // Project: https://github.com/gilbarbara/react-joyride
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>, Ben Dixon <https://github.com/bendxn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 2b29639123bcc4ee87a28cafd147a84d2dd1bab0 Mon Sep 17 00:00:00 2001
From: Jinwoo Lee <jinwoo@google.com>
Date: Mon, 11 Jun 2018 13:10:35 -0700
Subject: [PATCH 1121/1124] [cosmiconfig] correct `filePath` to `filepath`

It should be `filepath` as can be seen in the code:
https://github.com/davidtheclark/cosmiconfig/blob/3e68a30161fcb65296eed26a31cd7dc42bcbb791/src/createExplorer.js#L237

Also in the document: https://github.com/davidtheclark/cosmiconfig#result
---
 types/cosmiconfig/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index eb876b6ef2..16ba1967f3 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -14,7 +14,7 @@ export interface Config {
 
 export type CosmiconfigResult = {
   config: Config;
-  filePath: string;
+  filepath: string;
   isEmpty?: boolean;
 } | null;
 

From a05ebc4ab1b9a1047d89f2ec16bf74b0a232bb08 Mon Sep 17 00:00:00 2001
From: Jinwoo Lee <jinwoo@google.com>
Date: Mon, 11 Jun 2018 13:25:04 -0700
Subject: [PATCH 1122/1124] add a test

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

diff --git a/types/cosmiconfig/cosmiconfig-tests.ts b/types/cosmiconfig/cosmiconfig-tests.ts
index 508ad00aa0..c477eedb3e 100644
--- a/types/cosmiconfig/cosmiconfig-tests.ts
+++ b/types/cosmiconfig/cosmiconfig-tests.ts
@@ -22,6 +22,13 @@ Promise.all([
   explorer.loadSync(path.join(__dirname, "sample-config.json")),
 ]).then(result => result);
 
+const result = explorer.searchSync();
+if (result) {
+  const config = result.config;
+  const filepath = result.filepath;
+  const isEmpty = result.isEmpty;
+}
+
 explorer.clearLoadCache();
 explorer.clearSearchCache();
 explorer.clearCaches();

From ebff01610e7a438110d44a4742bf40014f7f6dc4 Mon Sep 17 00:00:00 2001
From: JayAndCatchFire <JayAndCatchFire@users.noreply.github.com>
Date: Mon, 11 Jun 2018 17:01:34 -0500
Subject: [PATCH 1123/1124] Replace name with username

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

diff --git a/types/karma-chai/index.d.ts b/types/karma-chai/index.d.ts
index 87910cb6e2..15c7010071 100644
--- a/types/karma-chai/index.d.ts
+++ b/types/karma-chai/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for karma-chai 0.1
 // Project: http://xdissent.github.io/karma-chai
-// Definitions by: Jay Sherby <https://github.com/JayAndCatchFire>
+// Definitions by: JayAndCatchFire <https://github.com/JayAndCatchFire>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import chai = require('chai');

From e59988ff12389374b6e34c8fc0faa26ce1c3f13b Mon Sep 17 00:00:00 2001
From: Landix Sistemas <github@landix.com.br>
Date: Mon, 11 Jun 2018 19:11:37 -0300
Subject: [PATCH 1124/1124] Add a responsive propertie to datatable Settings
 (#24981)

* Update index.d.ts

Add a responsive propertie to datatable Settings

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts
---
 types/datatables.net/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index 2fd3f3ae45..a8f63a999e 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1432,6 +1432,11 @@ declare namespace DataTables {
          */
         tabIndex?: number;
 
+        /**
+         * Enable or disable datatables responsive. Since: 1.10
+         */
+        responsive?: boolean | object;
+
         //#endregion "Options"
 
         //#region "Callbacks"